From 2ea07889e5fa30bf5317aef94fe902b07732c666 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 17 Jan 2020 23:37:06 +1000 Subject: [PATCH] Decompile menudialogMpSimulants --- src/game/game_176d70.c | 30 ++++++++---------------------- src/include/game/game_176d70.h | 2 +- src/setup/setup_020df0.c | 2 +- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index d7c1e4271..66004550c 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -6991,28 +6991,14 @@ glabel func0f17d378 /* f17d464: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menudialog0017d468 -/* f17d468: 24010064 */ addiu $at,$zero,0x64 -/* f17d46c: afa50004 */ sw $a1,0x4($sp) -/* f17d470: 1481000d */ bne $a0,$at,.L0f17d4a8 -/* f17d474: afa60008 */ sw $a2,0x8($sp) -/* f17d478: 3c0e8007 */ lui $t6,0x8007 -/* f17d47c: 8dce1448 */ lw $t6,0x1448($t6) -/* f17d480: 3c01800a */ lui $at,0x800a -/* f17d484: 000e78c0 */ sll $t7,$t6,0x3 -/* f17d488: 01ee7823 */ subu $t7,$t7,$t6 -/* f17d48c: 000f7880 */ sll $t7,$t7,0x2 -/* f17d490: 01ee7821 */ addu $t7,$t7,$t6 -/* f17d494: 000f78c0 */ sll $t7,$t7,0x3 -/* f17d498: 01ee7823 */ subu $t7,$t7,$t6 -/* f17d49c: 000f7900 */ sll $t7,$t7,0x4 -/* f17d4a0: 002f0821 */ addu $at,$at,$t7 -/* f17d4a4: ac20ee20 */ sw $zero,-0x11e0($at) -.L0f17d4a8: -/* f17d4a8: 03e00008 */ jr $ra -/* f17d4ac: 00001025 */ or $v0,$zero,$zero -); +bool menudialogMpSimulants(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + if (operation == MENUOP_100) { + g_MenuStack[g_MpPlayerNum].slotcount = 0; + } + + return false; +} GLOBAL_ASM( glabel func0f17d4b0 diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 1e98c4ed8..d91d808a1 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -172,7 +172,7 @@ s32 menudialog0017a174(u32, u32, u32 *); s32 menudialog0017c5a4(u32, u32, u32 *); void menudialog0017c618(void); s32 menudialog0017ccfc(u32, u32, u32 *); -s32 menudialog0017d468(u32, u32, u32 *); +bool menudialogMpSimulants(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog0017e3fc(u32, u32, u32 *); s32 menudialog0017eb34(u32, u32, u32 *); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index c3e8631a5..8410bc2a7 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10817,7 +10817,7 @@ struct menu_dialog menudialog_mpsimulants = { MENUDIALOGTYPE_DEFAULT, 0x5053, // "Simulants" menuitems_mpsimulants, - menudialog0017d468, + menudialogMpSimulants, 0x00000010, NULL, };