diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 934049450..e6ca20855 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -17944,7 +17944,7 @@ glabel func0f0e91d0 /* f0e93f0: 27a60064 */ addiu $a2,$sp,0x64 /* f0e93f4: 0320f809 */ jalr $t9 /* f0e93f8: 00000000 */ sll $zero,$zero,0x0 -/* f0e93fc: 0fc3cdb7 */ jal func0f0f36dc +/* f0e93fc: 0fc3cdb7 */ jal menuPopDialog /* f0e9400: 00000000 */ sll $zero,$zero,0x0 /* f0e9404: 8fa50078 */ lw $a1,0x78($sp) /* f0e9408: 24040006 */ addiu $a0,$zero,0x6 @@ -18022,7 +18022,7 @@ glabel func0f0e91d0 /* f0e9508: 5440004f */ bnezl $v0,.L0f0e9648 /* f0e950c: 8fae0060 */ lw $t6,0x60($sp) .L0f0e9510: -/* f0e9510: 0fc3cdb7 */ jal func0f0f36dc +/* f0e9510: 0fc3cdb7 */ jal menuPopDialog /* f0e9514: 00000000 */ sll $zero,$zero,0x0 /* f0e9518: 8fac0058 */ lw $t4,0x58($sp) /* f0e951c: 8fa50078 */ lw $a1,0x78($sp) @@ -20177,7 +20177,7 @@ glabel func0f0eb46c /* f0eb4a0: 30580008 */ andi $t8,$v0,0x8 /* f0eb4a4: 53000006 */ beqzl $t8,.L0f0eb4c0 /* f0eb4a8: 30590004 */ andi $t9,$v0,0x4 -/* f0eb4ac: 0fc3cdb7 */ jal func0f0f36dc +/* f0eb4ac: 0fc3cdb7 */ jal menuPopDialog /* f0eb4b0: afa70030 */ sw $a3,0x30($sp) /* f0eb4b4: 8fa70030 */ lw $a3,0x30($sp) /* f0eb4b8: 8ce20004 */ lw $v0,0x4($a3) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index f015b3e22..3c5801a55 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -3743,7 +3743,7 @@ glabel func0f0f361c ); GLOBAL_ASM( -glabel func0f0f36dc +glabel menuPopDialog /* f0f36dc: 27bdffe8 */ addiu $sp,$sp,-24 /* f0f36e0: afbf0014 */ sw $ra,0x14($sp) /* f0f36e4: 0fc3ccef */ jal func0f0f33bc @@ -8910,7 +8910,7 @@ glabel func0f0f8120 /* f0f81c4: 5920000b */ blezl $t1,.L0f0f81f4 /* f0f81c8: 8fbf0024 */ lw $ra,0x24($sp) .L0f0f81cc: -/* f0f81cc: 0fc3cdb7 */ jal func0f0f36dc +/* f0f81cc: 0fc3cdb7 */ jal menuPopDialog /* f0f81d0: 00000000 */ sll $zero,$zero,0x0 /* f0f81d4: 8e4a0000 */ lw $t2,0x0($s2) /* f0f81d8: 01530019 */ multu $t2,$s3 @@ -11193,7 +11193,7 @@ glabel func0f0f935c .L0f0fa25c: /* f0fa25c: 55c00019 */ bnezl $t6,.L0f0fa2c4 /* f0fa260: 8fd00008 */ lw $s0,0x8($s8) -/* f0fa264: 0fc3cdb7 */ jal func0f0f36dc +/* f0fa264: 0fc3cdb7 */ jal menuPopDialog /* f0fa268: 00000000 */ sll $zero,$zero,0x0 /* f0fa26c: 10000015 */ beqz $zero,.L0f0fa2c4 /* f0fa270: 8fd00008 */ lw $s0,0x8($s8) @@ -11216,7 +11216,7 @@ glabel func0f0f935c /* f0fa2b0: 55610004 */ bnel $t3,$at,.L0f0fa2c4 /* f0fa2b4: 8fd00008 */ lw $s0,0x8($s8) .L0f0fa2b8: -/* f0fa2b8: 0fc3cdb7 */ jal func0f0f36dc +/* f0fa2b8: 0fc3cdb7 */ jal menuPopDialog /* f0fa2bc: 00000000 */ sll $zero,$zero,0x0 .L0f0fa2c0: /* f0fa2c0: 8fd00008 */ lw $s0,0x8($s8) @@ -14245,7 +14245,7 @@ glabel menuhandler000fcc34 /* f0fccfc: 17220003 */ bne $t9,$v0,.L0f0fcd0c /* f0fcd00: 00000000 */ sll $zero,$zero,0x0 .L0f0fcd04: -/* f0fcd04: 0fc3cdb7 */ jal func0f0f36dc +/* f0fcd04: 0fc3cdb7 */ jal menuPopDialog /* f0fcd08: 00008025 */ or $s0,$zero,$zero .L0f0fcd0c: /* f0fcd0c: 5200ffe8 */ beqzl $s0,.L0f0fccb0 @@ -14499,7 +14499,7 @@ glabel menuhandlerRetrySavePak /* f0fd058: afa5001c */ sw $a1,0x1c($sp) /* f0fd05c: 1481001b */ bne $a0,$at,.L0f0fd0cc /* f0fd060: afa60020 */ sw $a2,0x20($sp) -/* f0fd064: 0fc3cdb7 */ jal func0f0f36dc +/* f0fd064: 0fc3cdb7 */ jal menuPopDialog /* f0fd068: 00000000 */ sll $zero,$zero,0x0 /* f0fd06c: 3c02800a */ lui $v0,%hi(g_Vars) /* f0fd070: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -15189,7 +15189,7 @@ glabel menuhandler000fd6f0 /* f0fd9c0: 0fc6490e */ jal func0f192438 /* f0fd9c4: 8c65001c */ lw $a1,0x1c($v1) .L0f0fd9c8: -/* f0fd9c8: 0fc3cdb7 */ jal func0f0f36dc +/* f0fd9c8: 0fc3cdb7 */ jal menuPopDialog /* f0fd9cc: 00000000 */ sll $zero,$zero,0x0 /* f0fd9d0: 100000a4 */ beqz $zero,.L0f0fdc64 /* f0fd9d4: 00001025 */ or $v0,$zero,$zero diff --git a/src/game/game_102240.c b/src/game/game_102240.c index aac03e1ac..7cc6e23f3 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -1431,8 +1431,8 @@ s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menu_item *item, bool g_MissionConfig.fpdmodeaccuracy = func0f1036ac(g_MissionConfig.updmodeaccuracy, 3); g_MissionConfig.difficulty = DIFF_PA; setDifficulty(g_MissionConfig.difficulty); - func0f0f36dc(); - func0f0f36dc(); + menuPopDialog(); + menuPopDialog(); menuPushDialog(&g_ObjectivesMenuDialog); } @@ -1756,7 +1756,7 @@ s32 menuhandlerSoloDifficulty(u32 operation, struct menu_item *item, s32 *value) g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; setDifficulty(g_MissionConfig.difficulty); - func0f0f36dc(); + menuPopDialog(); menuPushDialog(&g_ObjectivesMenuDialog); break; case MENUOP_CHECKDISABLED: @@ -1923,7 +1923,7 @@ glabel func0f103e68 s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_SET) { - func0f0f36dc(); + menuPopDialog(); menuPushDialog(&g_ObjectivesMenuDialog); } @@ -2246,7 +2246,7 @@ s32 menuhandlerCoopDifficulty(u32 operation, struct menu_item *item, s32 *value) g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; setDifficulty(g_MissionConfig.difficulty); - func0f0f36dc(); + menuPopDialog(); menuPushDialog(&g_CoopOptionsMenuDialog); break; case MENUOP_CHECKDISABLED: @@ -2265,7 +2265,7 @@ s32 menuhandlerAntiDifficulty(u32 operation, struct menu_item *item, s32 *value) g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; setDifficulty(g_MissionConfig.difficulty); - func0f0f36dc(); + menuPopDialog(); menuPushDialog(&g_AntiOptionsMenuDialog); } @@ -4445,7 +4445,7 @@ glabel menuhandler00106644 /* f106758: a06004d4 */ sb $zero,0x4d4($v1) /* f10675c: 01f87821 */ addu $t7,$t7,$t8 /* f106760: 8def38a0 */ lw $t7,0x38a0($t7) -/* f106764: 0fc3cdb7 */ jal func0f0f36dc +/* f106764: 0fc3cdb7 */ jal menuPopDialog /* f106768: a06f04d5 */ sb $t7,0x4d5($v1) /* f10676c: 0fc06fa8 */ jal func0f01bea0 /* f106770: 00000000 */ sll $zero,$zero,0x0 @@ -4454,7 +4454,7 @@ glabel menuhandler00106644 .L0f10677c: /* f10677c: 240e0001 */ addiu $t6,$zero,0x1 /* f106780: a07904d4 */ sb $t9,0x4d4($v1) -/* f106784: 0fc3cdb7 */ jal func0f0f36dc +/* f106784: 0fc3cdb7 */ jal menuPopDialog /* f106788: a06e04d5 */ sb $t6,0x4d5($v1) /* f10678c: 0fc06fa8 */ jal func0f01bea0 /* f106790: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 3d53d52fa..597547baa 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1477,7 +1477,7 @@ glabel menuhandler00108f08 /* f108f6c: 10000004 */ beqz $zero,.L0f108f80 /* f108f70: 8fbf0014 */ lw $ra,0x14($sp) .L0f108f74: -/* f108f74: 0fc3cdb7 */ jal func0f0f36dc +/* f108f74: 0fc3cdb7 */ jal menuPopDialog /* f108f78: 00000000 */ sll $zero,$zero,0x0 .L0f108f7c: /* f108f7c: 8fbf0014 */ lw $ra,0x14($sp) @@ -2599,7 +2599,7 @@ glabel func0f109ec4 /* f109f40: 10000058 */ beqz $zero,.L0f10a0a4 /* f109f44: 8fbf0014 */ lw $ra,0x14($sp) .L0f109f48: -/* f109f48: 0fc3cdb7 */ jal func0f0f36dc +/* f109f48: 0fc3cdb7 */ jal menuPopDialog /* f109f4c: 00000000 */ sll $zero,$zero,0x0 /* f109f50: 3c078007 */ lui $a3,0x8007 /* f109f54: 8ce71448 */ lw $a3,0x1448($a3) @@ -2741,7 +2741,7 @@ glabel menuhandler0010a120 /* f10a12c: afa5001c */ sw $a1,0x1c($sp) /* f10a130: 14810006 */ bne $a0,$at,.L0f10a14c /* f10a134: afa60020 */ sw $a2,0x20($sp) -/* f10a138: 0fc3cdb7 */ jal func0f0f36dc +/* f10a138: 0fc3cdb7 */ jal menuPopDialog /* f10a13c: 00000000 */ sll $zero,$zero,0x0 /* f10a140: 3c048007 */ lui $a0,%hi(menudialog_changefilename) /* f10a144: 0fc3cbd3 */ jal menuPushDialog @@ -2762,9 +2762,9 @@ glabel menuhandler0010a160 /* f10a16c: afa5001c */ sw $a1,0x1c($sp) /* f10a170: 14810005 */ bne $a0,$at,.L0f10a188 /* f10a174: afa60020 */ sw $a2,0x20($sp) -/* f10a178: 0fc3cdb7 */ jal func0f0f36dc +/* f10a178: 0fc3cdb7 */ jal menuPopDialog /* f10a17c: 00000000 */ sll $zero,$zero,0x0 -/* f10a180: 0fc3cdb7 */ jal func0f0f36dc +/* f10a180: 0fc3cdb7 */ jal menuPopDialog /* f10a184: 00000000 */ sll $zero,$zero,0x0 .L0f10a188: /* f10a188: 8fbf0014 */ lw $ra,0x14($sp) @@ -2988,7 +2988,7 @@ glabel menuhandler0010a454 /* f10a460: afa5001c */ sw $a1,0x1c($sp) /* f10a464: 14810003 */ bne $a0,$at,.L0f10a474 /* f10a468: afa60020 */ sw $a2,0x20($sp) -/* f10a46c: 0fc3cdb7 */ jal func0f0f36dc +/* f10a46c: 0fc3cdb7 */ jal menuPopDialog /* f10a470: 00000000 */ sll $zero,$zero,0x0 .L0f10a474: /* f10a474: 8fbf0014 */ lw $ra,0x14($sp) @@ -3088,7 +3088,7 @@ glabel menuhandler0010a5ac /* f10a5b8: afa5001c */ sw $a1,0x1c($sp) /* f10a5bc: 14810005 */ bne $a0,$at,.L0f10a5d4 /* f10a5c0: afa60020 */ sw $a2,0x20($sp) -/* f10a5c4: 0fc3cdb7 */ jal func0f0f36dc +/* f10a5c4: 0fc3cdb7 */ jal menuPopDialog /* f10a5c8: 00000000 */ sll $zero,$zero,0x0 /* f10a5cc: 0fc425a8 */ jal func0f1096a0 /* f10a5d0: 00000000 */ sll $zero,$zero,0x0 @@ -3924,7 +3924,7 @@ glabel menuhandler0010b14c /* f10b1b4: 03291021 */ addu $v0,$t9,$t1 /* f10b1b8: 018d7025 */ or $t6,$t4,$t5 /* f10b1bc: ac6e0e24 */ sw $t6,0xe24($v1) -/* f10b1c0: 0fc3cdb7 */ jal func0f0f36dc +/* f10b1c0: 0fc3cdb7 */ jal menuPopDialog /* f10b1c4: afa20024 */ sw $v0,0x24($sp) /* f10b1c8: 3c0f8007 */ lui $t7,0x8007 /* f10b1cc: 8def1448 */ lw $t7,0x1448($t7) @@ -5605,9 +5605,9 @@ glabel menuhandlerDropOut /* f10c9cc: afa5001c */ sw $a1,0x1c($sp) /* f10c9d0: 1481000d */ bne $a0,$at,.L0f10ca08 /* f10c9d4: afa60020 */ sw $a2,0x20($sp) -/* f10c9d8: 0fc3cdb7 */ jal func0f0f36dc +/* f10c9d8: 0fc3cdb7 */ jal menuPopDialog /* f10c9dc: 00000000 */ sll $zero,$zero,0x0 -/* f10c9e0: 0fc3cdb7 */ jal func0f0f36dc +/* f10c9e0: 0fc3cdb7 */ jal menuPopDialog /* f10c9e4: 00000000 */ sll $zero,$zero,0x0 /* f10c9e8: 0fc6321f */ jal func0f18c87c /* f10c9ec: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 935c3beca..caa4c817a 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -76,25 +76,15 @@ const u32 var7f1b3a04[] = {0x00000000}; const char var7f1b3a08[] = "tc != NULL"; const char var7f1b3a14[] = "gamefile.c"; -GLOBAL_ASM( -glabel menuhandler0010ccd0 -/* f10ccd0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10ccd4: 24010006 */ addiu $at,$zero,0x6 -/* f10ccd8: afbf0014 */ sw $ra,0x14($sp) -/* f10ccdc: afa5001c */ sw $a1,0x1c($sp) -/* f10cce0: 14810005 */ bne $a0,$at,.L0f10ccf8 -/* f10cce4: afa60020 */ sw $a2,0x20($sp) -/* f10cce8: 0fc3cdb7 */ jal func0f0f36dc -/* f10ccec: 00000000 */ sll $zero,$zero,0x0 -/* f10ccf0: 0fc3cdb7 */ jal func0f0f36dc -/* f10ccf4: 00000000 */ sll $zero,$zero,0x0 -.L0f10ccf8: -/* f10ccf8: 8fbf0014 */ lw $ra,0x14($sp) -/* f10ccfc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f10cd00: 00001025 */ or $v0,$zero,$zero -/* f10cd04: 03e00008 */ jr $ra -/* f10cd08: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + menuPopDialog(); + menuPopDialog(); + } + + return 0; +} GLOBAL_ASM( glabel menudialog0010cd0c @@ -136,9 +126,9 @@ glabel menudialog0010cd0c /* f10cd94: 8089000a */ lb $t1,0xa($a0) /* f10cd98: afa4003c */ sw $a0,0x3c($sp) /* f10cd9c: afa00038 */ sw $zero,0x38($sp) -/* f10cda0: 0fc3cdb7 */ jal func0f0f36dc +/* f10cda0: 0fc3cdb7 */ jal menuPopDialog /* f10cda4: afa70044 */ sw $a3,0x44($sp) -/* f10cda8: 0fc3cdb7 */ jal func0f0f36dc +/* f10cda8: 0fc3cdb7 */ jal menuPopDialog /* f10cdac: 00000000 */ sll $zero,$zero,0x0 /* f10cdb0: 8fa4003c */ lw $a0,0x3c($sp) /* f10cdb4: 8fa50038 */ lw $a1,0x38($sp) @@ -996,7 +986,7 @@ glabel func0f10d910 /* f10d920: afbf0014 */ sw $ra,0x14($sp) /* f10d924: 05c00005 */ bltz $t6,.L0f10d93c /* f10d928: 00803825 */ or $a3,$a0,$zero -/* f10d92c: 0fc3cdb7 */ jal func0f0f36dc +/* f10d92c: 0fc3cdb7 */ jal menuPopDialog /* f10d930: 00000000 */ sll $zero,$zero,0x0 /* f10d934: 100000f9 */ beqz $zero,.L0f10dd1c /* f10d938: 8fbf0014 */ lw $ra,0x14($sp) @@ -1039,7 +1029,7 @@ glabel func0f10d910 /* f10d9b8: 8c6204b4 */ lw $v0,0x4b4($v1) /* f10d9bc: 54e00006 */ bnezl $a3,.L0f10d9d8 /* f10d9c0: 8c6204b4 */ lw $v0,0x4b4($v1) -/* f10d9c4: 0fc3cdb7 */ jal func0f0f36dc +/* f10d9c4: 0fc3cdb7 */ jal menuPopDialog /* f10d9c8: 00000000 */ sll $zero,$zero,0x0 /* f10d9cc: 100000d3 */ beqz $zero,.L0f10dd1c /* f10d9d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -1081,9 +1071,9 @@ glabel func0f10d910 /* f10da54: 24840001 */ addiu $a0,$a0,0x1 /* f10da58: 14400007 */ bnez $v0,.L0f10da78 /* f10da5c: 00000000 */ sll $zero,$zero,0x0 -/* f10da60: 0fc3cdb7 */ jal func0f0f36dc +/* f10da60: 0fc3cdb7 */ jal menuPopDialog /* f10da64: 00000000 */ sll $zero,$zero,0x0 -/* f10da68: 0fc3cdb7 */ jal func0f0f36dc +/* f10da68: 0fc3cdb7 */ jal menuPopDialog /* f10da6c: 00000000 */ sll $zero,$zero,0x0 /* f10da70: 100000aa */ beqz $zero,.L0f10dd1c /* f10da74: 8fbf0014 */ lw $ra,0x14($sp) @@ -1190,7 +1180,7 @@ glabel func0f10d910 /* f10dbe8: 24010002 */ addiu $at,$zero,0x2 /* f10dbec: 14e10004 */ bne $a3,$at,.L0f10dc00 /* f10dbf0: 00000000 */ sll $zero,$zero,0x0 -/* f10dbf4: 0fc3cdb7 */ jal func0f0f36dc +/* f10dbf4: 0fc3cdb7 */ jal menuPopDialog /* f10dbf8: afa70018 */ sw $a3,0x18($sp) /* f10dbfc: 8fa70018 */ lw $a3,0x18($sp) .L0f10dc00: @@ -1208,9 +1198,9 @@ glabel func0f10d910 /* f10dc2c: 24010002 */ addiu $at,$zero,0x2 /* f10dc30: 14e10007 */ bne $a3,$at,.L0f10dc50 /* f10dc34: 3c048007 */ lui $a0,%hi(menudialog_1b7a4) -/* f10dc38: 0fc3cdb7 */ jal func0f0f36dc +/* f10dc38: 0fc3cdb7 */ jal menuPopDialog /* f10dc3c: 00000000 */ sll $zero,$zero,0x0 -/* f10dc40: 0fc3cdb7 */ jal func0f0f36dc +/* f10dc40: 0fc3cdb7 */ jal menuPopDialog /* f10dc44: 00000000 */ sll $zero,$zero,0x0 /* f10dc48: 10000034 */ beqz $zero,.L0f10dd1c /* f10dc4c: 8fbf0014 */ lw $ra,0x14($sp) @@ -1241,9 +1231,9 @@ glabel func0f10d910 .L0f10dca4: /* f10dca4: 14e10007 */ bne $a3,$at,.L0f10dcc4 /* f10dca8: 3c048007 */ lui $a0,%hi(menudialog_1b7a4) -/* f10dcac: 0fc3cdb7 */ jal func0f0f36dc +/* f10dcac: 0fc3cdb7 */ jal menuPopDialog /* f10dcb0: 00000000 */ sll $zero,$zero,0x0 -/* f10dcb4: 0fc3cdb7 */ jal func0f0f36dc +/* f10dcb4: 0fc3cdb7 */ jal menuPopDialog /* f10dcb8: 00000000 */ sll $zero,$zero,0x0 /* f10dcbc: 10000017 */ beqz $zero,.L0f10dd1c /* f10dcc0: 8fbf0014 */ lw $ra,0x14($sp) @@ -1494,7 +1484,7 @@ glabel menudialog0010de58 /* f10e014: 15c10005 */ bne $t6,$at,.L0f10e02c /* f10e018: 00000000 */ sll $zero,$zero,0x0 .L0f10e01c: -/* f10e01c: 0fc3cdb7 */ jal func0f0f36dc +/* f10e01c: 0fc3cdb7 */ jal menuPopDialog /* f10e020: afa6001c */ sw $a2,0x1c($sp) /* f10e024: 10000007 */ beqz $zero,.L0f10e044 /* f10e028: 8fa6001c */ lw $a2,0x1c($sp) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 6de0de482..15e7e2fc1 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -38861,7 +38861,7 @@ glabel func0f14bdbc /* f14be78: 31aeff7f */ andi $t6,$t5,0xff7f /* f14be7c: a04e03f4 */ sb $t6,0x3f4($v0) /* f14be80: 8faf0020 */ lw $t7,0x20($sp) -/* f14be84: 0fc3cdb7 */ jal func0f0f36dc +/* f14be84: 0fc3cdb7 */ jal menuPopDialog /* f14be88: ac2f1448 */ sw $t7,0x1448($at) /* f14be8c: 3c018007 */ lui $at,0x8007 /* f14be90: 10000009 */ beqz $zero,.L0f14beb8 diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index e71baf15a..421742fc1 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -3021,9 +3021,9 @@ glabel menuhandler00179060 /* f17906c: afa5001c */ sw $a1,0x1c($sp) /* f179070: 14810005 */ bne $a0,$at,.L0f179088 /* f179074: afa60020 */ sw $a2,0x20($sp) -/* f179078: 0fc3cdb7 */ jal func0f0f36dc +/* f179078: 0fc3cdb7 */ jal menuPopDialog /* f17907c: 00000000 */ sll $zero,$zero,0x0 -/* f179080: 0fc3cdb7 */ jal func0f0f36dc +/* f179080: 0fc3cdb7 */ jal menuPopDialog /* f179084: 00000000 */ sll $zero,$zero,0x0 .L0f179088: /* f179088: 8fbf0014 */ lw $ra,0x14($sp) @@ -3776,7 +3776,7 @@ glabel menuhandler00179a10 /* f179a1c: afa5001c */ sw $a1,0x1c($sp) /* f179a20: 14810006 */ bne $a0,$at,.L0f179a3c /* f179a24: afa60020 */ sw $a2,0x20($sp) -/* f179a28: 0fc3cdb7 */ jal func0f0f36dc +/* f179a28: 0fc3cdb7 */ jal menuPopDialog /* f179a2c: 00000000 */ sll $zero,$zero,0x0 /* f179a30: 24040006 */ addiu $a0,$zero,0x6 /* f179a34: 0fc42947 */ jal func0f10a51c @@ -3837,7 +3837,7 @@ glabel menuhandler00179ad0 /* f179adc: afa5001c */ sw $a1,0x1c($sp) /* f179ae0: 14810008 */ bne $a0,$at,.L0f179b04 /* f179ae4: afa60020 */ sw $a2,0x20($sp) -/* f179ae8: 0fc3cdb7 */ jal func0f0f36dc +/* f179ae8: 0fc3cdb7 */ jal menuPopDialog /* f179aec: 00000000 */ sll $zero,$zero,0x0 /* f179af0: 3c04800b */ lui $a0,%hi(var800acba8) /* f179af4: 2484cba8 */ addiu $a0,$a0,%lo(var800acba8) @@ -3860,7 +3860,7 @@ glabel menuhandler00179b18 /* f179b24: afa5001c */ sw $a1,0x1c($sp) /* f179b28: 14810006 */ bne $a0,$at,.L0f179b44 /* f179b2c: afa60020 */ sw $a2,0x20($sp) -/* f179b30: 0fc3cdb7 */ jal func0f0f36dc +/* f179b30: 0fc3cdb7 */ jal menuPopDialog /* f179b34: 00000000 */ sll $zero,$zero,0x0 /* f179b38: 3c048008 */ lui $a0,%hi(menudialog_mpsavesetupname) /* f179b3c: 0fc3cbd3 */ jal menuPushDialog @@ -6540,7 +6540,7 @@ glabel menuhandler0017bfc0 /* f17c0f4: 8e480000 */ lw $t0,0x0($s2) /* f17c0f8: afa80044 */ sw $t0,0x44($sp) /* f17c0fc: 96490004 */ lhu $t1,0x4($s2) -/* f17c100: 0fc3cdb7 */ jal func0f0f36dc +/* f17c100: 0fc3cdb7 */ jal menuPopDialog /* f17c104: a7a90048 */ sh $t1,0x48($sp) /* f17c108: 3c068007 */ lui $a2,0x8007 /* f17c10c: 8cc61448 */ lw $a2,0x1448($a2) @@ -6963,7 +6963,7 @@ glabel menudialog0017c618 /* f17c67c: 9108c538 */ lbu $t0,-0x3ac8($t0) /* f17c680: 55000004 */ bnezl $t0,.L0f17c694 /* f17c684: 8fbf0014 */ lw $ra,0x14($sp) -/* f17c688: 0fc3cdb7 */ jal func0f0f36dc +/* f17c688: 0fc3cdb7 */ jal menuPopDialog /* f17c68c: 00000000 */ sll $zero,$zero,0x0 .L0f17c690: /* f17c690: 8fbf0014 */ lw $ra,0x14($sp) @@ -7617,7 +7617,7 @@ glabel menuhandlerMpDeleteSimulant /* f17cf98: 008f2021 */ addu $a0,$a0,$t7 /* f17cf9c: 0fc632ff */ jal func0f18cbfc /* f17cfa0: 8c84ee1c */ lw $a0,-0x11e4($a0) -/* f17cfa4: 0fc3cdb7 */ jal func0f0f36dc +/* f17cfa4: 0fc3cdb7 */ jal menuPopDialog /* f17cfa8: 00000000 */ sll $zero,$zero,0x0 .L0f17cfac: /* f17cfac: 8fbf0014 */ lw $ra,0x14($sp) @@ -8173,7 +8173,7 @@ glabel func0f17d4b0 /* f17d71c: 1000ffa9 */ beqz $zero,.L0f17d5c4 /* f17d720: 00000000 */ sll $zero,$zero,0x0 .L0f17d724: -/* f17d724: 0fc3cdb7 */ jal func0f0f36dc +/* f17d724: 0fc3cdb7 */ jal menuPopDialog /* f17d728: 00000000 */ sll $zero,$zero,0x0 .L0f17d72c: /* f17d72c: 00001025 */ or $v0,$zero,$zero @@ -8289,7 +8289,7 @@ glabel menuhandlerMpMaximumTeams .L0f17d890: /* f17d890: 5615ffe5 */ bnel $s0,$s5,.L0f17d828 /* f17d894: 964e0016 */ lhu $t6,0x16($s2) -/* f17d898: 0fc3cdb7 */ jal func0f0f36dc +/* f17d898: 0fc3cdb7 */ jal menuPopDialog /* f17d89c: 00000000 */ sll $zero,$zero,0x0 .L0f17d8a0: /* f17d8a0: 8fbf0034 */ lw $ra,0x34($sp) @@ -8355,7 +8355,7 @@ glabel menuhandlerMpHumansVsSimulants /* f17d970: 24420001 */ addiu $v0,$v0,0x1 /* f17d974: 5447ffe8 */ bnel $v0,$a3,.L0f17d918 /* f17d978: 948e0016 */ lhu $t6,0x16($a0) -/* f17d97c: 0fc3cdb7 */ jal func0f0f36dc +/* f17d97c: 0fc3cdb7 */ jal menuPopDialog /* f17d980: 00000000 */ sll $zero,$zero,0x0 .L0f17d984: /* f17d984: 8fbf0014 */ lw $ra,0x14($sp) @@ -8428,7 +8428,7 @@ glabel menuhandlerMpHumanSimulantPairs /* f17da6c: 24420001 */ addiu $v0,$v0,0x1 /* f17da70: 544affe1 */ bnel $v0,$t2,.L0f17d9f8 /* f17da74: 94f90016 */ lhu $t9,0x16($a3) -/* f17da78: 0fc3cdb7 */ jal func0f0f36dc +/* f17da78: 0fc3cdb7 */ jal menuPopDialog /* f17da7c: 00000000 */ sll $zero,$zero,0x0 .L0f17da80: /* f17da80: 8fbf0014 */ lw $ra,0x14($sp) @@ -9122,7 +9122,7 @@ glabel menuhandler0017e38c /* f17e3a0: afa60020 */ sw $a2,0x20($sp) /* f17e3a4: 0fc6709a */ jal func0f19c268 /* f17e3a8: 00000000 */ sll $zero,$zero,0x0 -/* f17e3ac: 0fc3cdb7 */ jal func0f0f36dc +/* f17e3ac: 0fc3cdb7 */ jal menuPopDialog /* f17e3b0: 00000000 */ sll $zero,$zero,0x0 /* f17e3b4: 3c0e8007 */ lui $t6,0x8007 /* f17e3b8: 8dce1448 */ lw $t6,0x1448($t6) @@ -9196,7 +9196,7 @@ glabel menudialog0017e3fc /* f17e4ac: 24010005 */ addiu $at,$zero,0x5 /* f17e4b0: 55210004 */ bnel $t1,$at,.L0f17e4c4 /* f17e4b4: 8fbf0014 */ lw $ra,0x14($sp) -/* f17e4b8: 0fc3cdb7 */ jal func0f0f36dc +/* f17e4b8: 0fc3cdb7 */ jal menuPopDialog /* f17e4bc: 00000000 */ sll $zero,$zero,0x0 .L0f17e4c0: /* f17e4c0: 8fbf0014 */ lw $ra,0x14($sp) @@ -10941,7 +10941,7 @@ glabel func0f17fa28 .L0f17fc2c: /* f17fc2c: 1600000b */ bnez $s0,.L0f17fc5c /* f17fc30: 00000000 */ sll $zero,$zero,0x0 -/* f17fc34: 0fc3cdb7 */ jal func0f0f36dc +/* f17fc34: 0fc3cdb7 */ jal menuPopDialog /* f17fc38: 00000000 */ sll $zero,$zero,0x0 /* f17fc3c: 3c078008 */ lui $a3,%hi(menudialog_mphilloptions) /* f17fc40: 3c088008 */ lui $t0,%hi(menudialog_mphackeroptions) @@ -16976,7 +16976,7 @@ glabel menudialog00184ec0 /* f184f64: 006d082b */ sltu $at,$v1,$t5 /* f184f68: 5020000d */ beqzl $at,.L0f184fa0 /* f184f6c: 8fbf0014 */ lw $ra,0x14($sp) -/* f184f70: 0fc3cdb7 */ jal func0f0f36dc +/* f184f70: 0fc3cdb7 */ jal menuPopDialog /* f184f74: 00000000 */ sll $zero,$zero,0x0 /* f184f78: 3c0e800b */ lui $t6,0x800b /* f184f7c: 91cecb98 */ lbu $t6,-0x3468($t6) diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 37d9c0440..36bb81646 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3048,7 +3048,7 @@ glabel menuhandler001a5d5c /* f1a5d9c: 10000004 */ beqz $zero,.L0f1a5db0 /* f1a5da0: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a5da4: -/* f1a5da4: 0fc3cdb7 */ jal func0f0f36dc +/* f1a5da4: 0fc3cdb7 */ jal menuPopDialog /* f1a5da8: 00000000 */ sll $zero,$zero,0x0 .L0f1a5dac: /* f1a5dac: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index 9a8094369..7c3002356 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -37,7 +37,7 @@ void menuPushDialog(struct menu_dialog *dialog); u32 func0f0f3220(void); u32 func0f0f33bc(void); u32 func0f0f361c(void); -void func0f0f36dc(void); +void menuPopDialog(void); u32 func0f0f3704(void); u32 func0f0f372c(void); u32 func0f0f37a4(void); diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h index 45bbb4fc0..8903989e0 100644 --- a/src/include/game/game_10ccd0.h +++ b/src/include/game/game_10ccd0.h @@ -54,7 +54,7 @@ u32 func0f111460(void); s32 menudialog0010cd0c(u32, u32, u32 *); s32 menudialog0010dd28(u32, u32, u32 *); s32 menudialog0010de58(u32, u32, u32 *); -s32 menuhandler0010ccd0(u32, u32, u32 *); +s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010e064(u32, u32, u32 *); s32 menuhandlerContinueToCredits(u32, u32, u32 *); s32 menuhandlerReplyLastLevel(u32, u32, u32 *); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 7a714e68d..4d4e4f12d 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3904,7 +3904,7 @@ struct menu_dialog menudialog_mpgamesetup = { struct menu_item menuitems_1b570[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572a, 0x00000000, menuhandlerAcceptMission }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572b, 0x00000000, menuhandler0010ccd0 }, // "Decline" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572b, 0x00000000, menuhandlerDeclineMission }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3922,7 +3922,7 @@ struct menu_dialog menudialog_1b5c0 = { struct menu_item menuitems_promptnextmission[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572a, 0x00000000, menuhandlerAcceptMission }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572b, 0x00000000, menuhandler0010ccd0 }, // "Decline" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572b, 0x00000000, menuhandlerDeclineMission }, // "Decline" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000059d6, 0x00000000, menuhandlerReplyPreviousMission }, // "Replay Previous Mission" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },