From 489bf8accfe96767858059891703b05879ba5a94 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 2 Jun 2020 21:34:49 +1000 Subject: [PATCH] Decompile func0f167b10 --- src/game/game_167ae0.c | 27 +++++++++------------------ src/gvars/gvars.c | 8 ++------ src/include/gvars/gvars.h | 4 ++-- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 92b07a6c7..60824cd39 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -129,24 +129,15 @@ void func0f167af8(void) g_Vars.unk0004d8 = -1; } -GLOBAL_ASM( -glabel func0f167b10 -/* f167b10: 3c03800b */ lui $v1,%hi(var800aa5b0) -/* f167b14: 3c04800b */ lui $a0,%hi(var800aa5c0) -/* f167b18: 3c05800b */ lui $a1,%hi(var800aa5cc) -/* f167b1c: 24a5a5cc */ addiu $a1,$a1,%lo(var800aa5cc) -/* f167b20: 2484a5c0 */ addiu $a0,$a0,%lo(var800aa5c0) -/* f167b24: 2463a5b0 */ addiu $v1,$v1,%lo(var800aa5b0) -/* f167b28: 2402ffff */ addiu $v0,$zero,-1 -.L0f167b2c: -/* f167b2c: 24840004 */ addiu $a0,$a0,0x4 -/* f167b30: 24630004 */ addiu $v1,$v1,0x4 -/* f167b34: ac60fffc */ sw $zero,-0x4($v1) -/* f167b38: 1485fffc */ bne $a0,$a1,.L0f167b2c -/* f167b3c: ac82fffc */ sw $v0,-0x4($a0) -/* f167b40: 03e00008 */ jr $ra -/* f167b44: 00000000 */ sll $zero,$zero,0x0 -); +void func0f167b10(void) +{ + s32 i; + + for (i = 0; i != 3; i++) { + var800aa5b0[i] = 0; + var800aa5c0[i] = -1; + } +} GLOBAL_ASM( glabel func0f167b48 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 220e4a8c2..dae86dd26 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -19536,13 +19536,9 @@ u32 var800aa5a0 = 0; u32 var800aa5a4 = 0; u32 var800aa5a8 = 0; u32 var800aa5ac = 0; -u32 var800aa5b0 = 0; -u32 var800aa5b4 = 0; -u32 var800aa5b8 = 0; +s32 var800aa5b0[3] = {0}; u32 var800aa5bc = 0; -u32 var800aa5c0 = 0; -u32 var800aa5c4 = 0; -u32 var800aa5c8 = 0; +s32 var800aa5c0[3] = {0}; u32 var800aa5cc = 0; u32 var800aa5d0 = 0; u32 var800aa5d4 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 10c6aaf0e..6585c8135 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -761,8 +761,8 @@ extern u32 var800aa580; extern u32 var800aa590; extern u32 var800aa59c; extern u32 var800aa5a0; -extern u32 var800aa5b0; -extern u32 var800aa5c0; +extern s32 var800aa5b0[3]; +extern s32 var800aa5c0[3]; extern u32 var800aa5cc; extern u32 var800aa5d8; extern u32 var800aaa38;