From ba10fef601bad02dad2cfaf2e0e8dd528406b54b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 23 Mar 2020 23:43:51 +1000 Subject: [PATCH] Decompile func0f0f8300 --- src/game/game_0f09f0.c | 27 ++++++++++----------------- src/include/types.h | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 5a2c3de76..30378ae64 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -9008,23 +9008,16 @@ bool func0f0f82a8(s32 arg0) } } -GLOBAL_ASM( -glabel func0f0f8300 -/* f0f8300: 3c0e800a */ lui $t6,%hi(g_MenuData) -/* f0f8304: 8dce19c0 */ lw $t6,%lo(g_MenuData)($t6) -/* f0f8308: 3c03800a */ lui $v1,%hi(g_MenuData) -/* f0f830c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) -/* f0f8310: 15c00005 */ bnez $t6,.L0f0f8328 -/* f0f8314: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) -/* f0f8318: 244219c4 */ addiu $v0,$v0,%lo(g_MenuData+0x4) -.L0f0f831c: -/* f0f831c: 24630001 */ addiu $v1,$v1,0x1 -/* f0f8320: 1462fffe */ bne $v1,$v0,.L0f0f831c -/* f0f8324: a0600016 */ sb $zero,0x16($v1) -.L0f0f8328: -/* f0f8328: 03e00008 */ jr $ra -/* f0f832c: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0f8300(void) +{ + s32 i; + + if (g_MenuData.count == 0) { + for (i = 0; i < 4; i++) { + g_MenuData.unk017[i] = 0; + } + } +} GLOBAL_ASM( glabel menuPushRootDialog diff --git a/src/include/types.h b/src/include/types.h index a185aadce..2b45202a8 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5644,7 +5644,7 @@ struct menudata { /*0x014*/ u8 unk014; /*0x015*/ u8 unk015; /*0x016*/ u8 unk016; - /*0x018*/ u32 unk018; + /*0x017*/ u8 unk017[4]; /*0x01c*/ u32 unk01c; /*0x020*/ u32 unk020; /*0x024*/ u32 unk024;