From 6967428690c4012c08d24aa0e662add6e06b4004 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 4 Jan 2021 08:33:16 +1000 Subject: [PATCH] Decompile func0f013b80 --- src/game/game_013550.c | 18 +++++++----------- src/gvars/gvars.c | 5 +---- src/include/gvars/gvars.h | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/game/game_013550.c b/src/game/game_013550.c index fc5ac0c29..726e490e2 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -245,17 +245,13 @@ glabel func0f0139f0 /* f013b7c: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel func0f013b80 -/* f013b80: 3c02800b */ lui $v0,%hi(var800aabc8) -/* f013b84: 3c01800b */ lui $at,%hi(var800ab538) -/* f013b88: 2442abc8 */ addiu $v0,$v0,%lo(var800aabc8) -/* f013b8c: ac20b538 */ sw $zero,%lo(var800ab538)($at) -/* f013b90: ac400000 */ sw $zero,0x0($v0) -/* f013b94: ac400004 */ sw $zero,0x4($v0) -/* f013b98: 03e00008 */ jr $ra -/* f013b9c: ac40000c */ sw $zero,0xc($v0) -); +void func0f013b80(void) +{ + var800ab538 = 0; + var800aabc8[0] = 0; + var800aabc8[1] = 0; + var800aabc8[3] = 0; +} void func0f013ba0(void) { diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 5c2bd510f..b7af15281 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -15721,10 +15721,7 @@ struct var800aabb8 *var800aabb8 = NULL; u32 var800aabbc = 0; struct texture *g_Textures = NULL; u32 var800aabc4 = 0; -u32 var800aabc8 = 0; -u32 var800aabcc = 0; -u32 var800aabd0 = 0; -u32 var800aabd4 = 0; +u32 var800aabc8[4] = {0}; u32 var800aabd8 = 0; u32 var800aabdc = 0; u32 var800aabe0 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 3f0c22537..e39d8081f 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -783,7 +783,7 @@ extern u32 *g_LangBanks[69]; extern void *var800aabb4; extern struct var800aabb8 *var800aabb8; extern struct texture *g_Textures; -extern u32 var800aabc8; +extern u32 var800aabc8[4]; extern u32 var800aabd8; extern u32 var800ab538; extern u32 var800ab53c;