diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 1d365a9bb..e76a079fe 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -3112,26 +3112,19 @@ glabel func0f009818 /* f0099a0: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f0099a4 -/* f0099a4: 3c018006 */ lui $at,%hi(var80061640) -/* f0099a8: ac201640 */ sw $zero,%lo(var80061640)($at) -/* f0099ac: 3c018006 */ lui $at,%hi(var800616e4) -/* f0099b0: 3c03800a */ lui $v1,%hi(var8009cb08) -/* f0099b4: 3c04800a */ lui $a0,%hi(var8009cbf8) -/* f0099b8: ac2016e4 */ sw $zero,%lo(var800616e4)($at) -/* f0099bc: 2484cbf8 */ addiu $a0,$a0,%lo(var8009cbf8) -/* f0099c0: 2463cb08 */ addiu $v1,$v1,%lo(var8009cb08) -/* f0099c4: 2402ffff */ addiu $v0,$zero,-1 -.L0f0099c8: -/* f0099c8: 24630028 */ addiu $v1,$v1,0x28 -/* f0099cc: ac62ffe4 */ sw $v0,-0x1c($v1) -/* f0099d0: ac60fff8 */ sw $zero,-0x8($v1) -/* f0099d4: 1464fffc */ bne $v1,$a0,.L0f0099c8 -/* f0099d8: ac60fffc */ sw $zero,-0x4($v1) -/* f0099dc: 03e00008 */ jr $ra -/* f0099e0: 00000000 */ nop -); +void func0f0099a4(void) +{ + s32 i; + + var80061640 = 0; + var800616e4 = 0; + + for (i = 0; i < ARRAYCOUNT(var8009cb08); i++) { + var8009cb08[i].unk0c = -1; + var8009cb08[i].unk20 = 0; + var8009cb08[i].unk24 = 0; + } +} GLOBAL_ASM( glabel func0f0099e4 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 3a16e1271..e0975dd5b 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -14514,66 +14514,7 @@ u32 var8009caf8 = 0; u32 var8009cafc = 0; u32 var8009cb00 = 0; u32 var8009cb04 = 0; -u32 var8009cb08 = 0; -u32 var8009cb0c = 0; -u32 var8009cb10 = 0; -u32 var8009cb14 = 0; -u32 var8009cb18 = 0; -u32 var8009cb1c = 0; -u32 var8009cb20 = 0; -u32 var8009cb24 = 0; -u32 var8009cb28 = 0; -u32 var8009cb2c = 0; -u32 var8009cb30 = 0; -u32 var8009cb34 = 0; -u32 var8009cb38 = 0; -u32 var8009cb3c = 0; -u32 var8009cb40 = 0; -u32 var8009cb44 = 0; -u32 var8009cb48 = 0; -u32 var8009cb4c = 0; -u32 var8009cb50 = 0; -u32 var8009cb54 = 0; -u32 var8009cb58 = 0; -u32 var8009cb5c = 0; -u32 var8009cb60 = 0; -u32 var8009cb64 = 0; -u32 var8009cb68 = 0; -u32 var8009cb6c = 0; -u32 var8009cb70 = 0; -u32 var8009cb74 = 0; -u32 var8009cb78 = 0; -u32 var8009cb7c = 0; -u32 var8009cb80 = 0; -u32 var8009cb84 = 0; -u32 var8009cb88 = 0; -u32 var8009cb8c = 0; -u32 var8009cb90 = 0; -u32 var8009cb94 = 0; -u32 var8009cb98 = 0; -u32 var8009cb9c = 0; -u32 var8009cba0 = 0; -u32 var8009cba4 = 0; -u32 var8009cba8 = 0; -u32 var8009cbac = 0; -u32 var8009cbb0 = 0; -u32 var8009cbb4 = 0; -u32 var8009cbb8 = 0; -u32 var8009cbbc = 0; -u32 var8009cbc0 = 0; -u32 var8009cbc4 = 0; -u32 var8009cbc8 = 0; -u32 var8009cbcc = 0; -u32 var8009cbd0 = 0; -u32 var8009cbd4 = 0; -u32 var8009cbd8 = 0; -u32 var8009cbdc = 0; -u32 var8009cbe0 = 0; -u32 var8009cbe4 = 0; -u32 var8009cbe8 = 0; -u32 var8009cbec = 0; -u32 var8009cbf0 = 0; -u32 var8009cbf4 = 0; +struct var8009cb08 var8009cb08[6] = {0}; u32 var8009cbf8 = 0; u32 var8009cbfc = 0; struct prop *g_DangerousProps[MAX_DANGEROUSPROPS] = {NULL}; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 9513bb3b8..d14cd2601 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -493,7 +493,7 @@ extern u32 var8009cadc; extern u32 var8009cae0; extern u8 var8009caec; extern u8 var8009caf0; -extern u32 var8009cb08; +extern struct var8009cb08 var8009cb08[6]; extern u32 var8009cbf8; extern struct prop *g_DangerousProps[MAX_DANGEROUSPROPS]; extern s32 var8009cc30; diff --git a/src/include/types.h b/src/include/types.h index 2403c1fe4..df50abdc1 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6779,4 +6779,17 @@ struct var8006996c { /*0x28*/ u32 unk28; }; +struct var8009cb08 { + u32 unk00; + u32 unk04; + u32 unk08; + s32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u32 unk20; + u32 unk24; +}; + #endif