diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index cdc2300f1..ed8d2d331 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -5172,34 +5172,19 @@ void currentPlayerPause(u32 mode) { g_PauseMode = mode; - if (g_Vars.currentplayer->pausemode == 0) { - g_Vars.currentplayer->pausemode = 1; + if (g_Vars.currentplayer->pausemode == PAUSEMODE_0) { + g_Vars.currentplayer->pausemode = PAUSEMODE_1; } } -GLOBAL_ASM( -glabel func0f0baf38 -/* f0baf38: 3c0e800a */ lui $t6,0x800a -/* f0baf3c: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0baf40: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0baf44: afbf0014 */ sw $ra,0x14($sp) -/* f0baf48: 8dcf1a24 */ lw $t7,0x1a24($t6) -/* f0baf4c: 24010003 */ addiu $at,$zero,0x3 -/* f0baf50: 55e10009 */ bnel $t7,$at,.L0f0baf78 -/* f0baf54: 8fbf0014 */ lw $ra,0x14($sp) -/* f0baf58: 0fc5b350 */ jal func0f16cd40 -/* f0baf5c: 00002025 */ or $a0,$zero,$zero -/* f0baf60: 0fc5b6cf */ jal func0f16db3c -/* f0baf64: 00000000 */ sll $zero,$zero,0x0 -/* f0baf68: 3c18800a */ lui $t8,0x800a -/* f0baf6c: 8f18a244 */ lw $t8,-0x5dbc($t8) -/* f0baf70: af001a24 */ sw $zero,0x1a24($t8) -/* f0baf74: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0baf78: -/* f0baf78: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0baf7c: 03e00008 */ jr $ra -/* f0baf80: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0baf38(void) +{ + if (g_Vars.currentplayer->pausemode == PAUSEMODE_3) { + func0f16cd40(0); + func0f16db3c(); + g_Vars.currentplayer->pausemode = PAUSEMODE_0; + } +} GLOBAL_ASM( glabel func0f0baf84 diff --git a/src/include/constants.h b/src/include/constants.h index bfffa7b4f..ff5b5948e 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1593,6 +1593,10 @@ #define PATHTYPE_FLYING 2 #define PATHTYPE_4 4 +#define PAUSEMODE_0 0 +#define PAUSEMODE_1 1 +#define PAUSEMODE_3 3 + #define PLAYERFLAG_NOCONTROL 0x00000002 #define PROPFLAG_02 0x02 diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index cb18de7a4..dc9b403a8 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -35,7 +35,7 @@ u32 func0f0baac0(void); u32 func0f0bace0(void); u32 func0f0bad6c(void); void currentPlayerPause(u32 mode); -u32 func0f0baf38(void); +void func0f0baf38(void); u32 func0f0baf84(void); u32 func0f0bb04c(void); u32 func0f0bb2e8(void); diff --git a/src/include/game/game_167ae0.h b/src/include/game/game_167ae0.h index f501cbd34..27b046d3c 100644 --- a/src/include/game/game_167ae0.h +++ b/src/include/game/game_167ae0.h @@ -24,7 +24,7 @@ u32 getEffectiveSlowMotion(void); u32 func0f16b96c(void); u32 func0f16cb04(void); void func0f16cce4(void); -u32 func0f16cd40(void); +void func0f16cd40(u32 arg0); void fadeConfigure(u32 color, s16 num_frames); bool fadeIsActive(void); void stageLoad(void); diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index 5333e8bb0..9c7d8c2b4 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -25,7 +25,7 @@ u32 func0f16d9fc(void); u32 func0f16da2c(void); u32 func0f16daa4(void); u32 func0f16db14(void); -u32 func0f16db3c(void); +void func0f16db3c(void); u32 func0f16dba4(void); u32 func0f16dc78(void); u32 func0f16dd14(void);