diff --git a/src/game/utils.c b/src/game/utils.c index cd919558e..68bbc2572 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -708,18 +708,17 @@ bool func0f1777b8(struct coord *a, struct coord *b, struct coord *c, struct coor return true; } +void func0f1777f8(void) +{ + s32 i; + + for (i = 0; i < 4; i++) { + var800ac0f8[i] = 0; + } +} + GLOBAL_ASM( -glabel func0f1777f8 -/* f1777f8: 3c03800b */ lui $v1,%hi(var800ac0f8) -/* f1777fc: 3c02800b */ lui $v0,%hi(var800ac108) -/* f177800: 2442c108 */ addiu $v0,$v0,%lo(var800ac108) -/* f177804: 2463c0f8 */ addiu $v1,$v1,%lo(var800ac0f8) -.L0f177808: -/* f177808: 24630004 */ addiu $v1,$v1,0x4 -/* f17780c: 1462fffe */ bne $v1,$v0,.L0f177808 -/* f177810: ac60fffc */ sw $zero,-0x4($v1) -/* f177814: 03e00008 */ jr $ra -/* f177818: 00000000 */ nop +glabel func0f17781c /* f17781c: 27bdff78 */ addiu $sp,$sp,-136 /* f177820: afb50038 */ sw $s5,0x38($sp) /* f177824: afb10028 */ sw $s1,0x28($sp) diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 50bdedef3..5fe5fac72 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -17806,10 +17806,7 @@ u32 var800ac0e8 = 0; u32 var800ac0ec = 0; u32 var800ac0f0 = 0; u32 var800ac0f4 = 0; -u32 var800ac0f8 = 0; -u32 var800ac0fc = 0; -u32 var800ac100 = 0; -u32 var800ac104 = 0; +u32 var800ac0f8[4] = {0}; u32 var800ac108 = 0; u32 var800ac10c = 0; struct scenariodata g_ScenarioData = {0}; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index f44d68116..c957f6443 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -801,7 +801,7 @@ extern u32 var800ab7c8; extern u32 var800abac8; extern u32 var800abdc8; extern u32 var800ac0e8; -extern u32 var800ac0f8; +extern u32 var800ac0f8[4]; extern u32 var800ac108; extern struct scenariodata g_ScenarioData; extern u32 var800ac258;