From 5dc8a0622f2b195c9b55f11db444e13679bf505d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 26 Nov 2020 23:25:26 +1000 Subject: [PATCH] Decompile currentPlayerTickPauseMenu --- src/game/bondmove.c | 6 +- src/game/endscreen.c | 2 +- src/game/game_01bea0.c | 4 +- src/game/game_0b63b0.c | 223 +++++++++------------------- src/game/game_0f09f0.c | 2 +- src/game/game_1371b0.c | 2 +- src/game/game_167ae0.c | 2 +- src/game/game_177e00.c | 6 +- src/game/mplayer.c | 4 +- src/game/music.c | 2 +- src/include/constants.h | 14 +- src/include/game/data/data_0160b0.h | 2 +- src/include/game/game_0b63b0.h | 4 +- src/include/game/mplayer.h | 2 +- src/include/game/music.h | 2 +- src/include/types.h | 2 +- 16 files changed, 99 insertions(+), 180 deletions(-) diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 2e9fac993..eec6a3167 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -4057,7 +4057,7 @@ glabel var7f1ad8e4 // if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (sp1a0 & START_BUTTON)) { // if (g_Vars.mplayerisrunning == false) { // if (g_Vars.lvframenum > 15) { -// currentPlayerPause(PAUSEMODE_2); +// currentPlayerPause(MENUROOT_MAINMENU); // } // } else { // mpPushPauseDialog(); @@ -4067,8 +4067,8 @@ glabel var7f1ad8e4 // // 8e14 // if (g_Vars.mplayerisrunning) { // if (PLAYERCOUNT() == 1) { -// if (mpIsPaused() && (sp1a0 & START_BUTTON) && g_MpSetup.paused != PAUSEMODE_2) { -// mpSetPaused(PAUSEMODE_UNPAUSED); +// if (mpIsPaused() && (sp1a0 & START_BUTTON) && g_MpSetup.paused != MPPAUSEMODE_2) { +// mpSetPaused(MPPAUSEMODE_0); // } // } else { // if (mpIsPaused() && (sp1a0 & START_BUTTON)) { diff --git a/src/game/endscreen.c b/src/game/endscreen.c index aad1e243d..6e43de77e 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -1499,7 +1499,7 @@ glabel endscreenPrepare // // if (g_MenuData.root == MENUROOT_ENDSCREEN) { // soloSetPaused(true); -// g_Vars.currentplayer->pausemode = PAUSEMODE_3; +// g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; // } //} diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 4cf2c6cd1..989730c40 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -2460,7 +2460,7 @@ glabel var7f1a863c // } else if (g_Vars.restartlevel) { // mainSetStageNum(mainGetStageNum()); // } else { -// mpSetPaused(0); +// mpSetPaused(MPPAUSEMODE_0); // g_Vars.mplayerisrunning = false; // g_Vars.normmplayerisrunning = false; // g_Vars.lvmpbotlevel = 0; @@ -2485,7 +2485,7 @@ glabel var7f1a863c // break; // case MENUROOT_9: // d348 // if (g_Vars.coopplayernum >= 0) { -// mpSetPaused(0); +// mpSetPaused(MPPAUSEMODE_0); // g_Vars.mplayerisrunning = false; // g_Vars.normmplayerisrunning = false; // g_Vars.lvmpbotlevel = 0; diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 21bb4b0d2..499d7b958 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -149,7 +149,7 @@ u32 var80070830 = 0x00000000; u32 var80070834 = 0x3f800000; u32 var80070838 = 0x00000000; u32 var8007083c = 0x00000000; -u32 g_PauseMode = 0x00000000; +u32 g_GlobalMenuRoot = 0; u32 var80070844 = 0x00000000; u32 var80070848 = 0x40a00000; u32 var8007084c = 0x42200000; @@ -4752,162 +4752,79 @@ glabel func0f0bace0 /* f0bad68: 27bd0028 */ addiu $sp,$sp,0x28 ); -GLOBAL_ASM( -glabel func0f0bad6c -.late_rodata -glabel var7f1ad604 -.word func0f0bad6c+0x74 # f0bade0 -glabel var7f1ad608 -.word func0f0bad6c+0x94 # f0bae00 -glabel var7f1ad60c -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad610 -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad614 -.word func0f0bad6c+0x84 # f0badf0 -glabel var7f1ad618 -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad61c -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad620 -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad624 -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad628 -.word func0f0bad6c+0x94 # f0bae00 -glabel var7f1ad62c -.word func0f0bad6c+0x98 # f0bae04 -glabel var7f1ad630 -.word func0f0bad6c+0x74 # f0bade0 -.text -/* f0bad6c: 3c05800a */ lui $a1,%hi(g_Vars) -/* f0bad70: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) -/* f0bad74: 8ca30284 */ lw $v1,0x284($a1) -/* f0bad78: 27bdffe0 */ addiu $sp,$sp,-32 -/* f0bad7c: afbf0014 */ sw $ra,0x14($sp) -/* f0bad80: 8c621a24 */ lw $v0,0x1a24($v1) -/* f0bad84: 00002025 */ or $a0,$zero,$zero -/* f0bad88: 24010001 */ addiu $at,$zero,0x1 -/* f0bad8c: 5040005c */ beqzl $v0,.L0f0baf00 -/* f0bad90: 8fbf0014 */ lw $ra,0x14($sp) -/* f0bad94: 10410008 */ beq $v0,$at,.L0f0badb8 -/* f0bad98: 3c0e8007 */ lui $t6,%hi(g_PauseMode) -/* f0bad9c: 24010003 */ addiu $at,$zero,0x3 -/* f0bada0: 10410056 */ beq $v0,$at,.L0f0baefc -/* f0bada4: 24010005 */ addiu $at,$zero,0x5 -/* f0bada8: 50410045 */ beql $v0,$at,.L0f0baec0 -/* f0badac: 8c6d1a28 */ lw $t5,0x1a28($v1) -/* f0badb0: 10000053 */ b .L0f0baf00 -/* f0badb4: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0badb8: -/* f0badb8: 8dce0840 */ lw $t6,%lo(g_PauseMode)($t6) -/* f0badbc: 25cffffe */ addiu $t7,$t6,-2 -/* f0badc0: 2de1000c */ sltiu $at,$t7,0xc -/* f0badc4: 1020000f */ beqz $at,.L0f0bae04 -/* f0badc8: 000f7880 */ sll $t7,$t7,0x2 -/* f0badcc: 3c017f1b */ lui $at,%hi(var7f1ad604) -/* f0badd0: 002f0821 */ addu $at,$at,$t7 -/* f0badd4: 8c2fd604 */ lw $t7,%lo(var7f1ad604)($at) -/* f0badd8: 01e00008 */ jr $t7 -/* f0baddc: 00000000 */ nop -/* f0bade0: 0fc41ac8 */ jal soloChoosePauseDialog -/* f0bade4: 00000000 */ nop -/* f0bade8: 10000006 */ b .L0f0bae04 -/* f0badec: 00402025 */ or $a0,$v0,$zero -/* f0badf0: 0fc43240 */ jal filemgrConsiderPushingFileSelectDialog -/* f0badf4: 00000000 */ nop -/* f0badf8: 10000002 */ b .L0f0bae04 -/* f0badfc: 00402025 */ or $a0,$v0,$zero -/* f0bae00: 24040001 */ addiu $a0,$zero,0x1 -.L0f0bae04: -/* f0bae04: 5080003e */ beqzl $a0,.L0f0baf00 -/* f0bae08: 8fbf0014 */ lw $ra,0x14($sp) -/* f0bae0c: 0fc68606 */ jal dtGetData -/* f0bae10: 00000000 */ nop -/* f0bae14: 24040001 */ addiu $a0,$zero,0x1 -/* f0bae18: 0fc5b350 */ jal soloSetPaused -/* f0bae1c: afa20018 */ sw $v0,0x18($sp) -/* f0bae20: 3c05800a */ lui $a1,%hi(g_Vars) -/* f0bae24: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) -/* f0bae28: 8cb90284 */ lw $t9,0x284($a1) -/* f0bae2c: 8fa30018 */ lw $v1,0x18($sp) -/* f0bae30: 24180003 */ addiu $t8,$zero,0x3 -/* f0bae34: 3c028007 */ lui $v0,%hi(g_PauseMode) -/* f0bae38: af381a24 */ sw $t8,0x1a24($t9) -/* f0bae3c: 8c420840 */ lw $v0,%lo(g_PauseMode)($v0) -/* f0bae40: 24010002 */ addiu $at,$zero,0x2 -/* f0bae44: 10410003 */ beq $v0,$at,.L0f0bae54 -/* f0bae48: 2401000d */ addiu $at,$zero,0xd -/* f0bae4c: 14410017 */ bne $v0,$at,.L0f0baeac -/* f0bae50: 00000000 */ nop -.L0f0bae54: -/* f0bae54: 8ca804b4 */ lw $t0,0x4b4($a1) -/* f0bae58: 24010026 */ addiu $at,$zero,0x26 -/* f0bae5c: 15010013 */ bne $t0,$at,.L0f0baeac -/* f0bae60: 00000000 */ nop -/* f0bae64: 8ca90284 */ lw $t1,0x284($a1) -/* f0bae68: 8d2a00bc */ lw $t2,0xbc($t1) -/* f0bae6c: 85420028 */ lh $v0,0x28($t2) -/* f0bae70: 28410016 */ slti $at,$v0,0x16 -/* f0bae74: 14200002 */ bnez $at,.L0f0bae80 -/* f0bae78: 2841001a */ slti $at,$v0,0x1a -/* f0bae7c: 1420001f */ bnez $at,.L0f0baefc -.L0f0bae80: -/* f0bae80: 2401000a */ addiu $at,$zero,0xa -/* f0bae84: 1041001d */ beq $v0,$at,.L0f0baefc -/* f0bae88: 2401001e */ addiu $at,$zero,0x1e -/* f0bae8c: 5041001c */ beql $v0,$at,.L0f0baf00 -/* f0bae90: 8fbf0014 */ lw $ra,0x14($sp) -/* f0bae94: 10600005 */ beqz $v1,.L0f0baeac -/* f0bae98: 00000000 */ nop -/* f0bae9c: 8c6b0000 */ lw $t3,0x0($v1) -/* f0baea0: 000b67c2 */ srl $t4,$t3,0x1f -/* f0baea4: 55800016 */ bnezl $t4,.L0f0baf00 -/* f0baea8: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0baeac: -/* f0baeac: 0fc5b6c5 */ jal musicStartForMenu -/* f0baeb0: 00000000 */ nop -/* f0baeb4: 10000012 */ b .L0f0baf00 -/* f0baeb8: 8fbf0014 */ lw $ra,0x14($sp) -/* f0baebc: 8c6d1a28 */ lw $t5,0x1a28($v1) -.L0f0baec0: -/* f0baec0: 8cae0000 */ lw $t6,0x0($a1) -/* f0baec4: 01ae7821 */ addu $t7,$t5,$t6 -/* f0baec8: ac6f1a28 */ sw $t7,0x1a28($v1) -/* f0baecc: 8cb80284 */ lw $t8,0x284($a1) -/* f0baed0: 8f191a28 */ lw $t9,0x1a28($t8) -/* f0baed4: 2b210014 */ slti $at,$t9,0x14 -/* f0baed8: 54200009 */ bnezl $at,.L0f0baf00 -/* f0baedc: 8fbf0014 */ lw $ra,0x14($sp) -/* f0baee0: 0fc5b350 */ jal soloSetPaused -/* f0baee4: 00002025 */ or $a0,$zero,$zero -/* f0baee8: 3c05800a */ lui $a1,%hi(g_Vars) -/* f0baeec: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) -/* f0baef0: 8ca80284 */ lw $t0,0x284($a1) -/* f0baef4: 0fc5b6cf */ jal func0f16db3c -/* f0baef8: ad001a24 */ sw $zero,0x1a24($t0) -.L0f0baefc: -/* f0baefc: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0baf00: -/* f0baf00: 27bd0020 */ addiu $sp,$sp,0x20 -/* f0baf04: 03e00008 */ jr $ra -/* f0baf08: 00000000 */ nop -); - -void currentPlayerPause(s32 mode) +void currentPlayerTickPauseMenu(void) { - g_PauseMode = mode; + bool opened = false; + + switch (g_Vars.currentplayer->pausemode) { + case PAUSEMODE_UNPAUSED: + break; + case PAUSEMODE_PAUSING: + // Pause menu is opening + switch (g_GlobalMenuRoot) { + case MENUROOT_TRAINING: + case MENUROOT_MAINMENU: + opened = soloChoosePauseDialog(); + break; + case MENUROOT_FILEMGR: + opened = filemgrConsiderPushingFileSelectDialog(); + break; + case MENUROOT_4MBMAINMENU: + case MENUROOT_MPSETUP: + opened = true; + break; + } + + if (opened) { + struct trainingdata *data = dtGetData(); + soloSetPaused(true); + g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; + + if ((g_GlobalMenuRoot == MENUROOT_MAINMENU || g_GlobalMenuRoot == MENUROOT_TRAINING) + && g_Vars.stagenum == STAGE_CITRAINING) { + s32 room = g_Vars.currentplayer->prop->rooms[0]; + + if ((room >= CIROOM_HOLOSTART && room <= CIROOM_HOLOEND) + || room == CIROOM_FIRINGRANGE + || room == CIROOM_DEVICEROOM + || (data && data->intraining)) { + return; + } + } + + musicStartForMenu(); + } + break; + case PAUSEMODE_PAUSED: + // Pause menu is fully open + break; + case PAUSEMODE_UNPAUSING: + // Pause menu is closing + g_Vars.currentplayer->pausetime60 += g_Vars.diffframe60; + + if (g_Vars.currentplayer->pausetime60 >= 20) { + soloSetPaused(false); + g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; + musicResumeAfterUnpause(); + } + break; + } +} + +void currentPlayerPause(s32 root) +{ + g_GlobalMenuRoot = root; if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { - g_Vars.currentplayer->pausemode = PAUSEMODE_1; + g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSING; } } void func0f0baf38(void) { - if (g_Vars.currentplayer->pausemode == PAUSEMODE_3) { - soloSetPaused(0); - func0f16db3c(); + if (g_Vars.currentplayer->pausemode == PAUSEMODE_PAUSED) { + soloSetPaused(false); + musicResumeAfterUnpause(); g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; } } @@ -7618,7 +7535,7 @@ glabel var7f1ad6ac /* f0bdf64: 8e0c1a24 */ lw $t4,0x1a24($s0) /* f0bdf68: 51800005 */ beqzl $t4,.L0f0bdf80 /* f0bdf6c: 960e0010 */ lhu $t6,0x10($s0) -/* f0bdf70: 0fc2eb5b */ jal func0f0bad6c +/* f0bdf70: 0fc2eb5b */ jal currentPlayerTickPauseMenu /* f0bdf74: 00000000 */ nop /* f0bdf78: 8e700284 */ lw $s0,0x284($s3) /* f0bdf7c: 960e0010 */ lhu $t6,0x10($s0) @@ -9660,7 +9577,7 @@ glabel var7f1ad6ac // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED // && (buttons & START_BUTTON)) { // if (g_Vars.mplayerisrunning == false) { -// currentPlayerPause(PAUSEMODE_2); +// currentPlayerPause(MENUROOT_MAINMENU); // } else { // mpPushPauseDialog(); // } @@ -9708,7 +9625,7 @@ glabel var7f1ad6ac // // // df64 // if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { -// func0f0bad6c(); +// currentPlayerTickPauseMenu(); // } // // // df80 @@ -9928,7 +9845,7 @@ glabel var7f1ad6ac // // if (pause) { // if (g_Vars.mplayerisrunning == false) { -// currentPlayerPause(PAUSEMODE_2); +// currentPlayerPause(MENUROOT_MAINMENU); // } else { // mpPushPauseDialog(); // } diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 81ea8d6a4..7dc814b64 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -8476,7 +8476,7 @@ void func0f0f85e0(struct menudialog *dialog, s32 root) menuPushRootDialog(dialog, root); soloSetPaused(true); - g_Vars.currentplayer->pausemode = PAUSEMODE_3; + g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; } u32 var800714dc = 0x00000078; diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 3494789a1..0e08f199b 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -3509,7 +3509,7 @@ glabel var7f1b5874 /* f13a300: 8e2a0000 */ lw $t2,0x0($s1) /* f13a304: ad404204 */ sw $zero,0x4204($t2) /* f13a308: 8e2b0000 */ lw $t3,0x0($s1) -/* f13a30c: 0fc5b6cf */ jal func0f16db3c +/* f13a30c: 0fc5b6cf */ jal musicResumeAfterUnpause /* f13a310: a1604208 */ sb $zero,0x4208($t3) /* f13a314: 0fc5b52e */ jal musicStartPrimary /* f13a318: 4600a306 */ mov.s $f12,$f20 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 613883d0d..b68ae874e 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -1663,7 +1663,7 @@ glabel var7f1b7868 /* f169768: 8d591a24 */ lw $t9,0x1a24($t2) /* f16976c: 532005d6 */ beqzl $t9,.L0f16aec8 /* f169770: 826e04d3 */ lb $t6,0x4d3($s3) -/* f169774: 0fc2eb5b */ jal func0f0bad6c +/* f169774: 0fc2eb5b */ jal currentPlayerTickPauseMenu /* f169778: 00000000 */ nop /* f16977c: 100005d2 */ b .L0f16aec8 /* f169780: 826e04d3 */ lb $t6,0x4d3($s3) diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 2ed2305d5..5fc9d6f4b 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -226,9 +226,9 @@ s32 menuhandlerMpPause(u32 operation, struct menuitem *item, union handlerdata * { if (operation == MENUOP_SET) { if (mpIsPaused()) { - mpSetPaused(false); + mpSetPaused(MPPAUSEMODE_0); } else { - mpSetPaused(true); + mpSetPaused(MPPAUSEMODE_1); } } @@ -897,7 +897,7 @@ void mpPushPauseDialog(void) { u32 prevplayernum = g_MpPlayerNum; - if (g_MpSetup.paused != 2 && var8005d9d0 == 0) { + if (g_MpSetup.paused != MPPAUSEMODE_2 && var8005d9d0 == 0) { g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; if (g_Menus[g_MpPlayerNum].unk83c == 0) { diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 6e47dd1fa..fabc067e0 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2133,9 +2133,9 @@ bool mpIsPaused(void) return true; } -void mpSetPaused(u8 pause) +void mpSetPaused(u8 mode) { - g_MpSetup.paused = pause; + g_MpSetup.paused = mode; } GLOBAL_ASM( diff --git a/src/game/music.c b/src/game/music.c index 4a3b2f50d..b499cf162 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -355,7 +355,7 @@ void musicStartForMenu(void) musicStartMenu2(menuChooseMusic()); } -void func0f16db3c(void) +void musicResumeAfterUnpause(void) { func0f16d2ac(TRACKTYPE_MENU, 1, 0); diff --git a/src/include/constants.h b/src/include/constants.h index 982ef4d66..657dcf57c 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1949,6 +1949,10 @@ #define MPOPTION_PAC_HIGHLIGHTTARGET 0x00080000 #define MPOPTION_PAC_SHOWONRADAR 0x00100000 +#define MPPAUSEMODE_0 0 // unpaused +#define MPPAUSEMODE_1 1 // paused via "Pause" menu item +#define MPPAUSEMODE_2 2 // paused due to only one player and having opened menu? + #define MPPLAYERTITLE_BEGINNER 0 #define MPPLAYERTITLE_TRAINEE 1 #define MPPLAYERTITLE_AMATEUR 2 @@ -2449,12 +2453,10 @@ #define PATHFLAG_FLYING 2 #define PATHFLAG_04 4 -// These are suspected to be the same as the MENUROOT constants, -// but pausemode is the name used in the original source -#define PAUSEMODE_UNPAUSED 0 -#define PAUSEMODE_1 1 -#define PAUSEMODE_2 2 -#define PAUSEMODE_3 3 +#define PAUSEMODE_UNPAUSED 0 +#define PAUSEMODE_PAUSING 1 +#define PAUSEMODE_PAUSED 3 +#define PAUSEMODE_UNPAUSING 5 #define PDMODEPROP_REACTION 0 #define PDMODEPROP_HEALTH 1 diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h index 42dd27f5d..438e588c9 100644 --- a/src/include/game/data/data_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -79,7 +79,7 @@ extern u32 var80070818; extern u32 var80070824; extern u32 var80070830; extern u32 var8007083c; -extern u32 g_PauseMode; +extern u32 g_GlobalMenuRoot; extern u32 var80070844; extern struct healthdamagetype g_HealthDamageTypes[]; extern u32 var800709c4; diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index ec83bf37a..ca13d78c0 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -33,8 +33,8 @@ void func0f0ba8b0(f32 value); f32 currentPlayerGetTeleportFovY(void); void currentPlayerUpdateZoom(void); void func0f0bace0(void); -void func0f0bad6c(void); -void currentPlayerPause(s32 mode); +void currentPlayerTickPauseMenu(void); +void currentPlayerPause(s32 root); void func0f0baf38(void); Gfx *func0f0baf84(Gfx *gdl); Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac); diff --git a/src/include/game/mplayer.h b/src/include/game/mplayer.h index eb5e965df..e651b3832 100644 --- a/src/include/game/mplayer.h +++ b/src/include/game/mplayer.h @@ -36,7 +36,7 @@ void mpSetWeaponSet(s32 weaponsetnum); void func0f1895e8(void); s32 mpGetWeaponSet(void); bool mpIsPaused(void); -void mpSetPaused(u8 pause); +void mpSetPaused(u8 mode); u32 func0f18973c(void); u32 func0f189cc0(void); u32 func0f189dc8(void); diff --git a/src/include/game/music.h b/src/include/game/music.h index fea19a753..eba1f58a7 100644 --- a/src/include/game/music.h +++ b/src/include/game/music.h @@ -25,7 +25,7 @@ void func0f16d9fc(void); void func0f16da2c(void); void func0f16daa4(void); void musicStartForMenu(void); -void func0f16db3c(void); +void musicResumeAfterUnpause(void); void musicStartSoloDeath(void); void musicStartMpDeath(f32 arg0); void func0f16dd14(void); diff --git a/src/include/types.h b/src/include/types.h index 21628c1d8..8c91d6507 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2701,7 +2701,7 @@ struct player { /*0x1a1c*/ s32 grabbeddoextra; /*0x1a20*/ f32 grabbedrotextra; /*0x1a24*/ s32 pausemode; - /*0x1a28*/ u32 pausetime60; + /*0x1a28*/ s32 pausetime60; /*0x1a2c*/ struct coord grabbedposextra; /*0x1a38*/ f32 grabbedrotextrasum; /*0x1a3c*/ struct coord grabbedposextrasum;