From 189b32f1612e05b0cb815a22633f125f79472f9f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 30 Mar 2021 08:04:50 +1000 Subject: [PATCH] Decompile func00037e1c --- Makefile | 1 + src/include/lib/lib_37b00.h | 2 +- src/lib/lib_37b00.c | 26 ++++---------------------- src/lib/lib_38d10.c | 12 ++++++++++++ 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index fca22d177..b9676dd91 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,7 @@ $(B_DIR)/lib/ultra/libc/llcvt.o: MIPSISET := -mips3 -32 # For these files, see their explicit targets towards the end of this file. $(B_DIR)/lib/lib_2fba0.o: OPT_LVL := -g $(B_DIR)/lib/lib_30ce0.o: OPT_LVL := -g +$(B_DIR)/lib/lib_37b00.o: OPT_LVL := -g $(B_DIR)/lib/lib_3a100.o: OPT_LVL := -g $(B_DIR)/lib/lib_3d280.o: OPT_LVL := -g $(B_DIR)/lib/lib_3e730.o: OPT_LVL := -g diff --git a/src/include/lib/lib_37b00.h b/src/include/lib/lib_37b00.h index 9033b4e1f..945ad389b 100644 --- a/src/include/lib/lib_37b00.h +++ b/src/include/lib/lib_37b00.h @@ -6,7 +6,7 @@ void func00037b00(ALHeap *heap); u32 func00037d88(void); -u32 func00037e1c(void); +void func00037e1c(void); void func00037e38(void); void func00037e68(void); u32 func00037ea4(void); diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index b4b7afeec..fd9201218 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -29,18 +29,6 @@ u32 var8009c3c0; u32 var8009c3c4; u32 var8009c3c8; u32 var8009c3cc; -u32 var8009c3d0; -u32 var8009c3d4; -u32 var8009c3d8; -u32 var8009c3dc; -u32 var8009c3e0; -u32 var8009c3e4; -u32 var8009c3e8; -u32 var8009c3ec; -u32 var8009c3f0; -u32 var8009c3f4; -u32 var8009c3f8; -u32 var8009c3fc; #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( @@ -429,16 +417,10 @@ glabel func00037d88 /* 37e18: 00000000 */ nop ); -GLOBAL_ASM( -glabel func00037e1c -/* 37e1c: 240e0003 */ addiu $t6,$zero,0x3 -/* 37e20: 3c01800a */ lui $at,%hi(var8009c3e0) -/* 37e24: ac2ec3e0 */ sw $t6,%lo(var8009c3e0)($at) -/* 37e28: 03e00008 */ jr $ra -/* 37e2c: 00000000 */ nop -/* 37e30: 03e00008 */ jr $ra -/* 37e34: 00000000 */ nop -); +void func00037e1c(void) +{ + var8009c3e0 = 3; +} GLOBAL_ASM( glabel func00037e38 diff --git a/src/lib/lib_38d10.c b/src/lib/lib_38d10.c index 98639ce9c..5094c0eab 100644 --- a/src/lib/lib_38d10.c +++ b/src/lib/lib_38d10.c @@ -4,6 +4,18 @@ #include "data.h" #include "types.h" +// This bss belongs in lib_37b00 but is here due to reordering issues +u32 var8009c3d0; +u32 var8009c3d4; +u32 var8009c3d8; +u32 var8009c3dc; +u32 var8009c3e0; +u32 var8009c3e4; +u32 var8009c3e8; +u32 var8009c3ec; +u32 var8009c3f0; +u32 var8009c3f4; + GLOBAL_ASM( glabel func00038d10 /* 38d10: 03e00008 */ jr $ra