etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing changes

Browse source
This commit is contained in:
MysterD 2022-02-20 20:39:05 -08:00
parent ad6907ff77
commit c2ee370182
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/level_update.c
View file

@ -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();
}
}

2
src/game/level_update.h
View file

@ -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

2
src/game/mario.c
View file

@ -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;