izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Add reset func for moon crash giants cutscene (#694)

Browse Source
This commit is contained in:
Archez
2024-06-15 15:52:42 -04:00
committed by GitHub
parent cc3e015f12
commit c2199dddcf
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/overlays/actors/ovl_En_Fall/z_en_fall.c
+9 -1
View File
@@ -32,6 +32,7 @@
void EnFall_Init(Actor* thisx, PlayState* play);
void EnFall_Destroy(Actor* thisx, PlayState* play);
void EnFall_Update(Actor* thisx, PlayState* play);
void EnFall_Reset(void);
void EnFall_Setup(EnFall* this, PlayState* play);
void EnFall_CrashingMoon_PerformCutsceneActions(EnFall* this, PlayState* play);
@@ -73,6 +74,7 @@ ActorInit En_Fall_InitVars = {
/**/ EnFall_Destroy,
/**/ EnFall_Update,
/**/ NULL,
/**/ EnFall_Reset,
};
/**
@@ -316,8 +318,10 @@ void EnFall_Setup(EnFall* this, PlayState* play) {
}
}
// 2S2H [Port] Moved static vars out of function scope so they can be cleared in actor reset
static s32 sGiantsCutsceneState = 0;
void EnFall_CrashingMoon_HandleGiantsCutscene(EnFall* this, PlayState* play) {
static s32 sGiantsCutsceneState = 0;
if ((play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 0)) {
switch (sGiantsCutsceneState) {
@@ -949,3 +953,7 @@ void EnFall_MoonsTear_Draw(Actor* thisx, PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx);
}
void EnFall_Reset(void) {
sGiantsCutsceneState = 0;
}