diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 9872a719e..33c8881d0 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -1146,30 +1146,14 @@ glabel func0f0f1418 /* f0f1490: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0f1494 -/* f0f1494: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) -/* f0f1498: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f149c: 3c18800a */ lui $t8,0x800a -/* f0f14a0: 2718e000 */ addiu $t8,$t8,-8192 -/* f0f14a4: 000e78c0 */ sll $t7,$t6,0x3 -/* f0f14a8: 01ee7823 */ subu $t7,$t7,$t6 -/* f0f14ac: 000f7880 */ sll $t7,$t7,0x2 -/* f0f14b0: 01ee7821 */ addu $t7,$t7,$t6 -/* f0f14b4: 000f78c0 */ sll $t7,$t7,0x3 -/* f0f14b8: 01ee7823 */ subu $t7,$t7,$t6 -/* f0f14bc: 000f7900 */ sll $t7,$t7,0x4 -/* f0f14c0: 01f81821 */ addu $v1,$t7,$t8 -/* f0f14c4: 00001025 */ or $v0,$zero,$zero -/* f0f14c8: 24040004 */ addiu $a0,$zero,0x4 -.L0f0f14cc: -/* f0f14cc: 24420001 */ addiu $v0,$v0,0x1 -/* f0f14d0: 24630008 */ addiu $v1,$v1,0x8 -/* f0f14d4: 1444fffd */ bne $v0,$a0,.L0f0f14cc -/* f0f14d8: ac600df4 */ sw $zero,0xdf4($v1) -/* f0f14dc: 03e00008 */ jr $ra -/* f0f14e0: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0f1494(void) +{ + s32 i; + + for (i = 0; i < 4; i++) { + g_MenuStack[g_MpPlayerNum].unkdfc[i].unk00 = 0; + } +} GLOBAL_ASM( glabel func0f0f14e4 diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index 5bf600968..ae8cd57f5 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -13,7 +13,7 @@ u32 func0f0f1338(void); u32 func0f0f139c(void); u32 func0f0f13ec(void); u32 func0f0f1418(void); -u32 func0f0f1494(void); +void func0f0f1494(void); u32 func0f0f14e4(void); u32 func0f0f155c(void); u32 func0f0f1580(void); diff --git a/src/include/types.h b/src/include/types.h index 71f765f5e..8630dd294 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3366,6 +3366,11 @@ struct menustackitem4f8 { struct menu_item *item; }; +struct menustackdfc { + u32 unk00; + u32 unk04; +}; + struct menustackitem { /*0x000*/ u32 unk000; /*0x004*/ u32 unk004; @@ -4267,14 +4272,7 @@ struct menustackitem { /*0xdf0*/ u32 unkdf0; /*0xdf4*/ s8 *unkdf4; /*0xdf8*/ u8 unkdf8; - /*0xdfc*/ u32 unkdfc; - /*0xe00*/ u32 unke00; - /*0xe04*/ u32 unke04; - /*0xe08*/ u32 unke08; - /*0xe0c*/ u32 unke0c; - /*0xe10*/ u32 unke10; - /*0xe14*/ u32 unke14; - /*0xe18*/ u32 unke18; + /*0xdfc*/ struct menustackdfc unkdfc[4]; /*0xe1c*/ s32 slotindex; /*0xe20*/ u32 slotcount; /*0xe24*/ u32 unke24;