diff --git a/src/game/level_update.c b/src/game/level_update.c index eddf96ff..125bbec9 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -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; diff --git a/src/game/level_update.h b/src/game/level_update.h index 04a4b55e..5fcb7d1e 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -102,7 +102,7 @@ struct HudDisplay { }; extern struct HudDisplay gHudDisplay; -extern s8 gNeverEnteredCastle; +extern bool gNeverEnteredCastle; enum HUDDisplayFlag { HUD_DISPLAY_FLAG_LIVES = 0x0001,