diff --git a/src/game/level_update.c b/src/game/level_update.c index 780a4fb02..595ae3fb0 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -845,7 +845,7 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { play_transition(WARP_TRANSITION_FADE_INTO_CIRCLE, 0x14, 0x00, 0x00, 0x00); break; - case WARP_OP_UNKNOWN_01: // enter totwc + case WARP_OP_LOOK_UP: // enter totwc sDelayedWarpTimer = 30; sSourceWarpNodeId = WARP_NODE_F2; play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x1E, 0xFF, 0xFF, 0xFF); @@ -1524,4 +1524,4 @@ void fake_lvl_init_from_save_file(void) { save_file_move_cap_to_default_location(); select_mario_cam_mode(); set_yoshi_as_not_dead(); -} \ No newline at end of file +} diff --git a/src/game/level_update.h b/src/game/level_update.h index 8a6225771..92252e587 100644 --- a/src/game/level_update.h +++ b/src/game/level_update.h @@ -12,7 +12,7 @@ #define TIMER_CONTROL_HIDE 3 #define WARP_OP_NONE 0x00 -#define WARP_OP_UNKNOWN_01 0x01 +#define WARP_OP_LOOK_UP 0x01 #define WARP_OP_UNKNOWN_02 0x02 #define WARP_OP_WARP_DOOR 0x03 #define WARP_OP_WARP_OBJECT 0x04 diff --git a/src/game/mario.c b/src/game/mario.c index 351cba698..befa94b36 100644 --- a/src/game/mario.c +++ b/src/game/mario.c @@ -1857,7 +1857,7 @@ static u8 prevent_hang(u32 hangPreventionActions[], u8* hangPreventionIndex) { // force the crash in debug mode #ifdef DEBUG - SOFT_ASSERT(hangPreventionIndex == 0); + SOFT_ASSERT_RETURN(hangPreventionIndex == 0, TRUE); #endif return TRUE;