Fix time savers not applying with boot to debug warp#6151
Merged
serprex merged 1 commit intoHarbourMasters:developfrom Jan 18, 2026
Merged
Fix time savers not applying with boot to debug warp#6151serprex merged 1 commit intoHarbourMasters:developfrom
serprex merged 1 commit intoHarbourMasters:developfrom
Conversation
Contributor
|
|
e16c3af to
9ddb8ce
Compare
Contributor
garrettjoecox
left a comment
There was a problem hiding this comment.
This is not the correct fix, this will cause all "OnLoadGame" hooks to fire every time the scene changes.
We probably instead need to manually invoke GameInteractor_ExecuteOnLoadGame within the boot sequence somewhere
Contributor
|
I'm busy most of today working on 2ship stuff but tomorrow I can try getting this working if you haven't already |
343c936 to
f17349d
Compare
Contributor
|
@serprex I think this alone should do the trick diff --git i/soh/src/overlays/gamestates/ovl_select/z_select.c w/soh/src/overlays/gamestates/ovl_select/z_select.c
index 7f15d3971..47c546608 100644
--- i/soh/src/overlays/gamestates/ovl_select/z_select.c
+++ w/soh/src/overlays/gamestates/ovl_select/z_select.c
@@ -13,6 +13,7 @@
#include "soh/Enhancements/randomizer/randomizer_grotto.h"
#include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
void Select_SwitchBetterWarpMode(SelectContext* this, u8 isBetterWarpMode);
void Sram_InitDebugSave(void);
@@ -32,6 +33,7 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) {
gSaveContext.magic = 0;
gSaveContext.magicCapacity = 0;
gSaveContext.magicLevel = gSaveContext.magic;
+ GameInteractor_ExecuteOnLoadGame(gSaveContext.fileNum);
}
for (int buttonIndex = 0; buttonIndex < ARRAY_COUNT(gSaveContext.buttonStatus); buttonIndex++) {
gSaveContext.buttonStatus[buttonIndex] = BTN_ENABLED; |
f17349d to
8ebf865
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
null
Build Artifacts