From 38ada9db5dbf716c496b1de3bc4d089bffe1834c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 17 Jan 2020 23:42:34 +1000 Subject: [PATCH] Decompile menudialog001a6aa4 --- src/game/game_1a3340.c | 35 ++++++++++++---------------------- src/include/game/game_1a3340.h | 2 +- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 92006dd09..6e54473f7 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3925,29 +3925,18 @@ s32 menuhandler001a6a70(u32 operation, struct menu_item *item, s32 *value) return 0; } -GLOBAL_ASM( -glabel menudialog001a6aa4 -/* f1a6aa4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a6aa8: 24010064 */ addiu $at,$zero,0x64 -/* f1a6aac: afbf0014 */ sw $ra,0x14($sp) -/* f1a6ab0: afa5001c */ sw $a1,0x1c($sp) -/* f1a6ab4: 10810006 */ beq $a0,$at,.L0f1a6ad0 -/* f1a6ab8: afa60020 */ sw $a2,0x20($sp) -/* f1a6abc: 24010065 */ addiu $at,$zero,0x65 -/* f1a6ac0: 50810006 */ beql $a0,$at,.L0f1a6adc -/* f1a6ac4: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a6ac8: 10000004 */ beqz $zero,.L0f1a6adc -/* f1a6acc: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1a6ad0: -/* f1a6ad0: 0fc68866 */ jal func0f1a2198 -/* f1a6ad4: 00000000 */ sll $zero,$zero,0x0 -/* f1a6ad8: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1a6adc: -/* f1a6adc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a6ae0: 00001025 */ or $v0,$zero,$zero -/* f1a6ae4: 03e00008 */ jr $ra -/* f1a6ae8: 00000000 */ sll $zero,$zero,0x0 -); +bool menudialog001a6aa4(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + switch (operation) { + case MENUOP_100: + func0f1a2198(); + break; + case MENUOP_101: + break; + } + + return false; +} GLOBAL_ASM( glabel func0f1a6aec diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 6dc041979..012fc1a93 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -42,7 +42,7 @@ s32 menudialog001a3af4(u32, u32, u32 *); s32 menudialog001a5f48(u32, u32, u32 *); s32 menudialog001a6548(u32, u32, u32 *); bool menudialogDeviceTrainingResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menudialog001a6aa4(u32, u32, u32 *); +bool menudialog001a6aa4(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog001a737c(u32, u32, u32 *); s32 menuhandler001a3340(u32, u32, u32 *);