izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at fixing gNeverEnteredCastle not getting correctly updated

Browse Source
This commit is contained in:
KiritoDv
2026-01-18 11:10:22 -06:00
parent aab24ff563
commit e1ba0756c8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/level_update.c
+3 -3
View File
@@ -177,7 +177,7 @@ s32 sDelayedWarpArg;
s16 unusedEULevelUpdateBss1;
#endif
s8 sTimerRunning;
s8 gNeverEnteredCastle;
bool gNeverEnteredCastle;
struct MarioState *gMarioState = &gMarioStates[0];
u8 unused1[4] = { 0 };
@@ -1188,7 +1188,7 @@ s32 init_level(void) {
set_mario_action(gMarioState, ACT_IDLE, 0);
} else if (!gDebugLevelSelect) {
if (gMarioState->action != ACT_UNINITIALIZED) {
if (save_file_exists(gCurrSaveFileNum - 1)) {
if (save_file_exists(gCurrSaveFileNum - 1) == TRUE) {
set_mario_action(gMarioState, ACT_IDLE, 0);
} else if (CVarGetInteger("gEnhancements.DisablePeachCutscene", 0) == 0) {
set_mario_action(gMarioState, ACT_INTRO_CUTSCENE, 0);
@@ -1259,7 +1259,7 @@ s32 lvl_init_from_save_file(UNUSED s16 arg0, s32 levelNum) {
#endif
sWarpDest.type = WARP_TYPE_NOT_WARPING;
sDelayedWarpOp = WARP_OP_NONE;
gNeverEnteredCastle = !save_file_exists(gCurrSaveFileNum - 1) || CVarGetInteger("gEnhancements.DisablePeachCutscene", 0) == 0;
gNeverEnteredCastle = save_file_exists(gCurrSaveFileNum - 1) == FALSE || CVarGetInteger("gEnhancements.DisablePeachCutscene", 0) == 0;
gCurrLevelNum = levelNum;
gCurrCourseNum = COURSE_NONE;
src/game/level_update.h
+1 -1
View File
@@ -102,7 +102,7 @@ struct HudDisplay {
};
extern struct HudDisplay gHudDisplay;
extern s8 gNeverEnteredCastle;
extern bool gNeverEnteredCastle;
enum HUDDisplayFlag {
HUD_DISPLAY_FLAG_LIVES = 0x0001,