Implemented save on achievements and fixed some bugs

KiritoDv · KiritoDv · commit c87b08f02604 · 2026-02-21T19:32:07.000-06:00
diff --git a/src/audio/external.c b/src/audio/external.c
@@ -2304,7 +2304,11 @@ void play_music(u8 player, u16 seqArgs, u16 fadeTimer) {
             if (i == 0) {
                 seq_player_play_sequence(SEQ_PLAYER_LEVEL, seqId, fadeTimer);
             } else if (!gSequencePlayers[SEQ_PLAYER_LEVEL].enabled) {
-                stop_background_music(sBackgroundMusicQueue[0].seqId);
+                s16 seqId = sBackgroundMusicQueue[0].seqId;
+                stop_background_music(seqId);
+                if (seqId == SEQ_LEVEL_BOSS_KOOPA || seqId == SEQ_LEVEL_BOSS_KOOPA_FINAL) {
+                    CALL_EVENT(BossBattleEnded);
+                }
             }
             return;
         }
diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c
@@ -799,6 +799,10 @@ u64 *synthesis_process_notes(s16 *aiBuf, s32 bufLen, u64 *cmd) {
 #endif
 
                     while (nAdpcmSamplesProcessed != samplesLenAdjusted) {
+
+                        if (note->synthesisBuffers == NULL) {
+                            continue;
+                        }
                         s32 samplesRemaining; // v1
                         s32 s0;
 
diff --git a/src/engine/level_script.c b/src/engine/level_script.c
@@ -23,6 +23,7 @@
 #include "math_util.h"
 #include "surface_collision.h"
 #include "surface_load.h"
+#include "seq_ids.h"
 #include "port/hooks/Events.h"
 
 #define CMD_GET(type, offset) (*(type *) (CMD_PROCESS_OFFSET(offset) + (u8 *) sCurrentCmd))
@@ -708,7 +709,11 @@ static void level_cmd_set_music(void) {
 }
 
 static void level_cmd_set_menu_music(void) {
-    set_background_music(0, CMD_GET(s16, 2), 0);
+    s16 seqId = CMD_GET(s16, 2);
+    if(seqId == SEQ_LEVEL_BOSS_KOOPA || seqId == SEQ_LEVEL_BOSS_KOOPA_FINAL) {
+        CALL_EVENT(BossBattleStarted, seqId == SEQ_LEVEL_BOSS_KOOPA ? BOSS_BATTLE_KOOPA : BOSS_BATTLE_KOOPA_FINAL);
+    }
+    set_background_music(0, seqId, 0);
     sCurrentCmd = CMD_NEXT;
 }
 
diff --git a/src/game/behaviors/eyerok.inc.c b/src/game/behaviors/eyerok.inc.c
@@ -128,6 +128,7 @@ static void eyerok_boss_act_die(void) {
     } else if (o->oTimer > 120) {
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
         obj_mark_for_deletion(o);
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c
@@ -91,6 +91,7 @@ void king_bobomb_act_2(void) {
     if (mario_is_far_below_object(1200.0f)) {
         o->oAction = 0;
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
@@ -157,6 +158,7 @@ void king_bobomb_act_1(void) {
     if (mario_is_far_below_object(1200.0f)) {
         o->oAction = 0;
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
@@ -227,6 +229,7 @@ void king_bobomb_act_7(void) {
 void king_bobomb_act_8(void) {
     if (o->oTimer == 60) {
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
@@ -313,6 +316,7 @@ void king_bobomb_act_5(void) { // bobomb returns home
             if (mario_is_far_below_object(1200.0f)) {
                 o->oAction = 0;
                 stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+                CALL_EVENT(BossBattleEnded);
             }
 
             if (cur_obj_can_mario_activate_textbox_2(500.0f, 100.0f)) {
diff --git a/src/game/behaviors/whomp.inc.c b/src/game/behaviors/whomp.inc.c
@@ -114,6 +114,7 @@ void king_whomp_chase(void) {
     if (mario_is_far_below_object(1000.0f)) {
         o->oAction = 0;
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
@@ -264,6 +265,7 @@ void whomp_die(void) {
 void king_whomp_stop_music(void) {
     if (o->oTimer == 60) {
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
+        CALL_EVENT(BossBattleEnded);
     }
 }
 
diff --git a/src/game/behaviors/wiggler.inc.c b/src/game/behaviors/wiggler.inc.c
@@ -370,6 +370,7 @@ static void wiggler_act_fall_through_floor(void) {
     if (o->oTimer == 60) {
         stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));
         o->oWigglerFallThroughFloorsHeight = 1700.0f;
+        CALL_EVENT(BossBattleEnded);
     } else if (o->oTimer > 60) {
         if (o->oPosY < o->oWigglerFallThroughFloorsHeight) {
             o->oAction = WIGGLER_ACT_WALK;
diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
@@ -1362,6 +1362,7 @@ void handle_special_dialog_text(s16 dialogID) { // dialog ID tables, in order
         if (dialogBossStart[i] == dialogID) {
             seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);
             play_music(SEQ_PLAYER_LEVEL, SEQUENCE_ARGS(4, SEQ_EVENT_BOSS), 0);
+            CALL_EVENT(BossBattleStarted, BOSS_BATTLE_GENERIC);
             return;
         }
     }
diff --git a/src/game/level_update.c b/src/game/level_update.c
@@ -728,15 +728,19 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) {
                 play_transition(WARP_TRANSITION_FADE_INTO_MARIO, 0x20, 0x00, 0x00, 0x00);
                 break;
 
-            case WARP_OP_DEATH:
+            case WARP_OP_DEATH: {
                 if (m->numLives == 0) {
                     sDelayedWarpOp = WARP_OP_GAME_OVER;
                 }
+                if(is_sequence_playing(SEQ_EVENT_BOSS) || is_sequence_playing(SEQ_LEVEL_BOSS_KOOPA) || is_sequence_playing(SEQ_LEVEL_BOSS_KOOPA_FINAL)) {
+                    CALL_EVENT(BossBattleEnded);
+                }
                 sDelayedWarpTimer = 48;
                 sSourceWarpNodeId = WARP_NODE_DEATH;
                 play_transition(WARP_TRANSITION_FADE_INTO_BOWSER, 0x30, 0x00, 0x00, 0x00);
                 play_sound(SOUND_MENU_BOWSER_LAUGH, gGlobalSoundSource);
                 break;
+            }
 
             case WARP_OP_WARP_FLOOR:
                 sSourceWarpNodeId = WARP_NODE_WARP_FLOOR;
diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c
@@ -13,6 +13,7 @@
 #include "mario_step.h"
 #include "save_file.h"
 #include "rumble_init.h"
+#include "seq_ids.h"
 
 void play_flip_sounds(struct MarioState *m, s16 frame1, s16 frame2, s16 frame3) {
     s32 animFrame = m->marioObj->header.gfx.animInfo.animFrame;
diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c
@@ -12,6 +12,7 @@
 #include "memory.h"
 #include "behavior_data.h"
 #include "rumble_init.h"
+#include "seq_ids.h"
 
 struct LandingAction {
     s16 numFrames;
@@ -1343,6 +1344,9 @@ s32 act_burning_ground(struct MarioState *m) {
         CALL_CANCELLABLE_EVENT(PlayerDeath, m, DEATH_TYPE_FIRE) {
             set_mario_action(m, ACT_STANDING_DEATH, 0);
         };
+        if(is_sequence_playing(SEQ_EVENT_BOSS) || is_sequence_playing(SEQ_LEVEL_BOSS_KOOPA) || is_sequence_playing(SEQ_LEVEL_BOSS_KOOPA_FINAL)) {
+            CALL_EVENT(BossBattleEnded);
+        }
     }
 
     m->marioBodyState->eyeState = MARIO_EYES_DEAD;
diff --git a/src/game/save_file.h b/src/game/save_file.h
@@ -3,6 +3,7 @@
 
 #include <libultra/types.h>
 #include "port/Rando/Types.h"
+#include "port/mods/achievements/Achievements.h"
 
 #include "types.h"
 #include "area.h"
@@ -37,20 +38,21 @@ struct RandoSaveOption {
     int32_t randoOptionValue;
 };
 
-typedef enum {
-    SAVETYPE_VANILLA,
-    SAVETYPE_RANDO,
-} SaveType;
-
 struct RandoSaveData {
     struct RandoSaveCheck randoSaveChecks[RC_MAX];
     struct RandoSaveEntrance randoSaveEntrances[RE_MAX];
     u32 randoSaveOptions[RO_MAX];
     u32 finalSeed;
 };
 
+typedef struct ShipSaveFeatures {
+    bool achievements;
+    bool rando;
+} ShipSaveFeatures;
+
 struct ShipSaveData {
-    SaveType saveType;
+    struct ShipSaveFeatures features;
+    struct AchievementSaveData achievementSaveData;
     struct RandoSaveData randoSaveData;
 };
 
diff --git a/src/menu/file_select.c b/src/menu/file_select.c
@@ -1776,11 +1776,12 @@ void print_save_file_star_count(s8 fileIndex, s16 x, s16 y) {
         int_to_str(starCount, starCountText);
         print_hud_lut_string(HUD_LUT_GLOBAL, x + offset + 16, y, starCountText);
     } else {
-        if (gSaveBuffer.files[fileIndex][0].shipSaveData.saveType == SAVETYPE_RANDO) {
-            // Print "rando" text
+        ShipSaveFeatures features = gSaveBuffer.files[fileIndex][0].shipSaveData.features;
+
+        if (features.rando) {
+            // Print "rando + achievements" text
             print_hud_lut_string(HUD_LUT_GLOBAL, x, y, textRand);
         } else {
-            // Print "new" text
             print_hud_lut_string(HUD_LUT_GLOBAL, x, y, GameEngine_LoadTranslation("TEXT_NEW"));
         }
     }
@@ -1848,19 +1849,19 @@ void print_main_menu_strings(void) {
     gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin);
     gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha);
     print_menu_generic_string(MARIOTEXT_X1, 65,
-                              gSaveBuffer.files[SAVE_FILE_A][0].shipSaveData.saveType == SAVETYPE_RANDO
+                              gSaveBuffer.files[SAVE_FILE_A][0].shipSaveData.features.rando
                                   ? textMarioRando
                                   : GameEngine_LoadTranslation("TEXT_FILE_MARIO_A"));
     print_menu_generic_string(MARIOTEXT_X2, 65,
-                              gSaveBuffer.files[SAVE_FILE_B][0].shipSaveData.saveType == SAVETYPE_RANDO
+                              gSaveBuffer.files[SAVE_FILE_B][0].shipSaveData.features.rando
                                   ? textMarioRando
                                   : GameEngine_LoadTranslation("TEXT_FILE_MARIO_B"));
     print_menu_generic_string(MARIOTEXT_X1, 105,
-                              gSaveBuffer.files[SAVE_FILE_C][0].shipSaveData.saveType == SAVETYPE_RANDO
+                              gSaveBuffer.files[SAVE_FILE_C][0].shipSaveData.features.rando
                                   ? textMarioRando
                                   : GameEngine_LoadTranslation("TEXT_FILE_MARIO_C"));
     print_menu_generic_string(MARIOTEXT_X2, 105,
-                              gSaveBuffer.files[SAVE_FILE_D][0].shipSaveData.saveType == SAVETYPE_RANDO
+                              gSaveBuffer.files[SAVE_FILE_D][0].shipSaveData.features.rando
                                   ? textMarioRando
                                   : GameEngine_LoadTranslation("TEXT_FILE_MARIO_D"));
     gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end);
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
@@ -811,6 +811,9 @@ void GameEngine::Destroy() {
 #ifdef __SWITCH__
     Ship::Switch::Exit();
 #endif
+    for(auto& entry : Instance->memoryPool) {
+        delete[] entry.addr;
+    }
 }
 
 void GameEngine::StartFrame() const {
@@ -1398,4 +1401,23 @@ extern "C" void GameEngine_GfxPrint(const char* str, void* printer, void (*print
 extern "C" void* GameEngine_GetExactDataByName(const char* path) {
     auto asset = Ship::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(path, true);
     return asset ? static_cast<void*>(asset->GetRawPointer()) : nullptr;
+}
+
+extern "C" void* GameEngine_Malloc(size_t size) {
+    auto& pool = GameEngine::Instance->memoryPool;
+
+    pool.push_back({ new uint8_t[size], size });
+    return (void*) pool.back().addr;
+}
+
+extern "C" void GameEngine_Free(void* ptr) {
+    auto& pool = GameEngine::Instance->memoryPool;
+
+    for (auto it = pool.begin(); it != pool.end(); ++it) {
+        if (it->addr == ptr) {
+            delete[] it->addr;
+            pool.erase(it);
+            break;
+        }
+    }
 }
diff --git a/src/port/Engine.h b/src/port/Engine.h
@@ -27,6 +27,11 @@ struct CtlEntry;
 struct AudioBankSample;
 struct AudioSequenceData;
 
+struct AllocationEntry {
+  uint8_t* addr;
+  size_t size;
+};
+
 class GameEngine {
   public:
     static GameEngine* Instance;
@@ -45,6 +50,8 @@ class GameEngine {
     std::vector<std::string> sequenceTable;
     std::vector<AudioSequenceData*> audioSequenceTable;
 
+    std::vector<AllocationEntry> memoryPool;
+
     std::unordered_map<std::string, uint8_t> bankMapTable;
     std::unordered_map<std::string, std::vector<uint8_t>>* dictionary;
 
@@ -120,6 +127,8 @@ bool GameEngine_OTRSigCheck(const char* imgData);
 struct Animation* GameEngine_LoadAnimation(uint32_t animId);
 void GameEngine_GfxPrint(const char* str, void* printer, void (*printImpl)(void*, char));
 void* GameEngine_GetExactDataByName(const char* path);
+void* GameEngine_Malloc(size_t size);
+void GameEngine_Free(void* ptr);
 
 #ifdef __cplusplus
 }
diff --git a/src/port/Rando/MiscBehavior/OnFileLoad.cpp b/src/port/Rando/MiscBehavior/OnFileLoad.cpp
@@ -24,14 +24,13 @@ void Rando::MiscBehavior::OnFileLoad() {
 
         bool loadedFromSpoiler = false;
 
-        if (!CVarGetInteger("gRandoSettings.Enabled", 0)) {
-            gSaveBuffer.files[selectedFileNum]->shipSaveData.saveType = SAVETYPE_VANILLA;
+        if (!CVarGetInteger("gRandoSettings.Enabled", 0) && !IS_RANDO(selectedFileNum)) {
             Rando::Logic::shuffledPool.clear();
             return;
         }
 
         if (!IS_RANDO(selectedFileNum)) {
-            gSaveBuffer.files[selectedFileNum]->shipSaveData.saveType = SAVETYPE_RANDO;
+            gSaveBuffer.files[selectedFileNum]->shipSaveData.features.rando = true;
             Rando::Logic::InitializeSaveChecks();
             Rando::Logic::InitializeSaveEntrances();
             Rando::Logic::InitializeSaveOptions();
diff --git a/src/port/Rando/Rando.h b/src/port/Rando/Rando.h
@@ -18,7 +18,7 @@ extern "C" {
 extern struct SaveBuffer gSaveBuffer;
 }
 
-#define IS_RANDO(fileNum) (gSaveBuffer.files[fileNum]->shipSaveData.saveType == SAVETYPE_RANDO)
+#define IS_RANDO(fileNum) (gSaveBuffer.files[fileNum]->shipSaveData.features.rando)
 #define RANDO_SAVE_CHECKS(fileNum) gSaveBuffer.files[fileNum]->shipSaveData.randoSaveData.randoSaveChecks
 #define RANDO_SAVE_ENTRANCES(fileNum) gSaveBuffer.files[fileNum]->shipSaveData.randoSaveData.randoSaveEntrances
 #define RANDO_SAVE_OPTIONS(fileNum) gSaveBuffer.files[fileNum]->shipSaveData.randoSaveData.randoSaveOptions
diff --git a/src/port/data/SaveConversion.h b/src/port/data/SaveConversion.h
diff --git a/src/port/data/Saves.cpp b/src/port/data/Saves.cpp
diff --git a/src/port/hooks/list/GameEvent.h b/src/port/hooks/list/GameEvent.h
diff --git a/src/port/mods/PortEnhancements.cpp b/src/port/mods/PortEnhancements.cpp
diff --git a/src/port/mods/PortEnhancements.h b/src/port/mods/PortEnhancements.h
diff --git a/src/port/mods/achievements/Achievements.cpp b/src/port/mods/achievements/Achievements.cpp
diff --git a/src/port/mods/achievements/Achievements.h b/src/port/mods/achievements/Achievements.h
diff --git a/src/port/ui/GhostshipMenuEnhancements.cpp b/src/port/ui/GhostshipMenuEnhancements.cpp

Original file line number	Diff line number	Diff line change
`@@ -2304,7 +2304,11 @@ void play_music(u8 player, u16 seqArgs, u16 fadeTimer) {`
`2304`	`2304`	`if (i == 0) {`
`2305`	`2305`	`seq_player_play_sequence(SEQ_PLAYER_LEVEL, seqId, fadeTimer);`
`2306`	`2306`	`} else if (!gSequencePlayers[SEQ_PLAYER_LEVEL].enabled) {`
`2307`		`- stop_background_music(sBackgroundMusicQueue[0].seqId);`
	`2307`	`+ s16 seqId = sBackgroundMusicQueue[0].seqId;`
	`2308`	`+ stop_background_music(seqId);`
	`2309`	`+ if (seqId == SEQ_LEVEL_BOSS_KOOPA \|\| seqId == SEQ_LEVEL_BOSS_KOOPA_FINAL) {`
	`2310`	`+ CALL_EVENT(BossBattleEnded);`
	`2311`	`+ }`
`2308`	`2312`	`}`
`2309`	`2313`	`return;`
`2310`	`2314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ static void eyerok_boss_act_die(void) {`
`128`	`128`	`} else if (o->oTimer > 120) {`
`129`	`129`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
`130`	`130`	`obj_mark_for_deletion(o);`
	`131`	`+ CALL_EVENT(BossBattleEnded);`
`131`	`132`	`}`
`132`	`133`	`}`
`133`	`134`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ void king_bobomb_act_2(void) {`
`91`	`91`	`if (mario_is_far_below_object(1200.0f)) {`
`92`	`92`	`o->oAction = 0;`
`93`	`93`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`94`	`+ CALL_EVENT(BossBattleEnded);`
`94`	`95`	`}`
`95`	`96`	`}`
`96`	`97`
`@@ -157,6 +158,7 @@ void king_bobomb_act_1(void) {`
`157`	`158`	`if (mario_is_far_below_object(1200.0f)) {`
`158`	`159`	`o->oAction = 0;`
`159`	`160`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`161`	`+ CALL_EVENT(BossBattleEnded);`
`160`	`162`	`}`
`161`	`163`	`}`
`162`	`164`
`@@ -227,6 +229,7 @@ void king_bobomb_act_7(void) {`
`227`	`229`	`void king_bobomb_act_8(void) {`
`228`	`230`	`if (o->oTimer == 60) {`
`229`	`231`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`232`	`+ CALL_EVENT(BossBattleEnded);`
`230`	`233`	`}`
`231`	`234`	`}`
`232`	`235`
`@@ -313,6 +316,7 @@ void king_bobomb_act_5(void) { // bobomb returns home`
`313`	`316`	`if (mario_is_far_below_object(1200.0f)) {`
`314`	`317`	`o->oAction = 0;`
`315`	`318`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`319`	`+ CALL_EVENT(BossBattleEnded);`
`316`	`320`	`}`
`317`	`321`
`318`	`322`	`if (cur_obj_can_mario_activate_textbox_2(500.0f, 100.0f)) {`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ void king_whomp_chase(void) {`
`114`	`114`	`if (mario_is_far_below_object(1000.0f)) {`
`115`	`115`	`o->oAction = 0;`
`116`	`116`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`117`	`+ CALL_EVENT(BossBattleEnded);`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
`@@ -264,6 +265,7 @@ void whomp_die(void) {`
`264`	`265`	`void king_whomp_stop_music(void) {`
`265`	`266`	`if (o->oTimer == 60) {`
`266`	`267`	`stop_background_music(SEQUENCE_ARGS(4, SEQ_EVENT_BOSS));`
	`268`	`+ CALL_EVENT(BossBattleEnded);`
`267`	`269`	`}`
`268`	`270`	`}`
`269`	`271`
Original file line number	Diff line number	Diff line change
`@@ -1362,6 +1362,7 @@ void handle_special_dialog_text(s16 dialogID) { // dialog ID tables, in order`
`1362`	`1362`	`if (dialogBossStart[i] == dialogID) {`
`1363`	`1363`	`seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);`
`1364`	`1364`	`play_music(SEQ_PLAYER_LEVEL, SEQUENCE_ARGS(4, SEQ_EVENT_BOSS), 0);`
	`1365`	`+ CALL_EVENT(BossBattleStarted, BOSS_BATTLE_GENERIC);`
`1365`	`1366`	`return;`
`1366`	`1367`	`}`
`1367`	`1368`	`}`