From b9fcf89953b348155bb6d437f18d78f4c455f3eb Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 30 Mar 2021 08:09:17 +1000 Subject: [PATCH] Decompile func00037e68 --- src/lib/lib_37b00.c | 38 +++++++++++++++++++------------------- src/lib/lib_38d10.c | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index 96f4416ef..4fa91a4a5 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -30,6 +30,18 @@ u32 var8009c3c4; u32 var8009c3c8; u32 var8009c3cc; +// Moved to another file due to bss reordering issues +extern u32 var8009c3d0; +extern u32 var8009c3d4; +extern u32 var8009c3d8; +extern u32 var8009c3dc; +extern u32 var8009c3e0; +extern u32 var8009c3e4; +extern u32 var8009c3e8; +extern u32 var8009c3ec; +extern u8 var8009c3f0; +extern u32 var8009c3f4; + #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( glabel func00037b00 @@ -429,25 +441,13 @@ void func00037e38(void) } } -GLOBAL_ASM( -glabel func00037e68 -/* 37e68: 3c0e800a */ lui $t6,%hi(var8009c3e0) -/* 37e6c: 8dcec3e0 */ lw $t6,%lo(var8009c3e0)($t6) -/* 37e70: 24010002 */ addiu $at,$zero,0x2 -/* 37e74: 15c10007 */ bne $t6,$at,.L00037e94 -/* 37e78: 00000000 */ nop -/* 37e7c: 240f0005 */ addiu $t7,$zero,0x5 -/* 37e80: 3c01800a */ lui $at,%hi(var8009c3f0) -/* 37e84: a02fc3f0 */ sb $t7,%lo(var8009c3f0)($at) -/* 37e88: 24180005 */ addiu $t8,$zero,0x5 -/* 37e8c: 3c01800a */ lui $at,%hi(var8009c3e0) -/* 37e90: ac38c3e0 */ sw $t8,%lo(var8009c3e0)($at) -.L00037e94: -/* 37e94: 03e00008 */ jr $ra -/* 37e98: 00000000 */ nop -/* 37e9c: 03e00008 */ jr $ra -/* 37ea0: 00000000 */ nop -); +void func00037e68(void) +{ + if (var8009c3e0 == 2) { + var8009c3f0 = 5; + var8009c3e0 = 5; + } +} GLOBAL_ASM( glabel func00037ea4 diff --git a/src/lib/lib_38d10.c b/src/lib/lib_38d10.c index 5094c0eab..dc52e95d2 100644 --- a/src/lib/lib_38d10.c +++ b/src/lib/lib_38d10.c @@ -13,7 +13,7 @@ u32 var8009c3e0; u32 var8009c3e4; u32 var8009c3e8; u32 var8009c3ec; -u32 var8009c3f0; +u8 var8009c3f0; u32 var8009c3f4; GLOBAL_ASM(