From 3cb937b1b6133fd640d24ed48de4afceeccc9a05 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 Dec 2020 14:22:06 +1000 Subject: [PATCH] Decompile func0002373c --- src/game/data/data_003dc0.c | 2 +- src/gvars/gvars.c | 4 ++-- src/include/game/data/data_000000.h | 2 +- src/include/gvars/gvars.h | 4 ++-- src/lib/lib_233c0.c | 20 ++++++-------------- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/game/data/data_003dc0.c b/src/game/data/data_003dc0.c index ebac8ee1e..8b27af7b3 100644 --- a/src/game/data/data_003dc0.c +++ b/src/game/data/data_003dc0.c @@ -75,7 +75,7 @@ u32 var8005eff8 = 0xffffffff; u32 var8005effc = 0x00000000; u32 var8005f000 = 0x00000000; u32 var8005f004 = 0x00000000; -u32 var8005f008 = 0x00000000; +s16 var8005f008 = 0x00000000; struct animheader *g_Anims = NULL; u32 var8005f010 = 0x00000000; u32 var8005f014 = 0x00000000; diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index b8ad4f15a..0bbf761d8 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -12313,8 +12313,8 @@ u32 var8009a884 = 0; u32 var8009a888 = 0; u32 var8009a88c = 0; u32 var8009a890 = 0; -u32 var8009a894 = 0; -u32 var8009a898 = 0; +s16 var8009a894 = 0; +struct animheader *var8009a898 = NULL; u32 var8009a89c = 0; u32 *g_TileFileData = NULL; u32 g_TileNumRooms = 0; diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 6afcab278..c1824ca8e 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -145,7 +145,7 @@ extern u32 var8005efcc; extern u32 var8005efd0; extern u32 var8005efe0; extern u32 var8005efec; -extern u32 var8005f008; +extern s16 var8005f008; extern struct animheader *g_Anims; extern u32 var8005f010; extern u32 var8005f014; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index e33989ffa..0dcd4553f 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -483,8 +483,8 @@ extern u32 var8009a880; extern u32 var8009a888; extern u32 var8009a88c; extern u32 var8009a890; -extern u32 var8009a894; -extern u32 var8009a898; +extern s16 var8009a894; +extern struct animheader *var8009a898; extern u32 *g_TileFileData; extern u32 g_TileNumRooms; extern u32 *g_TileRooms; diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 94440fd21..e87a926cc 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -271,20 +271,12 @@ glabel func00023640 /* 23738: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0002373c -/* 2373c: 3c0e800a */ lui $t6,%hi(var8009a894) -/* 23740: 85cea894 */ lh $t6,%lo(var8009a894)($t6) -/* 23744: 3c0f800a */ lui $t7,%hi(var8009a898) -/* 23748: 8defa898 */ lw $t7,%lo(var8009a898)($t7) -/* 2374c: 3c018006 */ lui $at,%hi(var8005f008) -/* 23750: a42ef008 */ sh $t6,%lo(var8005f008)($at) -/* 23754: 3c018006 */ lui $at,%hi(g_Anims) -/* 23758: ac2ff00c */ sw $t7,%lo(g_Anims)($at) -/* 2375c: 3c018006 */ lui $at,%hi(var8005f020) -/* 23760: 03e00008 */ jr $ra -/* 23764: ac20f020 */ sw $zero,%lo(var8005f020)($at) -); +void func0002373c(void) +{ + var8005f008 = var8009a894; + g_Anims = var8009a898; + var8005f020 = 0; +} GLOBAL_ASM( glabel animGetNumFrames