From 81056d20f6158527f2307d38a8d887d12f834ab4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 17 Jan 2020 23:34:02 +1000 Subject: [PATCH] Decompile menudialogMpSelectTune --- src/game/game_176d70.c | 31 ++++++++++++------------------- src/include/game/game_176d70.h | 2 +- src/setup/setup_020df0.c | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 1d30a8f30..d7c1e4271 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -7645,25 +7645,18 @@ glabel menuhandler0017dc84 /* f17df70: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menudialog0017df74 -/* f17df74: 24010064 */ addiu $at,$zero,0x64 -/* f17df78: afa50004 */ sw $a1,0x4($sp) -/* f17df7c: 14810004 */ bne $a0,$at,.L0f17df90 -/* f17df80: afa60008 */ sw $a2,0x8($sp) -/* f17df84: 240e0050 */ addiu $t6,$zero,0x50 -/* f17df88: 3c018008 */ lui $at,0x8008 -/* f17df8c: ac2e40e0 */ sw $t6,0x40e0($at) -.L0f17df90: -/* f17df90: 24010065 */ addiu $at,$zero,0x65 -/* f17df94: 14810003 */ bne $a0,$at,.L0f17dfa4 -/* f17df98: 240f000f */ addiu $t7,$zero,0xf -/* f17df9c: 3c018008 */ lui $at,0x8008 -/* f17dfa0: ac2f40e0 */ sw $t7,0x40e0($at) -.L0f17dfa4: -/* f17dfa4: 03e00008 */ jr $ra -/* f17dfa8: 00001025 */ or $v0,$zero,$zero -); +bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + if (operation == MENUOP_100) { + var800840e0 = 80; + } + + if (operation == MENUOP_101) { + var800840e0 = 15; + } + + return false; +} GLOBAL_ASM( glabel func0f17dfac diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index c03bfbd3e..1e98c4ed8 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -173,7 +173,7 @@ s32 menudialog0017c5a4(u32, u32, u32 *); void menudialog0017c618(void); s32 menudialog0017ccfc(u32, u32, u32 *); s32 menudialog0017d468(u32, u32, u32 *); -s32 menudialog0017df74(u32, u32, u32 *); +bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog0017e3fc(u32, u32, u32 *); s32 menudialog0017eb34(u32, u32, u32 *); bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index b2d16bc2c..c3e8631a5 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10900,7 +10900,7 @@ struct menu_dialog menudialog_2bd40 = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17dc44, menuitems_2bd18, - menudialog0017df74, + menudialogMpSelectTune, 0x00000010, NULL, };