cleanup to object fields, some new names (#101)

* names and such

* enum

* dying

include/functions.h

@@ -21,11 +21,11 @@ void func_8000FFCC(void);
 
 void func_80016A50(void);
 void func_800182F4(s32);
-void Audio_PlaySfx(u32, Vec3f*, u8, f32*, f32*, s8*);
-void func_80019290(s32, Vec3f**);
-void func_8001A38C(u8, Vec3f*);
-void Audio_KillSfx(Vec3f*);
-void func_8001A55C(Vec3f*, u32);
+void Audio_PlaySfx(u32, f32*, u8, f32*, f32*, s8*);
+void func_80019290(s32, void*);
+void func_8001A38C(u8, f32*);
+void Audio_KillSfx(f32*);
+void func_8001A55C(f32*, u32);
 void func_8001A838(u32);
 void func_8001ACDC(s32);
 void func_8001AD00(u32);
@@ -37,14 +37,14 @@ u8* func_8001C3EC(void);
 void func_8001C8B8(u8);
 void func_8001CA24(u8);
 void func_8001CB80(u8, u8);
-void func_8001CCDC(u8, Vec3f *);
-void func_8001CE28(u8, Vec3f *);
-void func_8001D034(Vec3f*, s32, u8);
-void func_8001D10C(Vec3f*, u32);
+void func_8001CCDC(u8, f32 *);
+void func_8001CE28(u8, f32 *);
+void func_8001D034(f32*, s32, u8);
+void func_8001D10C(f32*, u32);
 void func_8001D15C(u8);
 void func_8001D1C8(u8, s32);
-void func_8001D2FC(Vec3f *, u16);
-void func_8001D3A0(Vec3f *, u16);
+void func_8001D2FC(f32 *, u16);
+void func_8001D3A0(f32 *, u16);
 void func_8001D400(s8);
 void func_8001D444(u8, u16, u8, u8);
 void func_8001D4AC(u16, u8, u8, u8);
@@ -106,11 +106,11 @@ void func_8002E670(Actor*);
 void func_8002E694(Actor*);
 void func_8002E6B8(Actor*);
 void func_8002E6DC(Actor*);
-bool func_8002E4F8(u16*, s32);
+bool func_8002E4F8(u16*, RadioCharacterId);
 void func_8002E700(Player *);
 void func_8002EE64(Actor * actor);
 void func_8002F180(void);
-void func_8002F5F4(u16* msg, s32 character);
+void func_8002F5F4(u16* msg, RadioCharacterId character);
 void func_8003088C(Actor*);
 void func_800319AC(Actor* this);
 void func_80035448(Actor* actor);
@@ -207,10 +207,10 @@ void func_8005CA80(Item*);
 void func_8005CB44(Item*);
 void func_8005CC9C(Item*);
 void func_8005CDA8(Item*);
-void func_8005F030(Vec3f*);
-void func_8005F0E8(Vec3f*, Vec3f*);
-void func_8005F1EC(Vec3f*);
-void func_8005F290(Vec3f*, Vec3f*);
+void func_8005F030(f32*);
+void func_8005F0E8(f32*, Vec3f*);
+void func_8005F1EC(f32*);
+void func_8005F290(f32*, Vec3f*);
 void func_8005F670(Vec3f*);
 s32 func_8005F9DC(Vec3f*);
 
@@ -219,8 +219,8 @@ void func_80060714(s32 );
 void func_8006089C(u8 );
 void func_80060968(void);
 void func_80060D94(s32);
-void func_80060F30(Vec3f* , u32 , s32 );
-void Object_Kill(Object*, Vec3f*);
+void func_80060F30(f32* , u32 , s32 );
+void Object_Kill(Object*, f32*);
 s32 func_80060FE4(Vec3f*, f32);
 void Object_SetInfo(ObjectInfo* info, u32 objId);
 void Object_80_Initialize(Object_80*);
@@ -530,12 +530,12 @@ void func_800A3CA0(void);
 // fox_play
 s32 Play_CheckMedalStatus(u16);
 s32 Play_GetMaxShields(void);
-void func_800A6028(Vec3f*, u32);
+void func_800A6028(f32*, u32);
 void func_800A5844(void);
 void func_800A594C(void);
 void func_800A5D6C(void);
-void func_800A5FA0(Vec3f* , u32 , s32 );
-void func_800A6070(Vec3f* arg0, u32 arg1);
+void func_800A5FA0(f32* , u32 , s32 );
+void func_800A6070(f32* , u32 );
 void func_800A6148(void);
 void func_800A69F8(s32 , f32 , f32 , f32 );
 void Player_ApplyDamage(Player* player, s32 direction, s32 damage);
@@ -595,6 +595,7 @@ s32 Save_Write(void);
 s32 Save_Read(void);
 
 void func_menu_80187520(u32, void*);
+void func_menu_8019E8D0(void);
 
 void func_ending_8018A96C(void);
 void func_ending_8018AAC4(void);

include/sf64object.h

@@ -100,6 +100,13 @@ typedef struct {
     /* 0x1C */ u8 unk_1C;
 } UnkStruct_D003C; // size = 0x20
 
+typedef enum ObjectStatus {
+    /* 0 */ OBJ_FREE,
+    /* 1 */ OBJ_INIT,
+    /* 2 */ OBJ_ACTIVE,
+    /* 3 */ OBJ_DYING,
+} ObjectStatus;
+
 typedef struct {
     /* 0x00 */ u8 status;
     /* 0x02 */ u16 id;
@@ -130,7 +137,7 @@ typedef struct {
     /* 0x00 */ Object obj;
     /* 0x1C */ ObjectInfo info;
     /* 0x40 */ char unk40[0x8];
-    /* 0x48 */ Vec3f sfxPos;
+    /* 0x48 */ f32 sfxPos[3];
     /* 0x54 */ f32 unk_54;
 } Object_58; // size = 0x58
 
@@ -147,7 +154,7 @@ typedef struct {
     /* 0x58 */ char pad58[8];
     /* 0x60 */ f32 unk_60;
     /* 0x64 */ Vec3f vel;
-    /* 0x70 */ Vec3f sfxPos;
+    /* 0x70 */ f32 sfxPos[3];
     /* 0x7C */ char pad7C[4];
 } Object_80; // size = 0x80
 
@@ -174,7 +181,7 @@ typedef struct {
     /* 0x50 */ f32 unk_50;
     /* 0x54 */ f32 unk_54;
     /* 0x58 */ f32 unk_58;
-    /* 0x5C */ Vec3f sfxPos;
+    /* 0x5C */ f32 sfxPos[3];
     /* 0x68 */ f32 scale;
 } Item; // size 0x6C
 
@@ -198,7 +205,7 @@ typedef struct {
     /* 0x78 */ s16 unk_78;
     /* 0x7A */ s16 unk_7A;
     /* 0x7C */ char pad7C[4];
-    /* 0x80 */ Vec3f sfxPos;
+    /* 0x80 */ f32 sfxPos[3];
 } Effect; // size 0x8C
 
 typedef struct {
@@ -231,7 +238,7 @@ typedef struct {
     /* 0x0D8 */ f32 fwork[50];
     /* 0x1A0 */ Vec3f vwork[50];
     /* 0x3F8 */ f32 unk_3F8;
-    /* 0x3FC */ Vec3f sfxPos;
+    /* 0x3FC */ f32 sfxPos[3];
 } Boss; // size = 0x408
 
 #define DMG_BEAM 1
@@ -262,17 +269,17 @@ typedef struct {
     /* 0x0C8 */ u8 unk_0C8;
     /* 0x0C9 */ u8 unk_0C9;
     /* 0x0CA */ u8 timer_0CA[4];
-    /* 0x0CE */ s16 unk_0CE;
+    /* 0x0CE */ s16 health;
     /* 0x0D0 */ s8 unk_0D0;
     /* 0x0D2 */ s16 unk_0D2;
     /* 0x0D4 */ s16 unk_0D4;
-    /* 0x0D6 */ u16 unk_0D6;
+    /* 0x0D6 */ u16 damage;
     /* 0x0D8 */ Vec3f unk_0D8;
     /* 0x0E4 */ s16 unk_0E4;
     /* 0x0E6 */ s16 unk_0E6;
     /* 0x0E8 */ Vec3f vel;
     /* 0x0F4 */ Vec3f unk_0F4;
-    /* 0x100 */ Vec3f sfxPos;
+    /* 0x100 */ f32 sfxPos[3];
     /* 0x10C */ f32 gravity;
     /* 0x110 */ f32 scale;
     /* 0x114 */ f32 fwork[30];

include/sf64player.h

@@ -99,7 +99,7 @@ typedef struct {
     /* 0x2C */ f32 unk_2C;
     /* 0x30 */ f32 unk_30;
     /* 0x34 */ f32 unk_34; 
-    /* 0x38 */ Vec3f sfxPos;
+    /* 0x38 */ f32 sfxPos[3];
     /* 0x44 */ f32 unk_44;
     /* 0x48 */ f32 unk_48;
     /* 0x4C */ f32 unk_4C;
@@ -268,18 +268,15 @@ typedef struct Player {
     /* 0x2E0 */ Vec3f hit4;
     /* 0x2EC */ Vec3f hit3;
     /* 0x2F8 */ Vec3f jointTable[30];
-    /* 0x460 */ union {
-                Vec3f unk_460;
-                Vec3f unk_460_arr[1]; // probably fake
-    };
-    /* 0x460 */ Vec3f unk_46C;
-    /* 0x478 */ u8 unk_478;
-    /* 0x479 */ s8 unk_479;
-    /* 0x47C */ Vec3f *unk_47C;
-    /* 0x480 */ Vec3f *unk_480;
-    /* 0x484 */ s8 unk_484;
-    /* 0x485 */ s8 unk_485;
-    /* 0x488 */ f32 unk_488;
+    /* 0x460 */ f32 sfxPos[3];
+    /* 0x460 */ f32 sfxVel[3];
+    /* 0x478 */ u8 levelType;
+    /* 0x479 */ u8 form2;
+    /* 0x47C */ f32 *srcPos;
+    /* 0x480 */ f32 *srcVel;
+    /* 0x484 */ s8 boost;
+    /* 0x485 */ s8 brake;
+    /* 0x488 */ f32 yVel;
     /* 0x48C */ u8 unk_48C;
     /* 0x490 */ f32 unk_490;
     /* 0x494 */ u8 unk_494;

include/variables.h

@@ -22,7 +22,7 @@ extern u8 gAspMainData[];
 extern Mtx gIdentityMtx; // 800C4620
 extern Matrix gIdentityMatrix; //800C4660
 
-extern Vec3f D_800C5D28;
+extern f32 D_800C5D28[];
 extern f32 D_800C5D34;
 extern s8 D_800C5D3C;
 extern s8 D_800C7C50;
@@ -458,7 +458,7 @@ extern s32 D_80177A10[10];
 extern s32 D_Timer_80177A38[4];
 extern f32 D_80177A48[10];
 extern s32 D_Timer_80177A70[4];
-extern s32 D_80177A80;
+extern s32 gCsFrameCount;
 //
 extern s32 D_Timer_80177A88[4];
 extern u8 D_80177A98;
@@ -571,7 +571,7 @@ extern u8 D_80178238[60];
 // 0x8
 extern s32 D_8017827C;
 extern Player* gPlayer;
-extern s32 D_80178284;
+extern s32 gBossActive;
 extern f32* D_80178288;
 extern s32 D_8017828C;
 extern f32* D_80178290;

linker_scripts/us/symbol_addrs_engine.txt

@@ -466,7 +466,7 @@ D_80177A10 = 0x80177A10;//size:0x28
 D_Timer_80177A38 = 0x80177A38;
 D_80177A48 = 0x80177A48;//size:0x28
 D_Timer_80177A70 = 0x80177A70;//size:0x10
-D_80177A80 = 0x80177A80;
+gCsFrameCount = 0x80177A80;
 D_Timer_80177A88 = 0x80177A88;//size:0x10
 D_80177A98 = 0x80177A98;
 D_80177AA0 = 0x80177AA0;
@@ -530,7 +530,7 @@ gCurrentLevel = 0x80178234;
 D_80178238 = 0x80178238;//size:4 type:u8
 D_8017827C = 0x8017827C;
 gPlayer = 0x80178280;
-D_80178284 = 0x80178284;
+gBossActive = 0x80178284;
 D_80178288 = 0x80178288;
 D_8017828C = 0x8017828C;
 D_80178290 = 0x80178290;

src/main/fox_360.c

@@ -32,7 +32,7 @@ s32 D_800C9B4C = 96 * 30;
 };
 /* static */ Vec3f D_800C9B98 = { 60.0f, 0.0f, -170.0f };
 /* static */ Vec3f D_800C9BA4 = { -60.0f, 0.0f, -170.0f };
-/* static */ Vec3f D_800C9BB0 = { 0.0f, 0.0f, 0.0f };
+// /* static */ Vec3f D_800C9BB0 = { 0.0f, 0.0f, 0.0f };
 
 s32 D_8015F900;
 s32 D_8015F904;
@@ -87,9 +87,9 @@ void func_8002E3E0(Actor* actor) {
     D_80177850 = 15;
 }
 
-bool func_8002E4F8(u16* arg0, s32 arg1) {
+bool func_8002E4F8(u16* msg, RadioCharacterId rcid) {
     if ((gRadioState == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
-        func_800BA808(arg0, arg1);
+        func_800BA808(msg, rcid);
         return true;
     } else {
         return false;
@@ -102,7 +102,7 @@ void func_8002E548(void) {
 
         func_8008E51C(D_8015F930, D_8015F944);
         if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
-            Audio_PlaySfx(0x4900C02A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900C02A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     }
 }
@@ -143,11 +143,11 @@ void func_8002E700(Player* player) {
     Vec3f sp6C;
     Vec3f sp60;
 
-    D_80177A80++;
+    gCsFrameCount++;
     switch (player->unk_1D0) {
         case 0:
             player->unk_1F4 = player->timer_498 = player->damage = player->unk_280 = player->unk_2BC = player->unk_2B4 =
-                player->unk_4DC = D_80177A80 = 0;
+                player->unk_4DC = gCsFrameCount = 0;
             player->unk_130 = player->unk_034 = player->unk_110 = player->unk_08C = player->unk_0D8.x =
                 player->unk_0D8.y = player->unk_0D8.z = player->unk_134 = player->unk_4D8 = 0.0f;
             D_80177978 = 1673.0f;
@@ -172,12 +172,12 @@ void func_8002E700(Player* player) {
             player->unk_1D0++;
             break;
         case 1:
-            if (D_80177A80 >= 47) {
+            if (gCsFrameCount >= 47) {
                 D_80178358 = 255;
                 D_8017835C = 32;
                 D_80178348 = D_80178350 = D_80178354 = 0;
             }
-            if (D_80177A80 >= 64) {
+            if (gCsFrameCount >= 64) {
                 player->unk_1D0++;
                 player->unk_0D0 = 0.0f;
             }
@@ -200,7 +200,7 @@ void func_8002E700(Player* player) {
                 } else {
                     gRightWingHealth[0] = gLeftWingHealth[0] = 60;
                 }
-                Audio_PlaySfx(0x4900200E, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900200E, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 player->unk_1D0++;
             }
             break;
@@ -213,14 +213,14 @@ void func_8002E700(Player* player) {
                 player->unk_0D0 = D_80161A54;
                 player->unk_1D0++;
 
-                Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
         case 4:
             D_80177988 -= 1.0f;
             D_80177978 -= 1.0f;
             player->unk_0E4 += 0.4f;
-            if (D_80177A80 >= 130) {
+            if (gCsFrameCount >= 130) {
                 player->state_1C8 = PLAYERSTATE_1C8_3;
                 player->wings.unk_2C = 0;
                 player->unk_014 = 0;
@@ -301,7 +301,7 @@ void func_8002EE64(Actor* actor) {
     actor->fwork[25] = actor->fwork[26] = actor->fwork[28] = actor->fwork[27] = 0.0f;
     if ((actor->unk_0C9 != 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (gLevelType == LEVELTYPE_PLANET)) {
         for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) {
-            if ((obj58->obj.status == 2) &&
+            if ((obj58->obj.status == OBJ_ACTIVE) &&
                 ((obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_149) || (obj58->obj.id == OBJ_80_148) ||
                  (obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3)) &&
                 (fabsf(obj58->obj.pos.x - actor->obj.pos.x) < 2500.0f) &&
@@ -362,7 +362,7 @@ void func_8002F180(void) {
             continue;
         }
         Actor_Initialize(actor);
-        actor->obj.status = 2;
+        actor->obj.status = OBJ_ACTIVE;
         actor->obj.id = OBJ_ACTOR_197;
         Object_SetInfo(&actor->info, actor->obj.id);
         if (i == 0) {
@@ -382,18 +382,18 @@ void func_8002F180(void) {
             if (actor->unk_0E6 < 0) {
                 actor->unk_0B8 = 3;
             }
-            actor->unk_0CE = 50;
+            actor->health = 50;
             if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) {
                 actor->unk_0C9 = 1;
             }
             actor->iwork[11] = 1;
             if (actor->unk_0E4 < 4) {
-                Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C);
                 actor->info.unk_1C = 0.0f;
                 actor->info.bonus = 0;
             } else {
-                Audio_PlaySfx(0x31000011, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
     }
@@ -406,7 +406,7 @@ void func_8002F3E0(void) {
     for (i = 0, actor = &gActors[4]; i < 4; i++, actor++) {
         if (D_80177CD0[i] != 0) {
             Actor_Initialize(actor);
-            actor->obj.status = 2;
+            actor->obj.status = OBJ_ACTIVE;
             actor->obj.pos.x = D_800C9AFC[i].x;
             actor->obj.pos.y = D_800C9AFC[i].y;
             actor->obj.pos.z = D_800C9AFC[i].z;
@@ -414,7 +414,7 @@ void func_8002F3E0(void) {
             actor->unk_0E4 = i + 4;
             actor->unk_0E6 = D_800C9B2C[i];
             gActors[actor->unk_0E6].unk_0E6 = -1;
-            actor->unk_0CE = 100;
+            actor->health = 100;
             actor->unk_0C9 = 1;
             actor->unk_0F4.y = 225.0f;
             actor->unk_0B8 = 0;
@@ -427,21 +427,21 @@ void func_8002F3E0(void) {
             }
             Object_SetInfo(&actor->info, actor->obj.id);
             if (gCurrentLevel == LEVEL_VENOM_2) {
-                Audio_PlaySfx(0x31004006, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x31004006, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else {
-                Audio_PlaySfx(0x31004005, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x31004005, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
     }
 }
 
-void func_8002F5F4(u16* msg, s32 character) {
+void func_8002F5F4(u16* msg, RadioCharacterId character) {
     if ((D_80178300 == 0) && (gActors[0].unk_0B8 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
         func_800BA808(msg, character);
     }
 }
 
-void func_8002F64C(u16* msg, s32 character) {
+void func_8002F64C(u16* msg, RadioCharacterId character) {
     if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) {
         gRadioState = 0;
     }
@@ -449,7 +449,7 @@ void func_8002F64C(u16* msg, s32 character) {
 }
 
 void func_8002F69C(Actor* actor) {
-    Actor* var_s0;
+    Actor* otherActor;
     s32 i;
 
     if (D_8015F904 != 0) {
@@ -487,19 +487,19 @@ void func_8002F69C(Actor* actor) {
     if (D_8015F928 > D_800C9B4C) {
         if (D_8015F908 == 0) {
             D_8015F940++;
-            for (i = 1, var_s0 = &gActors[1]; i < 8; i++, var_s0++) {
-                if ((var_s0->obj.status == 2) && (var_s0->unk_0B8 == 2) && (var_s0->unk_0CE < 70) &&
-                    (var_s0->timer_0C6 != 0) && (var_s0->unk_0D4 == 1)) {
-                    if ((gActors[var_s0->unk_0E6].unk_0B8 == 3) && (gActors[var_s0->unk_0E6].unk_0E4 < 8)) {
-                        gActors[var_s0->unk_0E6].iwork[2] = 0;
-                        gActors[var_s0->unk_0E6].unk_0B8 = 2;
-                        gActors[var_s0->unk_0E6].unk_0E6 = var_s0->unk_0E4;
-                        if (D_800CA234 == &gActors[var_s0->unk_0E6]) {
+            for (i = 1, otherActor = &gActors[1]; i < 8; i++, otherActor++) {
+                if ((otherActor->obj.status == OBJ_ACTIVE) && (otherActor->unk_0B8 == 2) && (otherActor->health < 70) &&
+                    (otherActor->timer_0C6 != 0) && (otherActor->unk_0D4 == 1)) {
+                    if ((gActors[otherActor->unk_0E6].unk_0B8 == 3) && (gActors[otherActor->unk_0E6].unk_0E4 < 8)) {
+                        gActors[otherActor->unk_0E6].iwork[2] = 0;
+                        gActors[otherActor->unk_0E6].unk_0B8 = 2;
+                        gActors[otherActor->unk_0E6].unk_0E6 = otherActor->unk_0E4;
+                        if (D_800CA234 == &gActors[otherActor->unk_0E6]) {
                             D_800CA234 = NULL;
                             D_Timer_800CA238 = 0;
                         }
-                        if (gActors[var_s0->unk_0E6].iwork[3] == 0) {
-                            switch (gActors[var_s0->unk_0E6].unk_0E4) {
+                        if (gActors[otherActor->unk_0E6].iwork[3] == 0) {
+                            switch (gActors[otherActor->unk_0E6].unk_0E4) {
                                 case 1:
                                     func_8002F5F4(gMsg_ID_9160, RCID_FALCO);
                                     break;
@@ -510,17 +510,17 @@ void func_8002F69C(Actor* actor) {
                                     func_8002F5F4(gMsg_ID_9180, RCID_PEPPY);
                                     break;
                             }
-                            gActors[var_s0->unk_0E6].iwork[3] = 200;
+                            gActors[otherActor->unk_0E6].iwork[3] = 200;
                         }
                     }
-                    if (var_s0->unk_0E4 == 4) {
+                    if (otherActor->unk_0E4 == 4) {
                         if (gCurrentLevel != LEVEL_VENOM_2) {
-                            var_s0->unk_0B8 = 3;
-                            var_s0->unk_04E = 300;
+                            otherActor->unk_0B8 = 3;
+                            otherActor->unk_04E = 300;
                         }
                     } else {
-                        var_s0->unk_0B8 = 3;
-                        var_s0->unk_0E6 = -1;
+                        otherActor->unk_0B8 = 3;
+                        otherActor->unk_0E6 = -1;
                     }
                 }
             }
@@ -538,18 +538,18 @@ void func_8002F69C(Actor* actor) {
 }
 
 void func_8002FB4C(Actor* actor) {
-    Actor* var_a2;
-    Actor* var_v1;
+    Actor* actor2;
+    Actor* actor1;
     s32 var_a0;
     s32 j;
     s32 i;
 
-    for (i = 10, var_v1 = &gActors[10]; i < 60; i++, var_v1++) {
-        if ((var_v1->obj.status == 2) && (var_v1->obj.id == OBJ_ACTOR_197) && (var_v1->unk_0B6 == 0) &&
-            (var_v1->unk_0E6 < 0)) {
+    for (i = 10, actor1 = &gActors[10]; i < 60; i++, actor1++) {
+        if ((actor1->obj.status == OBJ_ACTIVE) && (actor1->obj.id == OBJ_ACTOR_197) && (actor1->unk_0B6 == 0) &&
+            (actor1->unk_0E6 < 0)) {
             var_a0 = false;
-            for (j = 1, var_a2 = &gActors[1]; j < 4; j++, var_a2++) {
-                if ((j != actor->index) && (i == var_a2->unk_0E6)) {
+            for (j = 1, actor2 = &gActors[1]; j < 4; j++, actor2++) {
+                if ((j != actor->index) && (i == actor2->unk_0E6)) {
                     var_a0 = true;
                 }
             }
@@ -564,27 +564,29 @@ void func_8002FB4C(Actor* actor) {
 }
 
 void func_8002FC00(Actor* actor) {
-    Actor* var_s1;
+    Actor* otherActor;
     s32 var_s5;
 
-    for (var_s5 = 0, var_s1 = &gActors[10]; var_s5 < 50; var_s5++, var_s1++) {
-        if ((var_s1->obj.status == 3) && (var_s1->unk_0E6 > 0) && (var_s1->unk_0E6 < 4)) {
-            Actor* var_v0;
+    for (var_s5 = 0, otherActor = &gActors[10]; var_s5 < 50; var_s5++, otherActor++) {
+        if ((otherActor->obj.status == OBJ_DYING) && (otherActor->unk_0E6 > 0) && (otherActor->unk_0E6 < 4)) {
+            Actor* actor2;
             s32 var_v1;
 
-            for (var_v1 = 0, var_v0 = &gActors[10]; var_v1 < 51; var_v1++, var_v0++) {
-                if ((var_v0->obj.status == 2) && (var_v0->unk_0B8 == 2) && (var_v0->unk_0E6 == var_s1->unk_0E6)) {
+            for (var_v1 = 0, actor2 = &gActors[10]; var_v1 < 51; var_v1++, actor2++) {
+                if ((actor2->obj.status == OBJ_ACTIVE) && (actor2->unk_0B8 == 2) &&
+                    (actor2->unk_0E6 == otherActor->unk_0E6)) {
                     return;
                 }
             }
-            if (gTeamShields[var_s1->unk_0E6] > 0) {
-                func_8002FB4C(&gActors[var_s1->unk_0E6]);
-                if ((var_s1->iwork[5] != 0) && (var_s1->unk_0D4 == 1) && (gActors[var_s1->unk_0E6].iwork[3] == 0)) {
-                    if (D_800CA234 == &gActors[var_s1->unk_0E6]) {
+            if (gTeamShields[otherActor->unk_0E6] > 0) {
+                func_8002FB4C(&gActors[otherActor->unk_0E6]);
+                if ((otherActor->iwork[5] != 0) && (otherActor->unk_0D4 == 1) &&
+                    (gActors[otherActor->unk_0E6].iwork[3] == 0)) {
+                    if (D_800CA234 == &gActors[otherActor->unk_0E6]) {
                         D_800CA234 = NULL;
                         D_Timer_800CA238 = 0;
                     }
-                    switch (gActors[var_s1->unk_0E6].unk_0E4) {
+                    switch (gActors[otherActor->unk_0E6].unk_0E4) {
                         case 1:
                             func_8002F5F4(gMsg_ID_9160, RCID_FALCO);
                             break;
@@ -595,8 +597,8 @@ void func_8002FC00(Actor* actor) {
                             func_8002F5F4(gMsg_ID_9180, RCID_PEPPY);
                             break;
                     }
-                    gActors[var_s1->unk_0E6].iwork[3] = 200;
-                    gActors[var_s1->unk_0E6].timer_0C4 = 600;
+                    gActors[otherActor->unk_0E6].iwork[3] = 200;
+                    gActors[otherActor->unk_0E6].timer_0C4 = 600;
                 }
             }
         }
@@ -615,8 +617,8 @@ bool func_8002FE74(void) {
     return false;
 }
 
-void func_8002FEF0(Actor* arg0) {
-    Actor* var_s0;
+void func_8002FEF0(Actor* actor) {
+    Actor* newActor;
     s32 i;
 
     if ((D_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) {
@@ -629,24 +631,24 @@ void func_8002FEF0(Actor* arg0) {
     if (D_8015F900 != 0) {
         D_8015F900--;
         if (D_8015F900 == 0) {
-            for (i = 20, var_s0 = &gActors[20]; i < 60; i++, var_s0++) {
-                if (var_s0->obj.status == 0) {
-                    Actor_Initialize(var_s0);
-                    var_s0->obj.status = 1;
-                    var_s0->obj.id = OBJ_ACTOR_291;
+            for (i = 20, newActor = &gActors[20]; i < 60; i++, newActor++) {
+                if (newActor->obj.status == OBJ_FREE) {
+                    Actor_Initialize(newActor);
+                    newActor->obj.status = OBJ_INIT;
+                    newActor->obj.id = OBJ_ACTOR_291;
                     if (gCurrentLevel == LEVEL_SECTOR_Z) {
-                        var_s0->obj.pos.x = 200.0f;
-                        var_s0->obj.pos.y = -500.0f;
-                        var_s0->obj.pos.z = 0.0f;
-                        Audio_PlaySfx(0x09000002, &var_s0->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                        var_s0->timer_0C2 = 50;
+                        newActor->obj.pos.x = 200.0f;
+                        newActor->obj.pos.y = -500.0f;
+                        newActor->obj.pos.z = 0.0f;
+                        Audio_PlaySfx(0x09000002, newActor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        newActor->timer_0C2 = 50;
                     } else {
-                        var_s0->obj.pos.x = 0.0f;
-                        var_s0->obj.pos.y = 3000.0f;
-                        var_s0->obj.pos.z = 5000.0f;
-                        var_s0->timer_0C2 = 50;
+                        newActor->obj.pos.x = 0.0f;
+                        newActor->obj.pos.y = 3000.0f;
+                        newActor->obj.pos.z = 5000.0f;
+                        newActor->timer_0C2 = 50;
                     }
-                    Object_SetInfo(&var_s0->info, var_s0->obj.id);
+                    Object_SetInfo(&newActor->info, newActor->obj.id);
                     break;
                 }
             }
@@ -665,7 +667,7 @@ void func_8002FEF0(Actor* arg0) {
 
 void func_8003010C(Actor* actor) {
     if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_4) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6)) {
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         return;
     }
     D_8015F928++;
@@ -705,7 +707,7 @@ s32 func_800301F4(Actor* actor) {
     temp_ft4 = actor->fwork[9] * 10.0f + (sp1C * 650.0f);
     temp_ft5 = actor->fwork[9] * 10.0f + (sp18 * 650.0f);
     for (i = 0; i < 200; i++) {
-        if ((gObjects58[i].obj.status == 2) &&
+        if ((gObjects58[i].obj.status == OBJ_ACTIVE) &&
             (fabsf(gObjects58[i].obj.pos.x - (actor->obj.pos.x + temp_ft4)) < 1000.0f) &&
             (fabsf(gObjects58[i].obj.pos.z - (actor->obj.pos.z + temp_ft5)) < 1000.0f)) {
             if (fabsf(gObjects58[i].obj.pos.y - actor->obj.pos.y) < 1000.0f) {
@@ -731,8 +733,8 @@ s32 func_800301F4(Actor* actor) {
     return 0;
 }
 
-s32 func_8003049C(Actor* arg0) {
-    Object_58* var_v0_2;
+s32 func_8003049C(Actor* actor) {
+    Object_58* obj58;
     s32 i;
     f32 sp44;
     f32 sp40;
@@ -747,23 +749,24 @@ s32 func_8003049C(Actor* arg0) {
         return 0;
     }
     if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) {
-        return func_800301F4(arg0);
+        return func_800301F4(actor);
     }
-    sp40 = __sinf(arg0->obj.rot.y * M_DTOR);
-    sp3C = __cosf(arg0->obj.rot.y * M_DTOR);
-    temp_fa0 = arg0->fwork[9] * 10.0f + (sp40 * 650.0f);
-    temp_ft4 = arg0->fwork[9] * 10.0f + (sp3C * 650.0f);
+    sp40 = __sinf(actor->obj.rot.y * M_DTOR);
+    sp3C = __cosf(actor->obj.rot.y * M_DTOR);
+    temp_fa0 = actor->fwork[9] * 10.0f + (sp40 * 650.0f);
+    temp_ft4 = actor->fwork[9] * 10.0f + (sp3C * 650.0f);
     if (gLevelMode == LEVELMODE_ALL_RANGE) {
-        for (i = 0, var_v0_2 = gObjects58; i < 200; i++, var_v0_2++) {
-            if ((var_v0_2->obj.status == 2) && (fabsf(var_v0_2->obj.pos.x - (arg0->obj.pos.x + temp_fa0)) < 1200.0f) &&
-                (fabsf(var_v0_2->obj.pos.z - (arg0->obj.pos.z + temp_ft4)) < 1200.0f) && (arg0->obj.pos.y < 650.0f)) {
+        for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) {
+            if ((obj58->obj.status == OBJ_ACTIVE) &&
+                (fabsf(obj58->obj.pos.x - (actor->obj.pos.x + temp_fa0)) < 1200.0f) &&
+                (fabsf(obj58->obj.pos.z - (actor->obj.pos.z + temp_ft4)) < 1200.0f) && (actor->obj.pos.y < 650.0f)) {
                 return 1;
             }
         }
     }
     sp44 = 1200.0f;
     var_ft5 = 650.0f;
-    if (arg0->unk_0E4 < 8) {
+    if (actor->unk_0E4 < 8) {
         var_ft5 = 720.0f;
     }
 
@@ -776,73 +779,73 @@ s32 func_8003049C(Actor* arg0) {
         sp44 = 1500.0f;
         var_ft5 = 700.0f;
     }
-    if ((fabsf(boss->obj.pos.x - (arg0->obj.pos.x + temp_fa0)) < sp44) &&
-        (fabsf(boss->obj.pos.z - (arg0->obj.pos.z + temp_ft4)) < sp44) &&
-        (fabsf(boss->obj.pos.y - arg0->obj.pos.y) < var_ft5)) {
+    if ((fabsf(boss->obj.pos.x - (actor->obj.pos.x + temp_fa0)) < sp44) &&
+        (fabsf(boss->obj.pos.z - (actor->obj.pos.z + temp_ft4)) < sp44) &&
+        (fabsf(boss->obj.pos.y - actor->obj.pos.y) < var_ft5)) {
         return 1;
     }
     return 0;
 }
 
-void func_8003088C(Actor* arg0) {
+void func_8003088C(Actor* actor) {
     s32 var_a1;
     Vec3f sp48;
     Vec3f sp3C;
 
-    if (arg0->unk_0D0 != 0) {
-        if (arg0->unk_0E4 == 100) {
-            arg0->unk_0D0 = 0;
+    if (actor->unk_0D0 != 0) {
+        if (actor->unk_0E4 == 100) {
+            actor->unk_0D0 = 0;
         }
-        if ((arg0->unk_0D0 >= 2) && (arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 8)) {
-            arg0->unk_0D6 = 10;
-            arg0->timer_0C2 = 10;
+        if ((actor->unk_0D0 >= 2) && (actor->unk_0E4 >= 4) && (actor->unk_0E4 < 8)) {
+            actor->damage = 10;
+            actor->timer_0C2 = 10;
         }
-        if (((arg0->unk_0E4 < 4) || (arg0->unk_0E4 == 9) || (arg0->unk_0E4 == 8)) && (arg0->unk_0D0 == 2)) {
-            arg0->unk_0D0 = 0;
+        if (((actor->unk_0E4 < 4) || (actor->unk_0E4 == 9) || (actor->unk_0E4 == 8)) && (actor->unk_0D0 == 2)) {
+            actor->unk_0D0 = 0;
         }
-        if ((arg0->unk_0D0 == 2) && (arg0->fwork[22] > 0.0f)) {
-            arg0->unk_0D0 = 0;
+        if ((actor->unk_0D0 == 2) && (actor->fwork[22] > 0.0f)) {
+            actor->unk_0D0 = 0;
         }
-        if (arg0->fwork[23] > 1.0f) {
-            arg0->unk_0D0 = 0;
+        if (actor->fwork[23] > 1.0f) {
+            actor->unk_0D0 = 0;
         }
-        if (arg0->unk_0D0 != 0) {
+        if (actor->unk_0D0 != 0) {
             var_a1 = false;
-            if ((arg0->unk_0B6 == 3) ||
-                ((gCurrentLevel == LEVEL_BOLSE) && (gBosses[1].obj.status != 0) && (arg0->unk_0E4 >= 4)) ||
-                ((gCurrentLevel == LEVEL_VENOM_2) && (arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 10) &&
-                 (arg0->unk_0D0 == 2))) {
-                arg0->unk_0D6 = 0;
+            if ((actor->unk_0B6 == 3) ||
+                ((gCurrentLevel == LEVEL_BOLSE) && (gBosses[1].obj.status != OBJ_FREE) && (actor->unk_0E4 >= 4)) ||
+                ((gCurrentLevel == LEVEL_VENOM_2) && (actor->unk_0E4 >= 4) && (actor->unk_0E4 < 10) &&
+                 (actor->unk_0D0 == 2))) {
+                actor->damage = 0;
                 var_a1 = true;
                 if (gCurrentLevel == LEVEL_BOLSE) {
-                    arg0->unk_0D4 = 0;
+                    actor->unk_0D4 = 0;
                 }
             }
-            if (arg0->unk_0E4 >= 4) {
-                if (((arg0->unk_0D0 != 3) || (arg0->unk_0E4 != 4)) &&
-                    ((arg0->unk_0E4 != 200) || (arg0->unk_0D0 != 2))) {
-                    arg0->unk_0CE -= arg0->unk_0D6;
+            if (actor->unk_0E4 >= 4) {
+                if (((actor->unk_0D0 != 3) || (actor->unk_0E4 != 4)) &&
+                    ((actor->unk_0E4 != 200) || (actor->unk_0D0 != 2))) {
+                    actor->health -= actor->damage;
                 }
-            } else if ((arg0->unk_0E4 < 4) && (arg0->unk_0B8 != 6)) {
-                if (arg0->unk_0E4 == 1) {
-                    gTeamDamage[arg0->unk_0E4] = arg0->unk_0D6;
+            } else if ((actor->unk_0E4 < 4) && (actor->unk_0B8 != 6)) {
+                if (actor->unk_0E4 == 1) {
+                    gTeamDamage[actor->unk_0E4] = actor->damage;
                 } else {
-                    gTeamDamage[arg0->unk_0E4] = arg0->unk_0D6 * 2;
+                    gTeamDamage[actor->unk_0E4] = actor->damage * 2;
                 }
             }
-            if (arg0->unk_0CE <= 0) {
-                arg0->unk_0CE = 0;
-                if (arg0->unk_0E4 == 200) {
-                    func_i4_80199900(arg0, 1);
-                    if (arg0->unk_0D4 == 1) {
-                        if (gActors[8].obj.status == 2) {
+            if (actor->health <= 0) {
+                actor->health = 0;
+                if (actor->unk_0E4 == 200) {
+                    func_i4_80199900(actor, 1);
+                    if (actor->unk_0D4 == 1) {
+                        if (gActors[8].obj.status == OBJ_ACTIVE) {
                             func_800BA808(gMsg_ID_16140, RCID_KATT);
                         }
-                        func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 10);
+                        func_80077240(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10);
                         gHitCount += 11;
                         D_80177850 = 15;
                     } else {
-                        switch (arg0->unk_0D4) {
+                        switch (actor->unk_0D4) {
                             case 102:
                                 func_800BA808(gMsg_ID_16170, RCID_FALCO);
                                 break;
@@ -859,52 +862,52 @@ void func_8003088C(Actor* arg0) {
                     }
                     return;
                 }
-                arg0->timer_0C6 = 50;
-                arg0->iwork[8] = 20;
-                arg0->obj.status = 3;
-                arg0->fwork[23] = 0.0f;
-                func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 4.0f);
-                Audio_PlaySfx(0x2903700B, &arg0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                arg0->timer_0C2 = 10;
-                arg0->timer_0BE = 0;
-                arg0->timer_04C = (Rand_ZeroOne() * 2.9f);
+                actor->timer_0C6 = 50;
+                actor->iwork[8] = 20;
+                actor->obj.status = OBJ_DYING;
+                actor->fwork[23] = 0.0f;
+                func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f);
+                Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                actor->timer_0C2 = 10;
+                actor->timer_0BE = 0;
+                actor->timer_04C = (Rand_ZeroOne() * 2.9f);
                 switch ((s32) (Rand_ZeroOne() * 4.0f)) {
                     case 0:
-                        arg0->timer_0BC = 0;
+                        actor->timer_0BC = 0;
                         break;
                     case 1:
-                        arg0->timer_0BC = 50;
+                        actor->timer_0BC = 50;
                         break;
                     case 2:
-                        arg0->timer_0BC = 200;
+                        actor->timer_0BC = 200;
                         break;
                     case 3:
-                        arg0->timer_0BC = 300;
+                        actor->timer_0BC = 300;
                         break;
                 }
                 if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
-                    arg0->timer_0BC = 70;
+                    actor->timer_0BC = 70;
                 }
                 if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) {
                     if (Rand_ZeroOne() < 0.5f) {
-                        arg0->timer_0BC = 10;
+                        actor->timer_0BC = 10;
                     } else {
-                        arg0->timer_0BC = (s32) (Rand_ZeroOne() * 50.0f);
+                        actor->timer_0BC = (s32) (Rand_ZeroOne() * 50.0f);
                     }
                 }
-                if ((arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 8)) {
-                    arg0->timer_0BC = (s32) (Rand_ZeroOne() * 40.0f) + 60.0f;
+                if ((actor->unk_0E4 >= 4) && (actor->unk_0E4 < 8)) {
+                    actor->timer_0BC = (s32) (Rand_ZeroOne() * 40.0f) + 60.0f;
                 }
-                if (arg0->unk_0D6 >= 20) {
-                    arg0->timer_0BC = 0;
+                if (actor->damage >= 20) {
+                    actor->timer_0BC = 0;
                 }
-                if ((gCurrentLevel == LEVEL_KATINA) && (arg0->unk_0B6 == 1) && (arg0->unk_0D4 == 1)) {
+                if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (actor->unk_0D4 == 1)) {
                     if (D_8015F921 < 2) {
                         func_8002F5F4(gMsg_ID_18018, RCID_BILL);
                     }
                     D_8015F921++;
                 }
-                switch (arg0->unk_0E4) {
+                switch (actor->unk_0E4) {
                     case 4:
                         D_80177CD0[0] = 0;
                         if (gCurrentLevel == LEVEL_VENOM_2) {
@@ -938,13 +941,13 @@ void func_8003088C(Actor* arg0) {
                         }
                         break;
                 }
-                if ((arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 8)) {
+                if ((actor->unk_0E4 >= 4) && (actor->unk_0E4 < 8)) {
                     D_8015F904 = 150;
                 }
-                switch (arg0->unk_0D4) {
+                switch (actor->unk_0D4) {
                     case 1:
-                        if (arg0->unk_0E4 >= 10) {
-                            switch (arg0->iwork[2]) {
+                        if (actor->unk_0E4 >= 10) {
+                            switch (actor->iwork[2]) {
                                 case 1:
                                     func_8002F5F4(gMsg_ID_20170, RCID_FALCO);
                                     break;
@@ -960,9 +963,9 @@ void func_8003088C(Actor* arg0) {
                     case 102:
                     case 103:
                     case 104:
-                        if ((arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 8)) {
+                        if ((actor->unk_0E4 >= 4) && (actor->unk_0E4 < 8)) {
                             if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) {
-                                switch (arg0->unk_0D4) {
+                                switch (actor->unk_0D4) {
                                     case 102:
                                         func_800BA808(gMsg_ID_9438, RCID_FALCO);
                                         break;
@@ -974,60 +977,60 @@ void func_8003088C(Actor* arg0) {
                                         break;
                                 }
                             } else {
-                                D_801515F0[arg0->unk_0D4].unk_00 = 80;
+                                D_801515F0[actor->unk_0D4].unk_00 = 80;
                             }
                         } else {
-                            D_801515F0[arg0->unk_0D4].unk_00 = 80;
+                            D_801515F0[actor->unk_0D4].unk_00 = 80;
                         }
                         break;
                 }
             } else {
                 if (var_a1) {
-                    Audio_PlaySfx(0x29001062, &arg0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                    arg0->iwork[7] = 3;
-                    arg0->iwork[18] = 5;
-                    arg0->iwork[8] = 15;
+                    Audio_PlaySfx(0x29001062, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    actor->iwork[7] = 3;
+                    actor->iwork[18] = 5;
+                    actor->iwork[8] = 15;
                     if (Rand_ZeroOne() < 0.5f) {
-                        arg0->fwork[8] = 0.0f;
-                        arg0->fwork[7] = 360.0f;
+                        actor->fwork[8] = 0.0f;
+                        actor->fwork[7] = 360.0f;
                     } else {
-                        arg0->fwork[7] = 0.0f;
-                        arg0->fwork[8] = 359.999f;
+                        actor->fwork[7] = 0.0f;
+                        actor->fwork[8] = 359.999f;
                     }
                 } else {
-                    arg0->timer_0C6 = 20;
-                    arg0->iwork[8] = 20;
+                    actor->timer_0C6 = 20;
+                    actor->iwork[8] = 20;
                 }
-                if (arg0->unk_0E4 == 200) {
-                    Audio_PlaySfx(0x29034003, &arg0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                } else if (arg0->iwork[7] == 0) {
-                    Audio_PlaySfx(0x2903300E, &arg0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                if (actor->unk_0E4 == 200) {
+                    Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                } else if (actor->iwork[7] == 0) {
+                    Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
-                func_8007D10C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.5f);
-                if (arg0->unk_0E4 < 100) {
-                    Matrix_RotateY(gCalcMatrix, arg0->unk_0F4.y * M_DTOR, 0);
+                func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f);
+                if (actor->unk_0E4 < 100) {
+                    Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0);
                     sp48.x = 30.0f;
                     if (Rand_ZeroOne() < 0.5f) {
                         sp48.x = -30.0f;
                     }
                     sp48.y = (Rand_ZeroOne() - 0.5f) * 30.0f;
                     sp48.z = 0.0f;
-                    if (arg0->iwork[7] != 0) {
+                    if (actor->iwork[7] != 0) {
                         sp48.x *= 1.5f;
                         sp48.y = 30.0f;
 
-                        if ((arg0->obj.pos.y > 100.0f) && (Rand_ZeroOne() < 0.5f)) {
+                        if ((actor->obj.pos.y > 100.0f) && (Rand_ZeroOne() < 0.5f)) {
                             sp48.y = -30.0f;
                         }
                     }
                     Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp48, &sp3C);
-                    arg0->fwork[13] = sp3C.x;
-                    arg0->fwork[14] = sp3C.y;
-                    arg0->fwork[12] = sp3C.z;
+                    actor->fwork[13] = sp3C.x;
+                    actor->fwork[14] = sp3C.y;
+                    actor->fwork[12] = sp3C.z;
                 }
-                if ((gRadioState == 0) && (gActors[0].obj.status == 2)) {
-                    if (arg0->unk_0D0 == 3) {
-                        switch (arg0->unk_0E4) {
+                if ((gRadioState == 0) && (gActors[0].obj.status == OBJ_ACTIVE)) {
+                    if (actor->unk_0D0 == 3) {
+                        switch (actor->unk_0E4) {
                             case 1:
                                 func_8002F5F4(gMsg_ID_20210, RCID_FALCO);
                                 break;
@@ -1041,18 +1044,18 @@ void func_8003088C(Actor* arg0) {
                                 func_8002F5F4(gMsg_ID_20084, RCID_KATT);
                                 break;
                         }
-                    } else if (arg0->unk_0D4 < 105) {
-                        if (arg0->unk_0E4 >= 4) {
-                            if (arg0->unk_0D4 == 1) {
-                                if ((gCurrentLevel == LEVEL_KATINA) && (arg0->unk_0B6 == 1) && (D_8015F920 == 0)) {
+                    } else if (actor->unk_0D4 < 105) {
+                        if (actor->unk_0E4 >= 4) {
+                            if (actor->unk_0D4 == 1) {
+                                if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (D_8015F920 == 0)) {
                                     D_8015F920 = 1;
                                     func_800BA808(gMsg_ID_18015, RCID_BILL);
-                                } else if (arg0->unk_0E4 == 8) {
+                                } else if (actor->unk_0E4 == 8) {
                                     func_8002F5F4(gMsg_ID_20084, RCID_KATT);
-                                } else if (arg0->unk_0E4 == 9) {
+                                } else if (actor->unk_0E4 == 9) {
                                     func_8002F5F4(gMsg_ID_20085, RCID_BILL);
                                 } else if (gCurrentLevel == LEVEL_VENOM_2) {
-                                    switch (arg0->unk_0E4) {
+                                    switch (actor->unk_0E4) {
                                         case 4:
                                             func_8002F5F4(gMsg_ID_19454, RCID_WOLF);
                                             break;
@@ -1068,8 +1071,8 @@ void func_8003088C(Actor* arg0) {
                                     }
                                 }
                             }
-                        } else if (arg0->unk_0D4 == 1) {
-                            switch (arg0->unk_0E4) {
+                        } else if (actor->unk_0D4 == 1) {
+                            switch (actor->unk_0E4) {
                                 case 1:
                                     func_8002F5F4(gMsg_ID_20060, RCID_FALCO);
                                     break;
@@ -1081,16 +1084,16 @@ void func_8003088C(Actor* arg0) {
                                     break;
                             }
                         }
-                    } else if ((arg0->unk_0E4 < 4) && (arg0->iwork[6] != 0) && (arg0->iwork[2] != 0)) {
-                        switch (arg0->unk_0E4) {
+                    } else if ((actor->unk_0E4 < 4) && (actor->iwork[6] != 0) && (actor->iwork[2] != 0)) {
+                        switch (actor->unk_0E4) {
                             case 1:
                                 if (gTeamShields[1] >= 90) {
                                     func_8002F5F4(gMsg_ID_9130, RCID_FALCO);
                                 } else {
                                     func_800BA808(gMsg_ID_9151, RCID_FALCO);
                                 }
-                                if ((D_800CA234 == NULL) || (gTeamShields[arg0->unk_0E4] <= 50)) {
-                                    D_800CA234 = arg0;
+                                if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) {
+                                    D_800CA234 = actor;
                                     D_Timer_800CA238 = 320;
                                 }
                                 break;
@@ -1100,8 +1103,8 @@ void func_8003088C(Actor* arg0) {
                                 } else {
                                     func_800BA808(gMsg_ID_9152, RCID_SLIPPY);
                                 }
-                                if ((D_800CA234 == NULL) || (gTeamShields[arg0->unk_0E4] <= 50)) {
-                                    D_800CA234 = arg0;
+                                if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) {
+                                    D_800CA234 = actor;
                                     D_Timer_800CA238 = 320;
                                 }
                                 break;
@@ -1111,8 +1114,8 @@ void func_8003088C(Actor* arg0) {
                                 } else {
                                     func_800BA808(gMsg_ID_9153, RCID_PEPPY);
                                 }
-                                if ((D_800CA234 == NULL) || (gTeamShields[arg0->unk_0E4] <= 50)) {
-                                    D_800CA234 = arg0;
+                                if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) {
+                                    D_800CA234 = actor;
                                     D_Timer_800CA238 = 320;
                                 }
                                 break;
@@ -1120,7 +1123,7 @@ void func_8003088C(Actor* arg0) {
                     }
                 }
             }
-            arg0->unk_0D0 = 0;
+            actor->unk_0D0 = 0;
         }
     }
 }
@@ -1333,7 +1336,7 @@ void func_800319AC(Actor* this) {
             this->fwork[29] = 5.0f;
             this->fwork[7] = 360.0f;
             this->fwork[8] = 0.0f;
-            Audio_PlaySfx(0x09000002, &this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             this->unk_046 = 0;
         }
         gTeamShields[this->unk_0E4] = -1;
@@ -1357,13 +1360,13 @@ void func_800319AC(Actor* this) {
                     (fabsf(this->obj.pos.z - D_800C9B50[this->unk_046].z) < 800.0f)) {
                     this->unk_046++;
                     if (this->unk_046 >= 4) {
-                        Object_Kill(&this->obj, &this->sfxPos);
+                        Object_Kill(&this->obj, this->sfxPos);
                     }
                 }
             } else {
                 this->fwork[5] = 20000.0f;
                 if (this->obj.pos.y > 3000.0f) {
-                    Object_Kill(&this->obj, &this->sfxPos);
+                    Object_Kill(&this->obj, this->sfxPos);
                 }
             }
             sp104 = 2;
@@ -1558,7 +1561,7 @@ void func_800319AC(Actor* this) {
                             }
                         }
                         if ((gRadioState == 0) && (this->timer_0C4 == 0) && (D_8015F928 > 700) && (D_8015F908 == 0) &&
-                            (gActors[0].obj.status == 2)) {
+                            (gActors[0].obj.status == OBJ_ACTIVE)) {
                             this->timer_0C4 = 600;
                             if (Rand_ZeroOne() < 0.5f) {
                                 gActors[this->unk_0E6].iwork[6]++;
@@ -1715,8 +1718,8 @@ void func_800319AC(Actor* this) {
                         this->iwork[4] = 0;
                     }
                     if ((this->unk_0E6 > 0) &&
-                        ((gActors[this->unk_0E6].obj.status == 3) || (gActors[this->unk_0E6].unk_0B8 == 6) ||
-                         (gActors[this->unk_0E6].obj.status == 0))) {
+                        ((gActors[this->unk_0E6].obj.status == OBJ_DYING) || (gActors[this->unk_0E6].unk_0B8 == 6) ||
+                         (gActors[this->unk_0E6].obj.status == OBJ_FREE))) {
                         this->unk_0B8 = 3;
                         if (gCurrentLevel == LEVEL_BOLSE) {
                             func_8002FB4C(this);
@@ -1785,7 +1788,7 @@ void func_800319AC(Actor* this) {
                 this->fwork[10] = 30.0f;
             }
             if ((this->unk_0E6 > 0) && (gActors[this->unk_0E6].obj.id == OBJ_ACTOR_197) &&
-                (gActors[this->unk_0E6].timer_0C2 == 0) && (gActors[this->unk_0E6].obj.status == 2)) {
+                (gActors[this->unk_0E6].timer_0C2 == 0) && (gActors[this->unk_0E6].obj.status == OBJ_ACTIVE)) {
                 this->unk_0B8 = 2;
                 this->iwork[2] = 0;
             }
@@ -2058,14 +2061,14 @@ void func_800319AC(Actor* this) {
                 this->obj.pos.z -= this->vel.z;
                 if ((temp_v0_27 >= 2) && (this->unk_0E4 >= 0xB)) {
                     this->timer_0BE = 2;
-                    this->obj.status = 3;
+                    this->obj.status = OBJ_DYING;
                     this->unk_044 = 0;
                     func_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 0xF);
                     func_8007A6F0(&this->obj.pos, 0x2903A008);
                 } else {
                     this->unk_0D0 = 1;
-                    this->unk_0D6 = 10;
-                    this->unk_0CE = 0;
+                    this->damage = 10;
+                    this->health = 0;
                     func_8003088C(this);
                 }
             }
@@ -2160,11 +2163,11 @@ bool func_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thi
 
 void func_80035448(Actor* actor) {
     f32 sp38;
-    Vec3f sp7C[32]; // larger than expected
+    s32 pad[3];
+    Vec3f sp1E4 = { 0.0f, 0.0f, 0.0f };
+    Vec3f sp7C[30]; // larger than expected
     f32 pad2;
 
-    sp7C[30] = D_800C9BB0; // not part of array? If not, why have it?
-
     if (actor->unk_0E4 != 1000) {
         if ((actor->iwork[8] != 0) && (actor->unk_0E4 < 100)) {
             pad2 = __sinf(actor->iwork[8] * 400.0f * M_DTOR);

src/main/fox_beam.c

@@ -4,7 +4,7 @@ static Vec3f D_8015F950;
 
 void func_80035D30(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_351;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -24,7 +24,7 @@ void func_80035DEC(f32 xPos, f32 yPos, f32 zPos) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_80035D30(&gEffects[i], xPos, yPos, zPos);
             break;
         }
@@ -52,7 +52,7 @@ void func_80035E78(PlayerShot* shot) {
         shot->unk_5C = 1;
         shot->unk_64 = 30;
         shot->unk_58 = 150;
-        func_8001CE28(shot->playerNum, &shot->sfxPos);
+        func_8001CE28(shot->playerNum, shot->sfxPos);
         D_Timer_80161A60 = 4;
         if (shot->obj.pos.y < (gGroundLevel + 450.0f)) {
             D_80178480 = 15;
@@ -119,7 +119,7 @@ void func_80036318(PlayerShot* shot) {
     s32 i;
 
     if (shot->obj.id == PLAYERSHOT_4) {
-        Object_Kill(&shot->obj, &shot->sfxPos);
+        Object_Kill(&shot->obj, shot->sfxPos);
         return;
     }
     shot->obj.pos.z = D_80178498; // strange order on the globals
@@ -160,7 +160,7 @@ void func_80036318(PlayerShot* shot) {
 
 void func_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 xRot, f32 scale, s32 unk44, s32 time) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_344;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -172,7 +172,7 @@ void func_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 x
     effect->unk_46 = 80;
     effect->timer_50 = time;
     Object_SetInfo(&effect->info, effect->obj.id);
-    func_800A6070(&effect->sfxPos, 0x29000000);
+    func_800A6070(effect->sfxPos, 0x29000000);
 }
 
 void func_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f32 yRot, f32 xRot, f32 scale, s32 unk44,
@@ -182,7 +182,7 @@ void func_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f
     if ((D_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 != 2) && (gCurrentLevel != LEVEL_SOLAR) &&
         (gCurrentLevel != LEVEL_BOLSE) && (gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_ZONESS)) {
         for (i = 0; i < 50; i++) {
-            if (gEffects[i].obj.status == 0) {
+            if (gEffects[i].obj.status == OBJ_FREE) {
                 func_80036528(&gEffects[i], xPos, yPos, zPos, yRot, xRot, scale, unk44, time);
                 break;
             }
@@ -192,7 +192,7 @@ void func_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f
 
 void func_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_345;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -201,7 +201,7 @@ void func_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 s
     effect->scale2 = scale * 0.5f;
     effect->timer_50 = 80;
     Object_SetInfo(&effect->info, effect->obj.id);
-    func_800A6070(&effect->sfxPos, 0x29000000);
+    func_800A6070(effect->sfxPos, 0x29000000);
 }
 
 void func_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
@@ -210,7 +210,7 @@ void func_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
     if ((D_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 <= 0) &&
         (gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_ZONESS)) {
         for (i = 0; i < 50; i++) {
-            if (gEffects[i].obj.status == 0) {
+            if (gEffects[i].obj.status == OBJ_FREE) {
                 func_800366CC(&gEffects[i], xPos, yPos, zPos, yRot, scale);
                 func_8007D10C(xPos, yPos, zPos, 2.0f);
                 break;
@@ -294,7 +294,7 @@ s32 func_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) {
                     (fabsf(hitbox->x.offset + obj->pos.x - shotPx) < (hitbox->x.size + xySizeMod)) &&
                     (fabsf(hitbox->y.offset + obj->pos.y - shotPy) < (hitbox->y.size + xySizeMod))) {
                     if (shot->obj.id == PLAYERSHOT_4) {
-                        Object_Kill(&shot->obj, &shot->sfxPos);
+                        Object_Kill(&shot->obj, shot->sfxPos);
                         return 0;
                     }
                     if ((obj->id < 176) || (obj->id >= 292)) {
@@ -602,7 +602,7 @@ bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) {
         if (!useCol2) {
             if (func_800998FC(&sp64, &sp58, &sp38, objId, &sp4C, sp44) > 0) {
                 if (shot->obj.id == PLAYERSHOT_4) {
-                    Object_Kill(&shot->obj, &shot->sfxPos);
+                    Object_Kill(&shot->obj, shot->sfxPos);
                     return false;
                 }
                 func_80036318(shot);
@@ -625,7 +625,7 @@ bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) {
             }
         } else if (func_800A3690(&sp64, &sp58, objId, &sp4C)) {
             if (shot->obj.id == PLAYERSHOT_4) {
-                Object_Kill(&shot->obj, &shot->sfxPos);
+                Object_Kill(&shot->obj, shot->sfxPos);
                 return false;
             }
             func_80036318(shot);
@@ -648,29 +648,29 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) {
     actor->unk_0D0 = 1;
     actor->unk_0D2 = hitIndex - 1;
     actor->timer_0C2 = 2;
-    actor->unk_0D6 = 10;
+    actor->damage = 10;
     if ((shot->playerNum < 4) && (gPlayer[shot->playerNum].form != FORM_LANDMASTER)) {
         switch (gLaserStrength[shot->playerNum]) {
             case LASERS_TWIN:
-                actor->unk_0D6 = 12;
+                actor->damage = 12;
                 break;
             case LASERS_HYPER:
-                actor->unk_0D6 = 15;
+                actor->damage = 15;
                 break;
         }
     } else if ((shot->playerNum >= 100) && (gCurrentLevel == LEVEL_SECTOR_X)) {
         if ((gActors[shot->playerNum - 100].obj.id == 200) && (gActors[shot->playerNum - 100].iwork[12] == 5)) {
-            actor->unk_0D6 = 30;
+            actor->damage = 30;
         }
     }
     if (shot->obj.id == PLAYERSHOT_9) {
-        actor->unk_0D6 = 100;
+        actor->damage = 100;
     } else if (shot->obj.id == PLAYERSHOT_8) {
         if (gCurrentLevel == LEVEL_AQUAS) {
-            actor->unk_0D6 = 31;
+            actor->damage = 31;
         } else {
             actor->unk_0D0 = 2;
-            actor->unk_0D6 = 30;
+            actor->damage = 30;
             actor->timer_0CA[shot->playerNum] = 0;
         }
     }
@@ -705,7 +705,7 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) {
             shot->obj.pos.z += shot->vel.z * 5.0f;
             actor->timer_0C2 = 3;
             func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
-            Audio_PlaySfx(0x29121007, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_800A668C(D_8017849C, D_801784A0, D_80178498);
         }
     } else {
@@ -738,19 +738,19 @@ void func_80038140(PlayerShot* shot) {
     }
     if (sp60) {
         for (i = 0, effect = gEffects; i < 100; i++, effect++) {
-            if ((effect->obj.status >= 2) && (effect->info.unk_19 != 0) &&
+            if ((effect->obj.status >= OBJ_ACTIVE) && (effect->info.unk_19 != 0) &&
                 (fabsf(shot->obj.pos.z - effect->obj.pos.z) < 200.0f) &&
                 (fabsf(shot->obj.pos.x - effect->obj.pos.x) < 100.0f) &&
                 (fabsf(shot->obj.pos.y - effect->obj.pos.y) < 100.0f)) {
                 if (effect->info.unk_19 == 2) {
                     effect->unk_44 = 1;
                 } else {
-                    Object_Kill(&effect->obj, &effect->sfxPos);
+                    Object_Kill(&effect->obj, effect->sfxPos);
                 }
             }
         }
         for (i = 0, actor = gActors; i < 60; i++, actor++) {
-            if ((actor->obj.status >= 2) && (actor->timer_0C2 == 0)) {
+            if ((actor->obj.status >= OBJ_ACTIVE) && (actor->timer_0C2 == 0)) {
                 switch (actor->obj.id) {
                     case OBJ_ACTOR_180:
                         if (func_8003774C(shot, actor->obj.id, &actor->obj)) {
@@ -852,7 +852,7 @@ void func_80038140(PlayerShot* shot) {
                         shot->obj.pos.y += 2.0f * shot->vel.y;
                         shot->obj.pos.z += 2.0f * shot->vel.z;
                         shot->unk_64 = 5;
-                        Audio_PlaySfx(0x09007011, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x09007011, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         func_80078E50(player->pos.x, player->pos.y, player->unk_138, 8.0f);
                     } else {
                         func_80036318(shot);
@@ -893,7 +893,7 @@ void func_80038140(PlayerShot* shot) {
 
     if ((gLevelMode == LEVELMODE_ALL_RANGE) && (shot->playerNum < 110)) {
         for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) {
-            if (obj58->obj.status == 2) {
+            if (obj58->obj.status == OBJ_ACTIVE) {
                 if ((obj58->obj.id == OBJ_80_117) || (obj58->obj.id == OBJ_80_141) || (obj58->obj.id == OBJ_80_149) ||
                     (obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_148) || (obj58->obj.id == OBJ_80_143) ||
                     (obj58->obj.id == OBJ_80_160) || (obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3) ||
@@ -906,7 +906,7 @@ void func_80038140(PlayerShot* shot) {
         }
     } else {
         for (i = 0, obj80 = gObjects80; i < 50; i++, obj80++) {
-            if (obj80->obj.status == 2) {
+            if (obj80->obj.status == OBJ_ACTIVE) {
                 if ((obj80->obj.id == OBJ_80_1) || (obj80->obj.id == OBJ_80_39) || (obj80->obj.id == OBJ_80_4) ||
                     (obj80->obj.id == OBJ_80_5) || (obj80->obj.id == OBJ_80_120) || (obj80->obj.id == OBJ_80_124) ||
                     (obj80->obj.id == OBJ_80_126) || (obj80->obj.id == OBJ_80_47) || (obj80->obj.id == OBJ_80_2) ||
@@ -925,7 +925,7 @@ void func_80038140(PlayerShot* shot) {
     }
     if (sp60) {
         for (i = 0, obj4C = gObjects4C; i < 40; i++, obj4C++) {
-            if (obj4C->obj.status == 2) {
+            if (obj4C->obj.status == OBJ_ACTIVE) {
                 if (obj4C->obj.id != OBJ_4C_169) {
                     if (func_80037698(shot, obj4C)) {
                         obj4C->unk_46 = 1;
@@ -939,7 +939,7 @@ void func_80038140(PlayerShot* shot) {
         }
     }
     for (i = 0, boss = gBosses; i < 4; i++, boss++) {
-        if ((boss->obj.status == 2) && (boss->timer_05A == 0)) {
+        if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
             if ((boss->obj.id == OBJ_BOSS_308) || (boss->obj.id == OBJ_BOSS_312) || (boss->obj.id == OBJ_BOSS_309) ||
                 (boss->obj.id == OBJ_BOSS_313)) {
                 func_8003774C(shot, boss->obj.id, &boss->obj);
@@ -949,11 +949,11 @@ void func_80038140(PlayerShot* shot) {
                 temp_fv0 = fabsf(boss->obj.pos.z - shot->obj.pos.z) * 0.8333333f;
                 if (sqrtf(SQ(temp_fv1) + SQ(temp_fa0) + SQ(temp_fv0)) < 1500.0f) {
                     if (shot->obj.id == PLAYERSHOT_4) {
-                        Object_Kill(&shot->obj, &shot->sfxPos);
+                        Object_Kill(&shot->obj, shot->sfxPos);
                     } else {
                         boss->dmgType = DMG_BEAM;
                         func_80036318(shot);
-                        Audio_PlaySfx(0x29001062, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29001062, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
             } else {
@@ -963,11 +963,11 @@ void func_80038140(PlayerShot* shot) {
                     temp_fv0 = fabsf(boss->obj.pos.z - shot->obj.pos.z);
                     if (sqrtf(SQ(temp_fv1) + SQ(temp_fa0) + SQ(temp_fv0)) < 2700.0f) {
                         if (shot->obj.id == PLAYERSHOT_4) {
-                            Object_Kill(&shot->obj, &shot->sfxPos);
+                            Object_Kill(&shot->obj, shot->sfxPos);
                         } else {
                             boss->dmgType = DMG_BEAM;
                             boss->dmgPart = 100;
-                            Audio_PlaySfx(0x29121007, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x29121007, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             func_80036318(shot);
                         }
                     }
@@ -975,7 +975,7 @@ void func_80038140(PlayerShot* shot) {
                 temp_v0 = func_80036874(shot, boss->info.hitbox, &boss->obj);
                 if (temp_v0 != 0) {
                     if (shot->obj.id == PLAYERSHOT_4) {
-                        Object_Kill(&shot->obj, &shot->sfxPos);
+                        Object_Kill(&shot->obj, shot->sfxPos);
                     } else if (!((boss->obj.id == OBJ_BOSS_316) && (shot->playerNum != 0))) {
                         boss->dmgType = DMG_BEAM;
                         if (shot->obj.id == PLAYERSHOT_3) {
@@ -1035,7 +1035,7 @@ void func_80038F34(PlayerShot* shot) {
     }
     if (!sp48) {
         if (!gVersusMode) {
-            Object_Kill(&shot->obj, &shot->sfxPos);
+            Object_Kill(&shot->obj, shot->sfxPos);
             return;
         }
     } else {
@@ -1217,7 +1217,7 @@ void func_80039A50(PlayerShot* shot) {
     }
     if (!sp104) {
         if ((shot->obj.id != PLAYERSHOT_3) && (shot->unk_64 < 10) && !gVersusMode) {
-            Object_Kill(&shot->obj, &shot->sfxPos);
+            Object_Kill(&shot->obj, shot->sfxPos);
         }
     } else {
         if ((shot->obj.id == PLAYERSHOT_5) || (shot->obj.id == PLAYERSHOT_6) || (shot->obj.id == PLAYERSHOT_7)) {
@@ -1482,7 +1482,7 @@ void func_8003AF88(PlayerShot* shot) {
 void func_8003AFD8(PlayerShot* shot) {
     shot->unk_60++;
     if (shot->unk_60 > 2) {
-        Object_Kill(&shot->obj, &shot->sfxPos);
+        Object_Kill(&shot->obj, shot->sfxPos);
     }
 }
 
@@ -1558,13 +1558,13 @@ void func_8003B00C(PlayerShot* shot, Player* player) {
             }
             if ((fabsf(shot->obj.pos.x - shot->unk_48) < 200.0f) && (fabsf(shot->obj.pos.y - shot->unk_4C) < 200.0f) &&
                 (fabsf(shot->obj.pos.z - shot->unk_50) < 200.0f)) {
-                Object_Kill(&shot->obj, &shot->sfxPos);
+                Object_Kill(&shot->obj, shot->sfxPos);
                 return;
             }
             break;
     }
     if (shot->unk_64 == 0) {
-        Object_Kill(&shot->obj, &shot->sfxPos);
+        Object_Kill(&shot->obj, shot->sfxPos);
     }
     if (shot->unk_5C == 1) {
         if (shot->obj.pos.y < gGroundLevel) {
@@ -1614,7 +1614,7 @@ void func_8003B55C(PlayerShot* shot, s32 index) {
             }
         }
         if (D_80161A88 == 2) {
-            Object_Kill(&shot->obj, &shot->sfxPos);
+            Object_Kill(&shot->obj, shot->sfxPos);
             return;
         }
         if (gCurrentLevel == LEVEL_FORTUNA) {
@@ -1635,7 +1635,7 @@ void func_8003B55C(PlayerShot* shot, s32 index) {
         }
     }
     if (shot->unk_64 == 0) {
-        Object_Kill(&shot->obj, &shot->sfxPos);
+        Object_Kill(&shot->obj, shot->sfxPos);
         return;
     } else if ((shot->playerNum < 110) || (shot->unk_64 & 1)) {
         func_80038140(shot);
@@ -1682,15 +1682,15 @@ bool func_8003BB4C(PlayerShot* shot) {
         var_fa0 = 200.0f;
     }
     for (i = 0, actor = gActors; i < 60; i++, actor++) {
-        if ((actor->obj.status == 2) && (actor->info.unk_1C != 0.0f) &&
+        if ((actor->obj.status == OBJ_ACTIVE) && (actor->info.unk_1C != 0.0f) &&
             ((actor->timer_0CA[shot->playerNum] == 0) && (fabsf(shot->obj.pos.x - actor->obj.pos.x) <= var_fa0) &&
              (fabsf(shot->obj.pos.y - (actor->obj.pos.y + actor->info.unk_1C)) <= var_fa0) &&
              (fabsf(shot->obj.pos.z - actor->obj.pos.z) <= var_fa0))) {
             actor->timer_0CA[shot->playerNum] = 20;
-            func_80060F30(gPlayer[shot->playerNum].unk_460_arr, 0x49008027, shot->playerNum);
+            func_80060F30(gPlayer[shot->playerNum].sfxPos, 0x49008027, shot->playerNum);
             for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) {
                 if (gPlayerShots[j].obj.id == PLAYERSHOT_4) {
-                    Object_Kill(&gPlayerShots[j].obj, &gPlayerShots[j].sfxPos);
+                    Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxPos);
                 }
             }
             D_801615B8[shot->playerNum] = 3.0f;
@@ -1708,10 +1708,10 @@ bool func_8003BB4C(PlayerShot* shot) {
                 D_80177B00[0][shot->playerNum] = D_80177B00[1][shot->playerNum] = D_80177B00[2][shot->playerNum] =
                     D_80177B00[3][shot->playerNum] = 0;
                 D_80177B00[i][shot->playerNum] = 20;
-                func_80060F30(gPlayer[shot->playerNum].unk_460_arr, 0x49008027, shot->playerNum);
+                func_80060F30(gPlayer[shot->playerNum].sfxPos, 0x49008027, shot->playerNum);
                 for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) {
                     if (gPlayerShots[j].obj.id == PLAYERSHOT_4) {
-                        Object_Kill(&gPlayerShots[j].obj, &gPlayerShots[j].sfxPos);
+                        Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxPos);
                     }
                 }
                 D_801615B8[shot->playerNum] = 3.0f;
@@ -1727,12 +1727,12 @@ void func_8003BEF4(PlayerShot* shot) {
     if (gVersusMode) {
         if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) ||
             !(gControllerHold[shot->playerNum].button & A_BUTTON) || (shot->unk_64 == 0)) {
-            Object_Kill(&shot->obj, &shot->sfxPos);
+            Object_Kill(&shot->obj, shot->sfxPos);
         }
     } else {
         if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) ||
             !(gControllerHold[gMainController].button & A_BUTTON) || (shot->unk_64 == 0)) {
-            Object_Kill(&shot->obj, &shot->sfxPos);
+            Object_Kill(&shot->obj, shot->sfxPos);
         }
     }
     func_80038140(shot);
@@ -1754,7 +1754,7 @@ void func_8003C008(PlayerShot* shot) {
 
     boss = gBosses;
     for (i = 0; i < ARRAY_COUNT(gBosses); i++, boss++) {
-        if ((boss->obj.status == 2) && (boss->timer_05A == 0)) {
+        if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
             if (boss->obj.id == OBJ_BOSS_316) {
                 var_s6 = gGameFrameCount & 7;
                 var_fs2 = shot->unk_44 * 40.0f;
@@ -1827,7 +1827,7 @@ void func_8003C3D8(PlayerShot* shot) {
     Math_SmoothStepToF(&D_8017836C, var_fv0, 1.0f, 0.08f, 0.001f);
 }
 
-void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
+void func_8003C4D0(PlayerShot* shot, s32 damage) {
     s32 i;
     f32 sp68;
     f32 sp64;
@@ -1841,7 +1841,7 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
     f32 temp_fs2 = shot->unk_44 * 60.0f;
 
     for (i = 0, obj80 = gObjects80; i < 50; i++, obj80++) {
-        if ((obj80->obj.status == 2) && (obj80->obj.id == OBJ_80_56)) {
+        if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id == OBJ_80_56)) {
             sp68 = obj80->obj.pos.x - shot->obj.pos.x;
             sp64 = obj80->obj.pos.y - shot->obj.pos.y;
             sp60 = obj80->obj.pos.z - shot->obj.pos.z;
@@ -1852,8 +1852,8 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
         }
     }
     for (i = 0, obj4C = gObjects4C; i < 40; i++, obj4C++) {
-        if ((obj4C->obj.status == 2) && ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_169) ||
-                                         (obj4C->obj.id == OBJ_4C_161) || (obj4C->obj.id == OBJ_4C_162))) {
+        if ((obj4C->obj.status == OBJ_ACTIVE) && ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_169) ||
+                                                  (obj4C->obj.id == OBJ_4C_161) || (obj4C->obj.id == OBJ_4C_162))) {
             sp68 = obj4C->obj.pos.x - shot->obj.pos.x;
             sp64 = obj4C->obj.pos.y - shot->obj.pos.y;
             sp60 = obj4C->obj.pos.z - shot->obj.pos.z;
@@ -1864,7 +1864,7 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
     }
     actor = gActors;
     for (i = 0; i < 60; i++, actor++) {
-        if ((actor->obj.status == 2) && (actor->timer_0C2 == 0) &&
+        if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0) &&
             !((gCurrentLevel == LEVEL_MACBETH) && (OBJ_ACTOR_205 <= actor->obj.id) &&
               (actor->obj.id < OBJ_ACTOR_214)) &&
             !((actor->obj.id == OBJ_ACTOR_200) && (actor->iwork[12] != 0)) &&
@@ -1887,17 +1887,17 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
                     actor->unk_0D0 = 2;
                     actor->unk_0D2 = 0;
                     actor->unk_0D4 = shot->playerNum + 1;
-                    actor->unk_0D6 = unkD6;
+                    actor->damage = damage;
 
                     if (actor->info.bonus != 0) {
                         shot->bonus++;
                     }
-                } else if ((actor->obj.id == OBJ_ACTOR_200) && (actor->scale >= 0.5f) && (unkD6 >= 31)) {
+                } else if ((actor->obj.id == OBJ_ACTOR_200) && (actor->scale >= 0.5f) && (damage >= 31)) {
                     actor->unk_0D4 = shot->playerNum + 1;
                     actor->vel.x = sp68 * 0.03f;
                     actor->vel.y = sp64 * 0.03f;
                     actor->vel.z = sp60 * 0.03f;
-                    actor->obj.status = 3;
+                    actor->obj.status = OBJ_DYING;
                     actor->timer_0BC = (s32) (Rand_ZeroOne() * 15.0f) + 10;
                     actor->timer_0BE = 0;
                     actor->timer_04C = 4;
@@ -1909,7 +1909,7 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
                     actor->unk_0D0 = 2;
                     actor->unk_0D2 = 0;
                     actor->unk_0D4 = shot->playerNum + 1;
-                    actor->unk_0D6 = unkD6;
+                    actor->damage = damage;
                     if (actor->info.bonus != 0) {
                         shot->bonus++;
                     }
@@ -1926,13 +1926,13 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
     }
     effect = gEffects;
     for (i = 0; i < 100; i++, effect++) {
-        if (effect->obj.status == 2) {
+        if (effect->obj.status == OBJ_ACTIVE) {
             sp68 = effect->obj.pos.x - shot->obj.pos.x;
             sp64 = effect->obj.pos.y - shot->obj.pos.y;
             sp60 = effect->obj.pos.z - shot->obj.pos.z;
             if (sqrtf(SQ(sp68) + SQ(sp64) + SQ(sp60)) < temp_fs2) {
                 if (effect->info.unk_16 == 0) {
-                    Object_Kill(&effect->obj, &effect->sfxPos);
+                    Object_Kill(&effect->obj, effect->sfxPos);
                 }
                 if (effect->info.unk_16 == 2) {
                     effect->obj.pos.x += sp68 * 0.03f;
@@ -2009,7 +2009,7 @@ void func_8003CC08(PlayerShot* shot) {
                     }
                 }
             }
-            if (!((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == 2) &&
+            if (!((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == OBJ_ACTIVE) &&
                   (gBosses[0].actionState == 17))) {
                 func_80038140(shot);
             }
@@ -2038,7 +2038,7 @@ void func_8003CC08(PlayerShot* shot) {
                 shot->unk_58 -= 8;
                 if (shot->unk_58 < 0) {
                     shot->unk_58 = 0;
-                    Object_Kill(&shot->obj, &shot->sfxPos);
+                    Object_Kill(&shot->obj, shot->sfxPos);
                     D_8017812C = 0;
                 }
             }
@@ -2075,7 +2075,7 @@ void func_8003CF90(PlayerShot* shot) {
         var_a3 = 0;
         if (shot->unk_60 == 0) {
             for (i = 0, actor = gActors; i < 60; i++, actor++) {
-                if ((actor->obj.status == 2) && (actor->info.unk_1C != 0.0f) &&
+                if ((actor->obj.status == OBJ_ACTIVE) && (actor->info.unk_1C != 0.0f) &&
                     (actor->timer_0CA[shot->playerNum] != 0)) {
                     var_a3 = 1;
                     actor->timer_0CA[shot->playerNum] = 2;
@@ -2201,7 +2201,7 @@ void func_8003D54C(PlayerShot* shot, s32 index) {
                         func_80077240(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, bonus);
                         gHitCount += shot->bonus;
                     }
-                    if ((shot->bonus >= 7) && (D_80178284 == 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
+                    if ((shot->bonus >= 7) && (gBossActive == 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
                         ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0))) {
                         do {
                             teamId = (s32) (Rand_ZeroOne() * 2.9f) + 1;
@@ -2219,7 +2219,7 @@ void func_8003D54C(PlayerShot* shot, s32 index) {
                         }
                     }
                 }
-                Object_Kill(&shot->obj, &shot->sfxPos);
+                Object_Kill(&shot->obj, shot->sfxPos);
                 func_8007A6F0(&shot->obj.pos, 0x0903502E);
             } else if (gCurrentLevel == LEVEL_AQUAS) {
                 func_i3_801ABA40(shot);
@@ -2292,7 +2292,7 @@ void func_8003DA0C(void) {
                 Matrix_Pop(&gGfxMatrix);
             }
             if (D_80161410 > 0) {
-                func_8005F290(&gPlayerShots[i].sfxPos, &D_8015F950);
+                func_8005F290(gPlayerShots[i].sfxPos, &D_8015F950);
             }
         }
     }

src/main/fox_bg.c

@@ -534,7 +534,7 @@ void func_8003E1E8(void) {
                             }
                             break;
                         case LEVEL_METEO:
-                            if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (D_80177A80 > 260)) {
+                            if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (gCsFrameCount > 260)) {
                                 Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f) - 30.0f, -290.0f, 1);
                                 Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
                                 Matrix_SetGfxMtx(&gMasterDisp);
@@ -584,7 +584,7 @@ void func_8003E1E8(void) {
                             break;
                         case LEVEL_FORTUNA:
                             sp128 = 1.5f;
-                            if ((D_80177A80 > 400) && (D_80177930 == 0)) {
+                            if ((gCsFrameCount > 400) && (D_80177930 == 0)) {
                                 sp128 = 0.75f;
                             }
                             Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1);
@@ -594,7 +594,7 @@ void func_8003E1E8(void) {
                             break;
                         case LEVEL_BOLSE:
                             sp128 = 1.0f;
-                            if ((D_80177A80 > 500) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) {
+                            if ((gCsFrameCount > 500) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) {
                                 sp128 = 1.3f;
                             }
                             Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1);

src/main/fox_boss.c

@@ -58,7 +58,7 @@ void func_80042FE8(Boss* boss) {
 void func_80042FF4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
                    f32 arg9, f32 argA, s32 argB, s32 argC) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_189;
     actor->unk_0B8 = argB;
     actor->obj.pos.x = arg1;
@@ -84,7 +84,7 @@ void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f
     s32 i;
 
     for (i = 59; i >= 0; i--) {
-        if (gActors[i].obj.status == 0) {
+        if (gActors[i].obj.status == OBJ_FREE) {
             func_80042FF4(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB);
             return;
         }
@@ -99,7 +99,7 @@ void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {
     func_800182F4(0x105000FF);
     func_800182F4(0x115000FF);
 
-    D_80177A80 = 0;
+    gCsFrameCount = 0;
     D_80178448 = arg3 + D_80177D20;
     D_80178440 = arg1;
     D_80178444 = arg2;

src/main/fox_demo.c

@@ -185,7 +185,7 @@ void func_80048AC0(s32 teamId) {
 
 void func_80048CC4(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = D_800C9F60[arg1].x + gPlayer[0].pos.x;
     actor->obj.pos.y = D_800C9F60[arg1].y + gPlayer[0].pos.y;
@@ -195,12 +195,12 @@ void func_80048CC4(Actor* actor, s32 arg1) {
     Object_SetInfo(&actor->info, actor->obj.id);
 
     if (arg1 == 3) {
-        Audio_PlaySfx(0x11030010U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-        Audio_PlaySfx(0x31024059U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         actor->unk_0B6 = 1;
     } else {
         actor->iwork[11] = 1;
-        Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -212,7 +212,7 @@ void func_80048E40(Player* player) {
     f32 temp_ret;
     s32 temp_v1;
 
-    gBosses[1].obj.status = 0;
+    gBosses[1].obj.status = OBJ_FREE;
     Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f);
     Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f);
     Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 3.0f, 0.0f);
@@ -226,13 +226,13 @@ void func_80048E40(Player* player) {
     switch (player->unk_1D0) {
         case 0:
             player->unk_4DC = 0;
-            func_8001A38C(1, &player->unk_460);
+            func_8001A38C(1, player->sfxPos);
             player->unk_1D0++;
             D_80177A48[0] = 0.0f;
             D_80177A48[1] = 0.0f;
             D_80177A48[2] = 0.0f;
             player->wings.unk_2C = 1;
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             /* fallthrough */
         case 1:
             D_80177A48[1] -= D_80177A48[2];
@@ -249,7 +249,7 @@ void func_80048E40(Player* player) {
             D_801779B8 = player->pos.y;
             D_801779C0 = player->unk_138 + D_80177D20;
 
-            switch (D_80177A80) {
+            switch (gCsFrameCount) {
                 case 101:
                     if (gTeamShields[1] > 0) {
                         func_80048CC4(&gActors[0], 0);
@@ -287,24 +287,24 @@ void func_80048E40(Player* player) {
                     break;
 
                 case 450:
-                    Audio_PlaySfx(0x09000002U, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     player->unk_194 = 5.0f;
                     player->unk_190 = 5.0f;
 
                 default:
                     break;
             }
-            if (D_80177A80 >= 0x1C3) {
+            if (gCsFrameCount >= 0x1C3) {
                 Math_SmoothStepToF(&D_80177A48[0], 1.0f, 0.1f, 0.004f, 0.0f);
                 player->unk_0D0 += 2.0f;
                 player->unk_0E4 += 0.1f;
                 player->unk_190 = 2.0f;
 
-                if (D_80177A80 == 530) {
+                if (gCsFrameCount == 530) {
                     func_8001DBD0(0x32);
                 }
 
-                if (D_80177A80 > 540) {
+                if (gCsFrameCount > 540) {
                     D_80178358 = 255;
                     D_80178348 = (D_80178350 = (D_80178354 = 0));
                     D_8017835C = 8;
@@ -378,7 +378,7 @@ void func_80049630(Actor* actor) {
 
         case 1:
             actor->unk_0B8 = 2;
-            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->timer_0BC = 0x96;
             actor->fwork[29] = 5.0f;
 
@@ -386,7 +386,7 @@ void func_80049630(Actor* actor) {
             actor->iwork[11] = 2;
             actor->fwork[0] += 2.0f;
             if (actor->timer_0BC == 0) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }
@@ -418,7 +418,7 @@ void func_8004990C(Player* player) {
 
 void func_80049968(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = D_800C9FD0[arg1];
     actor->obj.pos.y = D_800C9FE0[arg1];
@@ -432,12 +432,12 @@ void func_80049968(Actor* actor, s32 arg1) {
     actor->vel.z = gPlayer[0].vel.z;
     Object_SetInfo(&actor->info, actor->obj.id);
     actor->iwork[11] = 1;
-    Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_80049A9C(Effect* effect, f32 x, f32 y, f32 z) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_346;
     effect->timer_50 = 100;
     effect->scale2 = 0.2f;
@@ -456,7 +456,7 @@ void func_80049B44(void) {
     f32 z;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (!gEffects[i].obj.status) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             x = (Rand_ZeroOne() - 0.5f) * 400.0f;
             y = (Rand_ZeroOne() - 0.5f) * 400.0f;
             z = (-D_80177D20 - 500.0f) - Rand_ZeroOne() * 500.0f;
@@ -542,7 +542,7 @@ void func_80049C0C(Player* player) {
 
             if (player->timer_1F8 <= 100) {
                 if (player->timer_1F8 == 100) {
-                    func_800A6028(&player->unk_460, 0x0940802AU);
+                    func_800A6028(player->sfxPos, 0x0940802AU);
                     player->unk_194 = 5.0f;
                     player->unk_190 = 5.0f;
                 }
@@ -561,22 +561,22 @@ void func_80049C0C(Player* player) {
 
             if ((player->timer_1F8 == 0x5F) && (gTeamShields[1] > 0)) {
                 gActors[0].unk_0B8 = var_v0;
-                Audio_PlaySfx(0x0940802AU, &gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0940802AU, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if ((player->timer_1F8 == 0x5A) && (gTeamShields[3] > 0)) {
                 gActors[2].unk_0B8 = var_v0;
-                Audio_PlaySfx(0x0940802AU, &gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0940802AU, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if ((player->timer_1F8 == 85) && (gTeamShields[2] > 0)) {
                 gActors[1].unk_0B8 = var_v0;
-                Audio_PlaySfx(0x0940802AU, &gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0940802AU, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (player->timer_1F8 == 60) {
                 gActors[3].unk_0B8 = var_v0;
-                Audio_PlaySfx(0x0940802AU, &gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0940802AU, gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 func_800182F4(0x103200FF);
                 func_800182F4(0x113200FF);
             }
@@ -609,7 +609,7 @@ void func_80049C0C(Player* player) {
                     player->unk_234 = 1;
                     D_8017827C = 1;
                     D_800CA230 = 0.15f;
-                    Audio_PlaySfx(0x11407079U, &D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x11407079U, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     func_800AB334();
                 }
             }
@@ -660,7 +660,7 @@ void func_80049C0C(Player* player) {
 }
 
 void func_8004A52C(Player* player) {
-    D_80177A80 += 1;
+    gCsFrameCount += 1;
     if (gLevelMode == LEVELMODE_ON_RAILS) {
         switch (gCurrentLevel) {
             case LEVEL_CORNERIA:
@@ -744,7 +744,7 @@ void func_8004A52C(Player* player) {
 
 void func_8004A700(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = gPlayer[0].pos.x;
     actor->obj.pos.y = gPlayer[0].pos.y - 1000.0f;
@@ -758,7 +758,7 @@ void func_8004A700(Actor* actor, s32 arg1) {
     actor->obj.rot.z = D_800CA074[arg1];
     actor->iwork[11] = 1;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_8004A840(s32 actor) {
@@ -773,7 +773,7 @@ void func_8004A888(Effect* effect) {
     Matrix_RotateX(gCalcMatrix, -(gPlayer[0].unk_0E4 * M_DTOR), 1);
     Effect_Initialize(effect);
 
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     sp2C.x = (Rand_ZeroOne() - 0.5f) * 1500.0f;
     sp2C.y = (Rand_ZeroOne() - 0.5f) * 800.0f;
     sp2C.z = 3000.0f;
@@ -808,7 +808,7 @@ void func_8004AA84(void) {
 
     if (!(gGameFrameCount & 7) && (gLevelType == LEVEL_CORNERIA)) {
         for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-            if (!gEffects[i].obj.status) {
+            if (gEffects[i].obj.status == OBJ_FREE) {
                 func_8004A888(&gEffects[i]);
                 break;
             }
@@ -820,7 +820,7 @@ void func_8004AAF4(Player* player) {
     s32 pad;
     Vec3f sp70;
     Vec3f sp64;
-    Actor* var_s0;
+    Actor* actor;
     f32 var_s1;
     f32 var_s2;
     f32 var_s3;
@@ -828,9 +828,9 @@ void func_8004AAF4(Player* player) {
     s32 pad1;
     s32 pad2;
 
-    D_80177A80 += 1;
+    gCsFrameCount += 1;
     Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f);
-    if (D_80177A80 == 37) {
+    if (gCsFrameCount == 37) {
         D_80177E84 = 1;
         if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
             func_800BA808(gMsg_ID_19466, RCID_FOX);
@@ -866,7 +866,7 @@ void func_8004AAF4(Player* player) {
             D_80177A48[3] = 0.0f;
             player->wings.unk_2C = 1;
             player->unk_1D0++;
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             /* fallthrough */
         case 1:
             if (player->pos.y < 350.0f) {
@@ -881,16 +881,16 @@ void func_8004AAF4(Player* player) {
                 player->unk_204 = 2;
             }
 
-            if ((D_80177A80 >= 0x88) && (D_80177A80 < 0xB4)) {
+            if ((gCsFrameCount >= 0x88) && (gCsFrameCount < 0xB4)) {
                 Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f);
             }
 
-            if (D_80177A80 == 0x8A) {
-                Audio_PlaySfx(0x09000007U, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            if (gCsFrameCount == 0x8A) {
+                Audio_PlaySfx(0x09000007U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
-            if (D_80177A80 == 0xBE) {
-                Audio_PlaySfx(0x09000013U, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            if (gCsFrameCount == 0xBE) {
+                Audio_PlaySfx(0x09000013U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (D_80177A48[1] > 350.0f) {
@@ -900,21 +900,21 @@ void func_8004AAF4(Player* player) {
                 player->unk_194 = 10.0f;
                 player->unk_190 = 10.0f;
 
-                Audio_PlaySfx(0x09000002U, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                 D_801779A8[player->num] = 70.0f;
 
                 if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) {
                     D_800D1970 = 0;
-                    for (i = 0, var_s0 = &gActors[2]; i < 3; i++, var_s0++) {
-                        Actor_Initialize(var_s0);
-                        var_s0->obj.status = 1;
-                        var_s0->obj.id = OBJ_ACTOR_198;
-                        var_s0->obj.pos.x = D_800CA080[i] + player->pos.x;
-                        var_s0->obj.pos.y = D_800CA08C[i] + player->pos.y;
-                        var_s0->obj.pos.z = player->unk_138 - 1000.0f;
-                        var_s0->unk_0F4.y = 180.0f;
-                        Object_SetInfo(&var_s0->info, var_s0->obj.id);
+                    for (i = 0, actor = &gActors[2]; i < 3; i++, actor++) {
+                        Actor_Initialize(actor);
+                        actor->obj.status = OBJ_INIT;
+                        actor->obj.id = OBJ_ACTOR_198;
+                        actor->obj.pos.x = D_800CA080[i] + player->pos.x;
+                        actor->obj.pos.y = D_800CA08C[i] + player->pos.y;
+                        actor->obj.pos.z = player->unk_138 - 1000.0f;
+                        actor->unk_0F4.y = 180.0f;
+                        Object_SetInfo(&actor->info, actor->obj.id);
                     }
                 }
             }
@@ -1229,7 +1229,7 @@ void func_8004B368(Player* player) {
             D_80178468 = player->pos.y + sp6C.y;
             D_80178478 = player->unk_138 + sp6C.z;
 
-            switch (D_80177A80) {
+            switch (gCsFrameCount) {
                 case 330:
                     D_80177840 = 100;
                     break;
@@ -1315,7 +1315,7 @@ void func_8004B368(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 961:
             D_80177830 = 1;
             break;
@@ -1327,7 +1327,7 @@ void func_8004B368(Player* player) {
         case 1255:
             player->unk_1D0 = 3;
             player->timer_1F8 = 0xA;
-            func_800A6028(&player->unk_460, 0x09000002U);
+            func_800A6028(player->sfxPos, 0x09000002U);
             func_800182F4(0x103200FF);
             func_800182F4(0x113200FF);
             break;
@@ -1375,7 +1375,7 @@ void func_8004C930(Player* player) {
     s32 sp20;
     s32 btn;
 
-    D_80177A80 += 1;
+    gCsFrameCount += 1;
 
     switch (player->form) {
         case FORM_ARWING:
@@ -1422,7 +1422,7 @@ void func_8004C930(Player* player) {
                 func_i1_80191160(player);
                 func_800AA800(player);
             } else {
-                if (D_80177A80 == 170) {
+                if (gCsFrameCount == 170) {
                     func_8001D444(0, 0x26U, 0, 0xFFU);
                 }
                 func_8004B368(player);
@@ -1534,7 +1534,7 @@ void func_8004CCC0(Player* player) {
                     player->unk_12C = -180.0f;
                 }
                 player->unk_1D0 = 3;
-                func_800A5FA0(&player->unk_460, 0x09000002U, player->num);
+                func_800A5FA0(player->sfxPos, 0x09000002U, player->num);
                 player->unk_194 = 7.0f;
                 player->unk_190 = 7.0f;
             }
@@ -1617,26 +1617,22 @@ void func_8004CCC0(Player* player) {
 void func_8004D3C8(s32 arg0) {
 }
 
-void func_8004D3D4(Player* player, s32 arg1, Item* arg2) {
-    u16 itemId;
-
-    Item_Initialize(arg2);
-
-    arg2->obj.status = 1;
-    arg2->obj.pos.x = player->pos.x;
-    arg2->obj.pos.y = player->pos.y;
-    arg2->obj.pos.z = player->unk_138;
-    itemId = arg1 & 0xFFFF;
-    arg2->obj.id = itemId;
-    Object_SetInfo(&arg2->info, itemId);
+void func_8004D3D4(Player* player, ObjectId itemId, Item* item) {
+    Item_Initialize(item);
+    item->obj.status = OBJ_INIT;
+    item->obj.pos.x = player->pos.x;
+    item->obj.pos.y = player->pos.y;
+    item->obj.pos.z = player->unk_138;
+    item->obj.id = itemId;
+    Object_SetInfo(&item->info, item->obj.id);
 }
 
 void func_8004D440(Player* player) {
     s32 teamId;
 
     func_8001CA24(player->num);
-    func_8001A55C(&player->unk_460, 0x0900C010U);
-    func_800A5FA0(&player->unk_460, 0x0903F004U, player->num);
+    func_8001A55C(player->sfxPos, 0x0900C010U);
+    func_800A5FA0(player->sfxPos, 0x0903F004U, player->num);
     player->state_1C8 = PLAYERSTATE_1C8_6;
     player->timer_1F8 = 0x46;
     player->timer_224 = 0x14;
@@ -1718,7 +1714,7 @@ void func_8004D828(Player* player) {
     player->pos.x += player->vel.x;
     player->pos.y += player->vel.y;
 
-    if ((gCurrentLevel != LEVEL_VENOM_1 || D_80178284 == 0) &&
+    if ((gCurrentLevel != LEVEL_VENOM_1 || gBossActive == 0) &&
         (gLevelType == LEVELTYPE_PLANET || gCurrentLevel == LEVEL_BOLSE)) {
         player->vel.y -= 0.5f;
         player->unk_0E4 -= 2.0f;
@@ -1752,7 +1748,7 @@ void func_8004D828(Player* player) {
         player->vel.y = 10.0f;
         player->unk_1D0 = 1;
 
-        func_800A6070(&player->unk_460, 0x29000000U);
+        func_800A6070(player->sfxPos, 0x29000000U);
 
         if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_FORTUNA)) {
             func_80062C38(player->pos.x, player->pos.z);
@@ -1839,7 +1835,7 @@ void func_8004DEF8(Player* player) {
     player->pos.x += player->vel.x;
     player->pos.y += player->vel.y;
 
-    if (((gCurrentLevel != LEVEL_VENOM_ANDROSS) || (D_80178284 == 0)) && (gLevelType == LEVELTYPE_PLANET)) {
+    if (((gCurrentLevel != LEVEL_VENOM_ANDROSS) || (gBossActive == 0)) && (gLevelType == LEVELTYPE_PLANET)) {
         player->vel.y = player->vel.y - 0.5f;
     }
 
@@ -1864,7 +1860,7 @@ void func_8004DEF8(Player* player) {
         player->timer_220 = 0;
         player->vel.y = 10.0f;
         player->unk_1D0 = 1;
-        func_800A6070(&player->unk_460, 0x29000000U);
+        func_800A6070(player->sfxPos, 0x29000000U);
         if (gCurrentLevel == LEVEL_CORNERIA) {
             func_80062C38(player->pos.x, player->pos.z);
         }
@@ -1974,7 +1970,7 @@ void func_8004E4D4(Actor* actor) {
             actor->unk_0B8 = 2;
             actor->timer_0BC = 0x32;
             actor->fwork[9] = 2.0f;
-            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->fwork[29] = 5.0f;
             /* fallthrough */
 
@@ -1988,7 +1984,7 @@ void func_8004E4D4(Actor* actor) {
             actor->iwork[11] = 2;
             actor->fwork[9] *= 1.2f;
             if (actor->timer_0BC == 0) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
 
@@ -1996,7 +1992,7 @@ void func_8004E4D4(Actor* actor) {
             actor->unk_0B8 = 0xB;
             actor->timer_0BC = 0x96;
             actor->timer_0BE = 0x28;
-            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->fwork[29] = 5.0f;
             /* fallthrough */
         case 11:
@@ -2025,7 +2021,7 @@ void func_8004E4D4(Actor* actor) {
             }
 
             if (actor->timer_0BC == 0) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
 
@@ -2051,7 +2047,7 @@ void func_8004E4D4(Actor* actor) {
             break;
 
         case 31:
-            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->unk_0B8 += 1;
             actor->fwork[29] = 5.0f;
             /* fallthrough */
@@ -2136,7 +2132,7 @@ void func_8004EBD0(Actor* actor) {
             if (actor->timer_0BC == 0) {
                 actor->unk_0B8++;
                 actor->timer_0BC = 10;
-                func_800A6028(&actor->sfxPos, 0x09000002);
+                func_800A6028(actor->sfxPos, 0x09000002);
                 actor->fwork[29] = 5.0f;
             }
             break;
@@ -2171,7 +2167,7 @@ void func_8004EBD0(Actor* actor) {
 
             if (actor->timer_0BC == 0) {
                 func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 30.0f);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }
@@ -2208,14 +2204,14 @@ void func_8004F05C(Actor* actor) {
                         case 1:
                             actor->unk_0B8 = 2;
                             actor->timer_0BC = 0x64;
-                            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             actor->fwork[29] = 5.0f;
 
                         case 2:
                             actor->iwork[11] = 2;
                             actor->vel.z -= 5.0f;
                             if (actor->timer_0BC == 0) {
-                                Object_Kill(&actor->obj, &actor->sfxPos);
+                                Object_Kill(&actor->obj, actor->sfxPos);
                             }
                             break;
                     }
@@ -2223,14 +2219,14 @@ void func_8004F05C(Actor* actor) {
 
                 case 31:
                     if (actor->timer_0BC == 0) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                     break;
 
                 case 32:
                     actor->obj.rot.z += actor->unk_0F4.z;
                     if (actor->timer_0BC == 0) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                     break;
 
@@ -2253,18 +2249,18 @@ void func_8004F05C(Actor* actor) {
                     if (actor->timer_0BC == 0) {
                         if (actor->obj.pos.x >= -3500.0f) {
                             if (actor->obj.pos.z <= 3000.0f) {
-                                if ((fabsf(actor->obj.pos.y) <= 400.0f) && (D_80177A80 < 0x12D)) {
+                                if ((fabsf(actor->obj.pos.y) <= 400.0f) && (gCsFrameCount < 0x12D)) {
                                     func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
                                 }
                             }
                         }
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                     break;
 
                 case 43:
                     if (actor->timer_0BC == 0) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                     break;
             }
@@ -2359,7 +2355,7 @@ void func_8004F798(Actor* actor) {
             actor->fwork[29] = 10.0f;
             actor->vel.z -= 100.0f;
             if ((actor->obj.pos.z + D_80177D20) < -15000.0f) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }
@@ -2423,12 +2419,11 @@ void func_8004F8AC(Actor* actor) {
                     if (actor->unk_0B6 == 0xB) {
                         switch (actor->unk_0B8) {
                             case 0:
-                                if (D_80177A80 == 0x64) {
+                                if (gCsFrameCount == 0x64) {
                                     actor->unk_0B8 = 1;
                                     actor->timer_0BC = 0x32;
                                     actor->iwork[0] = 255;
-                                    Audio_PlaySfx(0x2902F026U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34,
-                                                  &D_800C5D3C);
+                                    Audio_PlaySfx(0x2902F026U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 }
                                 break;
 

src/main/fox_display.c

@@ -32,7 +32,7 @@ void func_80051B30(void) {
     if ((D_80177854 == 0x64) || (D_800CA234 == NULL)) {
         return;
     }
-    if ((D_800CA234->obj.status != 2) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) {
+    if ((D_800CA234->obj.status != OBJ_ACTIVE) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) {
         D_800CA234 = NULL;
         D_Timer_800CA238 = 0;
         return;
@@ -69,7 +69,7 @@ void func_80051B30(void) {
         }
         switch (sp7C) {
             case 0:
-                if (D_800CA234->sfxPos.x > 0.0f) {
+                if (D_800CA234->sfxPos[0] > 0.0f) {
                     sp78 = 20.0f;
                     sp74 = M_PI / 2.0f;
                 } else {
@@ -1440,16 +1440,16 @@ void func_80057814(Player* player) {
     sp20.x = player->pos.x;
     sp20.y = player->pos.y;
     sp20.z = player->unk_138;
-    sp2C.x = player->unk_460.x;
-    sp2C.y = player->unk_460.y;
-    sp2C.z = player->unk_460.z;
-    func_8005F0E8(&player->unk_460, &sp20);
-    player->unk_46C.x = player->unk_460.x - sp2C.x;
-    player->unk_46C.y = player->unk_460.y - sp2C.y;
-    player->unk_46C.z = player->unk_460.z - sp2C.z;
-    player->unk_480 = &player->unk_46C;
-    player->unk_47C = &player->unk_460;
-    player->unk_488 = player->vel.y;
+    sp2C.x = player->sfxPos[0];
+    sp2C.y = player->sfxPos[1];
+    sp2C.z = player->sfxPos[2];
+    func_8005F0E8(player->sfxPos, &sp20);
+    player->sfxVel[0] = player->sfxPos[0] - sp2C.x;
+    player->sfxVel[1] = player->sfxPos[1] - sp2C.y;
+    player->sfxVel[2] = player->sfxPos[2] - sp2C.z;
+    player->srcVel = player->sfxVel;
+    player->srcPos = player->sfxPos;
+    player->yVel = player->vel.y;
     player->unk_490 = player->unk_0F8;
 }
 

src/main/fox_edisplay.c

@@ -425,7 +425,7 @@ void func_8005ADAC(Actor* actor) {
     f32 sp54;
     s32 pad[5]; // fake? seems like a lot of padding
 
-    if ((actor->iwork[11] != 0) && (actor->obj.status == 2)) {
+    if ((actor->iwork[11] != 0) && (actor->obj.status == OBJ_ACTIVE)) {
         temp1 = 652.5f * 0.001f; // 0.65250003f;
         if (actor->iwork[11] >= 2) {
             temp1 = 1.3050001f;
@@ -483,7 +483,7 @@ f32 D_800CFCA0[] = {
 void func_8005B1E8(Actor* actor, s32 levelType) {
     f32 scale;
 
-    if ((actor->iwork[11] != 0) && (actor->obj.status == 2)) {
+    if ((actor->iwork[11] != 0) && (actor->obj.status == OBJ_ACTIVE)) {
         scale = 0.63f;
         if (actor->iwork[11] >= 2) {
             scale = D_800CFCA0[actor->iwork[11] - 2] * 0.45f;
@@ -508,7 +508,7 @@ void func_8005B388(Actor* actor) {
     Vec3f sp30;
 
     Matrix_MultVec3f(gGfxMatrix, &sp3C, &sp30);
-    if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (D_80178284 == 0)) ||
+    if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (gBossActive == 0)) ||
          (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) || (gCurrentLevel == LEVEL_VENOM_ANDROSS) ||
          (gCurrentLevel == LEVEL_VENOM_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) &&
         (gCurrentLevel != LEVEL_MACBETH) && (gCurrentLevel != LEVEL_TITANIA)) {
@@ -1012,10 +1012,10 @@ void Actor_Draw2(Actor* actor) {
             }
             if (actor->info.drawType == 0) {
                 gSPDisplayList(gMasterDisp++, actor->info.dList);
-                func_8005F1EC(&actor->sfxPos);
+                func_8005F1EC(actor->sfxPos);
             } else {
                 actor->info.draw(&actor->obj);
-                func_8005F1EC(&actor->sfxPos);
+                func_8005F1EC(actor->sfxPos);
                 if (((actor->obj.id == OBJ_ACTOR_198) || ((actor->obj.id == OBJ_ACTOR_203) && (actor->unk_0B6 > 0))) &&
                     (D_80161410 > 0)) {
                     Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80177E98[actor->unk_0E4]);
@@ -1108,7 +1108,7 @@ void Actor_Draw1(Actor* actor) {
     if (D_801615EC == 0) {
         actor->timer_0CA[gPlayerNum] = 0;
         if ((actor->obj.id == OBJ_ACTOR_189) || (actor->obj.id == OBJ_ACTOR_286)) {
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
         }
     }
     for (var_v1 = 0; var_v1 < gCamCount; var_v1++) {
@@ -1120,7 +1120,7 @@ void Actor_Draw1(Actor* actor) {
             }
         }
     }
-    func_8005F290(&actor->sfxPos, &D_801615E0);
+    func_8005F290(actor->sfxPos, &D_801615E0);
     actor->iwork[24] = D_801615EC;
 }
 
@@ -1140,7 +1140,7 @@ void Boss_Draw(Boss* boss, s32 arg1) {
         func_8005D1F0(&boss->obj, boss->info.drawType);
     }
     Matrix_MultVec3f(&D_801615F0, &sp30, &D_801615D0);
-    func_8005F290(&boss->sfxPos, &D_801615D0);
+    func_8005F290(boss->sfxPos, &D_801615D0);
     if ((boss->obj.id == OBJ_BOSS_316) || (boss->obj.id == OBJ_BOSS_317)) {
         var_fa1 = 6000.0f;
         var_fv0 = 6000.0f;
@@ -1236,9 +1236,9 @@ void Effect_Draw2(Effect* effect) {
             }
         }
     }
-    func_8005F290(&effect->sfxPos, &sp40);
+    func_8005F290(effect->sfxPos, &sp40);
     if ((sp3B == 0) && (effect->obj.id != OBJ_EFFECT_352) && (effect->obj.id != OBJ_EFFECT_373) && (!gVersusMode)) {
-        Object_Kill(&effect->obj, &effect->sfxPos);
+        Object_Kill(&effect->obj, effect->sfxPos);
     }
 }
 
@@ -1268,10 +1268,10 @@ void Item_Draw(Item* item, s32 arg1) {
             }
         }
     }
-    func_8005F290(&item->sfxPos, &sp38);
+    func_8005F290(item->sfxPos, &sp38);
     if ((var_v0 == 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (gCamCount == 1) && (item->obj.id < 336) &&
         (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
-        Object_Kill(&item->obj, &item->sfxPos);
+        Object_Kill(&item->obj, item->sfxPos);
     }
 }
 
@@ -1344,76 +1344,72 @@ void func_8005ECD8(s32 index, Object* obj) {
     }
 }
 
-void func_8005F030(Vec3f* arg0) {
-    if (arg0->x > 5000.0f) {
-        arg0->x = 5000.0f;
+void func_8005F030(f32* sfxSrc) {
+    if (sfxSrc[0] > 5000.0f) {
+        sfxSrc[0] = 5000.0f;
     }
-    if (arg0->x < -5000.0f) {
-        arg0->x = -5000.0f;
+    if (sfxSrc[0] < -5000.0f) {
+        sfxSrc[0] = -5000.0f;
     }
-    if (arg0->y > 2000.0f) {
-        arg0->y = 2000.0f;
+    if (sfxSrc[1] > 2000.0f) {
+        sfxSrc[1] = 2000.0f;
     }
-    if (arg0->y < -2000.0f) {
-        arg0->y = -2000.0f;
+    if (sfxSrc[1] < -2000.0f) {
+        sfxSrc[1] = -2000.0f;
     }
-    if (arg0->z > 5000.0f) {
-        arg0->z = 5000.0f;
+    if (sfxSrc[2] > 5000.0f) {
+        sfxSrc[2] = 5000.0f;
     }
-    if (arg0->z < -5000.0f) {
-        arg0->z = -5000.0f;
+    if (sfxSrc[2] < -5000.0f) {
+        sfxSrc[2] = -5000.0f;
     }
 }
 
-void func_8005F0E8(Vec3f* arg0, Vec3f* arg1) {
+void func_8005F0E8(f32* sfxSrc, Vec3f* pos) {
     Vec3f sp2C;
     Vec3f sp20;
 
     if (gCamCount != 1) {
-        arg0->x = arg0->y = arg0->z = 0.0f;
+        sfxSrc[0] = sfxSrc[1] = sfxSrc[2] = 0.0f;
     } else {
         Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0);
         Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1);
-        sp2C.x = arg1->x - D_801779D8.x;
-        sp2C.y = arg1->y - D_801779D8.y;
-        sp2C.z = arg1->z + D_80177D20 - D_801779D8.z;
+        sp2C.x = pos->x - D_801779D8.x;
+        sp2C.y = pos->y - D_801779D8.y;
+        sp2C.z = pos->z + D_80177D20 - D_801779D8.z;
         Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp20);
-        arg0->x = sp20.x;
-        arg0->y = sp20.y;
-        arg0->z = sp20.z;
+        sfxSrc[0] = sp20.x;
+        sfxSrc[1] = sp20.y;
+        sfxSrc[2] = sp20.z;
     }
-    func_8005F030(arg0);
+    func_8005F030(sfxSrc);
 }
 // check
-void func_8005F1EC(Vec3f* arg0) {
+void func_8005F1EC(f32* sfxSrc) {
     Vec3f sp2C = { 0.0f, 0.0f, 0.0f };
     Vec3f sp20;
     s32 pad;
 
     if (gCamCount != 1) {
-        arg0->z = 0.0f;
-        arg0->y = 0.0f;
-        arg0->x = 0.0f;
+        sfxSrc[0] = sfxSrc[1] = sfxSrc[2] = 0.0f;
     } else {
         Matrix_MultVec3f(&D_801615F0, &sp2C, &sp20);
-        arg0->x = sp20.x;
-        arg0->y = sp20.y;
-        arg0->z = sp20.z;
+        sfxSrc[0] = sp20.x;
+        sfxSrc[1] = sp20.y;
+        sfxSrc[2] = sp20.z;
     }
-    func_8005F030(arg0);
+    func_8005F030(sfxSrc);
 }
 
-void func_8005F290(Vec3f* arg0, Vec3f* arg1) {
+void func_8005F290(f32* sfxSrc, Vec3f* pos) {
     if (gCamCount != 1) {
-        arg0->z = 0.0f;
-        arg0->y = 0.0f;
-        arg0->x = 0.0f;
+        sfxSrc[0] = sfxSrc[1] = sfxSrc[2] = 0.0f;
     } else {
-        arg0->x = arg1->x;
-        arg0->y = arg1->y;
-        arg0->z = arg1->z;
+        sfxSrc[0] = pos->x;
+        sfxSrc[1] = pos->y;
+        sfxSrc[2] = pos->z;
     }
-    func_8005F030(arg0);
+    func_8005F030(sfxSrc);
 }
 
 void Object_58_Draw(Object_58* obj58) {
@@ -1551,11 +1547,11 @@ void Object_DrawAll(s32 arg0) {
             gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
         }
         for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) {
-            if ((obj58->obj.status == 2) && (obj58->obj.id != OBJ_80_147)) {
+            if ((obj58->obj.status == OBJ_ACTIVE) && (obj58->obj.id != OBJ_80_147)) {
                 if (gCurrentLevel == LEVEL_BOLSE) {
-                    spAC.x = obj58->sfxPos.x;
-                    spAC.y = obj58->sfxPos.y;
-                    spAC.z = obj58->sfxPos.z;
+                    spAC.x = obj58->sfxPos[0];
+                    spAC.y = obj58->sfxPos[1];
+                    spAC.z = obj58->sfxPos[2];
                     Matrix_MultVec3fNoTranslate(&D_i4_8019EE80, &spAC, &obj58->obj.pos);
                     obj58->obj.rot.y = gBosses[0].obj.rot.y + (*obj58).unk_54;
                 }
@@ -1567,19 +1563,19 @@ void Object_DrawAll(s32 arg0) {
     } else {
         RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
         for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-            if (obj80->obj.status >= 2) {
+            if (obj80->obj.status >= OBJ_ACTIVE) {
                 if (arg0 > 0) {
                     func_8005F670(&obj80->obj.pos);
                 }
                 Matrix_Push(&gGfxMatrix);
                 Object_80_Draw(obj80, arg0);
                 Matrix_Pop(&gGfxMatrix);
-                func_8005F1EC(&obj80->sfxPos);
+                func_8005F1EC(obj80->sfxPos);
             }
         }
     }
     for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-        if ((boss->obj.status >= 2) && (boss->obj.id != OBJ_BOSS_310)) {
+        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id != OBJ_BOSS_310)) {
             if (!(boss->timer_05C & 1)) {
                 RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
             } else {
@@ -1600,7 +1596,7 @@ void Object_DrawAll(s32 arg0) {
     Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG,
                        gAmbientB);
     for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) {
-        if ((obj4C->obj.status >= 2) && func_80060FE4(&obj4C->obj.pos, -12000.0f)) {
+        if ((obj4C->obj.status >= OBJ_ACTIVE) && func_80060FE4(&obj4C->obj.pos, -12000.0f)) {
             Matrix_Push(&gGfxMatrix);
             if ((obj4C->obj.id == OBJ_4C_165) || (obj4C->obj.id == OBJ_4C_166)) {
                 RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -1612,7 +1608,7 @@ void Object_DrawAll(s32 arg0) {
         }
     }
     for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
-        if (actor->obj.status >= 2) {
+        if (actor->obj.status >= OBJ_ACTIVE) {
             if (!(actor->timer_0C6 & 1)) {
                 if (gCurrentLevel == LEVEL_UNK_15) {
                     RCP_SetupDL_23();
@@ -1662,7 +1658,7 @@ void Object_DrawAll(s32 arg0) {
     gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
     Lights_SetOneLight(&gMasterDisp, -60, -60, 60, 150, 150, 150, 20, 20, 20);
     for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) {
-        if (item->obj.status >= 2) {
+        if (item->obj.status >= OBJ_ACTIVE) {
             Matrix_Push(&gGfxMatrix);
             RCP_SetupDL(&gMasterDisp, 0x1D);
             func_800597C0(arg0);
@@ -1681,7 +1677,7 @@ void func_8006046C(s32 arg0) {
 
     RCP_SetupDL(&gMasterDisp, 0x40);
     for (i = 0, effect = gEffects; i < ARRAY_COUNT(gEffects); i++, effect++) {
-        if (effect->obj.status >= 2) {
+        if (effect->obj.status >= OBJ_ACTIVE) {
             if (effect->info.unk_14 == 1) {
                 effect->obj.rot.y = (-gPlayer[gPlayerNum].unk_058 * 180.0f) / M_PI;
                 effect->obj.rot.x = (gPlayer[gPlayerNum].unk_05C * 180.0f) / M_PI;
@@ -1694,7 +1690,7 @@ void func_8006046C(s32 arg0) {
                 Matrix_Push(&gGfxMatrix);
                 Effect_Draw1(effect, arg0);
                 Matrix_Pop(&gGfxMatrix);
-                func_8005F1EC(&effect->sfxPos);
+                func_8005F1EC(effect->sfxPos);
                 if (effect->obj.id == OBJ_EFFECT_374) {
                     Matrix_Push(&gGfxMatrix);
                     func_8005ECD8(i, &effect->obj);
@@ -1704,7 +1700,7 @@ void func_8006046C(s32 arg0) {
         }
     }
     for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-        if ((boss->obj.status >= 2) && (boss->obj.id == OBJ_BOSS_310)) {
+        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_310)) {
             if (!(boss->timer_05C & 1)) {
                 RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
             } else {

src/main/fox_enmy2.c

@@ -16,7 +16,7 @@ void func_8006A7B0(u16* msg, s32 character) {
 void func_8006A800(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
     Effect_Initialize(effect);
 
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_361;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -43,7 +43,7 @@ void func_8006A900(f32 xPos, f32 yPos, f32 zPos, f32 arg3) {
     s32 i;
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006A800(&gEffects[i], xPos, yPos, zPos, arg3);
             break;
         }
@@ -58,7 +58,7 @@ void func_8006A978(Actor* actor) {
 
 void func_8006A984(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_365;
 
     effect->obj.pos.x = xPos;
@@ -77,7 +77,7 @@ void func_8006AA3C(f32 xPos, f32 yPos, f32 zPos) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006A984(&gEffects[i], xPos, yPos, zPos);
             break;
         }
@@ -191,19 +191,19 @@ void func_8006AD18(Actor* actor) {
     }
 
     if (actor->unk_0D0 != 0) {
-        actor->unk_0CE -= 10;
-        if ((actor->unk_0CE <= 0) || (actor->unk_0D0 >= 2)) {
+        actor->health -= 10;
+        if ((actor->health <= 0) || (actor->unk_0D0 >= 2)) {
             func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 10.0f);
             func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                           actor->vel.z, 8.0f, 30);
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
             func_8007A6F0(&actor->obj.pos, 0x2903A008);
             gHitCount += actor->info.bonus;
             D_80177850 = 15;
         } else {
             actor->unk_0D0 = 0;
             actor->timer_0C6 = 20;
-            Audio_PlaySfx(0x2903300E, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_8007D1E0(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 5.0f);
         }
     }
@@ -258,11 +258,11 @@ void func_8006B0A0(Actor* actor) {
                           D_80176B98[actor->unk_046][temp_hi], 4.0f);
         }
 
-        Audio_PlaySfx(0x2903B009, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         actor->unk_04A++;
 
         if (actor->unk_04A > 15) {
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
             D_80176550[actor->unk_046] = 0;
             gHitCount += actor->info.bonus;
             D_80177850 = 15;
@@ -333,7 +333,7 @@ void func_8006B95C(Object_80* obj80) {
 
             if (obj80->obj.pos.y < gGroundLevel + 40.0f) {
                 obj80->obj.pos.y = gGroundLevel + 40.0f;
-                Audio_PlaySfx(0x19130003, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x19130003, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 obj80->unk_48 = 2;
                 obj80->vel.y = 0.0f;
             }
@@ -350,7 +350,7 @@ void func_8006B95C(Object_80* obj80) {
 
 void func_8006BA64(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_375;
 
     effect->obj.pos.x = xPos;
@@ -368,7 +368,7 @@ void func_8006BB1C(f32 xPos, f32 yPos, f32 zPos) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006BA64(&gEffects[i], xPos, yPos, zPos);
             break;
         }
@@ -460,7 +460,7 @@ void func_8006BB78(Actor* actor) {
 
     if ((actor->unk_0D0 != 0) && (actor->unk_0B6 != 0)) {
         func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, actor->vel.y, 0.0f, 3.0f, 5);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         actor->unk_044 = 1;
         func_80066254(actor);
     }
@@ -511,10 +511,10 @@ void func_8006C008(Actor* actor) {
                     if (actor->unk_04A & 4) {
                         switch (actor->unk_046) {
                             case 2:
-                                Audio_PlaySfx(0x19000024, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x19000024, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 break;
                             case 25:
-                                Audio_PlaySfx(0x29003031, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x29003031, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 break;
                         }
                     }
@@ -593,7 +593,7 @@ void func_8006C008(Actor* actor) {
                 if ((actor->iwork[1] == 1) && ((actor->unk_048 == 8) || (actor->unk_048 == 9))) {
                     func_8007D2C8(actor->obj.pos.x, sp48 + 20.0f, actor->obj.pos.z, 8.0f);
                 }
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
 
@@ -607,7 +607,7 @@ void func_8006C008(Actor* actor) {
                  (actor->obj.pos.y < (gGroundLevel + 10.0f))) &&
                 (actor->timer_0BE == 0)) {
                 func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 func_8007A6F0(&actor->obj.pos, 0x2903A008);
             }
             break;
@@ -618,7 +618,7 @@ void func_8006C008(Actor* actor) {
                  (actor->obj.pos.y < (gGroundLevel + 10.0f))) &&
                 (actor->timer_0BE == 0)) {
                 func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 func_8007A6F0(&actor->obj.pos, 0x2903A008);
             }
             break;
@@ -639,7 +639,7 @@ void func_8006C008(Actor* actor) {
                  (actor->obj.pos.y < (gGroundLevel + 10.0f))) &&
                 (actor->timer_0BE == 0)) {
                 func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 func_8007A6F0(&actor->obj.pos, 0x2903A008);
             }
             break;
@@ -650,7 +650,7 @@ void func_8006C008(Actor* actor) {
                 (actor->timer_0BE == 0)) {
                 func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, actor->scale * 20.0f);
                 func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, actor->scale * 20.0f);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 func_8007A6F0(&actor->obj.pos, 0x2903A008);
             }
             break;
@@ -667,7 +667,7 @@ void func_8006C008(Actor* actor) {
                 actor->vel.x *= -0.7f;
             }
             if (actor->obj.pos.y < gGroundLevel) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
 
@@ -713,26 +713,26 @@ void func_8006C008(Actor* actor) {
             if (actor->unk_0B8 == 0x46) {
                 if ((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) ||
                     (actor->obj.pos.y < (gGroundLevel + 10.0f))) {
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                 }
             } else if (actor->unk_0B8 == 0x27) {
                 if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) ||
                      (actor->obj.pos.y < (gGroundLevel + 10.0f))) &&
                     (actor->timer_0BE == 0)) {
                     func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                     func_8007A6F0(&actor->obj.pos, 0x2903A008);
                 }
             } else if (((actor->unk_0B8 >= 0x29) && (actor->unk_0B8 < 0x2D)) || (actor->unk_0B8 == 0x3B)) {
                 if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0)) &&
                     (actor->timer_0BE == 0)) {
                     func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f * actor->scale);
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                     func_8007A6F0(&actor->obj.pos, 0x2903A008);
                 }
                 if (func_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) {
                     func_8007B228(actor->obj.pos.x, sp44, actor->obj.pos.z, 2.0f);
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                 }
             } else if (actor->unk_0B8 >= 0xA) {
                 if (!(actor->timer_0BC & 3)) {
@@ -743,7 +743,7 @@ void func_8006C008(Actor* actor) {
                     (actor->timer_0BE == 0)) {
                     func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                                   actor->vel.z, actor->scale * 1.5f, 4);
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                     func_8007A6F0(&actor->obj.pos, 0x2903A008);
                 }
             } else {
@@ -754,7 +754,7 @@ void func_8006C008(Actor* actor) {
                     (actor->obj.pos.y < (gGroundLevel + 10.0f))) {
                     if (gLevelType == LEVELTYPE_SPACE) {
                         func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f);
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                         return;
                     }
 
@@ -763,7 +763,7 @@ void func_8006C008(Actor* actor) {
                     actor->iwork[0]++;
 
                     if (actor->iwork[0] >= 2) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
 
                     if ((actor->unk_0B8 != 2) && (actor->unk_0B8 != 4)) {
@@ -780,14 +780,14 @@ void func_8006C008(Actor* actor) {
 
                 if (actor->unk_0B8 == 4) {
                     if ((gCurrentLevel == LEVEL_KATINA) && (actor->timer_0BC == 0)) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                 } else {
                     if (actor->timer_0BC & 1) {
                         func_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
                     }
                     if ((gLevelType == LEVELTYPE_SPACE) && (actor->timer_0BC == 0)) {
-                        Object_Kill(&actor->obj, &actor->sfxPos);
+                        Object_Kill(&actor->obj, actor->sfxPos);
                     }
                 }
             }
@@ -813,7 +813,7 @@ void func_8006D0F4(Actor* actor) {
     D_80178544 = 40;
 
     for (i = 0; i < ARRAY_COUNT(gObjects80); i++) {
-        if ((gObjects80[i].obj.status == 2) && ((gPlayer[0].unk_138 - 3000.0f) < gObjects80[i].obj.pos.z)) {
+        if ((gObjects80[i].obj.status == OBJ_ACTIVE) && ((gPlayer[0].unk_138 - 3000.0f) < gObjects80[i].obj.pos.z)) {
             hitboxData = D_800CF964[gObjects80[i].obj.id];
             count = *hitboxData;
             if (count != 0) {
@@ -1032,7 +1032,7 @@ void func_8006D36C(Actor* actor) {
             break;
 
         case 0xD000:
-            Audio_KillSfx(&actor->sfxPos);
+            Audio_KillSfx(actor->sfxPos);
             actor->unk_0B4 = temp_s1[actor->unk_0E6 + 1];
 
             if (actor->unk_0B4 == 40) {
@@ -1050,7 +1050,7 @@ void func_8006D36C(Actor* actor) {
                 actor->info.drawType = 2;
             }
 
-            actor->unk_0CE = temp_s1[actor->unk_0E6] & 0x1FF;
+            actor->health = temp_s1[actor->unk_0E6] & 0x1FF;
             actor->unk_0E6 += 2;
 
             if ((actor->unk_0B4 >= 200) && (actor->unk_0B4 < 300)) {
@@ -1067,14 +1067,14 @@ void func_8006D36C(Actor* actor) {
                             D_80176B98[i][j] = actor->obj.pos.z;
                         }
                         if (actor->unk_0B4 == 200) {
-                            Audio_PlaySfx(0x11032049, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x11032049, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         }
                         break;
                     }
                 }
 
                 if (actor->unk_046 == 100) {
-                    Object_Kill(&actor->obj, &actor->sfxPos);
+                    Object_Kill(&actor->obj, actor->sfxPos);
                 }
             }
 
@@ -1124,26 +1124,26 @@ void func_8006D36C(Actor* actor) {
                     case 1:
                         if ((gCurrentLevel != LEVEL_SOLAR) && (actor->unk_0B4 != 6) &&
                             ((gCurrentLevel != LEVEL_CORNERIA) || (actor->unk_0B4 != 8))) {
-                            Audio_PlaySfx(0x31000011, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         }
                         break;
                     case 2:
-                        Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                     case 3:
-                        Audio_PlaySfx(0x11030010, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                     case 4:
-                        Audio_PlaySfx(0x31012039, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x31012039, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                     case 5:
-                        Audio_PlaySfx(0x1900302B, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x1900302B, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                     case 6:
-                        Audio_PlaySfx(0x31000014, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x31000014, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                     case 7:
-                        Audio_PlaySfx(0x31000015, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x31000015, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                 }
 
@@ -1243,12 +1243,12 @@ void func_8006D36C(Actor* actor) {
 
         case 0xEE00:
             if ((D_80161A88 == 2) && (temp_s1[actor->unk_0E6 + 1] != 2)) {
-                func_8001A55C(&gPlayer[0].unk_460, 0x1100000B);
+                func_8001A55C(gPlayer[0].sfxPos, 0x1100000B);
             }
             D_80161A88 = temp_s1[actor->unk_0E6 + 1];
             actor->unk_0E6 += 2;
             func_8006D36C(actor);
-            actor->obj.status = 0;
+            actor->obj.status = OBJ_FREE;
             break;
 
         case 0x7000:
@@ -1265,13 +1265,13 @@ void func_8006D36C(Actor* actor) {
             break;
 
         case 0x7400:
-            func_8001D2FC(&actor->sfxPos, temp_s1[actor->unk_0E6 + 1]);
+            func_8001D2FC(actor->sfxPos, temp_s1[actor->unk_0E6 + 1]);
             actor->unk_0E6 += 2;
             func_8006D36C(actor);
             break;
 
         case 0x7600:
-            func_8001D3A0(&actor->sfxPos, temp_s1[actor->unk_0E6 + 1]);
+            func_8001D3A0(actor->sfxPos, temp_s1[actor->unk_0E6 + 1]);
             actor->unk_0E6 += 2;
             func_8006D36C(actor);
             break;
@@ -1286,7 +1286,7 @@ void func_8006D36C(Actor* actor) {
         case 0xF200:
             if (actor->iwork[12] == temp_s1[actor->unk_0E6 + 1]) {
                 actor->unk_0D0 = 1;
-                actor->unk_0D6 = temp_s1[actor->unk_0E6] & 0x1FF;
+                actor->damage = temp_s1[actor->unk_0E6] & 0x1FF;
                 actor->unk_0D4 = 100;
             } else {
                 gTeamDamage[temp_s1[actor->unk_0E6 + 1]] = temp_s1[actor->unk_0E6] & 0x1FF;
@@ -1543,7 +1543,7 @@ void func_8006EA50(Actor* actor) {
 
 void func_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_374;
 
     effect->obj.pos.x = xPos;
@@ -1552,14 +1552,14 @@ void func_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
 
     effect->timer_50 = 20;
     Object_SetInfo(&effect->info, effect->obj.id);
-    Audio_PlaySfx(0x2900201D, &effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x2900201D, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_8006EB64(f32 xPos, f32 yPos, f32 zPos) {
     s32 i;
 
     for (i = 50; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006EAC4(&gEffects[i], xPos, yPos, zPos);
             break;
         }
@@ -1568,7 +1568,7 @@ void func_8006EB64(f32 xPos, f32 yPos, f32 zPos) {
 
 void func_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_225;
 
     actor->obj.pos.x = xPos;
@@ -1577,14 +1577,14 @@ void func_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
 
     Object_SetInfo(&actor->info, actor->obj.id);
     actor->info.unk_16 = 2;
-    Audio_PlaySfx(0x2900201D, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_8006EC60(f32 xPos, f32 yPos, f32 zPos) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-        if (gActors[i].obj.status == 0) {
+        if (gActors[i].obj.status == OBJ_FREE) {
             func_8006EBC0(&gActors[i], xPos, yPos, zPos);
             break;
         }
@@ -1621,17 +1621,17 @@ void func_8006ECBC(PlayerShotId objId, PlayerShot* shot, s32 unk0E4, f32 xPos, f
 
     if (gLevelMode == LEVELMODE_ALL_RANGE) {
         if (unk0E4 + 100 < 104) {
-            Audio_PlaySfx(0x2900000D, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         } else {
-            Audio_PlaySfx(0x29002002, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     } else if ((unk0E4 < 60) && (gActors[unk0E4].obj.id == OBJ_ACTOR_200) && (gActors[unk0E4].iwork[12] > 0)) {
-        Audio_PlaySfx(0x2900000D, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     } else if (unk0E4 + 100 == 200) {
         shot->playerNum = 100;
-        Audio_PlaySfx(0x19030037, &shot->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x19030037, shot->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     } else {
-        Audio_PlaySfx(0x29002002, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -1661,7 +1661,7 @@ void func_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5,
 
 void func_8006F044(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_347;
 
     effect->obj.pos.x = xPos;
@@ -1678,7 +1678,7 @@ void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006F044(&gEffects[i], xPos, yPos, zPos, arg3);
             break;
         }
@@ -1687,7 +1687,7 @@ void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3) {
 
 void func_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_394;
 
     effect->obj.pos.x = xPos;
@@ -1707,7 +1707,7 @@ void func_8006F1EC(f32 xPos, f32 yPos, f32 zPos, f32 arg3) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8006F140(&gEffects[i], xPos, yPos, zPos, arg3);
             break;
         }
@@ -1831,7 +1831,7 @@ void func_8006F40C(Actor* actor) {
                 } else {
                     func_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 40.0f);
                 }
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 break;
 
             case 10:
@@ -1840,20 +1840,20 @@ void func_8006F40C(Actor* actor) {
                 } else {
                     func_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 15.0f);
                 }
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 break;
 
             case 11:
                 func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                               actor->vel.z, actor->scale * 3.0f, 15);
                 func_80066254(actor);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 func_8007A6F0(&actor->obj.pos, 0x2903B009);
                 break;
 
             case 12:
                 func_80066254(actor);
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
                 break;
 
             case 13:
@@ -1889,14 +1889,14 @@ void func_8006F40C(Actor* actor) {
             case 18:
                 for (var_v1 = 0, obj4C = gObjects4C; var_v1 < 40; var_v1++, obj4C++) {
 
-                    if ((obj4C->obj.status == 2) && (obj4C->obj.id == OBJ_4C_175)) {
+                    if ((obj4C->obj.status == OBJ_ACTIVE) && (obj4C->obj.id == OBJ_4C_175)) {
                         f32 sp64;
                         f32 sp60;
                         f32 sp5C;
                         f32 sp58;
                         f32 sp54;
 
-                        obj4C->obj.status = 0;
+                        obj4C->obj.status = OBJ_FREE;
                         sp64 = obj4C->obj.pos.x - actor->obj.pos.x;
                         sp60 = obj4C->obj.pos.y - actor->obj.pos.y;
                         sp5C = obj4C->obj.pos.z - actor->obj.pos.z;
@@ -1932,31 +1932,31 @@ void func_8006FE28(Actor* actor) {
         (fabsf(actor->obj.pos.y - gPlayer[0].pos.y) < 100.0f) &&
         (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 50.0f)) {
         func_80067A40();
-        func_8001A55C(&actor->sfxPos, 0x1900302B);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        func_8001A55C(actor->sfxPos, 0x1900302B);
+        Object_Kill(&actor->obj, actor->sfxPos);
     }
 }
 
 void func_8006FEEC(Actor* actor) {
     s32 i;
 
-    if ((actor->unk_0D0 != 0) && (actor->unk_0CE != 0)) {
+    if ((actor->unk_0D0 != 0) && (actor->health != 0)) {
         actor->unk_0D0 = 0;
-        actor->timer_0C6 = 0xF;
-        actor->unk_0CE = actor->unk_0CE - actor->unk_0D6;
+        actor->timer_0C6 = 15;
+        actor->health -= actor->damage;
 
-        if (actor->unk_0CE <= 0) {
+        if (actor->health <= 0) {
             for (i = 3; i < 11; i++) {
                 func_i3_801900FC(&actor->vwork[i], &actor->vwork[i + 11], (Rand_ZeroOne() - 0.5f) * 20.0f,
                                  Rand_ZeroOne() * -10.0f, Rand_ZeroOne() * 10.0f, 41, actor->scale, 200, i);
             }
             actor->unk_044 = 0;
             func_80066254(actor);
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
             func_8007A6F0(&actor->obj.pos, 0x29018036);
             func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f);
         } else {
-            Audio_PlaySfx(0x29033037, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     }
 }
@@ -2000,39 +2000,38 @@ void func_800701E0(Actor* actor) {
             actor->unk_0D0 = 0;
         }
 
-        if ((actor->unk_0D0 != 0) && (actor->unk_0B4 == 0x53) && (actor->timer_0C2 >= 2)) {
+        if ((actor->unk_0D0 != 0) && (actor->unk_0B4 == 83) && (actor->timer_0C2 >= 2)) {
             actor->unk_0D0 = 0;
         }
 
-        if ((actor->unk_0D0 != 0) &&
-            (((actor->unk_0B4 == 0x40) && (actor->unk_0D2 == 2)) || (actor->unk_0B4 != 0x40))) {
+        if ((actor->unk_0D0 != 0) && (((actor->unk_0B4 == 64) && (actor->unk_0D2 == 2)) || (actor->unk_0B4 != 64))) {
             if (actor->iwork[12] >= 4) {
-                actor->unk_0D6 = 0;
+                actor->damage = 0;
             }
 
             if ((actor->iwork[12] > 0) && (actor->iwork[12] < 4)) {
-                gTeamShields[actor->iwork[12]] -= actor->unk_0D6;
-            } else if ((actor->unk_0B4 == 0x53) && ((actor->unk_0D6 == 0x1E) || (actor->unk_0D6 == 0x1F))) {
-                actor->unk_0CE = 0;
+                gTeamShields[actor->iwork[12]] -= actor->damage;
+            } else if ((actor->unk_0B4 == 83) && ((actor->damage == 30) || (actor->damage == 31))) {
+                actor->health = 0;
             } else {
-                actor->unk_0CE -= actor->unk_0D6;
+                actor->health -= actor->damage;
             }
 
-            if (actor->unk_0CE <= 0) {
-                if (actor->unk_0B4 == 0x6A) {
+            if (actor->health <= 0) {
+                if (actor->unk_0B4 == 106) {
                     func_80077240(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3);
                     gHitCount += 4;
                     D_80177850 = 15;
                 }
 
-                if (actor->unk_0B4 != 0x53) {
+                if (actor->unk_0B4 != 83) {
                     if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) {
-                        Audio_PlaySfx(0x29018036, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29018036, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     } else {
-                        Audio_PlaySfx(0x2903700B, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
 
-                    actor->obj.status = 3;
+                    actor->obj.status = OBJ_DYING;
                     var_fv1 = 0.7f;
 
                     if (gLevelType == LEVELTYPE_SPACE) {
@@ -2041,7 +2040,7 @@ void func_800701E0(Actor* actor) {
 
                     if (((Rand_ZeroOne() < var_fv1) || (actor->iwork[12] != 0)) && (actor->info.unk_14 == 0) &&
                         (actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0xE) && (actor->unk_0B4 != 0x3D) &&
-                        ((s32) actor->unk_0D6 < 0x1F) && (actor->unk_0B4 != 0x3E) && (actor->unk_0B4 != 0x40) &&
+                        ((s32) actor->damage < 0x1F) && (actor->unk_0B4 != 0x3E) && (actor->unk_0B4 != 0x40) &&
                         (actor->unk_0B4 != 0x48) && (actor->unk_0B4 != 0x44)) {
                         func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 4.0f);
                         actor->unk_0D0 = 0;
@@ -2095,7 +2094,7 @@ void func_800701E0(Actor* actor) {
 
                             case 27:
                                 actor->obj.pos.y -= actor->vel.y;
-                                actor->obj.status = 2;
+                                actor->obj.status = OBJ_ACTIVE;
                                 func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
                                               actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f);
                                 actor->unk_0D0 = 0;
@@ -2117,18 +2116,18 @@ void func_800701E0(Actor* actor) {
                 }
 
                 if (actor->unk_0B4 == 0x52) {
-                    Audio_PlaySfx(0x11000055, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x11000055, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     actor->unk_0D0 = 1;
                     func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 0x3C);
                 }
             } else {
                 actor->timer_0C6 = 20;
                 if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) {
-                    Audio_PlaySfx(0x29033037, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                } else if (actor->unk_0CE < 20) {
-                    Audio_PlaySfx(0x2943500F, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                } else if (actor->health < 20) {
+                    Audio_PlaySfx(0x2943500F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 } else {
-                    Audio_PlaySfx(0x2903300E, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
 
                 if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0x3D) && (actor->unk_0B4 != 0x53)) {
@@ -2189,7 +2188,7 @@ void func_800701E0(Actor* actor) {
 
             if ((func_8006351C(actor->index, &actor->obj.pos, &sp3C, 0) != 0) ||
                 (actor->obj.pos.y < (gGroundLevel + 20.0f))) {
-                actor->obj.status = 3;
+                actor->obj.status = OBJ_DYING;
                 actor->obj.pos.z -= actor->vel.z;
                 actor->unk_0D0 = 1;
                 if (actor->unk_0B4 == 13) {
@@ -2212,15 +2211,15 @@ void func_80070BA8(Actor* actor) {
             actor->timer_0C6 = 10;
             func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y,
                           actor->vel.z, 0.2f, 10);
-            actor->unk_0CE -= actor->unk_0D6;
-            Audio_PlaySfx(0x29033064, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            if (actor->unk_0CE <= 0) {
+            actor->health -= actor->damage;
+            Audio_PlaySfx(0x29033064, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            if (actor->health <= 0) {
                 func_80077240(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->info.bonus);
                 gHitCount += actor->info.bonus + 1;
                 D_80177850 = 15;
             }
         } else {
-            Audio_PlaySfx(0x29121007, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     }
 }
@@ -2264,7 +2263,7 @@ void func_80070D44(Actor* actor) {
             break;
 
         case 1:
-            if ((gActors[actor->iwork[1]].obj.status != 2) || (gActors[actor->iwork[1]].unk_0CE <= 0) ||
+            if ((gActors[actor->iwork[1]].obj.status != OBJ_ACTIVE) || (gActors[actor->iwork[1]].health <= 0) ||
                 (actor->iwork[10] != gActors[actor->iwork[1]].unk_0E4)) {
                 func_80070CEC(actor);
             }
@@ -2517,15 +2516,15 @@ void func_80070D44(Actor* actor) {
             break;
 
         case 41:
-            if ((gActors[actor->iwork[9]].obj.status != 2) ||
-                ((gActors[actor->iwork[9]].scale < 0.0f) && (actor->unk_0CE <= 0))) {
+            if ((gActors[actor->iwork[9]].obj.status != OBJ_ACTIVE) ||
+                ((gActors[actor->iwork[9]].scale < 0.0f) && (actor->health <= 0))) {
                 func_80070CEC(actor);
             }
             break;
 
         case 42:
             for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-                if ((gActors[i].obj.status == 2) && (gActors[i].obj.id == OBJ_ACTOR_200) &&
+                if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_200) &&
                     (gActors[i].iwork[13] != 0) && (i != actor->index) && (actor->index == gActors[i].iwork[9])) {
                     return;
                 }
@@ -2535,7 +2534,7 @@ void func_80070D44(Actor* actor) {
 
         case 43:
             for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-                if ((gActors[i].obj.status == 2) && (gActors[i].obj.id == OBJ_ACTOR_200) &&
+                if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_200) &&
                     (gActors[i].iwork[13] != 0) && (i != actor->index) && (actor->index == gActors[i].iwork[9])) {
                     func_80070CEC(actor);
                     break;
@@ -2569,7 +2568,7 @@ void func_80070D44(Actor* actor) {
 
         case 46:
             for (i = 0, otherActor = gActors; i < ARRAY_COUNT(gActors); i++, otherActor++) {
-                if (((otherActor->obj.status == 3) || (otherActor->obj.status == 0)) &&
+                if (((otherActor->obj.status == OBJ_DYING) || (otherActor->obj.status == OBJ_FREE)) &&
                     (otherActor->iwork[15] == actor->iwork[15]) && (otherActor->iwork[16] != 0)) {
                     func_80070CEC(actor);
                 }
@@ -2782,7 +2781,7 @@ void func_80071DC0(Actor* actor) {
     }
 
     if (!(gGameFrameCount & 0xF)) {
-        Audio_PlaySfx(0x2903B009, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 
     actor->vel.y -= 0.1f;
@@ -2800,14 +2799,14 @@ void func_800720E8(Actor* actor) {
         case 0:
             if (actor->unk_0D0 != 0) {
                 if (actor->unk_0D0 == 2) {
-                    actor->unk_0D6 = 3;
+                    actor->damage = 3;
                 }
 
                 if ((actor->unk_0D4 > 100) && (gActors[actor->unk_0D4 - 101].unk_0B4 == 85)) {
-                    actor->unk_0D6 = 20;
+                    actor->damage = 20;
                 }
 
-                actor->unk_0CE -= actor->unk_0D6;
+                actor->health -= actor->damage;
                 actor->fwork[16] += 0.2f;
                 actor->timer_0BC = 5;
 
@@ -2815,12 +2814,12 @@ void func_800720E8(Actor* actor) {
                     actor->timer_0BE += 5;
                 }
 
-                if (actor->unk_0CE <= 0) {
+                if (actor->health <= 0) {
                     actor->unk_046 = 1;
                     actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032408);
-                    Audio_PlaySfx(0x1900000D, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x1900000D, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 } else {
-                    Audio_PlaySfx(0x2903300E, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2903300E, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 actor->unk_0D0 = 0;
             }
@@ -2847,7 +2846,7 @@ void func_800722EC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) {
     sp2C.z = 20.0f;
     Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp20);
     effect->vel.x = sp20.x;
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_365;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -2864,7 +2863,7 @@ void func_8007240C(f32 xPos, f32 yPos, f32 zPos, f32 yRot) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_800722EC(&gEffects[i], xPos, yPos, zPos, yRot);
             break;
         }
@@ -2929,7 +2928,7 @@ void func_80072594(Actor* actor) {
     spD4 = 0.0f;
 
     if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (D_8017828C != 0)) {
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         return;
     }
 
@@ -2942,7 +2941,7 @@ void func_80072594(Actor* actor) {
         }
     } else {
         if (((actor->unk_0B4 == 0x11) || (actor->unk_0B4 == 0x1E) || (actor->unk_0B4 == 0x1F)) &&
-            (actor->unk_0CE <= 0)) {
+            (actor->health <= 0)) {
             func_80071DC0(actor);
             return;
         }
@@ -2966,15 +2965,15 @@ void func_80072594(Actor* actor) {
             if (actor->unk_0D0 != 0) {
                 actor->unk_0D0 = 0;
                 actor->timer_0C6 = 20;
-                actor->unk_0CE -= actor->unk_0D6;
+                actor->health -= actor->damage;
 
-                Audio_PlaySfx(0x29034041, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29034041, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
-                if (actor->unk_0CE <= 0) {
+                if (actor->health <= 0) {
                     actor->timer_0C6 = 200;
-                    actor->obj.status = 3;
+                    actor->obj.status = OBJ_DYING;
                     func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
-                    actor->obj.status = 3;
+                    actor->obj.status = OBJ_DYING;
                     actor->timer_0BC = 20;
                     actor->obj.id = OBJ_ACTOR_194;
                 }
@@ -3226,7 +3225,7 @@ void func_80072594(Actor* actor) {
         }
 
         if (actor->iwork[13] != 0) {
-            if (gActors[actor->iwork[9]].obj.status != 2) {
+            if (gActors[actor->iwork[9]].obj.status != OBJ_ACTIVE) {
                 actor->iwork[13] = 0;
             } else {
                 Matrix_RotateY(gCalcMatrix, gActors[actor->iwork[9]].obj.rot.y * M_DTOR, 0);
@@ -3359,9 +3358,9 @@ void func_80072594(Actor* actor) {
                     (actor->unk_0B4 != 0x31) && (actor->unk_0B4 != 0x32)) {
                     actor->unk_0D0 = 0;
                     if (gCurrentLevel == LEVEL_METEO) {
-                        Audio_PlaySfx(0x2902107D, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2902107D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     } else {
-                        Audio_PlaySfx(0x29121007, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
 
@@ -3404,7 +3403,7 @@ void func_80072594(Actor* actor) {
                         spF0 = 350.0f;
                         if (!(gGameFrameCount & 3)) {
                             func_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y);
-                            Audio_PlaySfx(0x19800017, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x19800017, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         }
                     }
 
@@ -3504,7 +3503,7 @@ void func_80072594(Actor* actor) {
 
                                 if (effect != NULL) {
                                     effect->unk_78 = effect->unk_7A = 12;
-                                    effect->obj.status = 2;
+                                    effect->obj.status = OBJ_ACTIVE;
                                     effect->obj.pos.x = actor->obj.pos.x + sp90.x;
                                     effect->obj.pos.y = actor->obj.pos.y + sp90.y;
                                     effect->obj.pos.z = actor->obj.pos.z;
@@ -3539,7 +3538,7 @@ void func_80072594(Actor* actor) {
 
                         effect->unk_78 = effect->unk_7A = 0xB;
 
-                        effect->obj.status = 2;
+                        effect->obj.status = OBJ_ACTIVE;
 
                         effect->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 3.0f) + actor->obj.pos.x + sp90.x;
                         effect->obj.pos.y = ((Rand_ZeroOne() - 0.5f) * 3.0f) + actor->obj.pos.y + sp90.y;
@@ -3566,7 +3565,7 @@ void func_80072594(Actor* actor) {
                         effect = func_8007783C(OBJ_EFFECT_394);
                         if (effect != NULL) {
                             effect->unk_78 = effect->unk_7A = 0xB;
-                            effect->obj.status = 2;
+                            effect->obj.status = OBJ_ACTIVE;
                             effect->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 3.0f) + actor->obj.pos.x;
                             effect->obj.pos.y = ((Rand_ZeroOne() - 0.5f) * 5.0f) + actor->obj.pos.y + 50.0f;
                             effect->obj.pos.z = ((Rand_ZeroOne() - 0.5f) * 3.0f) + actor->obj.pos.z + 200.0f;
@@ -3613,7 +3612,7 @@ void func_80072594(Actor* actor) {
                 break;
 
             case 83:
-                if (actor->unk_0CE <= 0) {
+                if (actor->health <= 0) {
                     if (actor->unk_0B6 == 0x14) {
                         spD4 = actor->obj.pos.z;
                         spD8 = actor->obj.pos.y;
@@ -3701,7 +3700,7 @@ bool func_80074C44(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* dat
     s32 var_s1;
 
     if (limbIndex == 5) {
-        var_s1 = (s32) (actor->unk_0CE * 0.6375f);
+        var_s1 = (s32) (actor->health * 0.6375f);
         if (var_s1 > 255) {
             var_s1 = 255;
         }
@@ -3778,7 +3777,7 @@ void func_80074FF0(Actor* actor) {
         }
     }
 
-    if ((actor->obj.status == 3) && (actor->timer_0BE != 0)) {
+    if ((actor->obj.status == OBJ_DYING) && (actor->timer_0BE != 0)) {
         RCP_SetupDL_27();
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
     }
@@ -4100,7 +4099,7 @@ void func_800763A4(Actor* actor) {
 
     if (actor->unk_0B4 == 27) {
         actor->obj.pos.y -= actor->vel.y;
-        actor->obj.status = 2;
+        actor->obj.status = OBJ_ACTIVE;
         func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z,
                       actor->scale * 5.0f);
         actor->timer_0C2 = 10000;
@@ -4113,7 +4112,7 @@ void func_800763A4(Actor* actor) {
         actor->vel.y = 0.0f;
 
         if (actor->timer_0BE == 1) {
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
             func_80066254(actor);
 
             if (gLevelMode == LEVELMODE_ALL_RANGE) {

src/main/fox_game.c

@@ -383,9 +383,9 @@ void func_800A26C0(void) {
                 gCamCount = 1;
                 gLifeCount[0] = 2;
                 D_80177D20 = 0.0f;
-                D_8016170C = D_80177A80 = D_80177830 = D_80177838 = D_80177840 = D_80178754 = gVersusMode = D_80177AE0 =
-                    D_80178410 = D_80177B40 = D_80177854 = gOptionMenuStatus = gDrawMode = gShowBossHealth =
-                        D_80161A2C = gBgColor = D_80178340 = 0;
+                D_8016170C = gCsFrameCount = D_80177830 = D_80177838 = D_80177840 = D_80178754 = gVersusMode =
+                    D_80177AE0 = D_80178410 = D_80177B40 = D_80177854 = gOptionMenuStatus = gDrawMode =
+                        gShowBossHealth = D_80161A2C = gBgColor = D_80178340 = 0;
                 gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C =
                     D_80177CA4 = D_80161A5C = D_80161A34 = 0;
                 for (i = 0; i < 4; i++) {
@@ -545,9 +545,9 @@ Actor* func_800A3608(s32 arg0) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) {
-        if (actor->obj.status == 0) {
+        if (actor->obj.status == OBJ_FREE) {
             Actor_Initialize(actor);
-            actor->obj.status = 1;
+            actor->obj.status = OBJ_INIT;
             actor->obj.id = arg0;
             Object_SetInfo(&actor->info, actor->obj.id);
             break;

src/main/fox_hud.c

@@ -843,7 +843,7 @@ void func_80086DCC(void) {
         }
 
         if ((D_80177840 == 92) || (D_80177840 == 87) || (D_80177840 == 82) || (D_80177840 == 77)) {
-            Audio_PlaySfx(0x49008031U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49008031U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     } else {
         if (D_80177840 <= 100) {
@@ -870,9 +870,9 @@ void func_80086DCC(void) {
 
         if ((D_80177840 == 80) || (D_80177840 == 72) || (D_80177840 == 64) || (D_80177840 == 56)) {
             if (!boolTemp) {
-                Audio_PlaySfx(0x49008034U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49008034U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else {
-                Audio_PlaySfx(0x49008031U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49008031U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
     }
@@ -1129,7 +1129,7 @@ void func_80087B5C(void) {
                 if (((gTeamShields[1] > 0) && (gTeamShields[1] < 255)) &&
                     ((gTeamShields[2] > 0) && (gTeamShields[2] < 255)) &&
                     ((gTeamShields[3] > 0) && (gTeamShields[3] < 255))) {
-                    Audio_PlaySfx(0x41007012U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x41007012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 D_801617C0[0] = 2;
 
@@ -1142,7 +1142,7 @@ void func_80087B5C(void) {
                 }
 
                 if (D_801617C0[5] > 0) {
-                    Audio_PlaySfx(0x49004007U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                     if (D_801617C0[5] >= 100) {
                         D_801617C0[5] -= 100;
@@ -1200,7 +1200,7 @@ void func_80087B5C(void) {
                     D_801617C0[0]++;
                 } else {
                     if (!(gGameFrameCount & 1)) {
-                        Audio_PlaySfx(0x4900C024U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x4900C024U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         D_801617C0[3]++;
                     }
                 }
@@ -1474,7 +1474,7 @@ void func_80088970(void) {
                     D_80161838[0] = 0;
                     if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) {
                         D_80161810[1] ^= 1;
-                        Audio_PlaySfx(0x49000002U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49000002U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
 
@@ -1872,7 +1872,7 @@ void func_80089D28(void) {
     if ((gb == 10) || (gb == 0)) {
         // clang-format off
         //! FAKE: Probably a MACRO
-        if (1) {Audio_PlaySfx(0x4900001c, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
+        if (1) {Audio_PlaySfx(0x4900001c, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
         // clang-format on
     }
 
@@ -2029,7 +2029,7 @@ void func_8008A240(void) {
 
     if (gVersusMode == 1) {
         for (i = 0, item = gItems; i < 20; i++, item++) {
-            if (item->obj.status >= 2) {
+            if (item->obj.status >= OBJ_ACTIVE) {
                 gUnkEntities28[item->index + 50].unk_00 = 1;
                 gUnkEntities28[item->index + 50].unk_02 = 103;
                 gUnkEntities28[item->index + 50].pos.x = item->obj.pos.x;
@@ -2221,20 +2221,20 @@ s32 func_8008AC54(s32 arg0) {
     for (i = 0, actor = gActors; i < 60; i++, actor++) {
         switch (arg0) {
             case 0:
-                if ((actor->obj.status == 2) && (actor->obj.id == OBJ_ACTOR_190)) {
+                if ((actor->obj.status == OBJ_ACTIVE) && (actor->obj.id == OBJ_ACTOR_190)) {
                     ret++;
                 }
                 break;
 
             case 1:
-                if ((actor->obj.status == 2) && (actor->obj.id == OBJ_ACTOR_191)) {
+                if ((actor->obj.status == OBJ_ACTIVE) && (actor->obj.id == OBJ_ACTOR_191)) {
                     ret++;
                 }
                 break;
 
             case 2:
                 if (((actor->obj.id == OBJ_ACTOR_190) || (actor->obj.id == OBJ_ACTOR_191)) &&
-                    (actor->obj.status == 2)) {
+                    (actor->obj.status == OBJ_ACTIVE)) {
                     ret++;
                 }
                 break;
@@ -2304,7 +2304,7 @@ void func_8008B044(void) {
                 return;
             }
 
-            Audio_PlaySfx(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             if (D_800CFF90 != 0) {
                 func_8001AF40(1);
@@ -2317,7 +2317,7 @@ void func_8008B044(void) {
                 D_80161790++;
                 if (D_80161790 >= 7) {
                     if (D_80161794 & 1) {
-                        Audio_PlaySfx(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                     D_80161790 = 0;
                     D_80161794++;
@@ -2513,7 +2513,7 @@ s32 func_8008B774(void) {
         ((gLevelMode != LEVELMODE_ALL_RANGE) || (gCurrentLevel == LEVEL_CORNERIA) ||
          (gCurrentLevel == LEVEL_SECTOR_Y))) {
         for (i = 0; i < 60; i++) {
-            if ((gActors[i].obj.status == 2) && (gActors[i].iwork[12] == temp)) {
+            if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].iwork[12] == temp)) {
                 if ((gActors[i].unk_0B4 == 2) || (gActors[i].unk_0B4 == 43) ||
                     ((gActors[i].obj.id == 198) &&
                      ((gActors[i].unk_0E4 == 1) || (gActors[i].unk_0E4 == 2) || (gActors[i].unk_0E4 == 3)))) {
@@ -2544,7 +2544,7 @@ s32 func_8008B774(void) {
                 if (gActors[i].timer_0C6) {
                     ret = 1;
                 }
-                if ((ret == 1) && (gActors[i].unk_0CE <= 0)) {
+                if ((ret == 1) && (gActors[i].health <= 0)) {
                     ret = 2;
                 }
             }
@@ -3122,7 +3122,7 @@ void func_8008DE68(void) {
 
     if ((gShowBossHealth == 1) && (gTeamShields[2] > 0)) {
         if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) {
-            Audio_PlaySfx(0x4900C028, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900C028, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_801616BC = 255.0f;
         }
 
@@ -3471,7 +3471,7 @@ void func_8008EA14(f32 x, f32 y) {
             break;
     }
 
-    if (gPlayerShots[15].obj.status == 0) {
+    if (gPlayerShots[15].obj.status == OBJ_FREE) {
         D_80161770 = D_80161774 = D_80161778 = 255.0f;
         D_8016177C = D_80161780 = 255.0f;
         D_80161784 = 0.0f;
@@ -3766,8 +3766,8 @@ s32 func_80090200(Boss* boss) {
 
         switch (boss->swork[1]) {
             case 0:
-                Audio_PlaySfx(0x11000011U, &boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                Audio_PlaySfx(0x3140402EU, &boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x11000011U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x3140402EU, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 func_800182F4(0x103200FF);
                 func_800182F4(0x113200FF);
 
@@ -3896,7 +3896,7 @@ bool func_8009092C(Actor* actor) {
     boss = &gBosses[1];
 
     for (i = 1; i < 4; i++, boss++) {
-        if (boss->obj.status == 2) {
+        if (boss->obj.status == OBJ_ACTIVE) {
             var_s5 = true;
             if (actor->unk_0E6 == 0) {
                 actor->unk_0E6 = i;
@@ -3977,7 +3977,7 @@ bool func_80090A00(Actor* actor) {
             actor->fwork[4] = gPlayer[0].pos.x - 1000.0f;
             actor->iwork[2]++;
             if (actor->iwork[2] == actor->iwork[3]) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }
@@ -4017,7 +4017,7 @@ bool func_80090CCC(Actor* actor) {
         actor->fwork[10] = 30.0f;
     }
 
-    if (gBosses[actor->unk_0E6].obj.status == 0) {
+    if (gBosses[actor->unk_0E6].obj.status == OBJ_FREE) {
         actor->unk_0B8 = 1;
         actor->unk_0E6 = 0;
         actor->iwork[6] = 0;
@@ -4160,7 +4160,7 @@ bool func_80091368(Actor* actor) {
             }
 
             if (actor->obj.pos.y > 3000.0f) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }
@@ -4219,7 +4219,7 @@ bool func_800915FC(Actor* actor) {
         }
 
         for (i = 0, obj58 = &gObjects58[0]; i < 200; i++, obj58++) {
-            if (obj58->obj.status != 2) {
+            if (obj58->obj.status != OBJ_ACTIVE) {
                 continue;
             }
 
@@ -4360,7 +4360,7 @@ bool func_80091CF8(Actor* actor) {
     if (actor->iwork[1] != 0) {
         if (actor->fwork[10] < 0.1f) {
             actor->fwork[10] = 20.0f;
-            Audio_PlaySfx(0x09000002, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->fwork[29] = 5.0f;
         }
         actor->iwork[1] = 0;
@@ -4403,13 +4403,13 @@ bool func_80091F00(Actor* actor) {
         return false;
     }
 
-    actor->unk_0CE -= actor->unk_0D6;
-    if (actor->unk_0CE <= 0) {
-        actor->unk_0CE = -1;
+    actor->health -= actor->damage;
+    if (actor->health <= 0) {
+        actor->health = -1;
     }
     actor->timer_0C6 = 20;
 
-    Audio_PlaySfx(0x2903300E, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f);
     Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0);
 
@@ -4428,7 +4428,7 @@ bool func_80091F00(Actor* actor) {
     actor->fwork[14] = sp34.y;
     actor->fwork[12] = sp34.z;
 
-    gTeamShields[actor->unk_0E4] = actor->unk_0CE;
+    gTeamShields[actor->unk_0E4] = actor->health;
 
     if (gRadioState != 0) {
         return false;
@@ -4743,21 +4743,21 @@ void func_80092D48(Actor* actor) {
         actor->unk_0C9 = 1;
     }
 
-    Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
     if (((D_800D1970 & 3) == 2) && (gCurrentLevel == LEVEL_SECTOR_X)) {
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
     }
 
     if (gTeamShields[actor->unk_0E4] <= 0) {
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
     }
 }
 
 void func_80092EC0(Actor* actor) {
     f32 var_fv1;
 
-    actor->unk_0CE = gTeamShields[actor->unk_0E4];
+    actor->health = gTeamShields[actor->unk_0E4];
 
     switch (actor->unk_048) {
         case 0:
@@ -4841,7 +4841,7 @@ void func_80093164(Actor* actor) {
         switch (actor->unk_0B6) {
             case 1:
                 if ((player->state_1C8 != PLAYERSTATE_1C8_2) || (actor->unk_0B6 != 1)) {
-                    if (D_80177A80 > 1588) {
+                    if (gCsFrameCount > 1588) {
                         actor->fwork[0] = 5.0f;
                     } else {
                         actor->fwork[0] = 15.0f;
@@ -4881,7 +4881,7 @@ void func_80093310(void) {
     Actor* this = &gActors[0];
 
     Actor_Initialize(this);
-    this->obj.status = 1;
+    this->obj.status = OBJ_INIT;
     this->obj.pos.x = 0.0f;
     this->obj.pos.y += 1700.0f;
     this->obj.pos.z -= 5000.0f;
@@ -4889,7 +4889,7 @@ void func_80093310(void) {
     if (1) {}
     this->obj.id = OBJ_ACTOR_195;
     Object_SetInfo(&this->info, this->obj.id);
-    Audio_PlaySfx(0x11030010, &this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11030010, this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
@@ -4898,9 +4898,9 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
     Player* player = gPlayer;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (effect->obj.status == 0) {
+        if (effect->obj.status == OBJ_FREE) {
             Effect_Initialize(effect);
-            effect->obj.status = 1;
+            effect->obj.status = OBJ_INIT;
             effect->obj.id = OBJ_EFFECT_363;
             effect->obj.pos.x = x;
             effect->obj.pos.y = y;
@@ -4984,7 +4984,7 @@ void func_800935E8(Player* player) {
 
         case 0:
             func_80093310();
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             D_80177AB0 = 1;
             D_80177AC8 = 1;
             player->unk_234 = 0;
@@ -5018,7 +5018,7 @@ void func_800935E8(Player* player) {
             D_80177A48[7] = 0.0f;
 
         case 1:
-            if ((player->unk_208 == 0) && (D_80177A80 < 250)) {
+            if ((player->unk_208 == 0) && (gCsFrameCount < 250)) {
                 i = Rand_ZeroOne() * 64.0f;
                 if (i < 32) {
                     for (j = 0; j < 4; j++) {
@@ -5109,7 +5109,7 @@ void func_800935E8(Player* player) {
                 D_801779C0 = src.z;
             }
 
-            if (D_80177A80 >= 50) {
+            if (gCsFrameCount >= 50) {
                 // clang-format off
 	        if (D_80178340 == 255) { player->unk_1D0 = 2; }
                 // clang-format on
@@ -5193,7 +5193,7 @@ void func_800935E8(Player* player) {
             }
 
             if (player->timer_1F8 == 774) {
-                Audio_PlaySfx(0x01038026U, &player->unk_460, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x01038026U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_80177A10[9] = 40;
             }
 
@@ -5292,7 +5292,7 @@ void func_800935E8(Player* player) {
             D_80177AC8 = 0;
             D_80178358 = 0;
 
-            Object_Kill(&actor->obj, &actor->sfxPos);
+            Object_Kill(&actor->obj, actor->sfxPos);
 
             player->camEye.z = D_80177988 = 800.0f;
             player->camAt.z = D_801779C0 = 0.0f;
@@ -5378,7 +5378,6 @@ f32 D_800D24C0[] = { 128.0f, 128.0f, 255.0f, 128.0f };
 s32 D_800D24C8[] = { 0, 900 };
 f32 D_800D24CC = 0.02f;
 
-// 60, 200, 0,
 void func_80094954(Effect* effect) {
     Player* player = &gPlayer[0];
 
@@ -5402,7 +5401,7 @@ void func_80094954(Effect* effect) {
         }
 
         if ((effect->unk_4E == 1) && (effect->unk_4A <= 0)) {
-            Object_Kill(&effect->obj, &effect->sfxPos);
+            Object_Kill(&effect->obj, effect->sfxPos);
         }
 
         effect->vel.y += effect->scale1;
@@ -5412,29 +5411,28 @@ void func_80094954(Effect* effect) {
             effect->scale1 = -1.0f;
         }
         effect->obj.rot.z += effect->unk_48;
-        return;
-    }
-
-    if (player->state_1C8 == PLAYERSTATE_1C8_7) {
-        effect->obj.rot.x = player->unk_05C * 180.0f / M_PI;
-        effect->obj.rot.y = -player->unk_058 * 180.0f / M_PI;
-    }
-
-    if (player->state_1C8 == PLAYERSTATE_1C8_6) {
-        effect->unk_46 = 2;
-        if (player->unk_1D0 >= 4) {
-            effect->vel.y -= 0.13f;
+    } else {
+        if (player->state_1C8 == PLAYERSTATE_1C8_7) {
+            effect->obj.rot.x = RAD_TO_DEG(player->unk_05C);
+            effect->obj.rot.y = RAD_TO_DEG(-player->unk_058);
         }
-    }
 
-    effect->scale2 += 0.8f;
-    effect->unk_4A -= effect->unk_46;
+        if (player->state_1C8 == PLAYERSTATE_1C8_6) {
+            effect->unk_46 = 2;
+            if (player->unk_1D0 >= 4) {
+                effect->vel.y -= 0.13f;
+            }
+        }
 
-    if ((effect->unk_4A < 0) ||
-        ((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 == 5))) {
-        Object_Kill(&effect->obj, &effect->sfxPos);
+        effect->scale2 += 0.8f;
+        effect->unk_4A -= effect->unk_46;
+
+        if ((effect->unk_4A < 0) ||
+            ((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 == 5))) {
+            Object_Kill(&effect->obj, effect->sfxPos);
+        }
+        effect->obj.rot.z += effect->unk_48;
     }
-    effect->obj.rot.z += effect->unk_48;
 }
 
 void func_80094BBC(Effect* effect) {
@@ -5592,7 +5590,7 @@ void func_80094D20(f32 x, f32 y) {
 
 void func_80095350(Actor* actor) {
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->unk_0B6 = 9999;
     Object_SetInfo(&actor->info, actor->obj.id);
@@ -5607,7 +5605,7 @@ void func_800953A0(Actor* actor, s32 arg1) {
     };
 
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos = D_800D2510[arg1];
     actor->obj.pos.z -= D_80177D20;
@@ -5622,7 +5620,7 @@ void func_8009546C(Actor* actor, s32 arg1) {
     };
 
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos = D_800D2540[arg1];
     actor->obj.pos.z -= D_80177D20;
@@ -5637,7 +5635,7 @@ void func_80095538(Actor* actor, s32 arg1) {
     };
 
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos = D_800D257C[arg1];
     actor->obj.pos.z -= D_80177D20;
@@ -5663,7 +5661,7 @@ void func_80095604(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_280 = 0;
             player->unk_1D0 = 1;
 
@@ -5680,16 +5678,16 @@ void func_80095604(Player* player) {
             D_80177A48[0] = 0.0f;
 
         case 1:
-            if (D_80177A80 > 240) {
+            if (gCsFrameCount > 240) {
                 D_80178348 = D_80178350 = D_80178354 = 255;
                 D_80178358 = 255;
                 D_8017835C = 16;
-                if (D_80177A80 == 280) {
+                if (gCsFrameCount == 280) {
                     player->unk_1D0 = 10;
                 }
             }
 
-            if ((D_80177A80 >= 30) && (D_80177A80 < 90)) {
+            if ((gCsFrameCount >= 30) && (gCsFrameCount < 90)) {
                 D_80177A48[5] -= 0.6f;
                 if ((D_80177A48[5]) < 0.0f) {
                     D_80177A48[5] += 360.0f;
@@ -5706,12 +5704,12 @@ void func_80095604(Player* player) {
                 Matrix_MultVec3f(gCalcMatrix, &src, &dest);
             }
 
-            if (D_80177A80 < 30) {
+            if (gCsFrameCount < 30) {
                 dest.x = gBosses[0].obj.pos.x;
                 dest.y = player->pos.y;
                 dest.z = gBosses[0].obj.pos.z + 1000.0f;
             }
-            if (D_80177A80 >= 90) {
+            if (gCsFrameCount >= 90) {
                 dest.x = player->camEye.x;
                 dest.y = player->camEye.y;
                 dest.z = player->camEye.z + 200.0f - D_80177D20;
@@ -5762,7 +5760,7 @@ void func_80095604(Player* player) {
             player->camEye.y = D_80177980;
             player->camEye.z = D_80177988;
 
-            if (D_80177A80 < 200) {
+            if (gCsFrameCount < 200) {
                 Math_SmoothStepToF(&D_801779A0, gBosses[0].obj.pos.x, 0.03f, 100.0f, 0.001f);
                 Math_SmoothStepToF(&D_801779B8, gBosses[0].obj.pos.y, 0.03f, 100.0f, 0.001f);
                 Math_SmoothStepToF(&D_801779C0, gBosses[0].obj.pos.z + 600.0f + D_80177D20, 0.03f, 100.0f, 0.001f);
@@ -5770,7 +5768,7 @@ void func_80095604(Player* player) {
                 Math_SmoothStepToF(&D_801779A0, player->pos.x, D_80177A48[6], 1000.0f, 0.001f);
                 Math_SmoothStepToF(&D_801779B8, player->pos.y, D_80177A48[6], 1000.0f, 0.001f);
                 Math_SmoothStepToF(&D_801779C0, player->pos.z + D_80177D20, D_80177A48[6], 1000.0f, 0.001f);
-                if (D_80177A80 > 180) {
+                if (gCsFrameCount > 180) {
                     D_80177A48[6] += 0.005f;
                 } else {
                     D_80177A48[6] += 0.005f;
@@ -5869,17 +5867,17 @@ void func_80095604(Player* player) {
             }
 
         case 12:
-            if ((D_80177A80 >= 380) && (D_80177A80 < 640 + 280)) {
+            if ((gCsFrameCount >= 380) && (gCsFrameCount < 640 + 280)) {
                 Math_SmoothStepToF(&actor->fwork[2], 0.0f, 0.02f, 1000.0f, 0.001f);
                 Math_SmoothStepToF(&actor->fwork[3], 300.0f, 0.02f, 1000.0f, 0.001f);
             }
-            if (D_80177A80 >= 920) {
+            if (gCsFrameCount >= 920) {
                 Math_SmoothStepToF(&actor->fwork[3], 200.0f, 0.02f, 1000.0f, 0.001f);
             }
-            if (D_80177A80 >= 1120) {
+            if (gCsFrameCount >= 1120) {
                 Math_SmoothStepToF(&actor->fwork[7], 0.1f, 0.05f, 1000.0f, 0.001f);
             }
-            if (D_80177A80 >= 1200) {
+            if (gCsFrameCount >= 1200) {
                 Math_SmoothStepToF(&actor->fwork[3], 800.0f, 0.02f, 1000.0f, 0.001f);
                 Math_SmoothStepToF(&player->unk_0D0, 5.0f, 0.1f, 1000.0f, 0.001f);
             } else {
@@ -5888,7 +5886,7 @@ void func_80095604(Player* player) {
                 actor->fwork[6] = player->unk_138 + D_80177D20;
             }
 
-            if (D_80177A80 < 1200) {
+            if (gCsFrameCount < 1200) {
                 D_801779A0 = player->pos.x;
                 D_801779B8 = player->pos.y;
                 D_801779C0 = player->pos.z - 50.0f + D_80177D20;
@@ -5919,7 +5917,7 @@ void func_80095604(Player* player) {
             D_80177980 = dest.y;
             D_80177988 = dest.z;
 
-            if (D_80177A80 >= 1360) {
+            if (gCsFrameCount >= 1360) {
                 D_80178348 = D_80178350 = D_80178354 = 0;
                 D_80178358 = 255;
                 D_8017835C = 16;
@@ -5933,7 +5931,7 @@ void func_80095604(Player* player) {
                 }
             }
 
-            if (D_80177A80 == 1310) {
+            if (gCsFrameCount == 1310) {
                 func_800182F4(0x105000FF);
                 func_800182F4(0x115000FF);
             }
@@ -5943,7 +5941,7 @@ void func_80095604(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 300:
             func_800BA808(gMsg_ID_15200, RCID_FOX);
             break;
@@ -6057,7 +6055,7 @@ void func_80096A74(Player* player) {
             D_80177A48[1] = 100.0f;
             D_80177A48[2] = 0.0f;
             D_80177A48[0] = 0.2f;
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_1D0 = 1;
             D_80178340 = D_80178358 = 255;
 
@@ -6074,18 +6072,18 @@ void func_80096A74(Player* player) {
             D_80177A48[4] = 0.0f;
 
         case 1:
-            if (D_80177A80 < 30) {
+            if (gCsFrameCount < 30) {
                 break;
             }
 
-            if ((D_80177A80 >= 40) && (D_80178340 != 0)) {
+            if ((gCsFrameCount >= 40) && (D_80178340 != 0)) {
                 D_80178358 = 0;
                 D_8017835C = 8;
             }
 
-            if (D_80177A80 < 140) {
+            if (gCsFrameCount < 140) {
                 Math_SmoothStepToF(&D_80177A48[1], 800.0f, 0.2f, 10.0f, 0.0f);
-                if (D_80177A80 > 60) {
+                if (gCsFrameCount > 60) {
                     Math_SmoothStepToF(&D_80177A48[4], 3.0f, 0.05f, 1000.0f, 0.001f);
                 }
                 player->unk_034 += D_80177A48[4];
@@ -6097,7 +6095,7 @@ void func_80096A74(Player* player) {
                 }
             }
 
-            if (D_80177A80 >= 140) {
+            if (gCsFrameCount >= 140) {
                 Math_SmoothStepToAngle(&player->unk_034, 0.0f, 0.05f, 3.0f, 0.001f);
                 Math_SmoothStepToF(&D_80177A48[1], 200.0f, 0.2f, 6.0f, 0.0f);
                 Math_SmoothStepToF(&D_80177A48[2], 200.0f, 0.2f, 6.0f, 0.0f);
@@ -6112,11 +6110,11 @@ void func_80096A74(Player* player) {
             D_801779B8 = player->pos.y;
             D_801779C0 = player->pos.z;
 
-            if (D_80177A80 == 270) {
+            if (gCsFrameCount == 270) {
                 player->unk_190 = player->unk_194 = 10.0f;
                 player->unk_1D0 = 2;
                 D_80177A48[1] = 400.0f;
-                Audio_PlaySfx(0x09004002U, &player->unk_460, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09004002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
 
@@ -6146,7 +6144,7 @@ void func_80096A74(Player* player) {
             D_801779B8 = (player->pos.y * player->unk_148 + 20.0f);
             D_801779C0 = player->pos.z;
 
-            if (D_80177A80 == 300) {
+            if (gCsFrameCount == 300) {
                 D_80177CE8 = 0;
                 D_80177838 = 50;
                 player->state_1C8 = PLAYERSTATE_1C8_3;
@@ -6161,10 +6159,10 @@ void func_80096A74(Player* player) {
             break;
     }
 
-    if (D_80177A80 >= 30) {
+    if (gCsFrameCount >= 30) {
         Math_SmoothStepToF(&player->unk_0D0, 30.0f, 0.05f, 1000.0f, 0.001f);
 
-        if (D_80177A80 < 110) {
+        if (gCsFrameCount < 110) {
             player->unk_0EC += (D_80177A48[4] * 2.0f);
             if (player->unk_0EC >= 360.0f) {
                 player->unk_0EC -= 360.0f;

src/main/fox_play.c

@@ -166,7 +166,8 @@ void func_800A3FEC(void) {
 }
 
 void func_800A4460(Player* player) {
-    if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == 2) && (gBosses[0].actionState == 17)) {
+    if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == OBJ_ACTIVE) &&
+        (gBosses[0].actionState == 17)) {
         player->unk_060 = __sinf(player->unk_0F4 * 0.7f * M_DTOR) * 0.5f;
         player->unk_088 += 13.0f;
         player->unk_0F4 += 20.0f;
@@ -277,11 +278,11 @@ void func_800A4C40(Player* player) {
         if ((sp30.y < gGroundLevel + 80.0f) || (sp3C.y < gGroundLevel + 80.0f)) {
             if (D_80161A64 == 0) {
                 D_80161A64 = 1;
-                Audio_PlaySfx(0x1100000B, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x1100000B, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         } else {
             D_80161A64 = 0;
-            func_8001A55C(&player->unk_460, 0x1100000B);
+            func_8001A55C(player->sfxPos, 0x1100000B);
         }
     }
 }
@@ -325,7 +326,7 @@ void func_800A4F7C(void) {
         }
         if (D_80178310[j].id == OBJ_80_147) {
             func_800A4F4C(&gObjects58[i]);
-            gObjects58[i].obj.status = 2;
+            gObjects58[i].obj.status = OBJ_ACTIVE;
             gObjects58[i].obj.id = D_80178310[j].id;
             gObjects58[i].obj.pos.x = D_80178310[j].xPos;
             gObjects58[i].obj.pos.z = D_80178310[j].zPos1;
@@ -340,7 +341,7 @@ void func_800A4F7C(void) {
         }
         if (D_80178310[j].id != OBJ_80_147) {
             func_800A4F4C(&gObjects58[i]);
-            gObjects58[i].obj.status = 2;
+            gObjects58[i].obj.status = OBJ_ACTIVE;
             gObjects58[i].obj.id = D_80178310[j].id;
             gObjects58[i].obj.pos.x = D_80178310[j].xPos;
             gObjects58[i].obj.pos.z = D_80178310[j].zPos1;
@@ -369,7 +370,7 @@ void func_800A5338(void) {
         }
         if (D_80178310[j].id < OBJ_4C_161) {
             func_800A4F4C(obj58);
-            obj58->obj.status = 2;
+            obj58->obj.status = OBJ_ACTIVE;
             obj58->obj.id = D_80178310[j].id;
             obj58->obj.pos.x = D_80178310[j].xPos;
             obj58->obj.pos.z = D_80178310[j].zPos1;
@@ -389,7 +390,7 @@ void func_800A5338(void) {
         }
         if (D_80178310[j].id == OBJ_4C_162) {
             Object_4C_Initialize(obj4C);
-            obj4C->obj.status = 1;
+            obj4C->obj.status = OBJ_INIT;
             obj4C->obj.id = D_80178310[j].id;
             obj4C->obj.pos.x = D_80178310[j].xPos;
             obj4C->obj.pos.z = D_80178310[j].zPos1;
@@ -400,7 +401,7 @@ void func_800A5338(void) {
     }
     i = 0; // fake?
     Boss_Initialize(&gBosses[i]);
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.pos.x = 0.0f;
     gBosses[i].obj.pos.y = 0.0f;
     gBosses[i].obj.pos.z = 0.0f;
@@ -421,7 +422,7 @@ void func_800A55B0(void) {
         }
         if (D_80178310[j].id < OBJ_4C_161) {
             func_800A4F4C(obj58);
-            obj58->obj.status = 2;
+            obj58->obj.status = OBJ_ACTIVE;
             obj58->obj.id = D_80178310[j].id;
             obj58->obj.pos.x = D_80178310[j].xPos;
             obj58->obj.pos.z = D_80178310[j].zPos1;
@@ -433,7 +434,7 @@ void func_800A55B0(void) {
     }
     i = 0; // fake?
     Boss_Initialize(&gBosses[i]);
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.pos.x = 0.0f;
     gBosses[i].obj.pos.y = 0.0f;
     gBosses[i].obj.pos.z = 0.0f;
@@ -441,7 +442,7 @@ void func_800A55B0(void) {
     Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id);
     i = 1;
     Boss_Initialize(&gBosses[i]);
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.pos.x = 0.0f;
     gBosses[i].obj.pos.y = 0.0f;
     gBosses[i].obj.pos.z = 0.0f;
@@ -449,7 +450,7 @@ void func_800A55B0(void) {
     Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id);
     i = 2;
     Boss_Initialize(&gBosses[i]);
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.pos.x = 0.0f;
     gBosses[i].obj.pos.y = 0.0f;
     gBosses[i].obj.pos.z = 0.0f;
@@ -461,7 +462,7 @@ void func_800A57E0(void) {
     s32 i = 0; // fake?
 
     Boss_Initialize(&gBosses[i]);
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.pos.x = 0.0f;
     gBosses[i].obj.pos.y = 0.0f;
     gBosses[i].obj.pos.z = 0.0f;
@@ -479,7 +480,7 @@ void func_800A5844(void) {
     gOverlayStage = 0;
     D_8015F924 = D_80177CA0 = 0;
     D_80177CB0 = 0.0f;
-    gSavedHitCount = D_80177A80 = D_80177838 = D_80177840 = gRadioState = 0;
+    gSavedHitCount = gCsFrameCount = D_80177838 = D_80177840 = gRadioState = 0;
     D_8017782C = 1;
     if (((gCurrentLevel == LEVEL_VENOM_2) && (D_80161A2E == 2)) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
         return;
@@ -514,8 +515,8 @@ void func_800A594C(void) {
     if (D_8017782C == 0) {
         if (gCurrentLevel == LEVEL_SOLAR) {
             func_8001D1C8(0xFF, 1);
-            Audio_PlaySfx(0x4100C023, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            func_8001A55C(&gPlayer[0].unk_460, 0x3140807E);
+            Audio_PlaySfx(0x4100C023, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_8001A55C(gPlayer[0].sfxPos, 0x3140807E);
         }
     } else if (gCurrentLevel == LEVEL_AQUAS) {
         sEnvSettings = SEGMENTED_TO_VIRTUAL(D_602E584);
@@ -587,20 +588,20 @@ void func_800A5EBC(void) {
     }
 }
 
-void func_800A5FA0(Vec3f* arg0, u32 arg1, s32 arg2) {
+void func_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) {
     if (!gVersusMode) {
-        Audio_PlaySfx(arg1, arg0, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(sfxId, sfxSrc, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     } else {
-        Audio_PlaySfx(arg1, arg0, arg2, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(sfxId, sfxSrc, mode, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
-void func_800A6028(Vec3f* arg0, u32 arg1) {
-    Audio_PlaySfx(arg1, arg0, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+void func_800A6028(f32* sfxSrc, u32 sfxId) {
+    Audio_PlaySfx(sfxId, sfxSrc, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
-void func_800A6070(Vec3f* arg0, u32 arg1) {
-    Audio_PlaySfx(arg1, arg0, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+void func_800A6070(f32* sfxSrc, u32 sfxId) {
+    Audio_PlaySfx(sfxId, sfxSrc, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_800A60B8(UnkEntity1C* unkEnt1C) {
@@ -644,34 +645,34 @@ void func_800A6148(void) {
         func_800A60E8(&gUnkEntities30[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gObjects80); i++) {
-        Object_Kill(&gObjects80[i].obj, &gObjects80[i].sfxPos);
+        Object_Kill(&gObjects80[i].obj, gObjects80[i].sfxPos);
         Object_80_Initialize(&gObjects80[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gObjects4C); i++) {
         Object_4C_Initialize(&gObjects4C[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-        Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+        Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
         Actor_Initialize(&gActors[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gBosses); i++) {
-        Object_Kill(&gBosses[i].obj, &gBosses[i].sfxPos);
+        Object_Kill(&gBosses[i].obj, gBosses[i].sfxPos);
         Boss_Initialize(&gBosses[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        Object_Kill(&gEffects[i].obj, &gEffects[i].sfxPos);
+        Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos);
         Effect_Initialize(&gEffects[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gItems); i++) {
-        Object_Kill(&gItems[i].obj, &gItems[i].sfxPos);
+        Object_Kill(&gItems[i].obj, gItems[i].sfxPos);
         Item_Initialize(&gItems[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) {
-        Object_Kill(&gPlayerShots[i].obj, &gPlayerShots[i].sfxPos);
+        Object_Kill(&gPlayerShots[i].obj, gPlayerShots[i].sfxPos);
         PlayerShot_Initialize(&gPlayerShots[i]);
     }
-    D_801782B8 = D_801782BC = D_801782C0 = D_801782D0 = D_80178284 = D_8017828C = D_8017812C = D_80177E70 = D_80177E78 =
-        D_80177E80 = 0;
+    D_801782B8 = D_801782BC = D_801782C0 = D_801782D0 = gBossActive = D_8017828C = D_8017812C = D_80177E70 =
+        D_80177E78 = D_80177E80 = 0;
     D_80177F10.x = D_80177F10.y = D_80177F10.z = D_80177E88.x = D_80177E88.y = D_80177E88.z = 0.0f;
     for (i = 0; i < ARRAY_COUNT(D_80177E98); i++) {
         D_80177E98[i].x = D_80177E98[i].y = D_80177E98[i].z = 100.0f;
@@ -731,7 +732,7 @@ void func_800A668C(f32 xPos, f32 yPos, f32 zPos) {
 
 void func_800A670C(Actor* actor, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_189;
     actor->unk_0B8 = arg1;
     actor->obj.pos.x = arg2;
@@ -778,7 +779,7 @@ void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
 
     if (!gVersusMode) {
         for (i = ARRAY_COUNT(gActors) - 1; i >= 10; i--) {
-            if (gActors[i].obj.status == 0) {
+            if (gActors[i].obj.status == OBJ_FREE) {
                 func_800A670C(&gActors[i], arg0, arg1, arg2, arg3);
                 break;
             }
@@ -802,7 +803,7 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) {
                     player->wings.rightState = WINGSTATE_BROKEN;
                     func_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
                     D_80177D70[player->num] = 50;
-                    func_800A5FA0(&player->unk_460, 0x0900A02C, player->num);
+                    func_800A5FA0(player->sfxPos, 0x0900A02C, player->num);
                     if (D_8015F90C == 0) {
                         D_8015F90C = 1000;
                     }
@@ -817,7 +818,7 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) {
                     player->wings.leftState = WINGSTATE_BROKEN;
                     func_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f);
                     D_80177D88[player->num] = 50;
-                    func_800A5FA0(&player->unk_460, 0x0900A02C, player->num);
+                    func_800A5FA0(player->sfxPos, 0x0900A02C, player->num);
                     if (D_8015F90C == 0) {
                         D_8015F90C = 1000;
                     }
@@ -850,7 +851,7 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) {
     if (player->unk_1A4 > 40) {
         sp34 = (player->unk_110 * 0.3f) + 20.0f;
         player->timer_498 = 5;
-    } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_80178284 == 0)) {
+    } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBossActive == 0)) {
         player->timer_498 = 3;
     } else if ((gCurrentLevel == LEVEL_VENOM_1) || (gCurrentLevel == LEVEL_AQUAS)) {
         player->timer_498 = 5;
@@ -858,22 +859,22 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) {
         player->timer_498 = 20;
     }
     if (D_80177AD0[player->num] != 0) {
-        func_800A5FA0(&player->unk_460, 0x0903900E, player->num);
+        func_800A5FA0(player->sfxPos, 0x0903900E, player->num);
         D_80177AE8[player->num] = 5;
         D_80177AB8[player->num] = 2.0f;
         player->damage = 0;
     } else {
         if (player->shields != 0) {
             if (player->shields < 50) {
-                Audio_PlaySfx(0x49008011, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49008011, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else if (player->shields < 100) {
-                Audio_PlaySfx(0x49008010, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49008010, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
         if (damage < 25) {
-            func_800A5FA0(&player->unk_460, 0x0903900E, player->num);
+            func_800A5FA0(player->sfxPos, 0x0903900E, player->num);
         } else {
-            func_800A5FA0(&player->unk_460, 0x0903A00F, player->num);
+            func_800A5FA0(player->sfxPos, 0x0903A00F, player->num);
         }
     }
     Matrix_RotateY(gCalcMatrix, player->unk_114 * M_DTOR, 0);
@@ -1457,7 +1458,7 @@ void func_800A86E4(Player* player) {
     s32 sp6C;
 
     for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) {
-        if ((item->obj.status == 2) &&
+        if ((item->obj.status == OBJ_ACTIVE) &&
             ((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5)) &&
             (item->timer_4A == 0) &&
             func_800A7974(player, item->info.hitbox, &sp6C, item->obj.pos.x, item->obj.pos.y, item->obj.pos.z, 0.0f,
@@ -1619,7 +1620,7 @@ void func_800A8BA4(Player* player) {
                 sp8C = 4000.0f;
             }
             for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) {
-                if (obj58->obj.status == 2) {
+                if (obj58->obj.status == OBJ_ACTIVE) {
                     spC8.x = obj58->obj.pos.x - player->pos.x;
                     spC8.z = obj58->obj.pos.z - player->unk_138;
                     if (sqrtf(SQ(spC8.x) + SQ(spC8.z)) < sp8C) {
@@ -1714,11 +1715,11 @@ void func_800A8BA4(Player* player) {
             }
         } else {
             for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-                if ((obj80->obj.status == 2) && (obj80->obj.id != OBJ_80_58) && (obj80->obj.id != OBJ_80_105) &&
-                    (obj80->obj.id != OBJ_80_59) && (obj80->obj.id != OBJ_80_60) && (obj80->obj.id != OBJ_80_61) &&
-                    (obj80->obj.id != OBJ_80_66) && (obj80->obj.id != OBJ_80_67) && (obj80->obj.id != OBJ_80_70) &&
-                    (obj80->obj.id != OBJ_80_72) && (obj80->obj.id != OBJ_80_71) && (obj80->obj.id != OBJ_80_73) &&
-                    (obj80->obj.id != OBJ_80_74) && (obj80->obj.id != OBJ_80_69) &&
+                if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id != OBJ_80_58) &&
+                    (obj80->obj.id != OBJ_80_105) && (obj80->obj.id != OBJ_80_59) && (obj80->obj.id != OBJ_80_60) &&
+                    (obj80->obj.id != OBJ_80_61) && (obj80->obj.id != OBJ_80_66) && (obj80->obj.id != OBJ_80_67) &&
+                    (obj80->obj.id != OBJ_80_70) && (obj80->obj.id != OBJ_80_72) && (obj80->obj.id != OBJ_80_71) &&
+                    (obj80->obj.id != OBJ_80_73) && (obj80->obj.id != OBJ_80_74) && (obj80->obj.id != OBJ_80_69) &&
                     ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) {
                     if ((obj80->obj.id == OBJ_80_1) || (obj80->obj.id == OBJ_80_4) || (obj80->obj.id == OBJ_80_5) ||
                         (obj80->obj.id == OBJ_80_47) || (obj80->obj.id == OBJ_80_117) ||
@@ -1752,7 +1753,7 @@ void func_800A8BA4(Player* player) {
                                     player->unk_23C = 80;
                                 }
                                 if (player->unk_22C == 0) {
-                                    Audio_PlaySfx(0x19000001, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                    Audio_PlaySfx(0x19000001, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 }
                                 player->unk_22C += 2;
                                 if (player->unk_22C >= 4) {
@@ -1760,7 +1761,7 @@ void func_800A8BA4(Player* player) {
                                 }
                             } else if (obj80->obj.id == OBJ_80_54) {
                                 if (player->unk_22C == 0) {
-                                    Audio_PlaySfx(0x19832019, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                    Audio_PlaySfx(0x19832019, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 }
                                 player->unk_22C += 2;
                                 if (player->unk_22C >= 4) {
@@ -1810,7 +1811,7 @@ void func_800A8BA4(Player* player) {
             }
         }
         for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-            if (boss->obj.status == 2) {
+            if (boss->obj.status == OBJ_ACTIVE) {
                 if ((boss->obj.id == OBJ_BOSS_312) || (boss->obj.id == OBJ_BOSS_308) ||
                     (boss->obj.id == OBJ_BOSS_313) || (boss->obj.id == OBJ_BOSS_309)) {
                     temp_v0 = func_800A8304(player, boss->obj.id, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z,
@@ -1857,7 +1858,7 @@ void func_800A8BA4(Player* player) {
                     if (temp_v0 != 0) {
                         if (temp_v0 < 0) {
                             if (player->unk_22C == 0) {
-                                Audio_PlaySfx(0x19000001, &boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x19000001, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             }
                             player->unk_22C += 2;
                             if (player->unk_22C >= 4) {
@@ -1882,7 +1883,7 @@ void func_800A8BA4(Player* player) {
             }
         }
         for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
-            if ((actor->obj.status == 2) && (actor->timer_0C2 == 0)) {
+            if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0)) {
                 if (actor->obj.id == OBJ_ACTOR_180) {
                     temp_v0 = func_800A8304(player, actor->obj.id, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
                                             actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z);
@@ -1918,13 +1919,13 @@ void func_800A8BA4(Player* player) {
                                     if (D_80177E80 == 3) {
                                         func_800BA808(gMsg_ID_5504, RCID_FALCO);
                                     }
-                                    Audio_PlaySfx(D_800CFF54[D_80177E80], &gPlayer[0].unk_460, 0, &D_800C5D34,
+                                    Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &D_800C5D34,
                                                   &D_800C5D34, &D_800C5D3C);
-                                    Audio_PlaySfx(0x49008025, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                    Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 }
                             } else if (temp_v0 < 0) {
                                 if (player->unk_22C == 0) {
-                                    Audio_PlaySfx(0x19000001, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                    Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 }
                                 player->unk_22C += 2;
                                 if (player->unk_22C >= 4) {
@@ -1956,7 +1957,7 @@ void func_800A8BA4(Player* player) {
                     if (temp_v0 != 0) {
                         if (temp_v0 < 0) {
                             if (player->unk_22C == 0) {
-                                Audio_PlaySfx(0x19000001, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             }
                             player->unk_22C += 2;
                             if (player->unk_22C >= 4) {
@@ -1981,7 +1982,7 @@ void func_800A8BA4(Player* player) {
             }
         }
         for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) {
-            if (obj4C->obj.status == 2) {
+            if (obj4C->obj.status == OBJ_ACTIVE) {
                 if ((player->unk_138 - 200.0f) < obj4C->obj.pos.z) {
                     temp_v0 = func_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y,
                                             obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
@@ -2142,7 +2143,7 @@ void func_800AA800(Player* player) {
             if (player->form == FORM_ON_FOOT) {
                 for (sp144 = 0; sp144 < 200; sp144++) {
                     obj58 = &gObjects58[sp144];
-                    if ((obj58->obj.status == 2) &&
+                    if ((obj58->obj.status == OBJ_ACTIVE) &&
                         ((obj58->obj.id == OBJ_80_143) || (obj58->obj.id == OBJ_80_140) ||
                          (obj58->obj.id == OBJ_80_141)) &&
                         (fabsf(obj58->obj.pos.x - player->pos.x) < 2000.0f) &&
@@ -2173,7 +2174,7 @@ void func_800AA800(Player* player) {
                 player->unk_064 = player->pos.x;
                 player->unk_06C = player->unk_138;
                 for (sp144 = 0, obj58 = gObjects58; sp144 < 200; sp144++, obj58++) {
-                    if ((obj58->obj.status == 2) &&
+                    if ((obj58->obj.status == OBJ_ACTIVE) &&
                         ((obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_149) ||
                          (obj58->obj.id == OBJ_80_148) || (obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3)) &&
                         (fabsf(obj58->obj.pos.x - player->pos.x) < 2500.0f) &&
@@ -2224,7 +2225,7 @@ void func_800AA800(Player* player) {
             for (sp144 = 0, obj80 = gObjects80;
                  (sp144 < 50) && (gLevelMode == LEVELMODE_ON_RAILS) && (gCurrentLevel != LEVEL_VENOM_1);
                  sp144++, obj80++) {
-                if ((obj80->obj.status == 2) && ((player->unk_138 - 3000.0f) < obj80->obj.pos.z) &&
+                if ((obj80->obj.status == OBJ_ACTIVE) && ((player->unk_138 - 3000.0f) < obj80->obj.pos.z) &&
                     (obj80->obj.id != OBJ_80_0) && (obj80->obj.id != OBJ_80_8)) {
                     tempx = obj80->obj.pos.x;
                     tempy = obj80->obj.pos.y;
@@ -2555,7 +2556,7 @@ void func_800ABAB4(void) {
     }
     D_80177E7C = 0;
     func_800A594C();
-    D_80161A62 = D_8017796C = D_Timer_80177B44 = D_80177B4C = D_8015F928 = D_8015F940 = D_80178284 = gGameFrameCount =
+    D_80161A62 = D_8017796C = D_Timer_80177B44 = D_80177B4C = D_8015F928 = D_8015F940 = gBossActive = gGameFrameCount =
         D_80178480 = D_801782FC = gBossFrameCount = D_80161690 = D_8015F900 = D_80177930 = 0;
 
     if (gCurrentLevel == LEVEL_SECTOR_X) {
@@ -2571,7 +2572,7 @@ void func_800ABAB4(void) {
     D_Timer_80161A60 = D_80178360 = D_80178364 = D_80178368 = D_80161704 = D_80161708 = D_80178340 = D_80177C50 =
         D_8015F93C = D_80177B6C = 0;
 
-    D_80177A80 = 0;
+    gCsFrameCount = 0;
     D_80178340 = D_80178358 = 255;
 
     D_8017835C = 16;
@@ -2619,7 +2620,7 @@ void func_800ABAB4(void) {
     if (gLevelMode == LEVELMODE_ALL_RANGE) {
         MEM_ARRAY_ALLOCATE(gObjects58, 200);
         for (i = 0; i < 200; i++) {
-            gObjects58[i].obj.status = 0;
+            gObjects58[i].obj.status = OBJ_FREE;
         }
         switch (gCurrentLevel) {
             case LEVEL_SECTOR_Z:
@@ -2798,7 +2799,7 @@ void func_800ACA40(Player* player) {
     for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) {
         if (gPlayerShots[i].obj.status == 0) {
             func_800AC650(player, &gPlayerShots[i], PLAYERSHOT_5, 100.0f);
-            func_800A5FA0(&player->unk_460, 0x09000014, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000014, player->num);
             player->unk_1A0 = 2;
             break;
         }
@@ -2817,7 +2818,7 @@ void func_800ACABC(Player* player) {
             for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) {
                 if (gPlayerShots[i].obj.status == 0) {
                     func_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_0, 400.0f / 3.0f);
-                    func_800A5FA0(&player->unk_460, 0x09400000, player->num);
+                    func_800A5FA0(player->sfxPos, 0x09400000, player->num);
                     D_80177AA0[player->num] = 0.5f;
                     break;
                 }
@@ -2829,10 +2830,10 @@ void func_800ACABC(Player* player) {
                 if (gPlayerShots[i].obj.status == 0) {
                     func_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f);
                     if (laser == LASERS_TWIN) {
-                        func_800A5FA0(&player->unk_460, 0x0940800C, player->num);
+                        func_800A5FA0(player->sfxPos, 0x0940800C, player->num);
                         D_80177AA0[player->num] = 0.5f;
                     } else {
-                        func_800A5FA0(&player->unk_460, 0x0940802B, player->num);
+                        func_800A5FA0(player->sfxPos, 0x0940802B, player->num);
                         D_80177AA0[player->num] = 0.75f;
                     }
                     break;
@@ -2844,7 +2845,7 @@ void func_800ACABC(Player* player) {
 
 void func_800ACC7C(Player* player) {
     if ((gBombCount[player->num] != 0) && (gBombButton[player->num] & gInputPress->button) &&
-        (gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].obj.status == 0)) {
+        (gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].obj.status == OBJ_FREE)) {
         if (gVersusMode) {
             gBombCount[player->num] = 0;
         } else {
@@ -2860,7 +2861,7 @@ void func_800ACC7C(Player* player) {
         gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_48 = 30.0f;
         gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_60 = 0;
         func_8001CB80(player->num, 1);
-        func_8001CCDC(player->num, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].sfxPos);
+        func_8001CCDC(player->num, gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].sfxPos);
     }
 }
 
@@ -2915,7 +2916,7 @@ void func_800AD094(Player* player) {
     for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) {
         if (gPlayerShots[i].obj.status == 0) {
             func_800ACDC0(player, &gPlayerShots[i], PLAYERSHOT_6);
-            func_800A5FA0(&player->unk_460, 0x09000014, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000014, player->num);
             player->timer_1F8 = 2;
             player->unk_180 = 10.0f;
             break;
@@ -2928,7 +2929,7 @@ bool func_800AD118(s32 playerNum) {
     s32 i;
 
     for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
-        if ((actor->obj.status == 2) && (actor->timer_0CA[playerNum] != 0)) {
+        if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0CA[playerNum] != 0)) {
             return false;
         }
     }
@@ -2954,7 +2955,7 @@ bool func_800AD1F4(Player* player) {
             gChargeTimers[player->num] = 21;
         }
         if (gChargeTimers[player->num] == 20) {
-            func_80060F30(&player->unk_460, 0x0900302D, player->num);
+            func_80060F30(player->sfxPos, 0x0900302D, player->num);
         }
         if ((!(gInputHold->button & R_TRIG) || !(gInputHold->button & Z_TRIG) || (player->form != FORM_ARWING) ||
              (player->state_1C8 != PLAYERSTATE_1C8_3)) &&
@@ -2980,7 +2981,7 @@ bool func_800AD1F4(Player* player) {
 
     if (gInputPress->button & A_BUTTON) {
         for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-            if ((gActors[i].obj.status == 2) && (gActors[i].timer_0CA[player->num] != 0)) {
+            if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].timer_0CA[player->num] != 0)) {
                 if ((gPlayerShots[14 - player->num].obj.status == 0) ||
                     (gPlayerShots[14 - player->num].obj.id != PLAYERSHOT_8) ||
                     ((gPlayerShots[14 - player->num].obj.id == PLAYERSHOT_8) &&
@@ -2990,7 +2991,7 @@ bool func_800AD1F4(Player* player) {
                     } else {
                         func_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f);
                     }
-                    func_80060F30(&player->unk_460, 0x09007029, player->num);
+                    func_80060F30(player->sfxPos, 0x09007029, player->num);
                     D_Timer_80177BD0[player->num] = 5;
                     return true;
                 }
@@ -3007,7 +3008,7 @@ bool func_800AD1F4(Player* player) {
                 } else {
                     func_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f);
                 }
-                func_80060F30(&player->unk_460, 0x09007029, player->num);
+                func_80060F30(player->sfxPos, 0x09007029, player->num);
                 gChargeTimers[player->num] = 0;
                 D_Timer_80177BD0[player->num] = 5;
                 return true;
@@ -3018,7 +3019,7 @@ bool func_800AD1F4(Player* player) {
     if (gInputPress->button & B_BUTTON) {
         var_a2 = false;
         for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-            if ((gActors[i].obj.status == 2) && (gActors[i].timer_0CA[player->num] != 0)) {
+            if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].timer_0CA[player->num] != 0)) {
                 var_a2 = true;
                 break;
             }
@@ -3041,7 +3042,7 @@ bool func_800AD1F4(Player* player) {
                 gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_48 = 30.0f;
                 gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_60 = 0;
                 func_8001CB80(player->num, 1);
-                func_8001CCDC(player->num, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].sfxPos);
+                func_8001CCDC(player->num, gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].sfxPos);
                 return true;
             }
         }
@@ -3201,7 +3202,7 @@ void func_800ADF58(Player* player) {
     if (D_801784AC == 4) {
         D_80177CC8 = player->unk_140;
     }
-    if ((D_80178284 == 0) && (player->unk_144 > 500000.0f)) {
+    if ((gBossActive == 0) && (player->unk_144 > 500000.0f)) {
         player->unk_144 = 0.0f;
         player->pos.z = 0.0f;
         D_80177DC8 = 0;
@@ -4339,8 +4340,8 @@ void func_800B0F50(Player* playerx) {
     if ((gCurrentLevel == LEVEL_TRAINING)) {
         D_80177824 = 1;
     }
-    player->unk_478 = gLevelType;
-    player->unk_479 = player->form;
+    player->levelType = gLevelType;
+    player->form2 = player->form;
     func_80057814(player);
     if (!gVersusMode && (((gCurrentLevel != LEVEL_TITANIA) && (gCurrentLevel != LEVEL_SOLAR)) || gVersusMode ||
                          (player->state_1C8 != PLAYERSTATE_1C8_2))) {
@@ -4530,7 +4531,7 @@ void func_800B2574(Player* player) {
         sp28 = 1.5f;
         sp2C = 0.35f;
     }
-    player->unk_484 = 0;
+    player->boost = 0;
     var = gInputPress->stick_y; // fake?
     if (D_Timer_80177A70[gPlayerNum] != 0) {
         D_Timer_80177A70[gPlayerNum]--;
@@ -4591,7 +4592,7 @@ void func_800B2574(Player* player) {
         if ((gInputHold->button & gBoostButton[player->num]) && !(gInputHold->button & gBrakeButton[player->num]) &&
             (player->state_1C8 != PLAYERSTATE_1C8_5) && !player->unk_2B4) {
             if (player->unk_2BC == 0.0f) {
-                func_800A5FA0(&player->unk_460, 0x09000002, player->num);
+                func_800A5FA0(player->sfxPos, 0x09000002, player->num);
                 player->unk_194 = 5.0f;
                 player->unk_190 = 5.0f;
                 if (gBoostButton[player->num] & gInputPress->button) {
@@ -4620,7 +4621,7 @@ void func_800B2574(Player* player) {
                 player->unk_110 = 30.0f;
             }
             Math_SmoothStepToF(&player->unk_08C, -400.0f, 0.1f, 30.0f, 0.0f);
-            player->unk_484 = 1;
+            player->boost = 1;
             Math_SmoothStepToF(&D_801779A8[player->num], 50.0f, 1.0f, 10.0f, 0.0f);
         } else {
             if (player->unk_2BC > 0.0f) {
@@ -4656,7 +4657,7 @@ void func_800B2C00(Player* player) {
         sp30 = 1.5f;
         sp34 = 0.35f;
     }
-    player->unk_485 = 0;
+    player->brake = 0;
     var = gInputPress->stick_y; // fake?
     if (D_Timer_80177A00[gPlayerNum] != 0) {
         D_Timer_80177A00[gPlayerNum]--;
@@ -4685,7 +4686,7 @@ void func_800B2C00(Player* player) {
     if ((gInputHold->button & gBrakeButton[player->num]) && !(gInputHold->button & gBoostButton[player->num]) &&
         (player->state_1C8 != PLAYERSTATE_1C8_5) && !player->unk_2B4) {
         if (player->unk_2BC == 0.0f) {
-            func_800A5FA0(&player->unk_460, 0x09000003, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000003, player->num);
             if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gInputPress->button & gBrakeButton[player->num])) {
                 D_Timer_80177A38[gPlayerNum] = 5;
             }
@@ -4707,7 +4708,7 @@ void func_800B2C00(Player* player) {
             player->unk_110 = -20.0f;
         }
         Math_SmoothStepToF(&player->unk_08C, 180.0f, 0.1f, 10.0f, 0.0f);
-        player->unk_485 = 1;
+        player->brake = 1;
         Math_SmoothStepToF(&D_801779A8[player->num], 25.0f, 1.0f, 5.0f, 0.0f);
     } else if (player->unk_2BC > 0.0f) {
         player->unk_2BC -= sp34;
@@ -4743,7 +4744,7 @@ void func_800B3010(Player* player) {
         if (player->unk_2BC == 0.0f) {
             player->unk_194 = 4.0f;
             player->unk_190 = 4.0f;
-            func_800A5FA0(&player->unk_460, 0x09000002, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000002, player->num);
         }
         Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f);
         player->unk_190 = 2.0f;
@@ -4756,7 +4757,7 @@ void func_800B3010(Player* player) {
     }
     if ((gInputHold->button & gBrakeButton[player->num]) && !player->unk_2B4) {
         if (player->unk_2BC == 0.0f) {
-            func_800A5FA0(&player->unk_460, 0x09000003, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000003, player->num);
         }
         Math_SmoothStepToF(&D_801779A8[player->num], 20.0f, 1.0f, 10.0f, 0.0f);
         sp2C = 5.0f;
@@ -4776,7 +4777,7 @@ void func_800B3314(Player* player) {
     player->unk_0D4 = 3.0f;
     if ((gInputHold->button & Z_TRIG) && !player->unk_2B4) {
         if (player->unk_2BC == 0.0f) {
-            func_800A5FA0(&player->unk_460, 0x09000002, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000002, player->num);
         }
         player->unk_188 = 0.0f;
         player->unk_12C += 4.0f;
@@ -4804,7 +4805,7 @@ void func_800B3314(Player* player) {
     }
     if ((gInputHold->button & R_TRIG) && !player->unk_2B4) {
         if (player->unk_2BC == 0.0f) {
-            func_800A5FA0(&player->unk_460, 0x09000002, player->num);
+            func_800A5FA0(player->sfxPos, 0x09000002, player->num);
         }
         player->unk_188 = 0.0f;
         player->unk_12C -= 4.0f;
@@ -5013,7 +5014,7 @@ void func_800B415C(Player* player) {
             var_v0 = 0xF;
         }
         if (!(gGameFrameCount & var_v0)) {
-            func_80060F30(&player->unk_460, 0x49001026, player->num);
+            func_80060F30(player->sfxPos, 0x49001026, player->num);
         }
     }
 }
@@ -5032,7 +5033,7 @@ void func_800B41EC(Player* player) {
         func_8001A838(0x4100C023);
     }
     func_8001CA24(player->num);
-    func_800A5FA0(&player->unk_460, 0x0900C010, player->num);
+    func_800A5FA0(player->sfxPos, 0x0900C010, player->num);
     player->shields = 0;
     player->unk_1D0 = 0;
     player->unk_1F4 = 0;
@@ -5289,9 +5290,9 @@ void func_800B48BC(Player* player) {
             if ((!gVersusMode || (D_80177E7C != 0)) && (player->unk_4DC == 0) && (gInputPress->button & U_CBUTTONS) &&
                 ((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) {
                 if (player->unk_238 = 1 - player->unk_238) {
-                    Audio_PlaySfx(0x4900002C, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x4900002C, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 } else {
-                    Audio_PlaySfx(0x4900002D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x4900002D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     if (gLevelMode == LEVELMODE_ON_RAILS) {
                         player->unk_034 = 0.0f;
                     }
@@ -5321,7 +5322,7 @@ void func_800B48BC(Player* player) {
                             if (D_80177E7C == 1) {
                                 D_80177E7C += 1;
                                 for (i = 0; i < 4; i++) {
-                                    func_800A5FA0(gPlayer[i].unk_460_arr, 0x09000002, gPlayer[i].num);
+                                    func_800A5FA0(gPlayer[i].sfxPos, 0x09000002, gPlayer[i].num);
                                     gPlayer[i].unk_190 = gPlayer[i].unk_194 = 5.0f;
                                 }
                             }
@@ -5405,7 +5406,7 @@ void func_800B48BC(Player* player) {
                 func_800B0F50(player);
                 func_800B44C4(player);
                 func_800B7184(player, 1);
-                func_800A5FA0(&player->unk_460, 0x09000002, player->num);
+                func_800A5FA0(player->sfxPos, 0x09000002, player->num);
                 player->unk_190 = player->unk_194 = 5.0f;
             } else if (player->unk_288 >= 0) {
                 if (player->unk_288 == 0) {
@@ -5828,9 +5829,7 @@ void func_800B6848(Player* player, s32 arg1) {
 void func_800B6BFC(Player* player, s32 arg1) {
     Vec3f sp64;
     Vec3f sp58;
-    f32 temp_fs1;
-    f32 sp50;
-    f32 temp_fs0;
+    Vec3f sp4C;
 
     Matrix_RotateX(gCalcMatrix, player->unk_0FC * M_DTOR, 0);
     Matrix_RotateZ(gCalcMatrix, player->unk_100 * M_DTOR, 1);
@@ -5842,9 +5841,9 @@ void func_800B6BFC(Player* player, s32 arg1) {
     Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp64, &sp58);
     Math_SmoothStepToF(&player->unk_02C, -player->unk_158 * 0.5f, 0.07f, 3.0f, 0.001f);
 
-    temp_fs0 = player->pos.x + sp58.x;
-    sp50 = (player->unk_068 + 10.0f + sp58.y) - (player->unk_02C * 0.8f);
-    temp_fs1 = player->pos.z + sp58.z;
+    sp4C.x = player->pos.x + sp58.x;
+    sp4C.y = (player->unk_068 + 10.0f + sp58.y) - (player->unk_02C * 0.8f);
+    sp4C.z = player->pos.z + sp58.z;
 
     player->camAt.x = player->pos.x + player->unk_134 * 0.1f;
     player->camAt.y = player->unk_068 + (player->pos.y - player->unk_068) * 0.4f + 18.0f + player->unk_02C * 1.5f +
@@ -5856,19 +5855,19 @@ void func_800B6BFC(Player* player, s32 arg1) {
     sp64.y = 0.0f;
     sp64.z = 0.0f;
     Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp64, &sp58);
-    temp_fs0 += sp58.x;
-    temp_fs1 += sp58.z;
+    sp4C.x += sp58.x;
+    sp4C.z += sp58.z;
     player->camAt.x += sp58.x;
     player->camAt.z += sp58.z;
 
-    Math_SmoothStepToF(&player->camEye.x, temp_fs0, 0.3f, 65.0f, 0.001f);
-    Math_SmoothStepToF(&player->camEye.y, sp50, 0.3f, 65.0f, 0.001f);
-    Math_SmoothStepToF(&player->camEye.z, temp_fs1, 0.3f, 65.0f, 0.001f);
+    Math_SmoothStepToF(&player->camEye.x, sp4C.x, 0.3f, 65.0f, 0.001f);
+    Math_SmoothStepToF(&player->camEye.y, sp4C.y, 0.3f, 65.0f, 0.001f);
+    Math_SmoothStepToF(&player->camEye.z, sp4C.z, 0.3f, 65.0f, 0.001f);
     Math_SmoothStepToF(&player->unk_034, player->unk_12C * -0.1f, 0.1f, 1.0f, 0.01f);
     if (arg1 != 0) {
-        player->camEye.x = temp_fs0;
-        player->camEye.y = sp50;
-        player->camEye.z = temp_fs1;
+        player->camEye.x = sp4C.x;
+        player->camEye.y = sp4C.y;
+        player->camEye.z = sp4C.z;
     }
 }
 
@@ -6128,7 +6127,7 @@ void func_800B79B0(void) {
                 gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8;
                 gPlayer[0].unk_1D0 = 0;
                 gOverlayStage = 1;
-                Audio_PlaySfx(0x1900602A, &D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x1900602A, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_80177930 = 2;
                 D_800D3180[gCurrentLevel] = 1;
             }
@@ -6182,9 +6181,9 @@ void func_800B79B0(void) {
                 }
                 if (gPlayer[0].heal == 0) {
                     if (gPlayer[0].shields == 50) {
-                        Audio_PlaySfx(0x49008011, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49008011, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     } else if (gPlayer[0].shields == 100) {
-                        Audio_PlaySfx(0x49008010, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49008010, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
             }
@@ -6278,9 +6277,9 @@ void func_800B852C(ObjectId objId, Item* item) {
         D_80177844 -= 1;
     } else {
         D_800D317C = sp1F;
-        if (item->obj.status == 0) {
+        if (item->obj.status == OBJ_FREE) {
             Item_Initialize(item);
-            item->obj.status = 1;
+            item->obj.status = OBJ_INIT;
             item->obj.pos.x = gObjects58[sp1F].obj.pos.x;
             item->obj.pos.y = gObjects58[sp1F].obj.pos.y;
             item->obj.pos.z = gObjects58[sp1F].obj.pos.z;
@@ -6320,7 +6319,7 @@ void func_800B86CC(void) {
             MEM_ARRAY_ALLOCATE(gObjects58, 200);
         }
         for (i = 0; i < 200; i++) {
-            gObjects58[i].obj.status = 0;
+            gObjects58[i].obj.status = OBJ_FREE;
         }
         func_800A6148();
         if (gCurrentLevel == LEVEL_CORNERIA) {
@@ -6370,14 +6369,14 @@ void func_800B86CC(void) {
                 func_8001D400(0);
                 func_800A6148();
                 for (i = 0; i < gCamCount; i++) {
-                    Audio_KillSfx(gPlayer[i].unk_460_arr);
+                    Audio_KillSfx(gPlayer[i].sfxPos);
                     func_8001CA24(i);
                 }
                 D_80177854 = 1;
                 gDrawMode = gVersusMode = 0;
                 gCamCount = 1;
                 gBgColor = 0;
-                D_80177A80 = D_80177840 = D_80177838 = gRadioState = 0;
+                gCsFrameCount = D_80177840 = D_80177838 = gRadioState = 0;
                 D_8017782C = 0;
             }
             if (gVersusMode) {
@@ -6395,18 +6394,18 @@ void func_800B86CC(void) {
                 if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) &&
                     (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
                     if (D_800D2860[0] = 1 - D_800D2860[0]) {
-                        Audio_PlaySfx(0x49000019, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49000019, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     } else {
-                        Audio_PlaySfx(0x4900101A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x4900101A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
             } else {
                 for (i = 0; i < 4; i++) {
                     if ((gControllerPress[i].button & R_TRIG) && (gPlayer[i].form != FORM_ON_FOOT)) {
                         if (D_800D2860[i] = 1 - D_800D2860[i]) {
-                            func_80060F30(gPlayer[i].unk_460_arr, 0x49000019, i);
+                            func_80060F30(gPlayer[i].sfxPos, 0x49000019, i);
                         } else {
-                            func_80060F30(gPlayer[i].unk_460_arr, 0x4900101A, i);
+                            func_80060F30(gPlayer[i].sfxPos, 0x4900101A, i);
                         }
                     }
                 }

src/main/fox_radio.c

@@ -593,7 +593,7 @@ void func_800BB5D0(void) {
                     if ((D_801782E8 >= 23000) && (D_801782E8 < 23033)) {
                         if (D_801782F8 != 0) {
                             D_Timer_801782B4 = 2;
-                            Audio_PlaySfx(0x49000017, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x49000017, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         }
                     } else if (temp_v0 == 1) {
                         D_Timer_801782B4 = 2;
@@ -718,7 +718,7 @@ void func_800BB5D0(void) {
                     break;
             }
 
-            if ((gActors[var_v1].obj.status != 2) && (gGameFrameCount & 4) &&
+            if ((gActors[var_v1].obj.status != OBJ_ACTIVE) && (gGameFrameCount & 4) &&
                 (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_801782A4 != 2) && (D_801782A4 != 3) &&
                 (D_801782A4 != 1000)) {
                 RCP_SetupDL(&gMasterDisp, 0x4C);
@@ -726,7 +726,7 @@ void func_800BB5D0(void) {
                 Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
             }
             if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) {
-                func_80086110(22.0f, 165.0f, gActors[var_v1].unk_0CE * 2.55f);
+                func_80086110(22.0f, 165.0f, gActors[var_v1].health * 2.55f);
             }
         }
         if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) {

src/main/fox_tank.c

@@ -137,7 +137,7 @@ void func_800438E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) {
     f32 pad[12];
 
     Effect_Initialize(effect);
-    effect->obj.status = 2;
+    effect->obj.status = OBJ_ACTIVE;
     effect->obj.id = OBJ_EFFECT_357;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -158,7 +158,7 @@ void func_80043AA0(f32 xPos, f32 yPos, f32 zPos, f32 scale) {
     s32 i;
 
     for (i = 50; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_800438E0(&gEffects[i], xPos, yPos, zPos, scale);
             break;
         }
@@ -304,7 +304,7 @@ void func_800443DC(Player* player) {
     s32 i;
 
     for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-        if ((obj80->obj.status == 2) && (obj80->obj.id == OBJ_80_58) &&
+        if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id == OBJ_80_58) &&
             ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) {
             func_800441C8(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z,
                           obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z);
@@ -341,7 +341,7 @@ void func_800444BC(Player* player) {
     }
     if ((player->pos.y - sp30) < sp38) {
         if (player->vel.y < -10.0f) {
-            Audio_PlaySfx(0x09008015, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
         player->unk_1D4 = 1;
         if (player->vel.y < -20.0f) {
@@ -507,7 +507,7 @@ void func_80044868(Player* player) {
     }
     if (player->unk_0D0 > 0.0f) {
         Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
-        if ((gCurrentLevel == LEVEL_TITANIA) && (D_80178284 == 0)) {
+        if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
             func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
         }
         if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) {
@@ -516,7 +516,7 @@ void func_80044868(Player* player) {
     }
     if (player->unk_0D0 > 10.0f) {
         Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
-        if ((gCurrentLevel == LEVEL_TITANIA) && (D_80178284 == 0)) {
+        if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
             func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
         }
     }
@@ -534,7 +534,7 @@ void func_80045130(Player* player) {
             player->unk_1F0 = 20;
             player->unk_1EC = 20;
             player->unk_494 = 1;
-            Audio_PlaySfx(0x1100000A, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         } else {
             player->timer_1E0 = 10;
         }
@@ -547,7 +547,7 @@ void func_80045130(Player* player) {
             player->unk_1F0 = -20;
             player->unk_1EC = -20;
             player->unk_494 = 1;
-            Audio_PlaySfx(0x1100000A, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         } else {
             player->timer_1E4 = 10;
         }
@@ -571,7 +571,7 @@ void func_80045348(Player* player) {
             sp2E = true;
             if (D_800C9F24 == 0.0f) {
                 player->unk_190 = player->unk_194 = 4.0f;
-                Audio_PlaySfx(0x0900402F, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0900402F, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else {
                 player->unk_190 = 2.0f;
             }
@@ -613,13 +613,13 @@ void func_80045678(Player* player) {
 
     player->unk_0D4 = 3.0f;
     if (!(gInputHold->button & Z_TRIG)) {
-        func_8001A55C(&player->unk_460, 0x01008016);
-        func_8001A55C(&player->unk_460, 0x1100000A);
+        func_8001A55C(player->sfxPos, 0x01008016);
+        func_8001A55C(player->sfxPos, 0x1100000A);
     }
     if ((gInputHold->button & Z_TRIG) && !player->unk_2B4) {
         D_800C9F14++;
         if (D_800C9F20 == 0.0f) {
-            Audio_PlaySfx(0x01004024, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x01004024, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
         player->unk_188 = 0.0f;
         player->unk_12C += 4.0f;
@@ -643,13 +643,13 @@ void func_80045678(Player* player) {
         D_800C9F20 = 0.0f;
     }
     if (!(gInputHold->button & R_TRIG)) {
-        func_8001A55C(&player->unk_460, 0x01008016);
-        func_8001A55C(&player->unk_460, 0x1100000A);
+        func_8001A55C(player->sfxPos, 0x01008016);
+        func_8001A55C(player->sfxPos, 0x1100000A);
     }
     if ((gInputHold->button & R_TRIG) && !player->unk_2B4) {
         D_800C9F14++;
         if (player->unk_2C0 == 0.0f) {
-            Audio_PlaySfx(0x01004024, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x01004024, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
         player->unk_188 = 0.0f;
         player->unk_12C -= 4.0f;
@@ -676,9 +676,9 @@ void func_80045678(Player* player) {
     if ((player->unk_16C > 0.2f) && (player->unk_170 > 0.2f) && (player->timer_220 == 0)) {
         if (D_800C9F3C == 0) {
             D_800C9F3C = 1;
-            func_8001A55C(&player->unk_460, 0x1100000A);
-            func_8001A55C(&player->unk_460, 0x01004024);
-            Audio_PlaySfx(0x01008016, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_8001A55C(player->sfxPos, 0x1100000A);
+            func_8001A55C(player->sfxPos, 0x01004024);
+            Audio_PlaySfx(0x01008016, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
         player->unk_12C += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f;
         temp = -gInputPress->stick_y;
@@ -762,7 +762,7 @@ void func_80045E7C(Player* player) {
             }
             if (player->unk_1EC == 0) {
                 player->unk_1DC = 0;
-                func_8001A55C(&player->unk_460, 0x1100000A);
+                func_8001A55C(player->sfxPos, 0x1100000A);
             }
         }
         if ((player->timer_1E8 >= 5) && (player->unk_1F4 == 0) && (player->unk_1DC != 9)) {
@@ -809,7 +809,7 @@ void func_80046260(Player* player) {
     s32 i;
 
     for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-        if ((obj80->obj.status == 2) && (obj80->obj.id == OBJ_80_58) &&
+        if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id == OBJ_80_58) &&
             ((player->unk_138 - 2000.0f) < obj80->obj.pos.z) && (obj80->obj.pos.y < player->pos.y)) {
             func_800460E0(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z,
                           obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z);
@@ -904,7 +904,7 @@ void func_80046704(Player* player) {
     }
     if (1) {}
     for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-        if ((obj80->obj.status == 2) && ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) {
+        if ((obj80->obj.status == OBJ_ACTIVE) && ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) {
             if ((obj80->obj.id == OBJ_80_69) || (obj80->obj.id == OBJ_80_70) || (obj80->obj.id == OBJ_80_71) ||
                 (obj80->obj.id == OBJ_80_72) || (obj80->obj.id == OBJ_80_73) || (obj80->obj.id == OBJ_80_67)) {
                 temp1 = obj80->obj.pos.x - player->pos.x;
@@ -957,7 +957,7 @@ void func_80046704(Player* player) {
                         player->unk_0D0 = -(D_800C9F00 * 1.5f);
                         player->vel.z = D_800C9F00 * 1.5f;
                         D_800C9F00 = 12;
-                        Audio_PlaySfx(0x09008015, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         break;
                 }
                 if (obj80->obj.id == OBJ_80_59) {
@@ -1136,14 +1136,14 @@ void func_80047504(Player* player) {
             if (player->unk_2BC > 90.0f) {
                 player->unk_2BC = 90.0f;
                 player->unk_2B4 = true;
-                func_8001A55C(&player->unk_460, 0x01004024);
-                func_8001A55C(&player->unk_460, 0x01008016);
+                func_8001A55C(player->sfxPos, 0x01004024);
+                func_8001A55C(player->sfxPos, 0x01008016);
             }
         } else {
             if (player->unk_2BC > 0.0f) {
                 player->unk_2B4 = true;
-                func_8001A55C(&player->unk_460, 0x01004024);
-                func_8001A55C(&player->unk_460, 0x01008016);
+                func_8001A55C(player->sfxPos, 0x01004024);
+                func_8001A55C(player->sfxPos, 0x01008016);
             }
         }
     } else {
@@ -1263,7 +1263,7 @@ void func_80047D38(Player* player, f32 arg1) {
     }
     if ((player->pos.y - 5.0f) < arg1) {
         if (player->vel.y < -10.0f) {
-            Audio_PlaySfx(0x09008015, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             player->unk_1F4 = 10;
         }
         D_800C9F04 = 1;
@@ -1310,7 +1310,7 @@ void func_80047FBC(Player* player) {
         Math_SmoothStepToF(&player->unk_0EC, -((player->vel.z / 5.0f) * 4.0f), 0.4f, 8.0f, 0.01f);
         if (player->unk_0EC >= 3.0f) {
             if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) {
-                Audio_PlaySfx(0x19000065, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x19000065, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             D_800C9F08 |= 1;
         }
@@ -1353,7 +1353,7 @@ void func_800481F4(Player* player) {
     func_800444BC(player);
     if (player->timer_498 == 0) {
         for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) {
-            if ((obj80->obj.status == 2) && (obj80->obj.id != OBJ_80_58) && (obj80->obj.id != OBJ_80_105) &&
+            if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id != OBJ_80_58) && (obj80->obj.id != OBJ_80_105) &&
                 (obj80->obj.id != OBJ_80_59) && (obj80->obj.id != OBJ_80_60) && (obj80->obj.id != OBJ_80_63) &&
                 (obj80->obj.id != OBJ_80_66) && (obj80->obj.id != OBJ_80_67) && (obj80->obj.id != OBJ_80_68) &&
                 (obj80->obj.id != OBJ_80_70) && (obj80->obj.id != OBJ_80_72) && (obj80->obj.id != OBJ_80_71) &&
@@ -1375,14 +1375,14 @@ void func_800481F4(Player* player) {
                             D_80178578 = 20;
                             player->unk_23C = 80;
                             if (player->unk_22C == 0) {
-                                Audio_PlaySfx(0x19000001, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x19000001, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             }
                             player->unk_22C += 2;
                             if (player->unk_22C >= 4) {
                                 player->unk_22C = 4;
                             }
                         } else if (temp_v0 == -2) {
-                            Audio_PlaySfx(0x19000001, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x19000001, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         }
                     } else {
                         Player_ApplyDamage(player, temp_v0, obj80->info.damage);
@@ -1392,7 +1392,7 @@ void func_800481F4(Player* player) {
         }
 
         for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-            if (boss->obj.status == 2) {
+            if (boss->obj.status == OBJ_ACTIVE) {
                 temp_v0 =
                     func_800A7974(player, boss->info.hitbox, &sp98, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z,
                                   boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z, 0.0f, 0.0f, 0.0f);
@@ -1403,7 +1403,7 @@ void func_800481F4(Player* player) {
         }
 
         for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
-            if ((actor->obj.status == 2) && (actor->timer_0C2 == 0)) {
+            if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0)) {
                 if (actor->obj.id == OBJ_ACTOR_200) {
                     temp_v0 =
                         func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y,
@@ -1487,7 +1487,7 @@ void func_800481F4(Player* player) {
             }
         }
         for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) {
-            if (obj4C->obj.status == 2) {
+            if (obj4C->obj.status == OBJ_ACTIVE) {
                 if ((player->unk_138 - 200.0f) < obj4C->obj.pos.z) {
                     temp_v0 = func_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y,
                                             obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);

src/main/fox_versus.c

@@ -51,7 +51,7 @@ void func_800BC760(void) {
     func_800A6148();
 
     for (i = 0; i < gCamCount; i++) {
-        Audio_KillSfx(gPlayer[i].unk_460_arr);
+        Audio_KillSfx(gPlayer[i].sfxPos);
         func_8001CA24(i);
     }
 
@@ -337,7 +337,7 @@ void func_800BDE44(void) {
                     } else {
                         D_80178810[i] = 0;
                     }
-                    Audio_PlaySfx(0x49004007U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
 
@@ -366,12 +366,12 @@ s32 func_800BE078(void) {
 
         if ((D_80178768[1] -= temp) >= 0) {
             if ((D_80178768[0] == 0) && (D_80178768[1] < 15) && (D_80178768[1] >= 0)) {
-                Audio_PlaySfx(0x4900C02AU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900C02AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
         }
         // clang-format off
-	if (D_80178768[0] == 0)	{ Audio_PlaySfx(0x4900D036U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
+	if (D_80178768[0] == 0)	{ Audio_PlaySfx(0x4900D036U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
         // clang-format on
         D_80178768[1] *= -1;
         temp = (D_80178768[1] / 60) + 1;
@@ -467,19 +467,19 @@ s32 func_800BE564(void) {
         }
 
         if ((sUnlockLandmaster) && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) {
-            Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80178780[i] = 2;
         }
 
         if ((sUnlockOnFoot) && (D_80178780[i] == 0) &&
             ((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) ||
              (gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) {
-            Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80178780[i] = 3;
         }
 
         if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) {
-            Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80178780[i] = 1;
         }
 
@@ -602,10 +602,10 @@ s32 func_800BEF00(void) {
     if (D_80178794 == 0) {
         D_80178790--;
         if (D_80178790 != 0) {
-            Audio_PlaySfx(0x49000008U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000008U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             ret = 0;
         } else {
-            Audio_PlaySfx(0x49000009U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000009U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             ret = 1;
         }
         D_80178794 = 30;
@@ -1133,7 +1133,7 @@ s32 func_800C07C4(void) {
     }
 
     // clang-format off
-    if (ret != 0) { Audio_PlaySfx(0x49000002U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
+    if (ret != 0) { Audio_PlaySfx(0x49000002U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
     // clang-format on
 
     return ret;
@@ -1259,7 +1259,7 @@ bool func_800C0D10(void) {
             if (cont == 4) {
                 D_800D4A90 = 2;
             } else {
-                Audio_PlaySfx(0x49004007U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
 
@@ -1310,7 +1310,7 @@ s32 func_800C0E78(void) {
 bool func_800C107C(s32 arg0) {
     D_80178798++;
     if (D_80178798 == 10) {
-        Audio_PlaySfx(0x49004007U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_801787B8++;
         D_80178798 = 0;
     }
@@ -1992,9 +1992,9 @@ void func_800C26C8(void) {
         src.z = -10000.0f;
 
         for (i = 0, actor = &gActors[10]; i < 5; i++, actor++) {
-            if (actor->obj.status == 0) {
+            if (actor->obj.status == OBJ_FREE) {
                 Actor_Initialize(actor);
-                actor->obj.status = 2;
+                actor->obj.status = OBJ_ACTIVE;
                 actor->obj.id = 197;
                 Matrix_RotateY(gCalcMatrix, M_DTOR * (Rand_ZeroOne() * 360.0f), 0);
                 Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest);
@@ -2002,7 +2002,7 @@ void func_800C26C8(void) {
                 actor->obj.pos.y = dest.y;
                 actor->obj.pos.z = dest.z;
                 actor->unk_0E4 = i + 10;
-                actor->unk_0CE = 24;
+                actor->health = 24;
                 actor->timer_0C2 = 30;
 
                 Object_SetInfo(&actor->info, actor->obj.id);

src/mods/sfxjukebox.c

@@ -79,7 +79,7 @@ void Option_ExpertSoundUpdate(void) {
     sfx |= sfxId & 0xFF;
 
     if (prevSfx != sfx) {
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         prevSfx = sfx;
     }
 
@@ -88,7 +88,7 @@ void Option_ExpertSoundUpdate(void) {
     if (gControllerPress[gMainController].button & A_BUTTON) {
         func_800182F4(0x100100FF);
         func_800182F4(0x110100FF);
-        Audio_PlaySfx(sfx, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(sfx, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801B9320 = true;
     }
 
@@ -100,8 +100,8 @@ void Option_ExpertSoundUpdate(void) {
             D_menu_801B912C = 0;
             D_menu_801B9244 = 1;
         } else {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            Audio_KillSfx(&D_800C5D28);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_KillSfx(D_800C5D28);
             func_800182F4(0x100100FF);
             func_800182F4(0x110100FF);
             D_menu_801B9320 = false;

src/overlays/ovl_i1/fox_co.c

@@ -33,7 +33,7 @@ void func_i1_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32
                       s32 arg9) {
 
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = arg9;
     actor->obj.pos.x = arg1;
     actor->obj.pos.y = arg2;
@@ -51,7 +51,7 @@ void func_i1_80187710(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-        if (gActors[i].obj.status == 0) {
+        if (gActors[i].obj.status == OBJ_FREE) {
             (void) "Enms[1].obj.mode %d\n";
             func_i1_80187670(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
             return;
@@ -74,9 +74,9 @@ void func_i1_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gItems); i++) {
-        if (gItems[i].obj.status == 0) {
+        if (gItems[i].obj.status == OBJ_FREE) {
             Item_Initialize(&gItems[i]);
-            gItems[i].obj.status = 1;
+            gItems[i].obj.status = OBJ_INIT;
             gItems[i].obj.id = arg4;
             gItems[i].timer_4A = 8;
             gItems[i].obj.pos.x = arg1;
@@ -99,7 +99,7 @@ void func_i1_801878D8(Boss* boss) {
             func_800182F4(0x103200FF);
             func_800182F4(0x113200FF);
         }
-        Object_Kill(&boss->obj, &boss->sfxPos);
+        Object_Kill(&boss->obj, boss->sfxPos);
         return;
     }
 
@@ -153,7 +153,7 @@ void func_i1_80187AC8(Boss* boss) {
                 boss->swork[10] = 1000;
                 boss->info.hitbox[1 + 0] = 100000.0f;
                 func_i1_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f);
-                Audio_PlaySfx(0x2940D09A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_Timer_80161A60 = 8;
                 if (fabsf(boss->obj.rot.x) < 20.0f) {
                     boss->swork[32] = 1;
@@ -162,7 +162,7 @@ void func_i1_80187AC8(Boss* boss) {
                 boss->timer_050 = 100;
                 func_800182F4(0x105000FF);
                 func_800182F4(0x115000FF);
-                D_80177A80 = 0;
+                gCsFrameCount = 0;
 
                 if ((gPlayer[0].state_1C8 == 3) || (gPlayer[0].state_1C8 == 5)) {
                     gPlayer[0].state_1C8 = 7;
@@ -221,7 +221,7 @@ void func_i1_80187AC8(Boss* boss) {
                 func_i1_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f);
             }
         } else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) {
-            Audio_PlaySfx(0x2903300E, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             boss->swork[23] = 200;
             if (boss->dmgPart == 4) {
                 boss->swork[24] -= boss->damage;
@@ -302,7 +302,7 @@ void func_i1_80187AC8(Boss* boss) {
 
         obj4C = gObjects4C;
         for (var_s1 = 0; var_s1 < 40; var_s1++, obj4C++) {
-            if ((obj4C->obj.status == 2) && (obj4C->obj.id == OBJ_4C_162)) {
+            if ((obj4C->obj.status == OBJ_ACTIVE) && (obj4C->obj.id == OBJ_4C_162)) {
                 if ((fabsf(obj4C->obj.pos.x - D_i1_8019B6D8[20]) < 90.0f) &&
                     (fabsf(obj4C->obj.pos.z - D_i1_8019B6D8[32]) < 90.0f)) {
                     obj4C->unk_46 = 1;
@@ -453,7 +453,7 @@ void func_i1_80188C7C(Boss* boss) {
     if (boss->unk_044 == 0) {
         boss->unk_044++;
         boss->fwork[12] *= -0.2f;
-        Audio_PlaySfx(0x19030004, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x19030004, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         func_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f);
         boss->swork[18] = 13;
         boss->swork[19] = 15;
@@ -485,7 +485,7 @@ void func_i1_80188D50(Boss* boss) {
                    (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 200.0f) && (gPlayer[0].unk_4D8 > 180.0f)) {
             boss->swork[36]++;
             D_i1_801997E0 = 20;
-            Audio_PlaySfx(0x49008025, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             if ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0)) {
                 do {
                     do {
@@ -511,9 +511,9 @@ void func_i1_80188D50(Boss* boss) {
             sp48.z = -2500.0f;
             Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp48, &sp3C);
             for (i = 0; i < ARRAY_COUNT(gItems); i++) {
-                if (gItems[i].obj.status == 0) {
+                if (gItems[i].obj.status == OBJ_FREE) {
                     Item_Initialize(&gItems[i]);
-                    gItems[i].obj.status = 1;
+                    gItems[i].obj.status = OBJ_INIT;
                     gItems[i].obj.id = OBJ_ITEM_1UP;
                     gItems[i].obj.pos.x = gPlayer[0].pos.x + sp3C.x;
                     gItems[i].obj.pos.y = gPlayer[0].pos.y + 100.0f;
@@ -551,7 +551,7 @@ void func_i1_80189058(Boss* boss) {
     if (gPlayer[0].state_1C8 != 9) {
         if (boss->swork[33] == 0) {
             boss->swork[33]++;
-            D_80178284 = 2;
+            gBossActive = 2;
 
             boss->unk_05E = 1;
             boss->swork[24] = 150;
@@ -864,13 +864,13 @@ void func_i1_80189058(Boss* boss) {
                 boss->swork[24] = boss->swork[25] = boss->swork[26] = boss->swork[27] = boss->swork[28] = 0;
 
                 if (boss->timer_050 == 12) {
-                    Object_Kill(&gEffects[0].obj, &gEffects[0].sfxPos);
+                    Object_Kill(&gEffects[0].obj, gEffects[0].sfxPos);
                     func_8007D0E0(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 25.0f);
                 }
                 if (boss->timer_050 == 10) {
                     for (sp218 = 0; sp218 < 50; sp218++) {
-                        if (gEffects[sp218].obj.status != 0) {
-                            Object_Kill(&gEffects[sp218].obj, &gEffects[sp218].sfxPos);
+                        if (gEffects[sp218].obj.status != OBJ_FREE) {
+                            Object_Kill(&gEffects[sp218].obj, gEffects[sp218].sfxPos);
                         }
                     }
                     func_8007A568(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 40.0f);
@@ -915,7 +915,7 @@ void func_i1_80189058(Boss* boss) {
                     }
                 }
                 if (boss->timer_050 == 0) {
-                    Object_Kill(&boss->obj, &boss->sfxPos);
+                    Object_Kill(&boss->obj, boss->sfxPos);
                 }
                 Animation_GetFrameData(&D_602BC18, 0, sp84);
                 break;
@@ -939,7 +939,7 @@ void func_i1_80189058(Boss* boss) {
                 boss->swork[31] = 0;
             }
             if ((boss->actionState != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) {
-                Audio_PlaySfx(0x29022019U, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29022019U, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             if ((gPlayer[0].unk_4DC != 0) && (boss->actionState != 0)) {
                 boss->actionState = 0;
@@ -1138,7 +1138,7 @@ s32 func_i1_8018AB64(Actor* actor) {
         sp7C.z = sp50[i] + actor->obj.pos.z;
         temp_v0 = func_8006351C(actor->index, &sp7C, &sp70, 1);
         if ((temp_v0 != 0) && (temp_v0 >= 10)) {
-            if ((gObjects80[temp_v0 - 10].obj.status == 2) && (gObjects80[temp_v0 - 10].obj.id == OBJ_80_40)) {
+            if ((gObjects80[temp_v0 - 10].obj.status == OBJ_ACTIVE) && (gObjects80[temp_v0 - 10].obj.id == OBJ_80_40)) {
                 return temp_v0 - 9;
             }
         }
@@ -1151,12 +1151,12 @@ void func_i1_8018ACE0(Actor* actor) {
     if (actor->unk_0D0 != 0) {
         actor->unk_0D0 = 0;
         if (actor->unk_0D2 == 0) {
-            Audio_PlaySfx(0x29034003, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                           actor->vel.z, 0.1f, 20);
             actor->timer_0C6 = 15;
-            actor->unk_0CE -= actor->unk_0D6;
-            if (actor->unk_0CE <= 0) {
+            actor->health -= actor->damage;
+            if (actor->health <= 0) {
                 actor->obj.id = OBJ_ACTOR_179;
                 Object_SetInfo(&actor->info, actor->obj.id);
                 actor->unk_0B8 = 100;
@@ -1166,7 +1166,7 @@ void func_i1_8018ACE0(Actor* actor) {
             }
         }
     }
-    if ((actor->unk_0CE < 11) && !(gGameFrameCount & 3)) {
+    if ((actor->health < 11) && !(gGameFrameCount & 3)) {
         func_8007D2C8(((Rand_ZeroOne() - 0.5f) * 100.0f) + actor->obj.pos.x,
                       ((Rand_ZeroOne() - 0.5f) * 100.0f) + (actor->obj.pos.y + 200.0f),
                       (Rand_ZeroOne() * 50.0f) + (actor->obj.pos.z + 50.0f), 3.0f);
@@ -1228,9 +1228,9 @@ void func_i1_8018B0B4(Actor* actor) {
     s32 i;
 
     for (i = 0; i < 50; i++) {
-        if (gObjects80[i].obj.status == 0) {
+        if (gObjects80[i].obj.status == OBJ_FREE) {
             Object_80_Initialize(&gObjects80[i]);
-            gObjects80[i].obj.status = 1;
+            gObjects80[i].obj.status = OBJ_INIT;
             gObjects80[i].obj.id = OBJ_80_42;
             gObjects80[i].obj.pos.x = actor->obj.pos.x;
             gObjects80[i].obj.pos.y = actor->obj.pos.y;
@@ -1294,7 +1294,7 @@ void func_i1_8018B15C(Actor* actor) {
                 temp_s1->vel.x = sp48.x;
                 temp_s1->vel.y = sp48.y;
                 temp_s1->vel.z = sp48.z;
-                Audio_PlaySfx(0x2902401C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2902401C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
     }
@@ -1368,7 +1368,7 @@ void func_i1_8018B58C(Actor* actor) {
                               (Rand_ZeroOne() * 50.0f) + (actor->obj.pos.z + 50.0f), 3.0f);
                 func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                               actor->vel.z, 0.1f, 10);
-                Audio_PlaySfx(0x2903A008, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (actor->timer_0BC == 0) {
@@ -1395,7 +1395,7 @@ void func_i1_8018B58C(Actor* actor) {
             if (actor->timer_0BC == 8) {
                 func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, 0.0f,
                               5.0f, 30);
-                Audio_PlaySfx(0x2903B009, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
         case 101:
@@ -1504,7 +1504,7 @@ void func_i1_8018BE7C(Boss* boss) {
     s32 i;
     s16 temp_s1;
 
-    D_80178284 = 1;
+    gBossActive = 1;
     gBossFrameCount = 0;
     boss->unk_05E = 1;
     boss->timer_050 = 354;
@@ -1513,7 +1513,7 @@ void func_i1_8018BE7C(Boss* boss) {
     if (fabsf(gPlayer[0].unk_0AC) < 1.0f) {
         boss->timer_05A = 30000;
         boss->obj.pos.z = (gPlayer[0].camEye.z - D_80177D20) - 2000.0f;
-        Audio_PlaySfx(0x31038018, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_i1_8019B6D0 = 0;
     } else {
         D_i1_8019B6D0 = 1;
@@ -1522,7 +1522,7 @@ void func_i1_8018BE7C(Boss* boss) {
         boss->obj.pos.z = gPlayer[0].unk_138 + 2000.0f;
         boss->fwork[7] = boss->obj.pos.x;
         boss->fwork[5] = 30.0f;
-        Audio_PlaySfx(0x31038018, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         boss->swork[10] = 3;
         boss->swork[8] = 3;
     }
@@ -1532,7 +1532,7 @@ void func_i1_8018BE7C(Boss* boss) {
     // Bosses OBJ_BOSS_294 to OBJ_BOSS_296
     for (i = 1; i < 4; i++) {
         Boss_Initialize(&gBosses[i]);
-        gBosses[i].obj.status = 1;
+        gBosses[i].obj.status = OBJ_INIT;
         gBosses[i].obj.id = i + 293;
         gBosses[i].obj.pos.x = boss->obj.pos.x;
         gBosses[i].obj.pos.y = boss->obj.pos.y;
@@ -1602,9 +1602,9 @@ void func_i1_8018C19C(Boss* boss) {
     Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1);
     if (D_i1_8019B6D0 == 0) {
         if (boss->obj.pos.x > 6000.0f) {
-            Object_Kill(&boss->obj, &boss->sfxPos);
+            Object_Kill(&boss->obj, boss->sfxPos);
             for (i = 1; i < ARRAY_COUNT(gBosses); i++) {
-                Object_Kill(&gBosses[i].obj, &gBosses[i].sfxPos);
+                Object_Kill(&gBosses[i].obj, gBosses[i].sfxPos);
             }
             return;
         }
@@ -1663,13 +1663,13 @@ void func_i1_8018C19C(Boss* boss) {
                     boss->health -= boss->damage;
                     if (boss->health < 120) {
                         boss->fwork[17] = 2.8f;
-                        Audio_PlaySfx(0x2943500F, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     } else {
-                        Audio_PlaySfx(0x29034003, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
             } else {
-                Audio_PlaySfx(0x29121007, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
         boss->vel.z = boss->fwork[18];
@@ -1783,7 +1783,7 @@ void func_i1_8018C19C(Boss* boss) {
                     boss->actionState = boss->swork[0];
                     boss->timer_050 = 60;
                     boss->fwork[8] = 0.0f;
-                    Audio_PlaySfx(0x2940201A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 break;
             case 4:
@@ -1795,7 +1795,7 @@ void func_i1_8018C19C(Boss* boss) {
                     boss->timer_050 = 20;
                     boss->fwork[8] = 0.0f;
                     if (gBosses[1].actionState == 0) {
-                        Audio_PlaySfx(0x2940201A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                     if ((boss->swork[5] == 0) && ((gBosses[2].actionState == 0) || (gBosses[3].actionState == 0))) {
                         func_800BA808(gMsg_ID_2292, RCID_BOSS_CORNERIA2);
@@ -1813,13 +1813,13 @@ void func_i1_8018C19C(Boss* boss) {
                 boss->fwork[13] = 20.0f;
                 if ((boss->fwork[0] > 60.0f) && (gBosses[2].actionState == 0) && (boss->swork[1] == 0)) {
                     func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0);
-                    Audio_PlaySfx(0x2903201B, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0);
                     boss->swork[1] = 1;
                 }
                 if ((boss->fwork[1] > 60.0f) && (gBosses[3].actionState == 0) && (boss->swork[2] == 0)) {
                     func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0);
-                    Audio_PlaySfx(0x2903201B, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0);
                     boss->swork[2] = 1;
                 }
@@ -1842,7 +1842,7 @@ void func_i1_8018C19C(Boss* boss) {
                     boss->swork[4]++;
                     boss->swork[4] &= 3;
                     if ((gBosses[3].actionState == 0) && (gBosses[2].actionState == 0)) {
-                        Audio_PlaySfx(0x2940201A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
                 break;
@@ -1868,7 +1868,7 @@ void func_i1_8018C19C(Boss* boss) {
                     boss->fwork[8] = 0.0f;
 
                     if ((boss->swork[3] != 1) || (boss->swork[3] != 3)) {
-                        func_8001A55C(&boss->sfxPos, 0x31034025);
+                        func_8001A55C(boss->sfxPos, 0x31034025);
                         boss->swork[9] = 0;
                     }
                 }
@@ -1878,7 +1878,7 @@ void func_i1_8018C19C(Boss* boss) {
                     if ((boss->obj.rot.y < 20.0f) && (boss->obj.rot.y > -20.0f)) {
                         if (boss->swork[9] == 0) {
                             boss->swork[9]++;
-                            Audio_PlaySfx(0x31034025, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x31034025, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             if (boss->swork[6] == 0) {
                                 func_800BA808(gMsg_ID_2293, RCID_BOSS_CORNERIA2);
                             }
@@ -1891,9 +1891,9 @@ void func_i1_8018C19C(Boss* boss) {
                                 Matrix_MultVec3f(gCalcMatrix, &D_i1_801998F0[0], &sp84[3]);
                                 effect = gEffects;
                                 for (i = 0; i < 100; i++, effect++) {
-                                    if (effect->obj.status == 0) {
+                                    if (effect->obj.status == OBJ_FREE) {
                                         Effect_Initialize(effect);
-                                        effect->obj.status = 1;
+                                        effect->obj.status = OBJ_INIT;
                                         effect->obj.id = OBJ_EFFECT_398;
                                         effect->timer_50 = 100;
                                         effect->unk_44 = 1;
@@ -1908,7 +1908,7 @@ void func_i1_8018C19C(Boss* boss) {
                                 }
 
                                 if (i >= 60) {
-                                    effect->obj.status = 0;
+                                    effect->obj.status = OBJ_FREE;
                                 }
                             }
                         }
@@ -1916,10 +1916,10 @@ void func_i1_8018C19C(Boss* boss) {
                 }
                 if (boss->health < 2) {
                     D_8017796C = -1;
-                    func_8001A55C(&boss->sfxPos, 0x31034025);
+                    func_8001A55C(boss->sfxPos, 0x31034025);
                     func_800182F4(0x102800FF);
                     func_800182F4(0x112800FF);
-                    Audio_PlaySfx(0x2940D09A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_Timer_80161A60 = 8;
                     gShowBossHealth = false;
                     func_800BA808(gMsg_ID_2294, RCID_BOSS_CORNERIA2);
@@ -2028,7 +2028,7 @@ void func_i1_8018C19C(Boss* boss) {
                 }
                 if (boss->timer_050 == 0) {
                     func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 500.0f, boss->obj.pos.z, 120.0f);
-                    Object_Kill(&boss->obj, &boss->sfxPos);
+                    Object_Kill(&boss->obj, boss->sfxPos);
                 }
                 break;
         }
@@ -2049,7 +2049,7 @@ void func_i1_8018C19C(Boss* boss) {
         boss->fwork[16] = 4.0f;
         if ((boss->swork[10] == 0) && (boss->actionState < 6)) {
             boss->fwork[17] = 1.8f;
-            Audio_PlaySfx(0x11020084, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x11020084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             boss->timer_058 = 71;
             boss->actionState = 6;
             boss->fwork[12] = 0.0f;
@@ -2087,7 +2087,7 @@ void func_i1_8018DDAC(Boss* boss) {
                         if (boss->health != 0) {
                             boss->timer_05C = 15;
                             boss->health -= boss->damage;
-                            Audio_PlaySfx(0x29034003, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             if (boss->health <= 0) {
                                 gBosses[0].swork[8]--;
                                 if (gBosses[0].swork[8] != 0) {
@@ -2098,7 +2098,7 @@ void func_i1_8018DDAC(Boss* boss) {
                                 boss->info.unk_10 = 300.0f;
                                 gBosses[0].fwork[14] = 25.0f;
                                 gBosses[0].fwork[15] = 0.0f;
-                                Audio_PlaySfx(0x2940C027, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 if (gBosses[0].swork[10] != 0) {
                                     gBosses[0].swork[10]--;
                                 }
@@ -2118,7 +2118,7 @@ void func_i1_8018DDAC(Boss* boss) {
                         }
                     }
                 } else {
-                    Audio_PlaySfx(0x29121007, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             boss->obj.rot.x = gBosses[0].obj.rot.x;
@@ -2153,7 +2153,7 @@ void func_i1_8018DDAC(Boss* boss) {
                     boss->swork[0] = 1;
                     boss->gravity = 0.0f;
                     func_i1_8018C0B0(boss);
-                    Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else {
                 boss->obj.rot.z -= 2.0f;
@@ -2181,7 +2181,7 @@ void func_i1_8018E290(Boss* boss) {
                         if (boss->health != 0) {
                             boss->timer_05C = 15;
                             boss->health -= boss->damage;
-                            Audio_PlaySfx(0x29034003, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             if (boss->health <= 0) {
                                 gBosses[0].swork[8]--;
                                 if (gBosses[0].swork[8] != 0) {
@@ -2193,7 +2193,7 @@ void func_i1_8018E290(Boss* boss) {
                                 gBosses[0].fwork[15] = 0.0f;
                                 gBosses[0].fwork[14] = 335.0f;
                                 boss->health = 0;
-                                Audio_PlaySfx(0x2940C027, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 if (gBosses[0].swork[10] != 0) {
                                     gBosses[0].swork[10]--;
                                 }
@@ -2211,7 +2211,7 @@ void func_i1_8018E290(Boss* boss) {
                         }
                     }
                 } else {
-                    Audio_PlaySfx(0x29121007, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             boss->obj.rot.x = gBosses[0].obj.rot.x;
@@ -2246,7 +2246,7 @@ void func_i1_8018E290(Boss* boss) {
                     boss->swork[0] = 1;
                     boss->gravity = 0.0f;
                     func_i1_8018C0B0(boss);
-                    Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else {
                 boss->obj.rot.z -= 2.0f;
@@ -2274,7 +2274,7 @@ void func_i1_8018E76C(Boss* boss) {
                         if (boss->health != 0) {
                             boss->timer_05C = 15;
                             boss->health -= boss->damage;
-                            Audio_PlaySfx(0x29034003, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                            Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                             if (boss->health <= 0) {
                                 gBosses[0].swork[8]--;
                                 if (gBosses[0].swork[8] != 0) {
@@ -2286,7 +2286,7 @@ void func_i1_8018E76C(Boss* boss) {
                                 gBosses[0].fwork[15] = 0.0f;
                                 gBosses[0].fwork[14] = 335.0f;
                                 boss->health = 0;
-                                Audio_PlaySfx(0x2940C027, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                                Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                                 if (gBosses[0].swork[10] != 0) {
                                     gBosses[0].swork[10]--;
                                 }
@@ -2307,7 +2307,7 @@ void func_i1_8018E76C(Boss* boss) {
                         }
                     }
                 } else {
-                    Audio_PlaySfx(0x29121007, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             boss->obj.rot.x = gBosses[0].obj.rot.x;
@@ -2339,7 +2339,7 @@ void func_i1_8018E76C(Boss* boss) {
                     boss->swork[0] = 1;
                     boss->gravity = 0.0f;
                     func_i1_8018C0B0(boss);
-                    Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else {
                 boss->obj.rot.z -= 2.0f;
@@ -2438,10 +2438,10 @@ void func_i1_8018F044(Object_80* obj80) {
                     if (obj80->unk_44 >= 3) {
                         obj80->unk_48 = 1;
                         obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_603E924);
-                        Audio_PlaySfx(0x1900000D, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x1900000D, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         return;
                     }
-                    Audio_PlaySfx(0x2903300E, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2903300E, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             break;
@@ -2486,7 +2486,7 @@ void func_i1_8018F31C(Object_80* obj80) {
 
 void func_i1_8018F3BC(Object_80* obj80, f32 arg1) {
     Object_80_Initialize(obj80);
-    obj80->obj.status = 1;
+    obj80->obj.status = OBJ_INIT;
     obj80->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 1000.0f) + arg1;
     obj80->obj.rot.y = (Rand_ZeroOne() * 90.0f) + 45.0f;
     if (arg1 > 0.0f) {
@@ -2505,14 +2505,14 @@ void func_i1_8018F4A4(void) {
 
     if (!(gGameFrameCount & 0xF) && !(gPlayer[0].unk_1D0 < 4)) {
         for (i = 0; i < 50; i++) {
-            if (gObjects80[i].obj.status == 0) {
+            if (gObjects80[i].obj.status == OBJ_FREE) {
                 func_i1_8018F3BC(&gObjects80[i], 4000.0f);
                 break;
             }
         }
 
         for (i = 0; i < ARRAY_COUNT(gObjects80); i++) {
-            if (gObjects80[i].obj.status == 0) {
+            if (gObjects80[i].obj.status == OBJ_FREE) {
                 func_i1_8018F3BC(&gObjects80[i], -4000.0f);
                 break;
             }
@@ -2523,7 +2523,7 @@ void func_i1_8018F4A4(void) {
 void func_i1_8018F55C(Effect* effect) {
 
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.pos.x = gPlayer[0].camEye.x + ((Rand_ZeroOne() - 0.5f) * 500.0f);
     effect->obj.pos.y = gPlayer[0].camEye.y + ((Rand_ZeroOne() - 0.8f) * 350.0f);
     effect->obj.id = OBJ_EFFECT_352;
@@ -2544,7 +2544,7 @@ void func_i1_8018F678(void) {
     if (!(gGameFrameCount & 0x1F) && gPlayer[0].pos.x == 0.0f) {
 
         for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-            if (gEffects[i].obj.status == 0) {
+            if (gEffects[i].obj.status == OBJ_FREE) {
                 func_i1_8018F55C(&gEffects[i]);
                 return;
             }
@@ -2563,7 +2563,7 @@ static f32 D_i1_80199AD8[3] = { -60.0f, 60.0f, -45.0f };
 void func_i1_8018F6F8(Actor* actor, s32 arg1) {
 
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = (D_i1_80199AB4[arg1] * 4.0f) + gPlayer[0].pos.x;
     actor->obj.pos.y = (D_i1_80199AC0[arg1] * 2.0f) + gPlayer[0].pos.y;
@@ -2579,7 +2579,7 @@ void func_i1_8018F6F8(Actor* actor, s32 arg1) {
     actor->unk_0C9 = 1;
     actor->iwork[11] = 1;
     actor->info.unk_10 = 200.0f;
-    Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 extern Gfx* D_30184D8;
@@ -2597,16 +2597,16 @@ void func_i1_8018F880(Player* player) {
     f32 sp30;
     f32 sp2C;
 
-    if (D_80177A80 < 0x32F) {
+    if (gCsFrameCount < 0x32F) {
         sp3C = player->pos.x;
         sp38 = player->pos.y + 15.0f;
         sp34 = player->unk_138 - 20.0f;
     } else {
-        if (D_80177A80 < 0x3F1) {
+        if (gCsFrameCount < 0x3F1) {
             sp3C = actor0->obj.pos.x;
             sp38 = actor0->obj.pos.y + 15.0f;
             sp34 = actor0->obj.pos.z - 20.0f;
-        } else if (D_80177A80 < 0x4AE) {
+        } else if (gCsFrameCount < 0x4AE) {
             sp3C = actor2->obj.pos.x;
             sp38 = actor2->obj.pos.y + 15.0f;
             sp34 = actor2->obj.pos.z - 20.0f;
@@ -2680,7 +2680,7 @@ void func_i1_8018F880(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_1D0 = 1;
             player->timer_1F8 = 600;
             player->pos.y = 6000.0f;
@@ -2728,10 +2728,10 @@ void func_i1_8018F880(Player* player) {
                 func_800BA808(gMsg_ID_2005, RCID_FOX);
             }
             if (player->timer_1F8 == 180) {
-                Audio_PlaySfx(0x09000007, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000007, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             if (player->timer_1F8 == 120) {
-                Audio_PlaySfx(0x09000013, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000013, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             if ((player->timer_1F8 < 190) && (player->timer_1F8 >= 151)) {
                 Math_SmoothStepToF(&player->wings.unk_24, 2.0f, 0.2f, 0.5f, 0.0f);
@@ -2920,19 +2920,19 @@ void func_i1_8018F880(Player* player) {
             }
             if (player->timer_1F8 == 70) {
                 actor0->unk_0B8 = 1;
-                func_800A6028(&player->unk_460, 0x09000002);
+                func_800A6028(player->sfxPos, 0x09000002);
             }
             if (player->timer_1F8 == 50) {
                 actor1->unk_0B8 = 2;
-                func_800A6028(&player->unk_460, 0x09000002);
+                func_800A6028(player->sfxPos, 0x09000002);
             }
             if (player->timer_1F8 == 30) {
                 actor2->unk_0B8 = 3;
-                func_800A6028(&player->unk_460, 0x09000002);
+                func_800A6028(player->sfxPos, 0x09000002);
             }
             if (player->timer_1F8 == 0) {
                 player->unk_1D0 = 9;
-                func_800A6028(&player->unk_460, 0x09000002);
+                func_800A6028(player->sfxPos, 0x09000002);
                 player->timer_1F8 = 3;
                 player->unk_194 = 5.0f;
                 player->unk_190 = 5.0f;
@@ -2954,9 +2954,9 @@ void func_i1_8018F880(Player* player) {
             }
             if (D_80178340 == 0xFF) {
                 func_8001D444(0, D_80177C90, 0, 0xFF);
-                Object_Kill(&actor0->obj, &actor0->sfxPos);
-                Object_Kill(&actor1->obj, &actor1->sfxPos);
-                Object_Kill(&actor2->obj, &actor2->sfxPos);
+                Object_Kill(&actor0->obj, actor0->sfxPos);
+                Object_Kill(&actor1->obj, actor1->sfxPos);
+                Object_Kill(&actor2->obj, actor2->sfxPos);
 
                 D_80177838 = 80;
                 player->pos.y = 350.0f;
@@ -3041,12 +3041,12 @@ void func_i1_80190F74(Actor* actor, s32 arg1) {
     actor->vel.x = player->vel.x;
     actor->vel.y = player->vel.y;
     actor->vel.z = player->vel.z;
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.rot.z = D_i1_80199B2C[arg1];
     Object_SetInfo(&actor->info, actor->obj.id);
     actor->iwork[11] = 1;
-    Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i1_80191160(Player* player) {
@@ -3078,7 +3078,7 @@ void func_i1_80191160(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            func_8001A38C(1, &player->unk_460);
+            func_8001A38C(1, player->sfxPos);
             sp54 = player->camEye.x - D_i1_8019B6D8[62];
             sp4C = player->camEye.z - D_i1_8019B6D8[64];
 
@@ -3111,7 +3111,7 @@ void func_i1_80191160(Player* player) {
             Math_SmoothStepToF(&player->camAt.z, D_i1_8019B6D8[64], 0.05f, 500.0f, 0.0f);
             temp_fa0 = player->pos.x - D_i1_8019B6D8[62];
             temp_fa1 = player->pos.z - D_i1_8019B6D8[64];
-            if (D_80177A80 < 30) {
+            if (gCsFrameCount < 30) {
                 temp_deg = Math_RadToDeg(-Math_Atan2F(temp_fa0, temp_fa1));
                 var_fv1 = Math_SmoothStepToAngle(&player->unk_0E8, temp_deg, 0.5f, 4.0f, 0.0001f) * 20.0f;
             } else {
@@ -3119,7 +3119,7 @@ void func_i1_80191160(Player* player) {
                 var_fv1 = Math_SmoothStepToAngle(&player->unk_0E8, temp_deg, 0.5f, 2.0f, 0.0001f) * 30.0f;
             }
             Math_SmoothStepToAngle(&player->unk_0EC, var_fv1, 0.1f, 5.0f, 0.0001f);
-            if (D_80177A80 == 220) {
+            if (gCsFrameCount == 220) {
                 player->unk_1D0++;
             }
             break;
@@ -3130,14 +3130,14 @@ void func_i1_80191160(Player* player) {
             Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_80177A48[2], 500.0f, 0.0f);
             Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_80177A48[2], 500.0f, 0.0f);
             Math_SmoothStepToF(&player->camAt.z, player->pos.z, D_80177A48[2], 500.0f, 0.0f);
-            if (D_80177A80 == 350) {
+            if (gCsFrameCount == 350) {
                 player->unk_1D0++;
                 D_80177A48[2] = 0.0f;
                 D_80177A48[3] = 0.05f;
             }
             break;
         case 3:
-            if ((D_80177A80 >= 701) && (D_80177A80 < 1000)) {
+            if ((gCsFrameCount >= 701) && (gCsFrameCount < 1000)) {
                 func_8004AA84();
             }
             Math_SmoothStepToAngle(&player->unk_0E4, 20.0f, 0.1f, 0.5f, 0);
@@ -3165,16 +3165,16 @@ void func_i1_80191160(Player* player) {
             Math_SmoothStepToF(&player->camAt.z, player->pos.z + sp58.z, D_80177A48[3], 500.0f, 0.0f);
             D_80177A48[5] += D_80177A48[4];
 
-            if ((D_80177A80 >= 401) && (D_80177A80 < 1000)) {
+            if ((gCsFrameCount >= 401) && (gCsFrameCount < 1000)) {
                 Math_SmoothStepToF(&D_80177A48[4], 0.5f, 1.0f, 0.003f, 0);
             }
-            if (D_80177A80 >= 1101) {
+            if (gCsFrameCount >= 1101) {
                 Math_SmoothStepToF(&D_80177A48[4], 0.0f, 1.0f, 0.003f, 0);
             }
-            if (D_80177A80 == 1270) {
+            if (gCsFrameCount == 1270) {
                 func_800182F4(0x103200FF);
                 func_800182F4(0x113200FF);
-                Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 player->unk_1D0++;
                 player->unk_0D0 = 2.0f;
                 player->unk_194 = 5.0f;
@@ -3182,7 +3182,7 @@ void func_i1_80191160(Player* player) {
             }
             break;
         case 4:
-            if (D_80177A80 >= 1270) {
+            if (gCsFrameCount >= 1270) {
                 player->unk_0D0 *= 1.2f;
                 player->unk_25C += 0.04f;
                 if (player->unk_25C > 0.6f) {
@@ -3190,10 +3190,10 @@ void func_i1_80191160(Player* player) {
                 }
                 player->unk_190 = 2.0f;
             }
-            if (D_80177A80 == 1290) {
+            if (gCsFrameCount == 1290) {
                 func_8001DBD0(50);
             }
-            if (D_80177A80 >= 1301) {
+            if (gCsFrameCount >= 1301) {
                 D_80178358 = 0xFF;
                 D_80178348 = D_80178350 = D_80178354 = 0;
                 D_8017835C = 8;
@@ -3207,7 +3207,7 @@ void func_i1_80191160(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 981:
             D_80177830 = 1;
             break;
@@ -3261,7 +3261,7 @@ void func_i1_80191160(Player* player) {
                 gActors[0].unk_0B8 = 1;
                 gActors[0].fwork[9] = 2.0f;
                 gActors[0].timer_0BC = 50;
-                Audio_PlaySfx(0x09000002, &gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 gActors[0].fwork[29] = 5.0f;
             }
             break;
@@ -3270,7 +3270,7 @@ void func_i1_80191160(Player* player) {
                 gActors[1].unk_0B8 = 1;
                 gActors[1].fwork[9] = 2.0f;
                 gActors[1].timer_0BC = 50;
-                Audio_PlaySfx(0x09000002, &gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 gActors[1].fwork[29] = 5.0f;
             }
             break;
@@ -3279,7 +3279,7 @@ void func_i1_80191160(Player* player) {
                 gActors[2].unk_0B8 = 1;
                 gActors[2].fwork[9] = 2.0f;
                 gActors[2].timer_0BC = 50;
-                Audio_PlaySfx(0x09000002, &gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 gActors[2].fwork[29] = 5.0f;
             }
             break;

src/overlays/ovl_i1/fox_tr.c

@@ -24,7 +24,7 @@ void func_i1_80198968(Item* item) {
                 if (item->obj.pos.z > (gPlayer->unk_138 + var_fv0)) {
                     item->unk_44 = 1;
                     PRINTF("♪:リング未通過音\n"); // Ring not passed sound
-                    Audio_PlaySfx(0x4900402F, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x4900402F, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_80177E80 = 0;
                 }
             }
@@ -33,7 +33,7 @@ void func_i1_80198968(Item* item) {
                 item->timer_48 = 50;
                 item->info.unk_10 = 10000.0f;
                 PRINTF("♪:リング通過音\n"); // Ring passing sound
-                Audio_PlaySfx(0x49008025, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_80177E80++;
                 if ((item->obj.rot.x != 0.0f) && (D_80177E80 >= 100)) {
                     func_800BA808(gMsg_ID_20330, RCID_ROB64);
@@ -51,7 +51,7 @@ void func_i1_80198968(Item* item) {
             item->obj.rot.z += 22.0f;
             Math_SmoothStepToAngle(&item->obj.rot.y, Math_RadToDeg(-gPlayer[item->unk_4E].unk_058), 0.2f, 10.0f, 0.0f);
             if (item->timer_48 == 0) {
-                Object_Kill(&item->obj, &item->sfxPos);
+                Object_Kill(&item->obj, item->sfxPos);
             }
             break;
     }

src/overlays/ovl_i1/fox_tr360.c

@@ -14,7 +14,7 @@ void func_i1_80198C50(void) {
         if (D_80178310[i].id >= 0) {
             if (D_80178310[i].id <= 160) {
                 func_800A4F4C(obj58);
-                obj58->obj.status = 2;
+                obj58->obj.status = OBJ_ACTIVE;
                 obj58->obj.id = D_80178310[i].id;
                 obj58->obj.pos.x = D_80178310[i].xPos;
                 obj58->obj.pos.z = -D_80178310[i].zPos1;
@@ -34,28 +34,28 @@ bool func_i1_80198DCC(Actor* actor, f32 x, f32 z) {
     s32 i;
 
     for (i = 0, obj58 = gObjects58; i < 200;) {
-        if ((obj58->obj.status == 2) &&
+        if ((obj58->obj.status == OBJ_ACTIVE) &&
             (fabsf(obj58->obj.pos.x - (actor->obj.pos.x + ((x * 650.0f) + 350.0f))) < 1200.0f) &&
             (fabsf(obj58->obj.pos.z - (actor->obj.pos.z + ((z * 650.0f) + 350.0f))) < 1200.0f) &&
             (actor->obj.pos.y < 650.0f)) {
             return true;
         }
         obj58++;
-        if ((obj58->obj.status == 2) &&
+        if ((obj58->obj.status == OBJ_ACTIVE) &&
             (fabsf(obj58->obj.pos.x - (actor->obj.pos.x + ((x * 650.0f) + 350.0f))) < 1200.0f) &&
             (fabsf(obj58->obj.pos.z - (actor->obj.pos.z + ((z * 650.0f) + 350.0f))) < 1200.0f) &&
             (actor->obj.pos.y < 650.0f)) {
             return true;
         }
         obj58++;
-        if ((obj58->obj.status == 2) &&
+        if ((obj58->obj.status == OBJ_ACTIVE) &&
             (fabsf(obj58->obj.pos.x - (actor->obj.pos.x + ((x * 650.0f) + 350.0f))) < 1200.0f) &&
             (fabsf(obj58->obj.pos.z - (actor->obj.pos.z + ((z * 650.0f) + 350.0f))) < 1200.0f) &&
             (actor->obj.pos.y < 650.0f)) {
             return true;
         }
         obj58++;
-        if ((obj58->obj.status == 2) &&
+        if ((obj58->obj.status == OBJ_ACTIVE) &&
             (fabsf(obj58->obj.pos.x - (actor->obj.pos.x + ((x * 650.0f) + 350.0f))) < 1200.0f) &&
             (fabsf(obj58->obj.pos.z - (actor->obj.pos.z + ((z * 650.0f) + 350.0f))) < 1200.0f) &&
             (actor->obj.pos.y < 650.0f)) {
@@ -185,9 +185,9 @@ void func_i1_8019949C(void) {
             sp44.y = 0.0f;
             sp44.z = -15000.0f;
             for (i = var_v1, actor = &gActors[i + 10]; i < 16; i++, actor++) {
-                if (actor->obj.status == 0) {
+                if (actor->obj.status == OBJ_FREE) {
                     Actor_Initialize(actor);
-                    actor->obj.status = 2;
+                    actor->obj.status = OBJ_ACTIVE;
                     actor->obj.id = OBJ_ACTOR_197;
                     Matrix_RotateY(gCalcMatrix, gGameFrameCount * 6.0f * M_DTOR, 0);
                     Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38);
@@ -196,14 +196,14 @@ void func_i1_8019949C(void) {
                     actor->obj.pos.z = sp38.z;
                     actor->unk_0F4.y = gGameFrameCount * 6.0f;
                     actor->unk_0E4 = i + 10;
-                    actor->unk_0CE = 24;
+                    actor->health = 24;
                     actor->unk_0C9 = actor->iwork[11] = 1;
                     actor->timer_0C2 = 30;
                     Object_SetInfo(&actor->info, actor->obj.id);
-                    Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     if ((i + 10) == 10) {
                         actor->unk_0E6 = 0;
-                        actor->unk_0CE = 50;
+                        actor->health = 50;
                     } else {
                         actor->unk_0E6 = -1;
                         actor->info.action = (ObjectFunc) func_i1_80199024;

src/overlays/ovl_i1/sf_ve1.c

@@ -68,10 +68,10 @@ void func_i1_801922DC(Object_4C* this) {
     s32 i;
 
     for (i = 0; i < 4; i++, boss++) {
-        if ((boss->obj.status != 0) && (boss->obj.id == OBJ_BOSS_319)) {
+        if ((boss->obj.status != OBJ_FREE) && (boss->obj.id == OBJ_BOSS_319)) {
             if (boss->obj.pos.z <= this->obj.pos.z) {
                 D_i1_8019C0B8 = (s32) this->obj.rot.x + 1;
-                this->obj.status = 0;
+                this->obj.status = OBJ_FREE;
             }
             break;
         }
@@ -83,10 +83,10 @@ void func_i1_80192358(Object_4C* this) {
     s32 i;
 
     for (i = 0; i < 4; i++, boss++) {
-        if ((boss->obj.status != 0) && (boss->obj.id == 0x13F)) {
+        if ((boss->obj.status != OBJ_FREE) && (boss->obj.id == 0x13F)) {
             if (boss->obj.pos.z <= this->obj.pos.z) {
                 D_i1_8019C0B8 = 0;
-                this->obj.status = 0;
+                this->obj.status = OBJ_FREE;
             }
             break;
         }
@@ -98,10 +98,10 @@ void func_i1_801923C0(Object_4C* obj4C) {
     s32 i;
 
     for (boss = &gBosses[0], i = 0; i < 4; i++, boss++) {
-        if (boss->obj.status != 0 && boss->obj.id == OBJ_BOSS_319) {
+        if (boss->obj.status != OBJ_FREE && boss->obj.id == OBJ_BOSS_319) {
             if (boss->obj.pos.z <= obj4C->obj.pos.z) {
                 D_i1_8019C0BC = (s32) obj4C->obj.rot.x + 1;
-                obj4C->obj.status = 0;
+                obj4C->obj.status = OBJ_FREE;
             }
             break;
         }
@@ -113,24 +113,24 @@ void func_i1_8019243C(Object_4C* obj4C) {
     s32 i;
 
     for (boss = &gBosses[0], i = 0; i < 4; i++, boss++) {
-        if (boss->obj.status != 0 && boss->obj.id == OBJ_BOSS_319) {
+        if (boss->obj.status != OBJ_FREE && boss->obj.id == OBJ_BOSS_319) {
             if (boss->obj.pos.z <= obj4C->obj.pos.z) {
                 D_i1_8019C0C0 = 1;
-                obj4C->obj.status = 0;
+                obj4C->obj.status = OBJ_FREE;
             }
             break;
         }
     }
 }
 
-void func_i1_801924A8(Object_80* arg0) {
-    switch (arg0->unk_48) {
+void func_i1_801924A8(Object_80* obj80) {
+    switch (obj80->unk_48) {
         case 0:
-            if (gPlayer[0].pos.z < arg0->obj.pos.z) {
+            if (gPlayer[0].pos.z < obj80->obj.pos.z) {
                 D_80177AB0 = 0;
                 D_80177A98 = 0;
 
-                arg0->unk_48++;
+                obj80->unk_48++;
             }
 
         case 1:
@@ -138,7 +138,7 @@ void func_i1_801924A8(Object_80* arg0) {
     }
 }
 
-void func_i1_8019250C(Actor* arg0) {
+void func_i1_8019250C(Actor* actor) {
 }
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192518.s")

src/overlays/ovl_i2/fox_me.c

@@ -60,9 +60,9 @@ void func_i2_8018756C(Actor* actor) {
 
     if (actor->unk_0D0 != 0) {
         actor->unk_0D0 = 0;
-        actor->unk_0CE -= actor->unk_0D6;
-        if (actor->unk_0CE <= 0) {
-            actor->obj.status = 3;
+        actor->health -= actor->damage;
+        if (actor->health <= 0) {
+            actor->obj.status = OBJ_DYING;
         }
     }
 
@@ -74,7 +74,7 @@ void func_i2_8018756C(Actor* actor) {
     vec.z = actor->vel.z;
 
     if ((func_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) || (actor->obj.pos.y < (gGroundLevel + 20.0f))) {
-        actor->obj.status = 3;
+        actor->obj.status = OBJ_DYING;
     }
     func_i2_80187530(actor);
 }
@@ -102,7 +102,7 @@ void func_i2_80187650(Actor* actor) {
     if (actor->unk_0D0 != 0) {
         func_8007A6F0(&actor->obj.pos, 0x2903A008);
         func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
     }
 
     if (actor->timer_0C2 == 0) {
@@ -112,7 +112,7 @@ void func_i2_80187650(Actor* actor) {
         if ((func_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) ||
             (actor->obj.pos.y < (gGroundLevel + 20.0f))) {
             func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
-            actor->obj.status = 3;
+            actor->obj.status = OBJ_DYING;
         }
     }
 
@@ -139,7 +139,7 @@ void func_i2_801877C4(Actor* actor) {
     if (actor->unk_0D0 != 0) {
         func_80066254(actor);
         func_8007A6F0(&actor->obj.pos, 0x2903A008);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 5.0f);
         func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, 10);
     }
@@ -162,7 +162,7 @@ void func_i2_8018795C(Actor* actor) {
     if (actor->unk_0D0 != 0) {
         func_80066254(actor);
         func_8007A6F0(&actor->obj.pos, 0x2903A008);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
         func_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, 0.0f,
                       0.0f, 0.0f, 4.0f, 10);
@@ -197,7 +197,7 @@ void func_i2_80187B08(Actor* actor) {
 
     if ((actor->unk_0D0 != 0) || (actor->timer_0BC == 0)) {
         func_8007A6F0(&actor->obj.pos, 0x2903A008);
-        Object_Kill(&actor->obj, &actor->sfxPos);
+        Object_Kill(&actor->obj, actor->sfxPos);
         func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
         func_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, 0.0f,
                       0.0f, 0.0f, 4.0f, 10);
@@ -206,7 +206,7 @@ void func_i2_80187B08(Actor* actor) {
 
 void func_i2_80187C68(Actor* actor, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yRot, s32 timerBC, s32 arg8, s32 id) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = (u16) id;
 
     actor->obj.pos.x = x;
@@ -227,7 +227,7 @@ void func_i2_80187D08(f32 x, f32 y, f32 z, f32 arg3, f32 xRot, f32 yRot, s32 arg
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
-        if (gActors[i].obj.status == 0) {
+        if (gActors[i].obj.status == OBJ_FREE) {
             func_i2_80187C68(&gActors[i], x, y, z, arg3, xRot, yRot, arg6, arg7, id);
             return;
         }
@@ -236,7 +236,7 @@ void func_i2_80187D08(f32 x, f32 y, f32 z, f32 arg3, f32 xRot, f32 yRot, s32 arg
 
 void func_i2_80187D98(Effect* effect, f32 x, f32 y, f32 z, f32 arg4, bool arg5) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_369;
 
     effect->obj.pos.x = x;
@@ -258,29 +258,29 @@ void func_i2_80187E38(f32 x, f32 y, f32 z, f32 arg3) {
     s32 i;
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187D98(&gEffects[i], x, y, z, arg3, 0);
-            Audio_PlaySfx(0x31037057U, &gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x31037057U, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         }
     }
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187D98(&gEffects[i], x, y, z, arg3, 1);
             break;
         }
     }
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 0);
             break;
         }
     }
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 1);
             break;
         }
@@ -289,7 +289,7 @@ void func_i2_80187E38(f32 x, f32 y, f32 z, f32 arg3) {
 
 void func_i2_80187FF8(Effect* effect, f32 x, f32 y, f32 z) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_371;
 
     effect->obj.pos.x = x;
@@ -306,15 +306,15 @@ void func_i2_80188088(Boss* boss) {
     s32 i;
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f);
-            Audio_PlaySfx(0x19006035U, &gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x19006035U, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         }
     }
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80187FF8(&gEffects[i], boss->obj.pos.x - 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f);
             break;
         }
@@ -323,7 +323,7 @@ void func_i2_80188088(Boss* boss) {
 
 void func_i2_801881A8(Effect* effect, f32 x, f32 y, f32 z, f32 zRot, s32 arg5) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_370;
 
     effect->obj.pos.x = x;
@@ -340,7 +340,7 @@ void func_i2_80188228(f32 x, f32 y, f32 z, f32 zRot) {
     s32 i;
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_801881A8(&gEffects[i], x, y, z, zRot, 0);
             break;
         }
@@ -351,9 +351,9 @@ void func_i2_80188298(f32 x, f32 y, f32 z, f32 zRot) {
     s32 i;
 
     for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_801881A8(&gEffects[i], x, y, z, zRot, -1);
-            Audio_PlaySfx(0x3102705CU, &gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x3102705CU, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         }
     }
@@ -399,7 +399,7 @@ void func_i2_80188344(Boss* boss) {
                 boss->timer_054 = 5;
                 boss->swork[0] += 32;
 
-                func_8001D034(&boss->sfxPos, 0x3103605B, boss->unk_04A);
+                func_8001D034(boss->sfxPos, 0x3103605B, boss->unk_04A);
 
                 boss->unk_04A++;
                 if (boss->unk_04A >= 8) {
@@ -408,7 +408,7 @@ void func_i2_80188344(Boss* boss) {
 
                 if (boss->swork[0] >= 0xFF) {
                     boss->unk_04A = 0;
-                    Audio_KillSfx(&boss->sfxPos);
+                    Audio_KillSfx(boss->sfxPos);
                     if (boss->swork[1] == 0) {
                         boss->swork[1]++;
                         func_800BA808(gMsg_ID_3315, RCID_PEPPY);
@@ -449,8 +449,8 @@ void func_i2_80188344(Boss* boss) {
 
                 boss->info.unk_10 = 1000.0f;
 
-                func_8001A55C(&boss->sfxPos, 0x3103605B);
-                Audio_PlaySfx(0x3102405DU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                func_8001A55C(boss->sfxPos, 0x3103605B);
+                Audio_PlaySfx(0x3102405DU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
 
@@ -509,7 +509,7 @@ void func_i2_80188A40(Boss* boss) {
 
     func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 255);
 
-    D_80178284 = 1;
+    gBossActive = 1;
 
     boss->swork[2] = 40;
     boss->swork[3] = 40;
@@ -526,7 +526,7 @@ void func_i2_80188A40(Boss* boss) {
 
     Boss_Initialize(&gBosses[i]);
 
-    gBosses[i].obj.status = 1;
+    gBosses[i].obj.status = OBJ_INIT;
     gBosses[i].obj.id = 0x12A;
     gBosses[i].obj.pos.x = boss->obj.pos.x;
     gBosses[i].obj.pos.y = boss->obj.pos.y;
@@ -534,12 +534,12 @@ void func_i2_80188A40(Boss* boss) {
 
     Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id);
     func_800BA808(gMsg_ID_3300, RCID_BOSS_METEO);
-    Audio_PlaySfx(0x3102505AU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_369;
 
     effect->obj.pos.x = x;
@@ -553,7 +553,7 @@ void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f
     effect->timer_50 = 20;
     effect->scale2 = arg7;
     effect->unk_4E = 1;
-    effect->unk_44 = 0x80;
+    effect->unk_44 = 128;
     Object_SetInfo(&effect->info, effect->obj.id);
 }
 
@@ -561,7 +561,7 @@ void func_i2_80188C2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 arg
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80188B84(&gEffects[i], x, y, z, xRot, yRot, arg5, arg6);
             return;
         }
@@ -609,7 +609,7 @@ void func_i2_80188CAC(Effect* effect) {
         func_i2_80188C2C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->obj.rot.x, effect->obj.rot.y,
                          effect->unk_60.z, 1.0f);
     } else if (effect->timer_50 == 0) {
-        Object_Kill(&effect->obj, &effect->sfxPos);
+        Object_Kill(&effect->obj, effect->sfxPos);
     }
 
     func_8007A774(gPlayer, effect, 90.0f);
@@ -617,7 +617,7 @@ void func_i2_80188CAC(Effect* effect) {
 
 void func_i2_80188E8C(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 zRot, f32 scale) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_370;
 
     effect->obj.pos.x = x;
@@ -630,7 +630,7 @@ void func_i2_80188E8C(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f
 
     effect->scale2 = scale;
     effect->unk_4E = 1;
-    effect->unk_44 = 0x80;
+    effect->unk_44 = 128;
     Object_SetInfo(&effect->info, effect->obj.id);
 }
 
@@ -638,7 +638,7 @@ void func_i2_80188F2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 sca
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i2_80188E8C(&gEffects[i], x, y, z, xRot, yRot, arg5, scale);
             return;
         }
@@ -673,52 +673,52 @@ void func_i2_80188FAC(Effect* effect) {
     } else {
         effect->unk_44 -= 8;
         if (effect->unk_44 < 0) {
-            Object_Kill(&effect->obj, &effect->sfxPos);
+            Object_Kill(&effect->obj, effect->sfxPos);
         }
     }
     func_8007A774(gPlayer, effect, 60.0f);
 }
 
-void func_i2_80189114(Effect* arg0) {
+void func_i2_80189114(Effect* effect) {
     if (gPlayer->state_1C8 == PLAYERSTATE_1C8_7) {
-        Object_Kill(&arg0->obj, &arg0->sfxPos);
+        Object_Kill(&effect->obj, effect->sfxPos);
     }
 
-    arg0->scale2 += 0.5f;
-    if (arg0->scale2 > 10.0f) {
-        arg0->scale2 = 10.0f;
+    effect->scale2 += 0.5f;
+    if (effect->scale2 > 10.0f) {
+        effect->scale2 = 10.0f;
     }
 
-    arg0->obj.rot.z += 35.0f;
-    if (arg0->obj.pos.x < gPlayer->pos.x) {
-        arg0->obj.pos.x += 1.5f;
-        if (arg0->vel.x < 40.0f) {
-            arg0->vel.x += 2.0f;
+    effect->obj.rot.z += 35.0f;
+    if (effect->obj.pos.x < gPlayer->pos.x) {
+        effect->obj.pos.x += 1.5f;
+        if (effect->vel.x < 40.0f) {
+            effect->vel.x += 2.0f;
         }
     }
 
-    if (gPlayer->pos.x < arg0->obj.pos.x) {
-        arg0->obj.pos.x -= 1.5f;
-        if (arg0->vel.x > -40.0f) {
-            arg0->vel.x -= 2.0f;
+    if (gPlayer->pos.x < effect->obj.pos.x) {
+        effect->obj.pos.x -= 1.5f;
+        if (effect->vel.x > -40.0f) {
+            effect->vel.x -= 2.0f;
         }
     }
 
-    if (arg0->obj.pos.y < gPlayer->pos.y) {
-        arg0->obj.pos.y += 1.5f;
-        if (arg0->vel.y < 40.0f) {
-            arg0->vel.y += 2.0f;
+    if (effect->obj.pos.y < gPlayer->pos.y) {
+        effect->obj.pos.y += 1.5f;
+        if (effect->vel.y < 40.0f) {
+            effect->vel.y += 2.0f;
         }
     }
 
-    if (gPlayer->pos.y < arg0->obj.pos.y) {
-        arg0->obj.pos.y -= 1.5f;
-        if (arg0->vel.y > -40.0f) {
-            arg0->vel.y -= 2.0f;
+    if (gPlayer->pos.y < effect->obj.pos.y) {
+        effect->obj.pos.y -= 1.5f;
+        if (effect->vel.y > -40.0f) {
+            effect->vel.y -= 2.0f;
         }
     }
 
-    func_8007A774(gPlayer, arg0, 100.0f);
+    func_8007A774(gPlayer, effect, 100.0f);
 }
 
 void func_i2_801892F0(Boss* boss, s32 arg1) {
@@ -848,27 +848,27 @@ void func_i2_8018978C(Boss* boss) {
     if (boss->swork[0] > 5) {
         boss->swork[0]--;
         if (boss->swork[0] == 5) {
-            func_8001A55C(&boss->sfxPos, 0x3102505AU);
+            func_8001A55C(boss->sfxPos, 0x3102505AU);
         }
     }
 
     if (boss->swork[1] > 5) {
         boss->swork[1] = boss->swork[1] - 1;
         if (boss->swork[1] == 5) {
-            func_8001A55C(&boss->sfxPos, 0x3102505AU);
+            func_8001A55C(boss->sfxPos, 0x3102505AU);
         }
     }
 
     if (boss->dmgType != 0) {
         boss->dmgType = 0;
         if ((boss->dmgPart != 7) && (boss->dmgPart >= 5) && (boss->dmgPart != 5)) {
-            Audio_PlaySfx(0x29121007U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
 
         if ((boss->actionState >= 2) && (boss->actionState < 20)) {
             if ((boss->dmgPart < 5) && (boss[0].fwork[17 + boss->dmgPart] > 0.5f)) {
                 if (boss[0].swork[boss->dmgPart + 2] != 0) {
-                    Audio_PlaySfx(0x29034003U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29034003U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                     boss[0].swork[9 + boss->dmgPart] = 20;
                     boss[0].swork[2 + boss->dmgPart] -= boss->damage;
@@ -888,14 +888,14 @@ void func_i2_8018978C(Boss* boss) {
                         }
                     }
                 } else {
-                    Audio_PlaySfx(0x29121007U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
 
             if (boss->actionState >= 9) {
                 if (boss->dmgPart == 5) {
                     if ((boss->swork[7] != 0) && (boss->fwork[22] > 0.8f)) {
-                        Audio_PlaySfx(0x2943500FU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         boss->swork[14] = 20;
                         boss->swork[7] -= boss->damage;
                         if (boss->swork[7] <= 0) {
@@ -903,13 +903,13 @@ void func_i2_8018978C(Boss* boss) {
                             func_i2_801892F0(boss, boss->dmgPart);
                         }
                     } else {
-                        Audio_PlaySfx(0x29121007U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
 
                 if (boss->dmgPart == 7) {
                     if ((boss->swork[8] != 0) && (boss->fwork[23] > 0.8f)) {
-                        Audio_PlaySfx(0x2943500FU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         boss->swork[15] = 20;
                         boss->swork[8] -= boss->damage;
                         if (boss->swork[8] <= 0) {
@@ -917,7 +917,7 @@ void func_i2_8018978C(Boss* boss) {
                             func_i2_801892F0(boss, boss->dmgPart);
                         }
                     } else {
-                        Audio_PlaySfx(0x29121007U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                 }
 
@@ -935,12 +935,12 @@ void func_i2_8018978C(Boss* boss) {
                             (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) {
                             gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7;
                             gPlayer[0].unk_1D0 = 0;
-                            D_80177A80 = 0;
+                            gCsFrameCount = 0;
                         }
 
                         func_800182F4(0x103200FF);
                         func_800182F4(0x113200FF);
-                        Audio_PlaySfx(0x2940D09AU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         D_Timer_80161A60 = 8;
                     }
                 }
@@ -1044,7 +1044,7 @@ void func_i2_8018978C(Boss* boss) {
             id = 190;
         }
 
-        Audio_PlaySfx(0x2903201BU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x2903201BU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
         src.x = 0.0f;
         src.y = 330.0f;
@@ -1147,7 +1147,7 @@ void func_i2_8018978C(Boss* boss) {
                 boss->timer_052 = 80;
             } else if (boss->vel.z < -50.0f) {
                 if (boss->swork[0] == 5) {
-                    Audio_PlaySfx(0x3102505AU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
 
                 if (boss->swork[0] < 10) {
@@ -1194,7 +1194,7 @@ void func_i2_8018978C(Boss* boss) {
                 if ((boss->timer_050 == 0) && (gBosses[boss->unk_044].actionState == 2)) {
                     boss->fwork[2] = 90.0f;
                     boss->timer_050 = D_i2_80195520[var_v0] + 45;
-                    Audio_PlaySfx(0x19030036U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x19030036U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
 
                 if (boss->fwork[2] > 0.0f) {
@@ -1228,7 +1228,7 @@ void func_i2_8018978C(Boss* boss) {
             boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * 0.02f);
 
             if (boss->timer_050 == 1) {
-                Audio_PlaySfx(0x31016056U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x31016056U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (boss->timer_050 == 0) {
@@ -1279,7 +1279,7 @@ void func_i2_8018978C(Boss* boss) {
                 }
                 if (boss->timer_050 == 0) {
                     boss->actionState = 7;
-                    Audio_PlaySfx(0x29038058U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29038058U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 func_i2_80189624();
             }
@@ -1294,7 +1294,7 @@ void func_i2_8018978C(Boss* boss) {
                 boss->fwork[11] -= 2.0f;
                 if (boss->fwork[11] <= 0.0f) {
                     boss->fwork[11] = 0.0f;
-                    Audio_KillSfx(&boss->sfxPos);
+                    Audio_KillSfx(boss->sfxPos);
                     if (boss->swork[6] == 0) {
                         boss->actionState = 8;
 
@@ -1304,7 +1304,7 @@ void func_i2_8018978C(Boss* boss) {
                         boss->fwork[10] = 0.0f;
                         boss->fwork[22] = 0.0f;
                         boss->fwork[23] = 0.0f;
-                        D_80177A80 = 0;
+                        gCsFrameCount = 0;
                         func_800BA808(gMsg_ID_3322, RCID_BOSS_METEO);
                         func_800182F4(0x100100FF);
                         func_800182F4(0x110100FF);
@@ -1317,16 +1317,16 @@ void func_i2_8018978C(Boss* boss) {
             break;
 
         case 8:
-            D_80177A80++;
-            if (D_80177A80 == 130) {
+            gCsFrameCount++;
+            if (gCsFrameCount == 130) {
                 func_800BA808(gMsg_ID_3330, RCID_BOSS_METEO);
             }
-            if (D_80177A80 == 300) {
+            if (gCsFrameCount == 300) {
                 PRINTF("msg_03340\n");
                 func_800BA808(gMsg_ID_3340, RCID_FALCO);
             }
 
-            if (D_80177A80 == 400) {
+            if (gCsFrameCount == 400) {
                 func_8001D444(0U, 0x8041U, 0U, 0xFFU);
                 if (gTeamShields[1] > 0) {
                     func_800BA808(gMsg_ID_3345, RCID_BOSS_METEO);
@@ -1344,7 +1344,7 @@ void func_i2_8018978C(Boss* boss) {
 
                 if (boss->timer_052 != 0) {
                     if (boss->swork[0] == 5) {
-                        Audio_PlaySfx(0x3102505AU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     }
                     if (boss->swork[0] < 10) {
                         boss->swork[0] += 2;
@@ -1358,7 +1358,7 @@ void func_i2_8018978C(Boss* boss) {
                     boss->actionState = 9;
                     boss->timer_050 = 0;
                     boss->fwork[15] = 8.0f;
-                    Audio_PlaySfx(0x11015034U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             break;
@@ -1405,7 +1405,7 @@ void func_i2_8018978C(Boss* boss) {
                 boss->actionState = 9;
                 boss->timer_050 = 70;
                 boss->fwork[15] = 8.0f;
-                Audio_PlaySfx(0x11015034U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else if ((boss->timer_050 & 1) == 1) {
                 func_i2_80188088(boss);
             }
@@ -1440,15 +1440,15 @@ void func_i2_8018978C(Boss* boss) {
 
             if (boss->timer_050 == 0) {
                 func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f);
-                Object_Kill(&boss->obj, &boss->sfxPos);
+                Object_Kill(&boss->obj, boss->sfxPos);
             }
             if (boss->timer_050 == 20) {
                 func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f);
-                Audio_PlaySfx(0x2940F026U, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2940F026U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_Timer_80177BD0[0] = 60;
                 for (i = 0; i < ARRAY_COUNT(gActors); i++) {
                     if (gActors[i].obj.id == 0xC6) {
-                        Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+                        Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
                     }
                 }
             }
@@ -1775,7 +1775,7 @@ void func_i2_8018BACC(Boss* boss) {
 
 void func_i2_8018C77C(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
 
     actor->obj.pos.x = D_i2_80195584[arg1] + gPlayer[0].pos.x;
@@ -1789,17 +1789,17 @@ void func_i2_8018C77C(Actor* actor, s32 arg1) {
 
     if (actor->unk_0B6 == 0) {
         actor->iwork[11] = 1;
-        Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         return;
     }
 
-    Audio_PlaySfx(0x11030010U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-    Audio_PlaySfx(0x31024059U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i2_8018C8F4(Actor* actor1, Actor* actor2) {
     Actor_Initialize(actor1);
-    actor1->obj.status = 1;
+    actor1->obj.status = OBJ_INIT;
     actor1->obj.id = OBJ_ACTOR_182;
 
     actor1->obj.pos.x = ((Rand_ZeroOneSeeded() - 0.5f) * 2000.0f) + actor2->obj.pos.x;
@@ -1816,7 +1816,7 @@ void func_i2_8018C8F4(Actor* actor1, Actor* actor2) {
 
 void func_i2_8018CA10(Actor* actor1, Actor* actor2, f32 x, f32 y, f32 z) {
     Actor_Initialize(actor1);
-    actor1->obj.status = 1;
+    actor1->obj.status = OBJ_INIT;
     actor1->obj.id = OBJ_ACTOR_182;
 
     actor1->obj.pos.x = actor2->obj.pos.x + x;
@@ -1835,7 +1835,7 @@ void func_i2_8018CAD8(void) {
     Actor* actor = &gActors[50];
 
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.pos.x = 0.0f;
     actor->obj.pos.y = 0.0f;
     actor->obj.pos.z = 9000.0f;
@@ -1846,7 +1846,7 @@ void func_i2_8018CAD8(void) {
 
 void func_i2_8018CB50(Effect* effect, Actor* actor) {
     Effect_Initialize(effect);
-    effect->obj.status = 2;
+    effect->obj.status = OBJ_ACTIVE;
     effect->obj.id = OBJ_EFFECT_346;
     effect->timer_50 = (s32) (Rand_ZeroOne() * 20.0f) + 20.0f;
     effect->scale2 = (Rand_ZeroOne() * 0.5f) + 0.5f;
@@ -1871,7 +1871,7 @@ void func_i2_8018CCF8(Actor* actor) {
 
     for (i = 0; i < 25; ++i) {
         for (j = 0; j < ARRAY_COUNT(gEffects); j++) {
-            if (gEffects[j].obj.status == 0) {
+            if (gEffects[j].obj.status == OBJ_FREE) {
                 func_i2_8018CB50(&gEffects[j], actor);
                 break;
             }
@@ -1900,7 +1900,7 @@ void func_i2_8018CD8C(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
 
             if (gTeamShields[1] > 0) {
                 func_i2_8018C77C(actor0, 0);
@@ -1949,51 +1949,51 @@ void func_i2_8018CD8C(Player* player) {
             Math_SmoothStepToF(&player->unk_0EC, 0.0f, 0.05f, 0.3f, 0);
 
             D_80177A48[0] = 0.1f;
-            if (D_80177A80 == 680) {
+            if (gCsFrameCount == 680) {
                 actor3->unk_0B8 = 10;
             }
-            if (D_80177A80 == 720) {
+            if (gCsFrameCount == 720) {
                 actor0->unk_0B8 = 11;
             }
-            if (D_80177A80 == 750) {
+            if (gCsFrameCount == 750) {
                 actor2->unk_0B8 = 12;
             }
-            if (D_80177A80 == 780) {
+            if (gCsFrameCount == 780) {
                 actor1->unk_0B8 = 13;
             }
-            if (D_80177A80 > 810) {
+            if (gCsFrameCount > 810) {
                 player->unk_1D0 = 2;
                 D_80177A48[0] = 0.0f;
                 player->timer_1F8 = 40;
             }
             sp8F = false;
-            if (D_80177A80 == 190) {
+            if (gCsFrameCount == 190) {
                 player->timer_1FC = 5;
                 player->unk_1D8 = 10;
                 sp8F = true;
             }
-            if (D_80177A80 == 230) {
+            if (gCsFrameCount == 230) {
                 player->timer_1FC = 3;
                 player->unk_1D8 = 6;
                 sp8F = true;
             }
-            if (D_80177A80 == 240) {
+            if (gCsFrameCount == 240) {
                 player->timer_1FC = 3;
                 player->unk_1D8 = 11;
                 sp8F = true;
             }
-            if (D_80177A80 == 270) {
+            if (gCsFrameCount == 270) {
                 player->timer_1FC = 2;
                 player->unk_1D8 = 12;
                 sp8F = true;
             }
-            if (D_80177A80 == 600) {
+            if (gCsFrameCount == 600) {
                 func_i2_8018CA10(&gActors[16], &gActors[3], 100.0f, 500.0f, 1500.0f);
                 func_i2_8018CA10(&gActors[17], &gActors[3], 300.0f, 400.0f, 2000.0f);
             }
-            if (D_80177A80 == 660) {
+            if (gCsFrameCount == 660) {
                 for (i = 4; i < 15; i++) {
-                    gActors[i].obj.status = 0;
+                    gActors[i].obj.status = OBJ_FREE;
                 }
 
                 actor3->obj.pos.x += 1000.0f;
@@ -2010,16 +2010,16 @@ void func_i2_8018CD8C(Player* player) {
                 func_i2_8018CA10(&gActors[14], &gActors[3], 1200.0f, -200.0f, -500.0f);
                 func_i2_8018CA10(&gActors[15], &gActors[3], 2000.0f, -100.0f, -1000.0f);
 
-                gActors[50].obj.status = gActors[16].obj.status = gActors[17].obj.status = 0;
+                gActors[50].obj.status = gActors[16].obj.status = gActors[17].obj.status = OBJ_FREE;
             }
 
-            if (D_80177A80 > 660) {
+            if (gCsFrameCount > 660) {
                 player->wings.unk_2C = 0;
             }
 
-            if (D_80177A80 == 340) {
+            if (gCsFrameCount == 340) {
                 func_8007D2C8(gActors[8].obj.pos.x, gActors[8].obj.pos.y, gActors[8].obj.pos.z, 10.0f);
-                gActors[8].obj.status = 0;
+                gActors[8].obj.status = OBJ_FREE;
                 func_i2_8018CCF8(&gActors[8]);
             }
 
@@ -2047,9 +2047,9 @@ void func_i2_8018CD8C(Player* player) {
                 if (player->timer_1FC == 1) {
                     func_8007D2C8(gActors[player->unk_1D8].obj.pos.x, gActors[player->unk_1D8].obj.pos.y,
                                   gActors[player->unk_1D8].obj.pos.z, 10.0f);
-                    gActors[player->unk_1D8].obj.status = 0;
+                    gActors[player->unk_1D8].obj.status = OBJ_FREE;
                     func_i2_8018CCF8(&gActors[player->unk_1D8]);
-                    Object_Kill(&gPlayerShots->obj, &gPlayerShots->sfxPos);
+                    Object_Kill(&gPlayerShots->obj, gPlayerShots->sfxPos);
                 }
             }
             break;
@@ -2079,7 +2079,7 @@ void func_i2_8018CD8C(Player* player) {
                 player->camAt.z = player->unk_138;
 
                 for (i = 0; i < 4; i++) {
-                    Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+                    Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
                 }
 
                 D_80178488 = 1;
@@ -2087,7 +2087,7 @@ void func_i2_8018CD8C(Player* player) {
             }
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 500:
             if ((gTeamShields[2] > 0) && (gTeamShields[3] > 0)) {
                 func_800BA808(gMsg_ID_3005, RCID_SLIPPY);
@@ -2184,7 +2184,7 @@ void func_i2_8018DE14(Effect* effect) {
 
 void func_i2_8018DF08(Actor* actor, s32 idx) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
 
     actor->obj.pos.x = D_i2_801955D0[idx].x + gPlayer[0].pos.x;
@@ -2197,12 +2197,12 @@ void func_i2_8018DF08(Actor* actor, s32 idx) {
     Object_SetInfo(&actor->info, actor->obj.id);
 
     if (idx == 3) {
-        Audio_PlaySfx(0x11030010U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-        Audio_PlaySfx(0x31024059U, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         actor->unk_0B6 = 1;
     } else {
         actor->iwork[11] = 1;
-        Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -2211,7 +2211,7 @@ void func_i2_8018E084(Player* player) {
     Vec3f dest;
     s32 pad[5];
 
-    gBosses[1].obj.status = 0;
+    gBosses[1].obj.status = OBJ_FREE;
 
     Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f);
     Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f);
@@ -2224,7 +2224,7 @@ void func_i2_8018E084(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            func_8001A38C(1, &player->unk_460);
+            func_8001A38C(1, player->sfxPos);
             player->unk_1D0++;
 
             D_80177A48[0] = 0.0f;
@@ -2233,7 +2233,7 @@ void func_i2_8018E084(Player* player) {
 
             player->wings.unk_2C = 1;
 
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
 
         case 1:
             Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0);
@@ -2259,8 +2259,8 @@ void func_i2_8018E084(Player* player) {
             Math_SmoothStepToF(&gBosses->vel.z, 0.0f, 1.0f, 0.5f, 0.0f);
             Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 3.0f, 0.0f);
 
-            if (D_80177A80 == 320) {
-                D_80177A80 = 200;
+            if (gCsFrameCount == 320) {
+                gCsFrameCount = 200;
                 D_80177A48[0] = 0.0f;
                 D_80177A48[3] = 0.0f;
                 D_80177A48[4] = 0.0f;
@@ -2279,21 +2279,21 @@ void func_i2_8018E084(Player* player) {
 
             Math_SmoothStepToF(&D_80177A48[1], 1080.0f, 0.01f, D_80177A48[3], 0.0f);
 
-            if (D_80177A80 < 500) {
+            if (gCsFrameCount < 500) {
                 Math_SmoothStepToF(&D_80177A48[2], -1700.0f, 0.1f, 30.0f, 0.0f);
-            } else if (D_80177A80 < 800) {
+            } else if (gCsFrameCount < 800) {
                 Math_SmoothStepToF(&D_80177A48[2], -1000.0f, 0.1f, 4.0f, 0.0f);
-            } else if (D_80177A80 < 1150) {
+            } else if (gCsFrameCount < 1150) {
                 Math_SmoothStepToF(&D_80177A48[2], -1250.0f, 0.1f, 4.0f, 0.0f);
             } else {
                 Math_SmoothStepToF(&D_80177A48[2], -1500.0f, 0.1f, 4.0f, 0.0f);
             }
 
-            if (D_80177A80 < 400) {
+            if (gCsFrameCount < 400) {
                 Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.03f, 0.2f, 0.0f);
-            } else if (D_80177A80 < 700) {
+            } else if (gCsFrameCount < 700) {
                 Math_SmoothStepToF(&D_80177A48[4], -40.0f, 0.03f, 0.4f, 0.0f);
-            } else if (D_80177A80 < 1100) {
+            } else if (gCsFrameCount < 1100) {
                 Math_SmoothStepToF(&D_80177A48[4], 40.0f, 0.03f, 0.4f, 0.0f);
             } else {
                 Math_SmoothStepToF(&D_80177A48[4], 7.0f, 0.03f, 0.2f, 0.0f);
@@ -2314,16 +2314,16 @@ void func_i2_8018E084(Player* player) {
             D_801779B8 = player->pos.y;
             D_801779C0 = player->unk_138 + D_80177D20 + 150.0f;
 
-            if (D_80177A80 > 1390) {
+            if (gCsFrameCount > 1390) {
                 player->unk_0D0 += 2.0f;
                 player->unk_0E4 += 0.1f;
                 player->unk_190 = 2.0f;
 
-                if (D_80177A80 == 1465) {
+                if (gCsFrameCount == 1465) {
                     func_8001DBD0(20);
                 }
 
-                if (D_80177A80 > 1465) {
+                if (gCsFrameCount > 1465) {
                     D_80178358 = 255;
                     D_80178348 = D_80178350 = D_80178354 = 0;
                     D_8017835C = 8;
@@ -2342,11 +2342,11 @@ void func_i2_8018E084(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 350:
-            Object_Kill(&gActors->obj, &gActors->sfxPos);
-            Object_Kill(&gActors[1].obj, &gActors[1].sfxPos);
-            Object_Kill(&gActors[2].obj, &gActors[2].sfxPos);
+            Object_Kill(&gActors->obj, gActors->sfxPos);
+            Object_Kill(&gActors[1].obj, gActors[1].sfxPos);
+            Object_Kill(&gActors[2].obj, gActors[2].sfxPos);
 
             if (gTeamShields[1] > 0) {
                 func_i2_8018DF08(gActors, 0);
@@ -2431,7 +2431,7 @@ void func_i2_8018E084(Player* player) {
             break;
 
         case 1390:
-            Audio_PlaySfx(0x09000002U, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             player->unk_194 = 5.0f;
             player->unk_190 = 5.0f;
             break;
@@ -2494,7 +2494,7 @@ void func_i2_8018ED9C(Actor* actor) {
 
         case 1:
             actor->unk_0B8 = 2;
-            Audio_PlaySfx(0x09000002U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->timer_0BC = 0x96;
             actor->fwork[29] = 5.0f;
 
@@ -2503,7 +2503,7 @@ void func_i2_8018ED9C(Actor* actor) {
             actor->fwork[0] += 2.0f;
             actor->unk_0F4.x += 0.1f;
             if (actor->timer_0BC == 0) {
-                Object_Kill(&actor->obj, &actor->sfxPos);
+                Object_Kill(&actor->obj, actor->sfxPos);
             }
             break;
     }

src/overlays/ovl_i2/fox_sx.c

@@ -1,8 +1,8 @@
 #include "global.h"
 
 s32 D_i2_80195D80;
-Vec3f D_i2_80195D88;
-Vec3f D_i2_80195D98;
+f32 D_i2_80195D88[3];
+f32 D_i2_80195D98[3];
 
 s32 D_i2_80195640 = 0;
 Vec3f D_i2_80195644 = { 73.0f, -102.0f, 80.0f };
@@ -41,9 +41,9 @@ void func_i2_8018F030(void) {
     Actor* actor = &gActors[0];
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) {
-        if (actor->obj.status == 0) {
+        if (actor->obj.status == OBJ_FREE) {
             Actor_Initialize(actor);
-            actor->obj.status = 1;
+            actor->obj.status = OBJ_INIT;
             actor->obj.id = OBJ_ACTOR_203;
             actor->unk_0B6 = 1;
             actor->obj.rot.y = 180.0f;
@@ -63,7 +63,7 @@ void func_i2_8018F124(void) {
     Actor* actor = &gActors[50];
 
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_203;
     actor->unk_0B6 = -1;
     actor->obj.pos.x = gPlayer->camEye.x + 3000.0f;
@@ -158,7 +158,7 @@ void func_i2_8018F330(Actor* actor) {
                     func_800B5D30(gPlayer, 1);
                 }
                 D_80161A44 = 12800.0f;
-                Object_Kill(&gActors[50].obj, &gActors[50].sfxPos);
+                Object_Kill(&gActors[50].obj, gActors[50].sfxPos);
             }
             break;
 
@@ -209,9 +209,9 @@ void func_i2_8018FA04(f32 x, f32 y, f32 z) {
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
         actor = &gActors[i];
-        if (actor->obj.status == 0) {
+        if (actor->obj.status == OBJ_FREE) {
             Actor_Initialize(actor);
-            actor->obj.status = 1;
+            actor->obj.status = OBJ_INIT;
             actor->obj.id = OBJ_ACTOR_203;
             actor->obj.pos.x = x;
             actor->obj.pos.y = y;
@@ -244,12 +244,12 @@ void func_i2_8018FBBC(Vec3f* pos) {
 
     for (i = 0; i < ARRAY_COUNT(gActors); i++) {
         actor = &gActors[i];
-        if (actor->obj.status >= 2 && fabsf(pos->x - actor->obj.pos.x) < 2500.0f &&
-            fabsf(pos->z - actor->obj.pos.z) < 2500.0f && actor->unk_0B8 != 1000 && actor->timer_0C2 == 0 &&
-            actor->scale < 0.0f &&
+        if ((actor->obj.status >= OBJ_ACTIVE) && (fabsf(pos->x - actor->obj.pos.x) < 2500.0f) &&
+            (fabsf(pos->z - actor->obj.pos.z) < 2500.0f) && (actor->unk_0B8 != 1000) && (actor->timer_0C2 == 0) &&
+            (actor->scale < 0.0f) &&
             func_80062DBC(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y,
-                          actor->vwork[29].z + actor->unk_0F4.z) != 0) {
-            func_800A6028(&actor->sfxPos, 0x09000004);
+                          actor->vwork[29].z + actor->unk_0F4.z)) {
+            func_800A6028(actor->sfxPos, 0x09000004);
             actor->unk_0B8 = 1000;
             xPos = Math_Atan2F(actor->obj.pos.x - pos->x, actor->obj.pos.z - pos->z);
             yPos = -Math_Atan2F(actor->obj.pos.y - pos->y,
@@ -417,7 +417,7 @@ void func_i2_80190078(Boss* boss) {
         boss->dmgType = 0;
         if (boss->swork[0] == 1) {
             if ((boss->dmgPart == 0) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) {
-                Audio_PlaySfx(0x2903300E, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 boss->swork[3] -= boss->damage;
                 boss->timer_054 = 20;
                 func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x,
@@ -444,8 +444,8 @@ void func_i2_80190078(Boss* boss) {
                     boss->swork[4] = 1;
                     boss->health = 1;
                     boss->swork[7] = 1;
-                    func_8001A55C(&D_i2_80195D88, 0x31032061);
-                    func_8001A55C(&D_i2_80195D98, 0x31032061);
+                    func_8001A55C(D_i2_80195D88, 0x31032061);
+                    func_8001A55C(D_i2_80195D98, 0x31032061);
                     boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603265C);
                     func_800182F4(0x100100FF);
                     func_800182F4(0x110100FF);
@@ -463,7 +463,7 @@ void func_i2_80190078(Boss* boss) {
             if (boss->dmgPart == 0) {
                 boss->health -= boss->damage;
 
-                Audio_PlaySfx(0x2903300E, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                 if (boss->health <= 0) {
                     D_8017796C = -1;
@@ -487,7 +487,7 @@ void func_i2_80190078(Boss* boss) {
 
                     boss->swork[4] = 2;
 
-                    Audio_PlaySfx(0x2940D09A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                     D_Timer_80161A60 = 8;
                     func_800182F4(0x100100FF);
@@ -509,8 +509,8 @@ void func_i2_80190078(Boss* boss) {
     if (((boss->actionState != 8) && (boss->actionState != 20)) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) {
         boss->actionState = 8;
         boss->fwork[0] = 0.0f;
-        func_8001A55C(&D_i2_80195D88, 0x31032061);
-        func_8001A55C(&D_i2_80195D98, 0x31032061);
+        func_8001A55C(D_i2_80195D88, 0x31032061);
+        func_8001A55C(D_i2_80195D98, 0x31032061);
     }
 
     boss->vel.z = -20.0f;
@@ -531,7 +531,7 @@ void func_i2_80190078(Boss* boss) {
             boss->swork[3] = 400;
             boss->health = 300;
             boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032550);
-            D_80178284 = 1;
+            gBossActive = 1;
             func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 255);
             boss->swork[6] = 1;
             boss->fwork[44] = 5.0f;
@@ -541,7 +541,7 @@ void func_i2_80190078(Boss* boss) {
 
         case 90:
             if ((boss->timer_050 == 110) || (boss->timer_050 == 66)) {
-                Audio_PlaySfx(0x29433022, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) {
@@ -563,7 +563,7 @@ void func_i2_80190078(Boss* boss) {
             if (boss->timer_050 == 0) {
                 boss->actionState = 100;
                 boss->fwork[0] = 0.0f;
-                Audio_PlaySfx(0x29400023, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29400023, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             boss->fwork[43] = boss->fwork[44] = 5.0f;
             boss->fwork[42] = 30.0f;
@@ -582,7 +582,7 @@ void func_i2_80190078(Boss* boss) {
                 boss->unk_04C = 0;
                 boss->actionState = 1;
                 boss->fwork[0] = 0.0f;
-                Audio_PlaySfx(0x29402024, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29402024, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             boss->fwork[43] = boss->fwork[44] = 5.0f;
@@ -629,7 +629,7 @@ void func_i2_80190078(Boss* boss) {
             }
 
             if (boss->unk_04C == 60) {
-                Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 boss->fwork[42] = 0.0f;
             }
 
@@ -665,7 +665,7 @@ void func_i2_80190078(Boss* boss) {
             }
 
             if (boss->unk_04C == 60) {
-                Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 boss->fwork[42] = 0.0f;
             }
 
@@ -722,15 +722,15 @@ void func_i2_80190078(Boss* boss) {
             sp74.y = boss->fwork[9] + boss->obj.pos.y;
             sp74.z = boss->fwork[10] + boss->obj.pos.z;
 
-            func_8005F0E8(&D_i2_80195D88, &sp74);
-            Audio_PlaySfx(0x31032061, &D_i2_80195D88, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_8005F0E8(D_i2_80195D88, &sp74);
+            Audio_PlaySfx(0x31032061, D_i2_80195D88, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             sp74.x = boss->fwork[11] + boss->obj.pos.x;
             sp74.y = boss->fwork[12] + boss->obj.pos.y;
             sp74.z = boss->fwork[13] + boss->obj.pos.z;
 
-            func_8005F0E8(&D_i2_80195D98, &sp74);
-            Audio_PlaySfx(0x31032061, &D_i2_80195D98, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_8005F0E8(D_i2_80195D98, &sp74);
+            Audio_PlaySfx(0x31032061, D_i2_80195D98, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0);
             Math_SmoothStepToF(&boss->fwork[28], -30.0f, 0.05f, 1.0f, 0);
@@ -805,15 +805,15 @@ void func_i2_80190078(Boss* boss) {
 
         case 6:
             if ((boss->timer_050 == 20) || (boss->timer_050 == 30)) {
-                Audio_PlaySfx(0x29433022, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (boss->timer_050 == 0) {
                 boss->unk_04C = 0;
                 boss->actionState = 1;
                 boss->swork[1] = 1;
-                func_8001A55C(&D_i2_80195D88, 0x31032061);
-                func_8001A55C(&D_i2_80195D98, 0x31032061);
+                func_8001A55C(D_i2_80195D88, 0x31032061);
+                func_8001A55C(D_i2_80195D98, 0x31032061);
                 boss->fwork[0] = 0.0f;
                 boss->fwork[44] = 0.0f;
                 boss->fwork[43] = 0.0f;
@@ -913,7 +913,7 @@ void func_i2_80190078(Boss* boss) {
                     }
                 }
                 if (boss->unk_04C == 60) {
-                    Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else if (boss->timer_050 == 1) {
                 func_800BA808(gMsg_ID_20267, RCID_PEPPY);
@@ -948,7 +948,7 @@ void func_i2_80190078(Boss* boss) {
             if (boss->unk_04C == 70) {
                 func_i2_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y,
                                  boss->fwork[13] + boss->obj.pos.z);
-                Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
 
@@ -964,7 +964,7 @@ void func_i2_80190078(Boss* boss) {
 
             boss->unk_04C++;
             if (!(boss->unk_04C & 15)) {
-                Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
 
             if (boss->unk_04C >= Animation_GetFrameCount(&D_60158C4)) {
@@ -1003,13 +1003,13 @@ void func_i2_80190078(Boss* boss) {
                 boss->fwork[3] = -1000.0f;
                 boss->fwork[1] = -2500.0f;
                 if (!(gGameFrameCount & 15)) {
-                    Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else if (boss->timer_050 > 100) {
                 boss->fwork[3] = 0;
                 boss->fwork[1] = -500.0f;
                 if (!(gGameFrameCount & 0xF)) {
-                    Audio_PlaySfx(0x2902401C, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             } else {
                 boss->fwork[3] = 0;
@@ -1095,7 +1095,7 @@ void func_i2_80190078(Boss* boss) {
                     gPlayer[0].unk_1D0 = 0;
                     gPlayer[0].unk_234 = 1;
                 }
-                Object_Kill(&boss->obj, &boss->sfxPos);
+                Object_Kill(&boss->obj, boss->sfxPos);
                 D_80177930 = boss->swork[6];
             }
             break;
@@ -1431,7 +1431,7 @@ void func_i2_80193434(Boss* boss) {
 void func_i2_80193800(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
 
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = D_i2_801956B0[arg1].x;
     actor->obj.pos.y = D_i2_801956B0[arg1].y;
@@ -1442,12 +1442,12 @@ void func_i2_80193800(Actor* actor, s32 arg1) {
     actor->obj.rot.x = 15.0f;
 
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x31000011, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i2_801938D8(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = D_i2_801956EC[arg1].x + gPlayer->camEye.x;
     actor->obj.pos.y = D_i2_801956EC[arg1].y + gPlayer->camEye.y;
@@ -1462,8 +1462,8 @@ void func_i2_801938D8(Actor* actor, s32 arg1) {
         actor->obj.rot.z = -20.0f;
     }
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-    Audio_PlaySfx(0x09000002, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i2_80193A30(Player* player) {
@@ -1478,7 +1478,7 @@ void func_i2_80193A30(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             for (i = 0; i < 5; i++) {
                 func_i2_80193800(&gActors[5 + i], i);
             }
@@ -1494,14 +1494,14 @@ void func_i2_80193A30(Player* player) {
             D_80178340 = 255;
             /* fallthrough */
         case 1:
-            if (D_80177A80 < 3) {
+            if (gCsFrameCount < 3) {
                 D_80178340 = 255;
             }
             D_80177A48[0] = 0.5f;
             D_801779A0 = gActors[5].obj.pos.x;
             D_801779C0 = gActors[5].obj.pos.z;
             player->unk_034 -= 0.1f;
-            if (D_80177A80 == 140) {
+            if (gCsFrameCount == 140) {
                 x = gActors[5].obj.pos.x;
                 y = gActors[5].obj.pos.y - (player->camEye.y + 50.0f);
                 z = gActors[5].obj.pos.z - (player->camEye.z + 20.0f);
@@ -1515,13 +1515,13 @@ void func_i2_80193A30(Player* player) {
                 func_8006EEFC(100, 0.0f, player->camEye.y + 50.0f, player->camEye.z + 20.0f, dest.x, dest.y, dest.z,
                               xyzDeg, xzDeg, 0.0f);
             }
-            if (D_80177A80 == 143) {
-                Object_Kill(&gPlayerShots->obj, &gPlayerShots->sfxPos);
+            if (gCsFrameCount == 143) {
+                Object_Kill(&gPlayerShots->obj, gPlayerShots->sfxPos);
                 func_8007BFFC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f,
                               40);
                 func_8007D2C8(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 6.0f);
                 func_8007B344(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 5.0f, 5);
-                Object_Kill(&gActors[5].obj, &gActors[5].sfxPos);
+                Object_Kill(&gActors[5].obj, gActors[5].sfxPos);
                 for (i = 0; i < 20; i++) {
                     func_80079618(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.5f);
                 }
@@ -1532,7 +1532,7 @@ void func_i2_80193A30(Player* player) {
             break;
 
         case 2:
-            if (D_80177A80 == 170) {
+            if (gCsFrameCount == 170) {
                 player->pos.x = 0.0f;
                 player->pos.y = player->camEye.y + 50.0f;
                 player->unk_1D0 += 1;
@@ -1542,16 +1542,16 @@ void func_i2_80193A30(Player* player) {
                 player->unk_0D0 = 30.0f;
                 player->unk_0EC = -80.0f;
                 player->unk_0E4 = -20.0f;
-                Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 for (i = 6; i < 10; i++) {
-                    Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+                    Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
                 }
                 D_80177A48[0] = 0.0f;
             }
             break;
 
         case 3:
-            if (D_80177A80 >= 201) {
+            if (gCsFrameCount >= 201) {
                 D_801779A0 = player->pos.x;
                 D_801779B8 = player->pos.y;
                 D_801779C0 = player->pos.z;
@@ -1562,7 +1562,7 @@ void func_i2_80193A30(Player* player) {
             Math_SmoothStepToF(&player->unk_0EC, 0.0f, 0.2f, 2.0f, 0);
             Math_SmoothStepToF(&player->unk_0E4, 20.0f, 0.1f, 1.0f, 0);
 
-            switch (D_80177A80) {
+            switch (gCsFrameCount) {
                 case 195:
                     if (gTeamShields[1] > 0) {
                         func_i2_801938D8(&gActors[0], 0);
@@ -1580,7 +1580,7 @@ void func_i2_80193A30(Player* player) {
                     break;
             }
 
-            if (D_80177A80 >= 301) {
+            if (gCsFrameCount >= 301) {
                 player->unk_1D0 += 1;
                 player->timer_1F8 = 40;
                 D_80177A48[0] = 0.0f;
@@ -1621,7 +1621,7 @@ void func_i2_80193A30(Player* player) {
                 player->camAt.x = player->camEye.x = player->pos.x;
                 D_80178488 = 1;
                 for (i = 0; i < 3; i++) {
-                    Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+                    Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
                 }
             }
             break;
@@ -1676,7 +1676,7 @@ void func_i2_801944D4(Actor* actor, s32 arg1) {
     actor->vel.x = player->vel.x;
     actor->vel.y = player->vel.y;
     actor->vel.z = player->vel.z;
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     Object_SetInfo(&actor->info, actor->obj.id);
     if (arg1 == 3) {
@@ -1689,7 +1689,7 @@ void func_i2_801944D4(Actor* actor, s32 arg1) {
         actor->obj.rot.z = D_i2_80195770[arg1];
         actor->iwork[11] = 1;
         actor->iwork[14] = D_i2_8019577C[arg1];
-        Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -1713,13 +1713,13 @@ void func_i2_80194728(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            func_8001A38C(1, &player->unk_460);
+            func_8001A38C(1, player->sfxPos);
             player->unk_1D0 += 1;
             D_80177A48[1] = 0.05f;
             D_80177A48[0] = 0.02f;
             D_80177A48[2] = 0.0f;
             D_80177A48[3] = D_80177A48[2];
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             D_80177A48[2] = 100.0f;
             D_80177A48[4] = 100.0f;
             D_80177A48[5] = 0.0f;
@@ -1727,9 +1727,9 @@ void func_i2_80194728(Player* player) {
             func_800A6148();
 
         case 1:
-            if (D_80177A80 >= 991) {
+            if (gCsFrameCount >= 991) {
                 Math_SmoothStepToF(D_80177A48 + 3, 0.0f, 0.1f, 0.01f, 0.0f);
-            } else if (D_80177A80 >= 121) {
+            } else if (gCsFrameCount >= 121) {
                 Math_SmoothStepToF(D_80177A48 + 3, -0.5f, 0.1f, 0.02f, 0.0f);
                 Math_SmoothStepToF(D_80177A48 + 4, 300.0f, 0.1f, 2.0f, 0.0f);
                 Math_SmoothStepToF(D_80177A48 + 5, -50.0f, 0.1f, 1.0f, 0.0f);
@@ -1764,11 +1764,11 @@ void func_i2_80194728(Player* player) {
                 Math_SmoothStepToAngle(&player->unk_0E4, 20.0f, 0.1f, 0.5f, 0.0f);
             }
 
-            if (D_80177A80 == 1195) {
+            if (gCsFrameCount == 1195) {
                 func_8001DBD0(10);
             }
 
-            if (D_80177A80 >= 1196) {
+            if (gCsFrameCount >= 1196) {
                 D_80178348 = D_80178350 = D_80178354 = 0;
                 D_80178358 = 255;
                 if (D_80178340 == 255) {
@@ -1782,7 +1782,7 @@ void func_i2_80194728(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 706:
             D_80177830 = 1;
             break;
@@ -1818,7 +1818,7 @@ void func_i2_80194728(Player* player) {
         case 920:
             gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0;
             func_i2_801944D4(&gActors[0], 3);
-            Audio_PlaySfx(0x11030010, &gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x11030010, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
 
         case 1050:
@@ -1836,7 +1836,7 @@ void func_i2_80194728(Player* player) {
         case 1160:
             func_800182F4(0x103200FF);
             func_800182F4(0x113200FF);
-            Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             player->unk_1D0 = 2;
             player->timer_1F8 = 40;
             player->unk_194 = 5.0f;
@@ -1844,7 +1844,7 @@ void func_i2_80194728(Player* player) {
             break;
     }
     if (gTeamShields[2] != -2) {
-        switch (D_80177A80) {
+        switch (gCsFrameCount) {
             case 140:
                 func_800BA808(gMsg_ID_20010, RCID_FOX);
                 break;
@@ -1899,7 +1899,7 @@ void func_i2_80194728(Player* player) {
                 break;
         }
     } else {
-        switch (D_80177A80) {
+        switch (gCsFrameCount) {
             case 140:
                 func_800BA808(gMsg_ID_5500, RCID_FOX);
                 break;

src/overlays/ovl_i3/fox_a6.c

@@ -441,7 +441,7 @@ void func_i3_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f3
     (void) "おん\n";
     (void) "おふ\n";
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_191;
     actor->obj.pos.x = xPos;
     actor->obj.pos.y = yPos;
@@ -461,7 +461,7 @@ void func_i3_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yR
     Actor* actor;
 
     for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
-        if (actor->obj.status == 0) {
+        if (actor->obj.status == OBJ_FREE) {
             func_i3_80187530(actor, xPos, yPos, zPos, fwork6, xRot, yRot, timer0BC, unk0B4);
             D_i3_801C2250[A6_BSS_11] = i + 1;
             break;
@@ -471,7 +471,7 @@ void func_i3_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yR
 
 void func_i3_8018767C(Effect* effect) {
     Effect_Initialize(effect);
-    effect->obj.status = 1;
+    effect->obj.status = OBJ_INIT;
     effect->obj.id = OBJ_EFFECT_395;
     effect->obj.pos.x = gBosses[0].obj.pos.x;
     effect->obj.pos.y = gBosses[0].obj.pos.y;
@@ -485,7 +485,7 @@ void func_i3_80187704(void) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i3_8018767C(&gEffects[i]);
             break;
         }
@@ -496,7 +496,7 @@ void func_i3_80187754(Boss* bossA6) {
     Hitbox* hitbox;
     s32 i;
 
-    D_80178284 = 1;
+    gBossActive = 1;
     D_80161A44 = 25000.0f;
     gBossFrameCount = 0;
     bossA6->health = 780;
@@ -525,7 +525,7 @@ void func_i3_80187754(Boss* bossA6) {
     A6_HIT_1(bossA6, 0)->x.size = A6_HIT_1(bossA6, 1)->x.size = A6_HIT_1(bossA6, 2)->x.size = 153.0f;
     func_800182F4(0x102800FF);
     func_800182F4(0x112800FF);
-    Audio_PlaySfx(0x11002050, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 #ifdef NON_MATCHING
@@ -570,9 +570,9 @@ void func_i3_80187944(Boss* bossA6) {
                 bossA6->health -= bossA6->damage;
                 bossA6->timer_05C = 15;
                 if (bossA6->health < 390) {
-                    Audio_PlaySfx(0x2943500F, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2943500F, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 } else {
-                    Audio_PlaySfx(0x29034003, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 if (bossA6->health <= 0) {
                     bossA6->health = 0;
@@ -580,7 +580,7 @@ void func_i3_80187944(Boss* bossA6) {
                     func_800BA808(gMsg_ID_15252, RCID_SLIPPY);
                     D_8017796C = -1;
                     D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f;
-                    Audio_PlaySfx(0x2940D09A, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2940D09A, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     gShowBossHealth = 0;
                     func_800182F4(0x102800FF);
                     func_800182F4(0x112800FF);
@@ -601,8 +601,8 @@ void func_i3_80187944(Boss* bossA6) {
                         bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0;
                     D_Timer_80161A60 = 4;
                     bossA6->actionState = 11;
-                    Audio_PlaySfx(0x2940C00A, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                    Audio_PlaySfx(0x3143402E, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x2940C00A, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x3143402E, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             if (((bossA6->dmgPart == 4) || (bossA6->dmgPart == 5) || (bossA6->dmgPart == 6)) &&
@@ -614,7 +614,7 @@ void func_i3_80187944(Boss* bossA6) {
             func_i3_8018A2C4(bossA6);
         }
         if (bossA6->dmgPart >= 7) {
-            Audio_PlaySfx(0x29121007, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x29121007, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     }
     for (i = 0; i < 3; i++) {
@@ -777,8 +777,8 @@ void func_i3_80187944(Boss* bossA6) {
                 Math_SmoothStepToF(&D_i3_801C22F0.unk_24, 0.0f, 0.1f, 1.0f, 0);
                 if (D_i3_801C22F0.unk_24 < 1.0f) {
                     D_i3_801C22F0.unk_24 = 0.0f;
-                    Audio_KillSfx(&bossA6->sfxPos);
-                    Audio_PlaySfx(0x19004051, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_KillSfx(bossA6->sfxPos);
+                    Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     bossA6->timer_050 = 20;
                     bossA6->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3];
                     bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].camEye.x;
@@ -788,7 +788,7 @@ void func_i3_80187944(Boss* bossA6) {
                     bossA6->vel.y = 0.0f;
                     bossA6->vel.z = -40.0f;
 
-                    Audio_PlaySfx(0x39408092, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             break;
@@ -798,7 +798,7 @@ void func_i3_80187944(Boss* bossA6) {
             Math_SmoothStepToAngle(&bossA6->obj.rot.z, 0.0f, 1.0f, 10.0f, 0.0001f);
             if (bossA6->obj.rot.z < 1.0f) {
                 if (D_i3_801C2250[A6_BSS_27] == 0) {
-                    Audio_PlaySfx(0x39408091, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x39408091, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_i3_801C2250[A6_BSS_27] = 1;
                 }
                 bossA6->obj.rot.z = 0.0f;
@@ -831,7 +831,7 @@ void func_i3_80187944(Boss* bossA6) {
                     bossA6->timer_050 = 50;
                     bossA6->actionState = 2;
                     D_i3_801C2250[A6_BSS_8] = 0;
-                    Audio_PlaySfx(0x39408092, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             break;
@@ -886,7 +886,7 @@ void func_i3_80187944(Boss* bossA6) {
                     if ((D_i3_801C2250[A6_BSS_6] == 0) || (D_i3_801C2250[A6_BSS_0] == 0)) {
                         bossA6->fwork[A6_FWK_1] = 90.0f;
                         bossA6->fwork[A6_FWK_2] = 2.0f;
-                        Audio_PlaySfx(0x31404066, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
                         D_i3_801C2250[A6_BSS_7] = 0;
                     }
@@ -895,9 +895,9 @@ void func_i3_80187944(Boss* bossA6) {
             break;
         case 3:
             if (bossA6->timer_050 == 1) {
-                Audio_KillSfx(&bossA6->sfxPos);
+                Audio_KillSfx(bossA6->sfxPos);
                 if (D_i3_801C2250[A6_BSS_7] == 0) {
-                    Audio_PlaySfx(0x31008069, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x31008069, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_i3_801C2250[A6_BSS_7] = 1;
                 }
             }
@@ -928,8 +928,8 @@ void func_i3_80187944(Boss* bossA6) {
                     bossA6->fwork[A6_FWK_2] = 1.0f;
                     bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028454);
                     D_i3_801C2250[A6_BSS_6] = 1;
-                    Audio_KillSfx(&bossA6->sfxPos);
-                    Audio_PlaySfx(0x31404067, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_KillSfx(bossA6->sfxPos);
+                    Audio_PlaySfx(0x31404067, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0;
                 } else if (bossA6->swork[A6_SWK_30 + 0] == 0) {
                     func_i3_8018A1B0(bossA6, 0);
@@ -948,7 +948,7 @@ void func_i3_80187944(Boss* bossA6) {
                 }
                 bossA6->fwork[A6_FWK_3] = ((Rand_ZeroOne() - 0.5f) * 1000.0f) + -3700.0f;
                 if (D_i3_801C2250[A6_BSS_28] == 0) {
-                    Audio_PlaySfx(0x39404068, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x39404068, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
             Math_SmoothStepToF(&bossA6->fwork[A6_FWK_29], 255.0f, 1.0f, 10.0f, 0.0001f);
@@ -976,7 +976,7 @@ void func_i3_80187944(Boss* bossA6) {
                     bossA6->timer_050 = 30;
                     bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0;
                     bossA6->fwork[A6_FWK_2] = 2.0f;
-                    Audio_PlaySfx(0x31404066, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
                     D_i3_801C2250[A6_BSS_7] = bossA6->swork[A6_SWK_37] = 0;
                     bossA6->actionState = 3;
@@ -998,7 +998,7 @@ void func_i3_80187944(Boss* bossA6) {
         case 5:
             if (bossA6->timer_050 == 1) {
                 func_i3_80187704();
-                Audio_PlaySfx(0x39033093, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x39033093, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_i3_801C2250[A6_BSS_33] = 120;
             }
             if (D_i3_801C2250[A6_BSS_33] != 0) {
@@ -1055,7 +1055,7 @@ void func_i3_80187944(Boss* bossA6) {
                     D_i3_801C22F0.unk_28[0] = D_i3_801C22F0.unk_28[2] = D_i3_801C22F0.unk_28[1] = 255.0f;
                     bossA6->actionState = 1;
                     D_i3_801C2250[A6_BSS_27] = 0;
-                    Object_Kill(&temp_s0_3->obj, &temp_s0_3->sfxPos);
+                    Object_Kill(&temp_s0_3->obj, temp_s0_3->sfxPos);
                 }
             }
             break;
@@ -1065,13 +1065,13 @@ void func_i3_80187944(Boss* bossA6) {
                 bossA6->timer_052 = 300;
                 bossA6->timer_054 = 0;
                 bossA6->actionState = 9;
-                Audio_PlaySfx(0x11002050, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             break;
         case 9:
             if (bossA6->timer_052 == 0) {
-                Audio_KillSfx(&bossA6->sfxPos);
-                Audio_PlaySfx(0x19004051, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_KillSfx(bossA6->sfxPos);
+                Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 bossA6->timer_054 = 0;
                 bossA6->actionState = 10;
             } else {
@@ -1101,7 +1101,7 @@ void func_i3_80187944(Boss* bossA6) {
                         if (temp_1 < 0) {
                             temp_1 = 0;
                         }
-                        if ((gActors[temp_1].obj.status == 0) || (gActors[temp_1].obj.id != OBJ_ACTOR_191) ||
+                        if ((gActors[temp_1].obj.status == OBJ_FREE) || (gActors[temp_1].obj.id != OBJ_ACTOR_191) ||
                             (D_i3_801C2250[A6_BSS_24] == 0)) {
                             D_i3_801C2250[A6_BSS_12_0 + i] = 0;
                             temp_1 = 0;
@@ -1148,7 +1148,7 @@ void func_i3_80187944(Boss* bossA6) {
             }
             if (bossA6->timer_052 == 0) {
                 gShowBossHealth = 0;
-                Object_Kill(&bossA6->obj, &bossA6->sfxPos);
+                Object_Kill(&bossA6->obj, bossA6->sfxPos);
             }
             break;
     }
@@ -1632,7 +1632,7 @@ void func_i3_8018B9BC(Boss* bossA6) {
                         D_i3_801C2250[A6_BSS_25] = 20;
                     }
                 }
-                Audio_PlaySfx(0x29033064, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x29033064, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 if (bossA6->swork[A6_SWK_0 + j] <= 0) {
                     bossA6->swork[A6_SWK_0 + j] = 0;
                     Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94);
@@ -1647,7 +1647,7 @@ void func_i3_8018B9BC(Boss* bossA6) {
                 }
                 if ((bossA6->swork[A6_SWK_15] == 0) && (bossA6->swork[A6_SWK_16] == 0) &&
                     (bossA6->swork[A6_SWK_17] == 0)) {
-                    Audio_KillSfx(&bossA6->sfxPos);
+                    Audio_KillSfx(bossA6->sfxPos);
                     if (bossA6->swork[A6_SWK_25] != 0) {
                         bossA6->swork[A6_SWK_25]--;
                         if (bossA6->swork[A6_SWK_25] != 0) {
@@ -1902,7 +1902,7 @@ void func_i3_8018C54C(Boss* bossA6) {
             if (bossA6->swork[A6_SWK_25] != 0) {
                 j = bossA6->swork[A6_SWK_25] - 1;
                 if ((bossA6->timer_058 != 0) && !(bossA6->timer_058 & 3)) {
-                    Audio_PlaySfx(0x29034003, &bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 if (bossA6->timer_058 == 1) {
                     if (bossA6->swork[A6_SWK_25] == 2) {
@@ -1986,7 +1986,7 @@ void func_i3_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel
             gPlayerShots[i].obj.pos.x = xPos;
             gPlayerShots[i].obj.pos.y = yPos;
             gPlayerShots[i].obj.pos.z = zPos;
-            gPlayerShots[i].obj.status = 1;
+            gPlayerShots[i].obj.status = OBJ_INIT;
             gPlayerShots[i].obj.rot.x = xRot + 180.0f;
             gPlayerShots[i].obj.rot.y = yRot;
             gPlayerShots[i].obj.rot.z = -zRot;
@@ -1996,7 +1996,7 @@ void func_i3_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel
             gPlayerShots[i].unk_64 = 150;
             gPlayerShots[i].playerNum = 100;
 
-            Audio_PlaySfx(0x2900000D, &gPlayerShots[i].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x2900000D, gPlayerShots[i].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         }
     }
@@ -2008,7 +2008,7 @@ void func_i3_8018D4E0(Actor* actor) {
     func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 0x14);
     func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 7.0f);
     func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f, 5);
-    Object_Kill(&actor->obj, &actor->sfxPos);
+    Object_Kill(&actor->obj, actor->sfxPos);
     for (i = 0; i < 15; i++) {
         func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
     }
@@ -2019,7 +2019,7 @@ void func_i3_8018D5C8(void) {
     s32 i = 0;
 
     Actor_Initialize(&gActors[i]);
-    gActors[i].obj.status = 1;
+    gActors[i].obj.status = OBJ_INIT;
     gActors[i].obj.pos.x = 1600.0f;
     gActors[i].obj.pos.y = 3750.0f;
     gActors[i].obj.pos.z = 13000.0f;
@@ -2028,7 +2028,7 @@ void func_i3_8018D5C8(void) {
     gActors[i].fwork[0] = 0.0f;
     gActors[i].obj.id = OBJ_ACTOR_195;
     Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
-    Audio_PlaySfx(0x11030010, &gActors[i].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11030010, gActors[i].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i3_8018D694(Actor* actor, s32 arg1) {
@@ -2038,7 +2038,7 @@ void func_i3_8018D694(Actor* actor, s32 arg1) {
     };
 
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = sp2C[arg1].x + 100.0f;
     actor->obj.pos.y = sp2C[arg1].y + 350.0f;
@@ -2052,7 +2052,7 @@ void func_i3_8018D694(Actor* actor, s32 arg1) {
     actor->fwork[8] = Rand_ZeroOneSeeded() * 360.0f;
     actor->fwork[9] = Rand_ZeroOneSeeded() * 360.0f;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x31000011, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i3_8018D804(Actor* actor, s32 arg1) {
@@ -2064,7 +2064,7 @@ void func_i3_8018D804(Actor* actor, s32 arg1) {
     Player* player = &gPlayer[0];
 
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = sp2C[arg1].x + player->pos.x;
     actor->obj.pos.y = sp2C[arg1].y + player->pos.y;
@@ -2073,7 +2073,7 @@ void func_i3_8018D804(Actor* actor, s32 arg1) {
     actor->iwork[11] = 1;
     actor->fwork[0] = 0.0f;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i3_8018D920(Vec3f* arg0) {
@@ -2126,7 +2126,7 @@ void func_i3_8018DA58(Actor* actor) {
         case 11:
         case 16:
             actor->unk_0B8++;
-            Audio_PlaySfx(0x09000002, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->fwork[29] = 5.0f;
             /* fallthrough */
         case 7:
@@ -2195,7 +2195,7 @@ void func_i3_8018DF74(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_1D0 = 1;
             Rand_SetSeed(1, 29000, 9876);
             func_i3_8018D694(&gActors[1], 0);
@@ -2228,7 +2228,7 @@ void func_i3_8018DF74(Player* player) {
             /* fallthrough */
         case 1:
             Math_SmoothStepToF(&gActors[0].obj.pos.y, 0.0f, 0.01f, 10.0f, 0.001f);
-            if (D_80177A80 < 490) {
+            if (gCsFrameCount < 490) {
                 sp74.x = 0.0f;
                 sp74.y = 0.0f;
                 sp74.z = D_80177A48[5];
@@ -2238,7 +2238,7 @@ void func_i3_8018DF74(Player* player) {
                 D_80177978 = sp68.x;
                 D_80177980 = sp68.y;
                 D_80177988 = sp68.z;
-                if (D_80177A80 < 200) {
+                if (gCsFrameCount < 200) {
                     Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f);
                     D_801779A0 = gActors[1].obj.pos.x;
                     D_801779B8 = gActors[1].obj.pos.y;
@@ -2271,18 +2271,18 @@ void func_i3_8018DF74(Player* player) {
                 D_80177A48[0] = 1.0f;
                 D_80177A48[1] = 1.0f;
             }
-            if (D_80177A80 == 460) {
+            if (gCsFrameCount == 460) {
                 player->unk_190 = 2.0f;
                 player->unk_194 = 5.0f;
-                Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
-            if (D_80177A80 >= 460) {
+            if (gCsFrameCount >= 460) {
                 Math_SmoothStepToF(&player->unk_0D0, 50.0f, 0.1f, 3.0f, 0.01f);
             }
             if (player->pos.z < 30.0f) {
                 player->unk_0D0 = player->pos.z = 0.0f;
             }
-            if (D_80177A80 == 540) {
+            if (gCsFrameCount == 540) {
                 D_80178488 = 1;
                 D_80177838 = 50;
                 player->pos.x = 0.0f;
@@ -2297,7 +2297,7 @@ void func_i3_8018DF74(Player* player) {
             }
             break;
     }
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 280:
             func_8001D444(0, 0x33, 0, 0xFF);
             break;
@@ -2385,7 +2385,7 @@ void func_i3_8018DF74(Player* player) {
 
 void func_i3_8018EA88(Actor* actor) {
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = 0.0f;
     actor->obj.pos.y = 0.0f;
@@ -2409,7 +2409,7 @@ void func_i3_8018EB3C(Actor* actor) {
     Player* player = &gPlayer[0];
 
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.pos.x = player->pos.x;
     actor->obj.pos.y = player->pos.y + 600.0f;
@@ -2418,8 +2418,8 @@ void func_i3_8018EB3C(Actor* actor) {
     actor->unk_0B8 = 100;
     actor->fwork[0] = 0.0f;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x11030010, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-    Audio_PlaySfx(0x31024059, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x31024059, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i3_8018EC38(Actor* actor, s32 arg1) {
@@ -2432,7 +2432,7 @@ void func_i3_8018EC38(Actor* actor, s32 arg1) {
 
     if (gTeamShields[arg1 + 1] > 0) {
         Actor_Initialize(actor);
-        actor->obj.status = 2;
+        actor->obj.status = OBJ_ACTIVE;
         actor->obj.id = OBJ_ACTOR_195;
         actor->obj.pos.x = sp2C[arg1].x + player->pos.x;
         actor->obj.pos.y = sp2C[arg1].y + player->pos.y;
@@ -2444,7 +2444,7 @@ void func_i3_8018EC38(Actor* actor, s32 arg1) {
             actor->iwork[14] = arg1 + 2;
         }
         Object_SetInfo(&actor->info, actor->obj.id);
-        Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -2461,13 +2461,13 @@ void func_i3_8018ED78(Player* player) {
 
     switch (player->unk_1D0) { /* irregular */
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_1D0 = 1;
             player->wings.unk_2C = 1;
             player->unk_194 = 5.0f;
             player->unk_190 = 2.0f;
             player->unk_0D0 = 60.0f;
-            Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80177A48[3] = 0.0f;
             /* fallthrough */
         case 1:
@@ -2475,7 +2475,7 @@ void func_i3_8018ED78(Player* player) {
             Math_SmoothStepToAngle(&player->unk_12C, 0.0f, 0.05f, 1.2f, 0.0001f);
             Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f);
             Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f);
-            if (D_80177A80 < 60) {
+            if (gCsFrameCount < 60) {
                 spf90.x = -100.0f;
                 spf90.y = -100.0f;
                 spf90.z = -1000.0f;
@@ -2492,7 +2492,7 @@ void func_i3_8018ED78(Player* player) {
                 Math_SmoothStepToAngle(&player->unk_0E4, sp88, 0.1f, 5.0f, 0.0001f);
                 Math_SmoothStepToAngle(&player->unk_0EC, sp84, 0.1f, 5.0f, 0.0001f);
             }
-            if (D_80177A80 == 60) {
+            if (gCsFrameCount == 60) {
                 player->unk_234 = 0;
                 player->unk_0D0 = 0.0f;
             }
@@ -2507,13 +2507,13 @@ void func_i3_8018ED78(Player* player) {
             D_801779B8 = gBosses[0].obj.pos.y;
             D_801779C0 = gBosses[0].obj.pos.z + D_80177D20;
             D_80177A48[0] = 0.04f;
-            if (D_80177A80 == 140) {
+            if (gCsFrameCount == 140) {
                 func_i3_8018EA88(&gActors[4]);
                 func_i3_8018EA88(&gActors[5]);
                 func_i3_8018EA88(&gActors[6]);
                 gActors[4].fwork[4] = 0.5f;
             }
-            if (D_80177A80 >= 200) {
+            if (gCsFrameCount >= 200) {
                 if (D_80178340 == 255) {
                     player->unk_1D0 = 2;
                     func_800A6148();
@@ -2522,16 +2522,16 @@ void func_i3_8018ED78(Player* player) {
                     D_80178358 = 255;
                     D_8017835C = 16;
                 }
-            } else if ((D_80177A80 == 131) || (D_80177A80 == 134) || (D_80177A80 == 137)) {
+            } else if ((gCsFrameCount == 131) || (gCsFrameCount == 134) || (gCsFrameCount == 137)) {
                 D_80178348 = D_80178350 = D_80178354 = 255;
                 D_80178340 = 192;
             } else {
                 D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0;
             }
-            if ((D_80177A80 == 146) || (D_80177A80 == 150)) {
-                Audio_PlaySfx(0x2940F026, &gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) {
+                Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
-            if (D_80177A80 >= 147) {
+            if (gCsFrameCount >= 147) {
                 gActors[4].iwork[3] -= 4;
                 if (gActors[4].iwork[3] < 0) {
                     gActors[4].iwork[3] = 0;
@@ -2543,11 +2543,11 @@ void func_i3_8018ED78(Player* player) {
                 Math_SmoothStepToF(&gActors[5].fwork[4], 450.0f, 0.03f, 1000.0f, 1.0f);
                 Math_SmoothStepToF(&gActors[5].scale, 450.0f, 0.03f, 1000.0f, 1.0f);
             }
-            if (D_80177A80 >= 161) {
+            if (gCsFrameCount >= 161) {
                 Math_SmoothStepToF(&gActors[6].fwork[4], 350.0f, 0.03f, 1000.0f, 1.0f);
                 Math_SmoothStepToF(&gActors[6].scale, 350.0f, 0.03f, 1000.0f, 1.0f);
             }
-            if (D_80177A80 >= 141) {
+            if (gCsFrameCount >= 141) {
                 gActors[4].obj.pos.x = gActors[5].obj.pos.x = gActors[6].obj.pos.x = gBosses[0].obj.pos.x;
                 gActors[4].obj.pos.y = gActors[5].obj.pos.y = gActors[6].obj.pos.y = gBosses[0].obj.pos.y;
                 gActors[4].obj.pos.z = gActors[5].obj.pos.z = gActors[6].obj.pos.z = gBosses[0].obj.pos.z;
@@ -2555,10 +2555,10 @@ void func_i3_8018ED78(Player* player) {
             }
             break;
         case 2:
-            if (D_80177A80 < 300) {
+            if (gCsFrameCount < 300) {
                 break;
             }
-            if (D_80177A80 == 300) {
+            if (gCsFrameCount == 300) {
                 player->unk_234 = 1;
                 player->pos.x = 0.0f;
                 player->pos.y = 200.0f;
@@ -2590,14 +2590,14 @@ void func_i3_8018ED78(Player* player) {
             Math_SmoothStepToF(&gActors[2].obj.pos.y, 40.0f, 0.01f, 10.0f, 0.001f);
             Math_SmoothStepToF(&gActors[3].obj.pos.y, 88.0f, 0.01f, 10.0f, 0.001f);
             Math_SmoothStepToF(&gActors[0].obj.pos.y, 60.0f, 0.01f, 2.0f, 0.001f);
-            if (D_80177A80 < 1077) {
+            if (gCsFrameCount < 1077) {
                 D_80177A48[1] = player->pos.x;
                 D_80177A48[3] = player->pos.z;
             }
-            if (D_80177A80 >= 940) {
+            if (gCsFrameCount >= 940) {
                 Math_SmoothStepToF(&D_80177A48[9], 0.0f, 0.01f, 1000.0f, 0.001f);
             }
-            if (D_80177A80 < 1077) {
+            if (gCsFrameCount < 1077) {
                 D_80177A48[4] = D_80177A48[4] + 0.3f;
                 if (D_80177A48[4] >= 360.0f) {
                     D_80177A48[4] = D_80177A48[4] - 360.0f;
@@ -2628,13 +2628,13 @@ void func_i3_8018ED78(Player* player) {
             player->camEye.y = D_80177980 = sp6C.y;
             player->camEye.z = D_80177988 = sp6C.z;
 
-            if (D_80177A80 == 1076) {
-                Object_Kill(&gActors[0].obj, &gActors[0].sfxPos);
+            if (gCsFrameCount == 1076) {
+                Object_Kill(&gActors[0].obj, gActors[0].sfxPos);
                 player->unk_190 = 2.0f;
                 player->unk_194 = 5.0f;
-                Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
-            if (D_80177A80 >= 1090) {
+            if (gCsFrameCount >= 1090) {
                 D_80178348 = D_80178350 = D_80178354 = 0;
                 D_80178358 = 255;
                 D_8017835C = 8;
@@ -2652,21 +2652,21 @@ void func_i3_8018ED78(Player* player) {
                     }
                     D_80161A94[0] = gGoldRingCount[0];
                     func_8001CA24(0);
-                    Audio_KillSfx(&player->unk_460);
+                    Audio_KillSfx(player->sfxPos);
                     func_800A6148();
                     gNextGameState = GSTATE_PLAY;
                     gNextLevel = LEVEL_VENOM_2;
                     func_80088564();
                 }
             }
-            if (D_80177A80 == 1040) {
+            if (gCsFrameCount == 1040) {
                 func_800182F4(0x105000FF);
                 func_800182F4(0x115000FF);
             }
             break;
     }
-    switch (D_80177A80) { /* switch 1; irregular */
-        case 380:         /* switch 1 */
+    switch (gCsFrameCount) { /* switch 1; irregular */
+        case 380:            /* switch 1 */
             func_8001D444(0, 38, 0, 255);
             break;
         case 550: /* switch 1 */
@@ -2683,27 +2683,27 @@ void func_i3_8018ED78(Player* player) {
             break;
         case 1070: /* switch 1 */
             gActors[1].fwork[29] = 5.0f;
-            Audio_PlaySfx(0x09000002, &gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         case 1072: /* switch 1 */
             gActors[2].fwork[29] = 5.0f;
-            Audio_PlaySfx(0x09000002, &gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
         case 1074: /* switch 1 */
             gActors[3].fwork[29] = 5.0f;
-            Audio_PlaySfx(0x09000002, &gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
     }
-    if (D_80177A80 >= 1070) {
+    if (gCsFrameCount >= 1070) {
         Math_SmoothStepToF(&gActors[1].fwork[12], 50.0f, 0.1f, 1000.0f, 0.001f);
     }
-    if (D_80177A80 >= 1072) {
+    if (gCsFrameCount >= 1072) {
         Math_SmoothStepToF(&gActors[2].fwork[12], 50.0f, 0.1f, 1000.0f, 0.001f);
     }
-    if (D_80177A80 >= 1074) {
+    if (gCsFrameCount >= 1074) {
         Math_SmoothStepToF(&gActors[3].fwork[12], 50.0f, 0.1f, 1000.0f, 0.001f);
     }
-    if (D_80177A80 >= 1076) {
+    if (gCsFrameCount >= 1076) {
         Math_SmoothStepToF(&player->unk_0D0, 50.0f, 0.1f, 1000.0f, 0.001f);
     }
     Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + player->unk_114 + 180.0f) * M_DTOR, 0);

src/overlays/ovl_i3/sf_so.c

@@ -188,7 +188,7 @@ s32 D_i3_801C27A0[8]; // unused? part of previous?
 void func_i3_8019E920(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2,
                       s32 unk4E) {
     Effect_Initialize(effect);
-    effect->obj.status = 2;
+    effect->obj.status = OBJ_ACTIVE;
     effect->obj.id = 392;
     effect->unk_4E = unk4E;
     if (unk4E == 2) {
@@ -211,7 +211,7 @@ void func_i3_8019E9F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel
     s32 i;
 
     for (i = 99; i >= 34; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i3_8019E920(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, unk4E);
             break;
         }
@@ -251,7 +251,7 @@ void func_i3_8019FAA4(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos
     Vec3f sp2C = D_i3_801BF920;
 
     Effect_Initialize(effect);
-    effect->obj.status = 2;
+    effect->obj.status = OBJ_ACTIVE;
     effect->obj.id = OBJ_EFFECT_392;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
@@ -312,7 +312,7 @@ void func_i3_8019FF44(Boss* bossSO, f32 xPos, f32 yPos, f32 zPos, f32 yVel, f32
     s32 i;
 
     for (i = 70; i >= 0; i--) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_i3_8019FAA4(bossSO, &gEffects[i], xPos, yPos, zPos, yVel, arg6);
             break;
         }
@@ -416,12 +416,12 @@ void func_i3_801A1EB0(Boss* bossSO, f32 xPos, f32 xOffset, f32 yPos, f32 zPos) {
 //         }
 //         bossSO->swork[10] = 20;
 //         if (bossSO->health > 0.0f) {
-//             Audio_PlaySfx(0x29433074U, &bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+//             Audio_PlaySfx(0x29433074U, bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 //         }
 //     }
 //     bossSO->timer_058 = 20;
 //     if ((bossSO->dmgPart > 0) && (bossSO->dmgPart < 4) && (bossSO->swork[2] != 0)) {
-//         Audio_PlaySfx(0x29433074U, &bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+//         Audio_PlaySfx(0x29433074U, bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 //         bossSO->swork[2] -= bossSO->damage;
 //         if (bossSO->swork[2] < 0) {
 //             bossSO->swork[2] = 0;
@@ -452,7 +452,7 @@ void func_i3_801A1EB0(Boss* bossSO, f32 xPos, f32 xOffset, f32 yPos, f32 zPos) {
 //         }
 //     }
 //     if ((bossSO->dmgPart >= 4) && (bossSO->dmgPart < 7) && (bossSO->swork[3] != 0)) {
-//         Audio_PlaySfx(0x29433074, &bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+//         Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 //         bossSO->swork[3] -= bossSO->damage;
 //         if (bossSO->swork[3] < 0) {
 //             bossSO->swork[3] = 0;
@@ -501,13 +501,13 @@ void func_i3_801A1EB0(Boss* bossSO, f32 xPos, f32 xOffset, f32 yPos, f32 zPos) {
 //         D_80178348 = 255;
 //         D_80178358 = 0;
 //         D_8017835C = 255;
-//         D_80177A80 = 0;
+//         gCsFrameCount = 0;
 //         D_80137E84[gMainController] = 1;
 //         D_Timer_80177BD0[gMainController] = 10;
 //         func_800182F4(0x100100FF);
 //         func_800182F4(0x110100FF);
 //         func_8001A838(0x4100C023U);
-//         Audio_PlaySfx(0x2940D09AU, &bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+//         Audio_PlaySfx(0x2940D09AU, bossSO->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 //         if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) {
 //             gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7;
 //             gPlayer[0].timer_1F8 = 0;
@@ -766,7 +766,7 @@ void func_i3_801A71B8(Boss* bossSO) {
     };
 
     Matrix_Scale(gCalcMatrix, bossSO->unk_3F8, bossSO->unk_3F8, bossSO->unk_3F8, 1);
-    if (D_80178284 != 0) {
+    if (gBossActive != 0) {
         Animation_DrawSkeleton(2, D_600E470, bossSO->vwork, func_i3_801A68A8, func_i3_801A6BDC, bossSO, gCalcMatrix);
     }
     if (bossSO->health <= 0) {
@@ -849,7 +849,7 @@ void func_i3_801A7750(void) {
         }
 
         Actor_Initialize(var_s0);
-        var_s0->obj.status = 1;
+        var_s0->obj.status = OBJ_INIT;
         var_s0->obj.id = OBJ_ACTOR_195;
 
         var_s0->obj.pos.x = gPlayer[0].pos.x + temp->x / 2.0f;
@@ -858,7 +858,7 @@ void func_i3_801A7750(void) {
         var_s0->unk_0B8 = 1;
         Object_SetInfo(&var_s0->info, var_s0->obj.id);
         var_s0->iwork[11] = 1;
-        Audio_PlaySfx(0x3100000C, &var_s0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000C, var_s0->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 }
 
@@ -874,7 +874,7 @@ void func_i3_801A7930(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             player->unk_034 = player->unk_4D8 = 0.0f;
             player->unk_0D0 = 40.0f;
 
@@ -889,12 +889,12 @@ void func_i3_801A7930(Player* player) {
             D_801779C0 = player->camAt.z;
             for (i = 10; i < 60; i++) {
                 if (gActors[i].unk_0B6 == 0) {
-                    Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
+                    Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
                 }
             }
-            Object_Kill(&gActors[2].obj, &gActors[2].sfxPos);
-            Object_Kill(&gActors[3].obj, &gActors[3].sfxPos);
-            Object_Kill(&gActors[4].obj, &gActors[4].sfxPos);
+            Object_Kill(&gActors[2].obj, gActors[2].sfxPos);
+            Object_Kill(&gActors[3].obj, gActors[3].sfxPos);
+            Object_Kill(&gActors[4].obj, gActors[4].sfxPos);
             player->unk_1D0 = 1;
             D_80177A48[0] = 0.1f;
             if (Rand_ZeroOne() > 0.5f) {
@@ -913,7 +913,7 @@ void func_i3_801A7930(Player* player) {
             Math_SmoothStepToF(&D_80177980, 300.0f, 1.0f, 20.0f, 0.0f);
             Math_SmoothStepToF(&D_801779B8, 290.0f, 1.0f, 20.0f, 0.0f);
             temp_fv1 = Math_SmoothStepToAngle(&player->unk_0E8, sp78, 0.5f, 2.0f, 0.0001f) * 30.0f;
-            if (D_80177A80 >= 0xE) {
+            if (gCsFrameCount >= 0xE) {
                 Math_SmoothStepToAngle(&player->unk_0EC, temp_fv1, 0.1f, 5.0f, 0.0001f);
                 D_801779A0 = 0.0f;
                 D_80177978 = 0.0f;
@@ -922,24 +922,24 @@ void func_i3_801A7930(Player* player) {
             } else {
                 player->unk_0EC += 30.0f;
             }
-            if (D_80177A80 >= 0xC8) {
+            if (gCsFrameCount >= 0xC8) {
                 player->unk_0E4 += 1.0f;
                 player->unk_0E8 += 1.0f;
                 player->unk_0EC += 1.0f;
             }
-            if (D_80177A80 >= 0xE6) {
+            if (gCsFrameCount >= 0xE6) {
                 D_80178358 = 0xFF;
                 D_80178348 = D_80178354 = D_80178350 = 0xFF;
             }
-            if (D_80177A80 == 0xE6) {
+            if (gCsFrameCount == 0xE6) {
                 func_800182F4(0x103200FF);
                 func_800182F4(0x113200FF);
             }
-            if (D_80177A80 == 0x190) {
+            if (gCsFrameCount == 0x190) {
                 player->unk_1D0++;
                 func_800A6148();
                 func_8001CA24(0);
-                Audio_KillSfx(&player->unk_460);
+                Audio_KillSfx(player->sfxPos);
                 D_80178340 = 0xFA;
                 player->timer_1F8 = 0x14;
                 player->unk_0D0 = 0.0f;
@@ -970,8 +970,8 @@ void func_i3_801A7930(Player* player) {
                 player->camAt.y = D_801779B8 = 200.0f;
                 player->camAt.z = D_801779C0 = player->pos.z + D_80177D20;
                 D_80177A48[0] = 0.0f;
-                Object_Kill(&gActors[4].obj, &gActors[4].sfxPos);
-                Object_Kill(&gActors[5].obj, &gActors[5].sfxPos);
+                Object_Kill(&gActors[4].obj, gActors[4].sfxPos);
+                Object_Kill(&gActors[5].obj, gActors[5].sfxPos);
             }
             break;
         case 3:
@@ -981,7 +981,7 @@ void func_i3_801A7930(Player* player) {
             if (D_801782F8 != 0) {
                 player->wings.unk_30 = (gGameFrameCount & 1) * 5.0f;
             }
-            switch (D_80177A80) {
+            switch (gCsFrameCount) {
                 case 0x1C2:
                     func_i3_801A0DF8(-1200.0f, -(D_80177D20 + 2500.0f), 90.0f, 2, 1.0f);
                     break;
@@ -989,10 +989,10 @@ void func_i3_801A7930(Player* player) {
                     func_i3_801A0DF8(1400.0f, -(D_80177D20 + 3250.0f), -90.0f, 3, 1.0f);
                     break;
                 case 0x226:
-                    Object_Kill(&gActors[4].obj, &gActors[4].sfxPos);
+                    Object_Kill(&gActors[4].obj, gActors[4].sfxPos);
                     break;
                 case 0x285:
-                    Object_Kill(&gActors[5].obj, &gActors[5].sfxPos);
+                    Object_Kill(&gActors[5].obj, gActors[5].sfxPos);
                     break;
                 case 0x2BC:
                     player->unk_1D0++;
@@ -1000,32 +1000,32 @@ void func_i3_801A7930(Player* player) {
                     D_i3_801C2768[3] = 1000.0f;
                     break;
             }
-            if ((D_80177A80 >= 0x208) && (D_80177A80 < 0x25D)) {
+            if ((gCsFrameCount >= 0x208) && (gCsFrameCount < 0x25D)) {
                 Math_SmoothStepToF(&player->pos.x, 400.0f, 0.1f, 10.0f, 0.1f);
             }
-            if ((D_80177A80 >= 0x208) && (D_80177A80 < 0x23A)) {
+            if ((gCsFrameCount >= 0x208) && (gCsFrameCount < 0x23A)) {
                 Math_SmoothStepToAngle(&player->unk_0EC, -30.0f, 0.1f, 5.0f, 0.1f);
             }
-            if ((D_80177A80 >= 0x23A) && (D_80177A80 < 0x25D)) {
+            if ((gCsFrameCount >= 0x23A) && (gCsFrameCount < 0x25D)) {
                 Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.1f, 5.0f, 0.1f);
             }
-            if ((D_80177A80 >= 0x25D) && (D_80177A80 < 0x26C)) {
+            if ((gCsFrameCount >= 0x25D) && (gCsFrameCount < 0x26C)) {
                 player->unk_0EC += 30.0f;
             }
-            if ((D_80177A80 >= 0x26C) && (D_80177A80 < 0x280)) {
+            if ((gCsFrameCount >= 0x26C) && (gCsFrameCount < 0x280)) {
                 Math_SmoothStepToAngle(&player->unk_0EC, 45.0f, 0.1f, 5.0f, 0.0f);
             }
-            if (D_80177A80 >= 0x280) {
+            if (gCsFrameCount >= 0x280) {
                 Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.3f, 7.0f, 0.0f);
             }
-            if (D_80177A80 >= 0x249) {
+            if (gCsFrameCount >= 0x249) {
                 Math_SmoothStepToF(&player->pos.x, 0.0f, 0.2f, 9.0f, 0);
             }
-            if (D_80177A80 >= 0x258) {
+            if (gCsFrameCount >= 0x258) {
                 Math_SmoothStepToF(&player->pos.y, 950.0f, 0.1f, 10.0f, 0.0001f);
             }
             Math_SmoothStepToF(&player->pos.z, -(D_80177D20 + 4350.0f), 1.0f, 20.0f, 0.0001f);
-            if (D_80177A80 >= 0x26C) {
+            if (gCsFrameCount >= 0x26C) {
                 Math_SmoothStepToF(&player->camEye.x, 0.0f, 1.0f, 10.0f, 0);
                 Math_SmoothStepToF(&player->camEye.y, player->pos.y + 52.0f, 1.0f, 16.0f, 0.0f);
                 Math_SmoothStepToF(&player->camEye.z, (player->pos.z + D_80177D20) - 50.0f, 1.0f, 21.5f, 0.0f);
@@ -1044,7 +1044,7 @@ void func_i3_801A7930(Player* player) {
             sp60.y = 0.0f;
             sp60.z = -700.0f;
             Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp60, &sp54);
-            if (D_80177A80 < 0x5A0) {
+            if (gCsFrameCount < 0x5A0) {
                 D_80177978 = sp54.x;
                 D_80177980 = D_i3_801C2768[3] + sp54.y;
                 D_80177988 = player->pos.z + D_80177D20 + sp54.z;
@@ -1052,16 +1052,16 @@ void func_i3_801A7930(Player* player) {
                 D_801779B8 = player->pos.y + 75.0f;
                 Math_SmoothStepToF(&D_i3_801C2768[3], 500.0f, 0.1f, 1.0f, 0.0001f);
                 D_801779C0 = player->pos.z + D_80177D20 + 200.0f;
-                if (D_80177A80 >= 0x578) {
-                    D_801779C0 -= (D_80177A80 * 8) - 11200;
+                if (gCsFrameCount >= 0x578) {
+                    D_801779C0 -= (gCsFrameCount * 8) - 11200;
                 }
             } else {
                 Math_SmoothStepToF(&D_80177978, 0.0f, 0.1f, 1.0f, 0.0001f);
                 D_801779A0 = 0.0f;
                 D_801779B8 = player->pos.y + 75.0f;
-                D_801779C0 = player->pos.z + D_80177D20 + 200.0f - ((D_80177A80 * 8) - 11200);
+                D_801779C0 = player->pos.z + D_80177D20 + 200.0f - ((gCsFrameCount * 8) - 11200);
             }
-            if (D_80177A80 >= 0x5B5) {
+            if (gCsFrameCount >= 0x5B5) {
                 player->unk_0D0 += 2.0f;
                 player->unk_0E4 += 0.2f;
                 Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.001f, 0);
@@ -1070,10 +1070,10 @@ void func_i3_801A7930(Player* player) {
                 Math_SmoothStepToF(&D_80177A48[2], 0.23f, 1.0f, 0.001f, 0.0f);
                 Math_SmoothStepToF(&D_80177A48[0], 0.5f, 0.1f, 0.0005f, 0.0f);
             }
-            if (D_80177A80 == 0x618) {
+            if (gCsFrameCount == 0x618) {
                 func_800A6148();
             }
-            if (D_80177A80 >= 0x5FB) {
+            if (gCsFrameCount >= 0x5FB) {
                 D_80178358 = 0xFF;
                 D_80178348 = D_80178350 = D_80178354 = 0;
                 D_8017835C = 8;
@@ -1088,7 +1088,7 @@ void func_i3_801A7930(Player* player) {
             }
             break;
     }
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 0x1B8:
             D_80177840 = 0x64;
             break;
@@ -1141,7 +1141,7 @@ void func_i3_801A7930(Player* player) {
             D_80177830 = 0;
             break;
         case 0x5B4:
-            Audio_PlaySfx(0x09000002, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             player->unk_190 = player->unk_194 = 5.0f;
             break;
         case 0x578:
@@ -1200,13 +1200,13 @@ void func_i3_801A8BE8(Actor* actor) {
         case 4:
             break;
         case 1:
-            if ((actor->unk_0B6 != 0) && ((((actor->index & 7) * 10) + 1030) < D_80177A80)) {
+            if ((actor->unk_0B6 != 0) && ((((actor->index & 7) * 10) + 1030) < gCsFrameCount)) {
                 actor->unk_0B8 = 4;
             }
             break;
         case 2:
             actor->unk_0B8 = 3;
-            Audio_PlaySfx(0x09000002, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             actor->fwork[29] = 5.0f;
             /* fallthrough */
         case 3:
@@ -1234,7 +1234,7 @@ void func_i3_801A8DB8(Vec3f* arg0, u32 arg1, f32 arg2) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
-        if (gEffects[i].obj.status == 0) {
+        if (gEffects[i].obj.status == OBJ_FREE) {
             func_8007A5F8(&gEffects[i], arg0, arg1);
             gEffects[i].vel.z = arg2;
             break;

src/overlays/ovl_i5/fox_ti_cs.c

@@ -10,7 +10,7 @@ f32 D_i5_801B7348[] = { 90.0f, -90.0f, 0.0f };
 
 void func_i5_80187530(Actor* actor) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
 
     actor->obj.pos.x = 0.0f;
@@ -19,13 +19,13 @@ void func_i5_80187530(Actor* actor) {
 
     actor->obj.rot.y = 180.0f;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x11030010U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     actor->unk_0B6 = 1;
 }
 
 void func_i5_801875D0(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
 
     actor->obj.pos.x = D_i5_801B72A0[arg1].x;
@@ -35,7 +35,7 @@ void func_i5_801875D0(Actor* actor, s32 arg1) {
     actor->obj.rot.y = 180.0f;
     actor->iwork[11] = 1;
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i5_8018769C(Player* player) {
@@ -48,7 +48,7 @@ void func_i5_8018769C(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = 0;
+            gCsFrameCount = 0;
             D_80177BAC = 1;
             player->unk_0D4 = 0.0f;
 
@@ -87,14 +87,14 @@ void func_i5_8018769C(Player* player) {
             D_80177980 = actor->obj.pos.y - 500.0f;
             D_80177988 = actor->obj.pos.z - 750.0f;
 
-            if (D_80177A80 == 330) {
+            if (gCsFrameCount == 330) {
                 func_800BA808(gMsg_ID_4113, RCID_FOX);
             }
 
-            if (D_80177A80 == 430) {
+            if (gCsFrameCount == 430) {
                 player->unk_1D0 = 2;
                 player->timer_1F8 = 10;
-                Audio_PlaySfx(0x09000002U, &player->unk_460, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
             D_801779A0 = player->pos.x;
             D_801779B8 = player->pos.y;
@@ -118,7 +118,7 @@ void func_i5_8018769C(Player* player) {
                 }
             }
 
-            if ((D_80177A80 > 450) && (D_80177A80 < 490)) {
+            if ((gCsFrameCount > 450) && (gCsFrameCount < 490)) {
                 Math_SmoothStepToF(&player->unk_170, 2.0f, 1.0f, 0.2f, 0.0f);
                 Math_SmoothStepToF(&player->unk_16C, 2.0f, 1.0f, 0.2f, 0.0f);
             } else {
@@ -126,8 +126,8 @@ void func_i5_8018769C(Player* player) {
                 Math_SmoothStepToF(&player->unk_16C, 0.5f, 1.0f, 0.2f, 0.0f);
             }
 
-            if (D_80177A80 == 500) {
-                D_80177A80 = 480;
+            if (gCsFrameCount == 500) {
+                gCsFrameCount = 480;
 
                 player->unk_1D0 = 3;
                 player->unk_144 = 200.0f;
@@ -206,7 +206,7 @@ void func_i5_8018769C(Player* player) {
 
                 if (D_80177A10[0] == 0) {
                     D_80177A10[0]++;
-                    Audio_PlaySfx(0x01008016U, &player->unk_460, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
 
@@ -214,13 +214,13 @@ void func_i5_8018769C(Player* player) {
                 func_8007A900(((Rand_ZeroOne() - 0.5f) * 30.0f) + player->pos.x, 30.0f,
                               ((Rand_ZeroOne() - 0.5f) * 30.0f) + player->unk_138, (2.0f * Rand_ZeroOne()) + 3.5f, 255,
                               12, 1);
-                Object_Kill(&gActors[3].obj, &gActors[3].sfxPos);
+                Object_Kill(&gActors[3].obj, gActors[3].sfxPos);
             }
 
             Math_SmoothStepToF(&player->unk_0F0, __sinf(((gGameFrameCount) *5.0f) * M_DTOR) * 10.0f, 0.1f, 100.0f,
                                0.0f);
 
-            if (D_80177A80 == 0x244) {
+            if (gCsFrameCount == 0x244) {
                 D_80177838 = 0x32;
                 player->state_1C8 = PLAYERSTATE_1C8_3;
                 player->unk_1D0 = player->timer_1F8 = player->timer_1FC = player->unk_240 = 0;
@@ -230,7 +230,7 @@ void func_i5_8018769C(Player* player) {
                 func_800A594C();
                 D_8017782C = 0;
                 if ((gControllerHold[player->num].button & Z_TRIG) && (gControllerHold[player->num].button & R_TRIG)) {
-                    func_8001A55C(&player->unk_460, 0x01008016);
+                    func_8001A55C(player->sfxPos, 0x01008016);
                 }
             }
             break;
@@ -264,7 +264,7 @@ void func_i5_80188108(Actor* actor, s32 arg1) {
     actor->vel.y = player->vel.y;
     actor->vel.z = player->vel.z;
 
-    actor->obj.status = 1;
+    actor->obj.status = OBJ_INIT;
     actor->obj.id = OBJ_ACTOR_195;
     actor->obj.rot.y = 180.0f;
 
@@ -275,11 +275,11 @@ void func_i5_80188108(Actor* actor, s32 arg1) {
         actor->unk_0C9 = 1;
         actor->fwork[3] = D_i5_801B7348[arg1];
         actor->unk_0B8 = 30;
-        Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     } else {
         actor->unk_0B6 = 1;
         actor->unk_0B8 = 20;
-        Audio_PlaySfx(0x11030010U, &actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         actor->fwork[9] = 20.0f;
     }
 }
@@ -293,7 +293,7 @@ void func_i5_801882CC(Player* player) {
 
     switch (player->unk_1D0) {
         case 0:
-            D_80177A80 = D_80178284 = D_80178488 = 0;
+            gCsFrameCount = gBossActive = D_80178488 = 0;
 
             func_800A6148();
 
@@ -315,14 +315,14 @@ void func_i5_801882CC(Player* player) {
                 func_i5_80188108(&gActors[2], 2);
             }
 
-            func_8001A55C(&player->unk_460_arr[0], 0x01004024U);
+            func_8001A55C(player->sfxPos, 0x01004024U);
 
         case 1:
             Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0.0f);
             Math_SmoothStepToF(&player->unk_0D0, 4.9f, 0.1f, 1.0f, 0.0f);
             Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 1.0f, 0.0f);
 
-            if (D_80177A80 < 0x460) {
+            if (gCsFrameCount < 0x460) {
                 Math_SmoothStepToF(&D_80177A48[1], 0.65f, 0.1f, 0.01f, 0.0f);
             } else {
                 Math_SmoothStepToF(&D_80177A48[1], 0.0f, 0.1f, 0.02f, 0.0f);
@@ -390,7 +390,7 @@ void func_i5_801882CC(Player* player) {
             Math_SmoothStepToF(&player->unk_170, 2.0f, 1.0f, 0.2f, 0.0f);
             Math_SmoothStepToF(&player->unk_16C, 2.0f, 1.0f, 0.2f, 0.0f);
 
-            if (D_80177A80 < 1470) {
+            if (gCsFrameCount < 1470) {
                 func_8007A900(((Rand_ZeroOne() - 0.5f) * 30.0f) + (player->pos.x + 30.0f), 30.0f,
                               ((Rand_ZeroOne() - 0.5f) * 30.0f) + player->unk_138, (2.0f * Rand_ZeroOne()) + 3.5f, 255,
                               12, 1);
@@ -418,7 +418,7 @@ void func_i5_801882CC(Player* player) {
             break;
     }
 
-    switch (D_80177A80) {
+    switch (gCsFrameCount) {
         case 831:
             D_80177830 = 1;
             break;
@@ -505,7 +505,7 @@ void func_i5_801882CC(Player* player) {
             D_80161A44 = 30000.0f;
             player->unk_240 = 1;
             func_8001CA24(0);
-            Audio_PlaySfx(0x01008016U, &player->unk_460, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             break;
     }
 
@@ -518,12 +518,12 @@ void func_i5_801882CC(Player* player) {
 
     player->camAt.y += camAtY;
 
-    if (D_80177A80 == 0x564) {
+    if (gCsFrameCount == 0x564) {
         func_800182F4(0x103C00FF);
         func_800182F4(0x113C00FF);
     }
 
-    if (D_80177A80 > 1440) {
+    if (gCsFrameCount > 1440) {
         D_80178348 = D_80178350 = D_80178354 = 0;
         D_80178358 = 255;
 

src/overlays/ovl_i6/fox_sy.c

@@ -18,7 +18,7 @@ void func_i6_8019C194(Boss*, f32, f32);
 
 void func_i6_80197B30(Actor* actor, s32 timer) {
     Actor_Initialize(actor);
-    actor->obj.status = 2;
+    actor->obj.status = OBJ_ACTIVE;
     actor->obj.id = 0xC3;
 
     actor->obj.pos.x = gPlayer->pos.x;
@@ -40,7 +40,7 @@ void func_i6_80197B30(Actor* actor, s32 timer) {
     actor->iwork[11] = 1;
 
     Object_SetInfo(&actor->info, actor->obj.id);
-    Audio_PlaySfx(0x3100000CU, &actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i6_80197C64(Effect* effect) {
@@ -104,7 +104,7 @@ void func_i6_80197CC4(Boss* boss) {
             func_800182F4(0x103200FF);
             func_800182F4(0x113200FF);
         }
-        Object_Kill(&boss->obj, &boss->sfxPos);
+        Object_Kill(&boss->obj, boss->sfxPos);
     }
 }
 
@@ -205,7 +205,7 @@ void func_i6_80198244(Boss* boss) {
 
     boss->fwork[10] = 181.0f;
     boss->fwork[34] = 2.8f;
-    Audio_PlaySfx(0x2902306CU, &boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    Audio_PlaySfx(0x2902306CU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }
 
 void func_i6_801983E4(Boss* boss) {

src/overlays/ovl_menu/fox_map.c

@@ -2017,7 +2017,7 @@ void func_menu_801A0954(void) {
     if (gControllerPress[gMainController].button & START_BUTTON) {
         func_8001D444(0, 0x3C, 0, 0xFF);
 
-        Audio_PlaySfx(0x4900001FU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
         for (planetId = 0; planetId < PLANET_MAX; planetId++) {
             if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@@ -2229,7 +2229,7 @@ void func_menu_801A1528(void) {
             }
 
             if (temp == 0.0f) {
-                Audio_PlaySfx(0x4900001FU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801CD948 = 0;
                 D_menu_801CD97C = 1;
                 D_menu_801CD944 = 3;
@@ -2238,7 +2238,7 @@ void func_menu_801A1528(void) {
     }
 
     if (gControllerPress[gMainController].button & START_BUTTON) {
-        Audio_PlaySfx(0x4900001FU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
         for (planetId = 0; planetId < PLANET_MAX; planetId++) {
             if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@@ -2346,9 +2346,9 @@ void func_menu_801A1C14(void) {
                 if (sCurrentPlanetId == PLANET_CORNERIA) {
                     D_80178340 = 0;
                     D_menu_801CD948 = 10;
-                    Audio_PlaySfx(0x0940A00BU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x0940A00BU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 } else {
-                    Audio_PlaySfx(0x19003012U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x19003012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_menu_801CD948++;
                 }
             } else {
@@ -2364,7 +2364,7 @@ void func_menu_801A1C14(void) {
 
         case 10:
             if (D_menu_801CEB34 == 4) {
-                Audio_PlaySfx(0x19003012U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x19003012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801CD948 = 2;
             }
             break;
@@ -2372,7 +2372,7 @@ void func_menu_801A1C14(void) {
         case 2:
             func_menu_801A2674();
             if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) {
-                Audio_PlaySfx(0x19004013U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x19004013U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801CD9D8 = 1;
                 if (sCurrentPlanetId == PLANET_CORNERIA) {
                     D_menu_801CEB48[0] = 1;
@@ -2791,9 +2791,9 @@ void func_menu_801A2EB8(void) {
 
     if (D_menu_801CD9C4 == 30) {
         if (D_menu_801CD93C == 2) {
-            Audio_PlaySfx(0x0900802AU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x0900802AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         } else {
-            Audio_PlaySfx(0x09000032U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x09000032U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
     }
 
@@ -2861,7 +2861,7 @@ void func_menu_801A2EB8(void) {
     }
 
     if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) {
-        Audio_PlaySfx(0x19000026U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x19000026U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 
     if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) {
@@ -3019,7 +3019,7 @@ void func_menu_801A36A8(void) {
     }
 
     if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
-        Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801CD948 = 3;
     }
 }
@@ -3473,7 +3473,7 @@ void func_menu_801A4D7C(void) {
 
     if (gControllerPress[gMainController].button & A_BUTTON) {
         func_8001D6DC(0);
-        Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801CF000[D_menu_801CEFDC] = 10;
 
         if (((D_menu_801CD93C != 0) && (D_menu_801CEFDC == 2)) || ((D_menu_801CD93C == 0) && (D_menu_801CEFDC == 1))) {
@@ -3664,7 +3664,7 @@ bool func_menu_801A5770(void) {
     }
 
     if (ret) {
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 
     return ret;
@@ -3874,7 +3874,7 @@ void func_menu_801A5E80(void) {
 
         case 4:
             if (D_menu_801CD9B8 == 0) {
-                Audio_PlaySfx(0x49002016U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49002016U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801CD9B8 = 75;
                 D_menu_801B8280++;
             }
@@ -4138,7 +4138,7 @@ void func_menu_801A659C(void) {
     func_8001A838(0x1100204C);
 
     if (sCurrentPlanetId != 9) {
-        Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 
     D_menu_801CEFC8 = 0;
@@ -4799,7 +4799,7 @@ void func_menu_801A809C(PlanetId planetId) {
                 D_menu_801CD998 += 8;
 
                 if (D_menu_801CD998 == 8) {
-                    Audio_PlaySfx(0x49008030U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49008030U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
 
                 if (D_menu_801CD998 >= 255) {
@@ -5706,7 +5706,7 @@ void func_menu_801AB300(void) {
                 D_menu_801CEA74 = 255;
                 D_80177D50 = 1.3f;
 
-                Audio_PlaySfx(0x4100001EU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4100001EU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 func_8001ACDC(Message_IdFromPtr(D_80178308));
 
                 D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2;
@@ -6383,7 +6383,7 @@ void func_menu_801AC9A0(s32 index) {
 
     switch (D_80177BD8[index]) {
         case 1:
-            Audio_PlaySfx(0x1900404DU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x1900404DU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80177BD8[index] = 11;
             break;
 
@@ -6607,7 +6607,7 @@ void func_menu_801AD11C(void) {
     if (gControllerPress[gMainController].button & START_BUTTON) {
         if (D_menu_801CD944 == 3 && D_80161A34 == 7) {
             if (D_menu_801CEFD0) {
-                Audio_PlaySfx(0x4900100AU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900100AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             } else {
                 func_8001D6DC(1);
                 D_menu_801CEFC4 = 1;
@@ -6652,7 +6652,7 @@ void func_menu_801AD11C(void) {
     }
 
     if (D_menu_801CF014 == 0 && var_a3 == 1) {
-        func_8001D10C(&D_800C5D28, 0x1100204C);
+        func_8001D10C(D_800C5D28, 0x1100204C);
         D_menu_801CF014 = 1;
     }
 
@@ -6706,7 +6706,7 @@ void func_menu_801AD11C(void) {
     }
 
     if (D_menu_801CF010 == 0 && var_t0 == 1) {
-        Audio_PlaySfx(0x1100004CU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x1100004CU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801CF010 = 1;
     }
 

src/overlays/ovl_menu/fox_option.c

@@ -1015,13 +1015,13 @@ void Option_MainMenuUpdate(void) {
             temp1 = func_menu_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController,
                                        &D_menu_801B9180);
             // clang-format off
-            if (temp1 != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
+            if (temp1 != 0) { Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
             // clang-format on
 
             if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) {
                 temp2 = func_menu_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190);
                 if (temp2 != 0) {
-                    Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     if (D_menu_801B91B0) {
                         sOptionCardList[0].unk_00.unk_08 = D_8004C50;
                         sOptionCardList[0].unk_00.unk_10 = 80;
@@ -1041,7 +1041,7 @@ void Option_MainMenuUpdate(void) {
             if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) {
                 temp2 = func_menu_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198);
                 if (temp2 != 0) {
-                    Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     if (D_menu_801B91AC) {
                         sOptionCardList[4].unk_00.unk_08 = D_8004C50;
                         sOptionCardList[4].unk_00.unk_10 = 80;
@@ -1059,13 +1059,13 @@ void Option_MainMenuUpdate(void) {
             }
 
             if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
-                Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000020, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4];
                 D_menu_801B91BC = 0;
                 D_menu_801B912C = 11;
             }
             if (gControllerPress[gMainController].button & B_BUTTON) {
-                Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B8284 = 0;
                 D_menu_801B8280 = 1;
                 D_menu_801B912C = 100;
@@ -1284,18 +1284,18 @@ void Option_VersusUpdate(void) {
 
         case 1:
             // clang-format off
-            if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
+            if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
             // clang-format on
 
             if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
-                Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000020, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8];
                 D_menu_801B91BC = 0;
                 D_menu_801B912C = 11;
             }
 
             if (gControllerPress[gMainController].button & B_BUTTON) {
-                Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B912C = 0;
                 D_menu_801B9124 = 1000;
                 gDrawMode = DRAWMODE_0;
@@ -1463,7 +1463,7 @@ void Option_SoundUpdate(void) {
     temp = func_menu_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250);
     if (temp != 0) {
         D_menu_801B9270[sp34] = 255.0f;
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
     }
 
     if (D_menu_801B9288 == 0) {
@@ -1479,12 +1479,12 @@ void Option_SoundUpdate(void) {
     }
 
     if (gControllerPress[gMainController].button & A_BUTTON) {
-        Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801B9288 = (D_menu_801B9288 + 1) & 3;
     }
 
     if (gControllerPress[gMainController].button & B_BUTTON) {
-        Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         if (D_menu_801B9284 == 1) {
             D_menu_801B9284 = 0;
             func_8001D8F4(D_menu_801B9284);
@@ -1502,7 +1502,7 @@ void func_menu_80194AEC(void) {
     s32 pad;
 
     if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) {
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         gSoundMode = sp3C;
         if (gSoundMode >= 3) {
             gSoundMode = 0;
@@ -1754,7 +1754,7 @@ void Option_ExpertSoundUpdate(void) {
     f32 sp28 = D_menu_801B931C;
 
     if (func_menu_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) {
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801B931C = sp28;
     }
 
@@ -1765,14 +1765,14 @@ void Option_ExpertSoundUpdate(void) {
 
     if (gControllerPress[gMainController].button & B_BUTTON) {
         if (!D_menu_801B9320) {
-            Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_8001D444(0, 36, 0, 255);
             gDrawMode = DRAWMODE_0;
             D_menu_801B9124 = 1000;
             D_menu_801B912C = 0;
             D_menu_801B9244 = 1;
         } else {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_800182F4(0x100100FF);
             func_800182F4(0x110100FF);
             D_menu_801B9320 = false;
@@ -1943,7 +1943,7 @@ void Option_DataUpdate(void) {
 
                 case 1:
                     D_menu_801B91CC = 2;
-                    Audio_PlaySfx(0x0940A00B, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x0940A00B, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_801779A8[gMainController] = 50.0f;
                     D_80177990[gMainController] = 0;
                     break;
@@ -1996,36 +1996,36 @@ void Option_DataUpdate(void) {
 void func_menu_8019669C(void) {
     if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) {
         if (func_menu_8019C5A0(&D_menu_801B91C0) != 0) {
-            Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         }
         if (1) {}
     }
 
     if (gControllerPress[gMainController].button & A_BUTTON) {
         if (D_menu_801B91CC == 3) {
-            Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B912C = 3;
         } else {
             D_menu_801B9330[D_menu_801B91C0] = 10;
             if (D_menu_801B91C0 == 0) {
                 if (D_menu_801B91CC == 1) {
-                    Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_menu_801B912C = 2;
                 } else {
-                    Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_menu_801B912C = 3;
                 }
             } else {
-                Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B912C = 4;
             }
         }
     } else if (gControllerPress[gMainController].button & B_BUTTON) {
         if (D_menu_801B91CC == 1) {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B912C = 2;
         } else {
-            Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B912C = 3;
         }
     }
@@ -2153,7 +2153,7 @@ void Option_RankingUpdate(void) {
     func_menu_80196FC4();
 
     if (gControllerPress[gMainController].button & B_BUTTON) {
-        Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         gDrawMode = DRAWMODE_0;
         D_menu_801B9124 = 1000;
         D_menu_801B912C = 0;
@@ -2168,7 +2168,7 @@ void Option_RankingDraw(void) {
 
 void func_menu_80196FC4(void) {
     if (gControllerPress[gMainController].button & A_BUTTON) {
-        Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801B93E0 ^= 1;
     }
 
@@ -2182,7 +2182,7 @@ void func_menu_80196FC4(void) {
 
 void func_menu_80197074(void) {
     if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) {
-        Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f;
         D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
         D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f;
@@ -2199,7 +2199,7 @@ void func_menu_8019715C(void) {
 
     if (D_menu_801B91D0 != 0) {
         if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) {
-            Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
             D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f;
             D_menu_801B91D0 = 0;
@@ -2767,19 +2767,19 @@ void func_menu_8019949C(void) {
         if (!(D_menu_801B93C4 & (1 << i))) {
             func_menu_8019C824(&D_menu_801B9358[i]);
             if (func_menu_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) {
-                Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             }
         }
 
         if (gControllerPress[i].button & A_BUTTON) {
             if (D_menu_801B93C4 == 15) {
-                Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B91EC = 10;
                 D_menu_801B912C++;
                 break;
             } else {
                 if (!(D_menu_801B93C4 & (1 << i))) {
-                    Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     gHandicap[i] = D_menu_801AED3C[i];
                     D_menu_801B9358[i] = 255.0f;
                     D_menu_801B9348[i] = 10;
@@ -2790,11 +2790,11 @@ void func_menu_8019949C(void) {
 
         if (gControllerPress[i].button & B_BUTTON) {
             if (D_menu_801B93C4 & (1 << i)) {
-                Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B93C4 &= (1 << i) ^ 15;
             } else {
                 func_8001D444(0, 36, 0, 255);
-                Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 func_menu_8019B8A0(2);
                 D_menu_801B9248 = 1;
                 break;
@@ -3106,19 +3106,19 @@ void func_menu_8019A2E0(void) {
         }
 
         if (func_menu_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
-            Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_801778A4 = D_menu_801B93D4 + 1;
         }
 
         if (gControllerPress[i].button & A_BUTTON) {
-            Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_menu_8019A080();
             D_menu_801B936C = 10;
             break;
         }
 
         if (gControllerPress[i].button & B_BUTTON) {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B9124 = D_menu_801B93D0;
             D_menu_801B91C4 = 0;
             Option_InitEntry();
@@ -3146,20 +3146,20 @@ void func_menu_8019A4DC(void) {
         }
 
         if (func_menu_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
-            Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B9340 = D_menu_801B93DC;
             D_801778C8 = D_menu_801B93DC;
         }
 
         if (gControllerPress[i].button & A_BUTTON) {
-            Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_menu_8019A080();
             D_menu_801B937C = 10;
             break;
         }
 
         if (gControllerPress[i].button & B_BUTTON) {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B9124 = D_menu_801B93D0;
             D_menu_801B91C4 = 0;
             Option_InitEntry();
@@ -3187,12 +3187,12 @@ void func_menu_8019A6DC(void) {
             continue;
         }
         if (func_menu_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) {
-            Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_80161A28 = D_menu_801B93D8;
         }
 
         if (gControllerPress[i].button & A_BUTTON) {
-            Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             if (D_80161A28 == 0) {
                 gVersusStage = VS_STAGE_CORNERIA;
                 if (D_menu_801B93D0 == 30) {
@@ -3208,7 +3208,7 @@ void func_menu_8019A6DC(void) {
         }
 
         if (gControllerPress[i].button & B_BUTTON) {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             if (D_menu_801B93D0 == 20) {
                 D_menu_801B9124 = D_menu_801B93D0;
                 D_menu_801B91C4 = 0;
@@ -3243,13 +3243,13 @@ void func_menu_8019A954(void) {
         }
 
         if (gControllerPress[i].button & A_BUTTON) {
-            Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             D_menu_801B91EC = 10;
             break;
         }
 
         if (gControllerPress[i].button & B_BUTTON) {
-            Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
             func_menu_8019A080();
             D_menu_801B933C = 0;
             D_menu_801B91F0 = 0;
@@ -3942,7 +3942,7 @@ bool func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250
     temp2 = *arg0;
 
     if ((s32) temp2 != (s32) temp) {
-        Audio_PlaySfx(0x49004007, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49004007, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
         var_a2 = true;
     }
 
@@ -4101,7 +4101,7 @@ void func_menu_8019CD54(void) {
             if (D_menu_801B9138 == 0) {
                 if (func_menu_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController,
                                        &D_menu_801B9160[D_menu_801B9098])) {
-                    Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]];
                     D_menu_801B90D0[D_menu_801B9098] = 0.0f;
                     D_menu_801B9100[D_menu_801B9098] = 0.0f;
@@ -4111,7 +4111,7 @@ void func_menu_8019CD54(void) {
             if (gControllerPress[gMainController].button & A_BUTTON) {
                 D_menu_801B90D0[D_menu_801B9098] = 0.0f;
                 if (D_menu_801B9138 != 0) {
-                    Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     D_menu_801B9140[0] = 10;
                     D_menu_801B9140[1] = 10;
                     D_menu_801B9140[2] = 10;
@@ -4121,7 +4121,7 @@ void func_menu_8019CD54(void) {
 
                 } else {
                     if (D_menu_801B9098 < 3) {
-                        Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         D_menu_801B90D0[D_menu_801B9098] = 0.0f;
                         D_menu_801B9140[D_menu_801B9098] = 15;
                         D_menu_801B9128 = 1;
@@ -4131,7 +4131,7 @@ void func_menu_8019CD54(void) {
             }
 
             if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) {
-                Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 if (D_menu_801B9138 != 0) {
                     D_menu_801B9138 = 0;
                 }
@@ -4473,7 +4473,7 @@ void func_menu_8019DE74(void) {
     func_menu_8019715C();
 
     if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN
-        Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
         gDrawMode = DRAWMODE_0;
         D_menu_801B912C = 0;
@@ -4516,10 +4516,10 @@ void Option_InvoiceUpdate(void) {
         case 1:
             if (D_menu_801B9178 == 0) {
                 if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) {
-                    Audio_PlaySfx(0x49000032, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000032, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 if ((gTotalHits * 64) >= 70000) {
-                    Audio_PlaySfx(0x49000033, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000033, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
                 D_menu_801B9178 = 20;
                 D_menu_801B912C++;
@@ -4528,7 +4528,7 @@ void Option_InvoiceUpdate(void) {
 
         case 2:
             if ((D_menu_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) {
-                Audio_PlaySfx(0x19031083, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x19031083, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B9090 = 1;
                 D_menu_801B9178 = 60;
                 D_menu_801B912C++;

src/overlays/ovl_menu/fox_title.c

@@ -117,7 +117,7 @@ s32 D_menu_801B8348;
 UnkStruct_D_801B8350 D_menu_801B8350[4];
 f32 D_menu_801B84D0;
 f32 D_menu_801B84D4;
-Vec3f D_menu_801B84D8;
+f32 D_menu_801B84D8[3];
 UnkStruct_D_menu_801B84E8 D_menu_801B84E8[4];
 UnkStruct_D_menu_801B8658 D_menu_801B8658;
 UnkStruct_D_menu_801B8688 D_menu_801B8688;
@@ -1114,8 +1114,8 @@ void func_menu_8018994C(void) {
             }
 
             if (D_menu_801B82B8 == 638) {
-                Audio_PlaySfx(0x11030010, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-                Audio_PlaySfx(0x31024059, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 func_800BA808(gMsg_ID_60, RCID_ROB64_TITLE);
             }
 
@@ -1186,8 +1186,8 @@ void func_menu_8018994C(void) {
             }
 
             if (D_80178340 == 255) {
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x11030010);
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x31024059);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x11030010);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x31024059);
 
                 D_menu_801B82C0 = 0;
 
@@ -1339,8 +1339,8 @@ void func_menu_8018A644(void) {
     switch (D_menu_801B82C0) {
         case 0:
             func_menu_8018A338();
-            Audio_PlaySfx(0x49000014, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            Audio_PlaySfx(0x0140001C, (Vec3f*) &D_menu_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x49000014, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x0140001C, D_menu_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             D_menu_801B82B4 = 0;
             D_menu_801B82C8 = 0.0f;
@@ -1386,7 +1386,7 @@ void func_menu_8018A644(void) {
 
             if (D_menu_801B7BEC == 795) {
                 func_8001A838(0x49000014);
-                func_8001A55C(&D_menu_801B84D8, 0x0140001C);
+                func_8001A55C(D_menu_801B84D8, 0x0140001C);
 
                 D_menu_801B82C0 = 0;
 
@@ -1503,8 +1503,8 @@ void func_menu_8018ACEC(void) {
     switch (D_menu_801B82C0) {
         case 0:
             func_menu_8018ABC0();
-            Audio_PlaySfx(0x11030010, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            Audio_PlaySfx(0x31024059, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             D_menu_801B82CC = 0.01f;
             D_menu_801B82B4 = 0;
@@ -1524,8 +1524,8 @@ void func_menu_8018ACEC(void) {
             }
 
             if (D_80178340 == 255) {
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x11030010);
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x31024059);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x11030010);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x31024059);
 
                 gDrawMode = DRAWMODE_0;
 
@@ -1680,7 +1680,7 @@ void func_menu_8018B5C4(void) {
 
         case 10:
             if (D_menu_801B82A8 == 0) {
-                Audio_PlaySfx(0x0100001D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0100001D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B82B4 = 0;
                 D_menu_801B82C0 = 1;
             }
@@ -1695,7 +1695,7 @@ void func_menu_8018B5C4(void) {
                 D_menu_801B9048 -= 0.41f;
                 if (D_menu_801B9048 < 0.0f) {
                     D_menu_801B9048 = 0.0f;
-                    Audio_PlaySfx(0x09002013, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x09002013, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 }
             }
 
@@ -1709,7 +1709,7 @@ void func_menu_8018B5C4(void) {
                 }
 
                 if (D_menu_801B84E8[i].unk_38 == 1) {
-                    Audio_PlaySfx(0x1950107A, &D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x1950107A, D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 };
 
                 if (D_menu_801B84E8[i].unk_38 == 0) {
@@ -1718,7 +1718,7 @@ void func_menu_8018B5C4(void) {
                                                  0.01f);
                     D_menu_801B84E8[i].unk_10 *= 1.04f;
                     if (temp[i] == 0.0f) {
-                        func_8001A55C(&D_menu_801B84E8[i].unk_50, 0x1950107A);
+                        func_8001A55C(D_menu_801B84E8[i].unk_50, 0x1950107A);
                     }
                 }
             }
@@ -1744,7 +1744,7 @@ void func_menu_8018B5C4(void) {
             if (D_menu_801B82B4 == 226) {
                 D_menu_801B7BF0 = 0;
 
-                Audio_PlaySfx(0x0100001E, &D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x0100001E, D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                 D_menu_801B86BC = 105.0f;
                 D_menu_801B86C0 = 0.0f;
@@ -1837,8 +1837,8 @@ void func_menu_8018B5C4(void) {
 
         case 3:
             if (D_menu_801B82A8 == 0) {
-                func_8001A55C(&D_menu_801B84E8[3].unk_50, 0x0100001E);
-                Audio_PlaySfx(0x09000002, &D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                func_8001A55C(D_menu_801B84E8[3].unk_50, 0x0100001E);
+                Audio_PlaySfx(0x09000002, D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
                 D_menu_801B82A8 = 4;
 
@@ -2026,8 +2026,8 @@ void func_menu_8018C644(void) {
 
     switch (D_menu_801B82C0) {
         case 0:
-            Audio_PlaySfx(0x11030010, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
-            Audio_PlaySfx(0x31024059, &D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 
             func_menu_8018C1C0();
 
@@ -2054,7 +2054,7 @@ void func_menu_8018C644(void) {
                     D_menu_801B84E8[i].unk_38--;
                 } else {
                     if (D_menu_801B84E8[i].unk_38 == 0) {
-                        Audio_PlaySfx(0x19000001, &D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        Audio_PlaySfx(0x19000001, D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                         D_menu_801B84E8[i].unk_38 = -1;
                         D_menu_801B84E8[i].unk_4C = 1;
                     }
@@ -2090,8 +2090,8 @@ void func_menu_8018C644(void) {
             }
 
             if (D_80178340 == 0xFF) {
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x11030010);
-                func_8001A55C(&D_menu_801B8658.unk_24, 0x31024059);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x11030010);
+                func_8001A55C(D_menu_801B8658.unk_24, 0x31024059);
                 D_menu_801B82C0++;
             }
             func_menu_801912A0();
@@ -2280,7 +2280,7 @@ void func_menu_8018D2B8(s32 arg0) {
 
     func_80053658(&wings);
 
-    func_8005F1EC(&D_menu_801B84E8[arg0].unk_50);
+    func_8005F1EC(D_menu_801B84E8[arg0].unk_50);
 
     if (D_menu_801B84E8[arg0].unk_40 != 0) {
         func_menu_8018D80C(arg0);
@@ -2482,7 +2482,7 @@ void func_menu_8018E058(void) {
     D_80177B8C = 1;
 
     func_800515C4();
-    func_8005F1EC(&D_menu_801B8658.unk_24);
+    func_8005F1EC(D_menu_801B8658.unk_24);
 
     Matrix_Pop(&gGfxMatrix);
 }
@@ -2589,7 +2589,7 @@ void func_menu_8018E67C(s32 arg0) {
     }
 
     if (arg0 == 0) {
-        func_8005F1EC(&D_menu_801B84D8);
+        func_8005F1EC(D_menu_801B84D8);
     }
 
     Matrix_Pop(&gGfxMatrix);
@@ -3211,7 +3211,7 @@ void func_menu_80190EA4(void) {
     switch (D_menu_801B8280) {
         case 0:
             if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right
-                Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                 D_menu_801B8284 = 0;
                 D_menu_801B8280 = 1;
                 gControllerLock = 0x1E;
@@ -3243,7 +3243,7 @@ void func_menu_80190FD0(void) {
                 if (((gControllerPress[gMainController].button & START_BUTTON) ||
                      (gControllerPress[gMainController].button & A_BUTTON)) &&
                     (D_menu_801B8280 == 0)) {
-                    Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                     func_800182F4(0x101E00FF);
                     func_800182F4(0x111E00FF);
                     D_menu_801B8284 = 0;

src/overlays/ovl_menu/fox_title.h

@@ -53,7 +53,7 @@ typedef struct {
     /* 0x44 */ f32 unk_44;
     /* 0x48 */ s32 unk_48;
     /* 0x4C */ s32 unk_4C;
-    /* 0x50 */ Vec3f unk_50;
+    /* 0x50 */ f32 unk_50[3];
 } UnkStruct_D_menu_801B84E8; // size = 0x5C
 
 typedef struct {
@@ -64,7 +64,7 @@ typedef struct {
     /* 0x18 */ f32 angleZ;
     /* 0x1C */ f32 scale;
     /* 0x20 */ char pad20[0x4];
-    /* 0x24 */ Vec3f unk_24;
+    /* 0x24 */ f32 unk_24[3];
 } UnkStruct_D_menu_801B8658; // size = 0x30
 
 typedef struct {
@@ -168,7 +168,7 @@ extern s32 D_menu_801B8348;
 extern UnkStruct_D_801B8350 D_menu_801B8350[4];
 extern f32 D_menu_801B84D0;
 extern f32 D_menu_801B84D4;
-extern Vec3f D_menu_801B84D8;
+extern f32 D_menu_801B84D8[3];
 extern UnkStruct_D_menu_801B84E8 D_menu_801B84E8[4];
 extern UnkStruct_D_menu_801B8658 D_menu_801B8658;
 extern UnkStruct_D_menu_801B8688 D_menu_801B8688;