Remove static for file globals because they don't show up in the mapfile (#271)

9 files changed, 96 insertions, 93 deletions

diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c
index 161fafb0..d1be5ea4 100644
--- a/src/engine/fox_360.c
+++ b/src/engine/fox_360.c
@@ -364,15 +364,15 @@ void ActorAllRange_SetShadowData(Actor* this) {
     }
 }
 
-static Vec3f sTeamSpawnPos[4] = {
+Vec3f sTeamSpawnPos[4] = {
     { 0.0f, 20000.0f, 0.0f },
     { 0.0f, 700.0f, 6500.0f },
     { -300.0f, 800.0f, 6800.0f },
     { 300.0f, 900.0f, 7200.0f },
 };
-static AllRangeAi sTeamAi[4] = { AI360_FOX, AI360_FALCO, AI360_SLIPPY, AI360_PEPPY };
-static s32 sTeamSpawnTargets[4] = { -1, AI360_ENEMY, AI360_ENEMY + 1, AI360_ENEMY + 2 };
-static s32 sTeamSpawnTargetsKA[4] = { -1, AI360_ENEMY + 11, AI360_ENEMY + 13, AI360_ENEMY + 15 };
+AllRangeAi sTeamAi[4] = { AI360_FOX, AI360_FALCO, AI360_SLIPPY, AI360_PEPPY };
+s32 sTeamSpawnTargets[4] = { -1, AI360_ENEMY, AI360_ENEMY + 1, AI360_ENEMY + 2 };
+s32 sTeamSpawnTargetsKA[4] = { -1, AI360_ENEMY + 11, AI360_ENEMY + 13, AI360_ENEMY + 15 };
 
 void ActorAllRange_SpawnTeam(void) {
     ActorAllRange* actor;
@@ -430,14 +430,14 @@ void ActorAllRange_SpawnTeam(void) {
     }
 }
 
-static Vec3f sStarWolfSpawnPos[4] = {
+Vec3f sStarWolfSpawnPos[4] = {
     { 9500.0f, 5000.0f, 9500.0f },
     { 10000.0f, 5000.0f, 10000.0f },
     { 10000.0f, 5000.0f, 9500.0f },
     { 9500.0f, 5000.0f, 10000.0f },
 };
-static s32 sStarWolfSpawnTargets[4] = { AI360_FOX, AI360_FALCO, AI360_PEPPY, AI360_SLIPPY };
-static f32 sStarWolfVE2SpawnRot[4] = { 330.0f, 90.0f, 280.0f, 70.0f };
+s32 sStarWolfSpawnTargets[4] = { AI360_FOX, AI360_FALCO, AI360_PEPPY, AI360_SLIPPY };
+f32 sStarWolfVE2SpawnRot[4] = { 330.0f, 90.0f, 280.0f, 70.0f };
 s32 gAllRangeSpawnEvent = 96 * 30;
 
 void ActorAllRange_SpawnStarWolf(void) {
@@ -1275,7 +1275,7 @@ bool func_360_80031900(ActorAllRange* this) {
     }
 }
 
-static Vec3f sSectorZRetreatPath[6] = {
+Vec3f sSectorZRetreatPath[6] = {
     { 8000.0f, 500.0f, 0.0f }, { 5000.0f, 400.0f, 0.0f }, { 2000.0f, 300.0f, 0.0f },
     { -500.0f, 250.0f, 0.0f }, { 0.0f, 250.0f, 0.0f },    { 0.0f, 250.0f, 0.0f },
 };
diff --git a/src/engine/fox_beam.c b/src/engine/fox_beam.c
index 48feefa0..adb02894 100644
--- a/src/engine/fox_beam.c
+++ b/src/engine/fox_beam.c
@@ -4,7 +4,7 @@
 #include "assets/ast_great_fox.h"
 #include "assets/ast_versus.h"
 
-static Vec3f sShotViewPos;
+Vec3f sShotViewPos;
 
 void PlayerShot_SetupEffect351(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
     Effect_Initialize(effect);
@@ -1222,10 +1222,10 @@ void PlayerShot_DrawLaser(PlayerShot* shot) {
     }
 }
 
-static f32 D_800C9BD8[10] = { 100.0f, 100.0f, 0.0f, 0.0f, 0.0f, 50.0f, 0.0f, 40.0f, 30.0f, 100.0f };
-static u8 D_800C9C00[4] = { 255, 255, 32, 32 };
-static u8 D_800C9C04[4] = { 255, 32, 255, 32 };
-static u8 D_800C9C08[4] = { 32, 32, 32, 255 };
+f32 D_800C9BD8[10] = { 100.0f, 100.0f, 0.0f, 0.0f, 0.0f, 50.0f, 0.0f, 40.0f, 30.0f, 100.0f };
+u8 D_800C9C00[4] = { 255, 255, 32, 32 };
+u8 D_800C9C04[4] = { 255, 32, 255, 32 };
+u8 D_800C9C08[4] = { 32, 32, 32, 255 };
 void PlayerShot_DrawShot(PlayerShot* shot) {
     Vec3f sp11C = { 0.0f, 0.0f, 0.0f };
     s32 pad[4];
@@ -2083,7 +2083,8 @@ void PlayerShot_UpdateBomb(PlayerShot* shot) {
     }
 }
 
-static Vec3f sLockOnPos = { 0.0f, 0.0f, 0.0f };
+Vec3f sLockOnPos = { 0.0f, 0.0f, 0.0f };
+
 void PlayerShot_UpdateLockOnShot(PlayerShot* shot) {
     s32 i;
     s32 var_a3;
diff --git a/src/engine/fox_colheaders.c b/src/engine/fox_colheaders.c
index 9ff133ac..1f15184a 100644
--- a/src/engine/fox_colheaders.c
+++ b/src/engine/fox_colheaders.c
@@ -12,23 +12,23 @@
 #include "assets/ast_versus.h"
 #include "assets/ast_zoness.h"
 
-static Vec3f D_800D2920[16] = {
+Vec3f D_800D2920[16] = {
     { 1075.0f, 0.0f, 0.0f },   { 746.0f, 0.0f, -746.0f },    { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
     { 291.0f, 558.0f, 0.0f },  { 0.0f, 354.0f, -291.0f },    { 202.0f, 594.0f, 202.0f },  { 772.0f, 0.0f, 622.0f },
     { 0.0f, 473.0f, 291.0f },  { 144.0f, 0.0f, 1075.0f },    { -202.0f, 461.0f, 202.0f }, { -515.0f, 0.0f, 746.0f },
     { -291.0f, 453.0f, 0.0f }, { -372.0f, 390.0f, -281.0f }, { -951.0f, 0.0f, 0.0f },     { -746.0f, 0.0f, -746.0f },
 };
-static Triangle D_800D29E0[22] = {
+Triangle D_800D29E0[22] = {
     { 0, 1, 2 },  { 2, 1, 3 },   { 4, 2, 5 },   { 3, 5, 2 },    { 2, 4, 0 },    { 4, 6, 7 },
     { 7, 0, 4 },  { 6, 4, 5 },   { 7, 6, 8 },   { 8, 9, 7 },    { 8, 10, 11 },  { 10, 8, 6 },
     { 11, 9, 8 }, { 12, 10, 6 }, { 6, 13, 12 }, { 14, 12, 13 }, { 10, 12, 14 }, { 14, 11, 10 },
     { 5, 13, 6 }, { 5, 3, 15 },  { 15, 13, 5 }, { 13, 15, 14 },
 };
-static Triangle D_800D2A64[13] = {
+Triangle D_800D2A64[13] = {
     { 0, 1, 2 }, { 2, 3, 4 }, { 2, 5, 0 }, { 4, 5, 2 }, { 4, 3, 6 },  { 4, 7, 5 },  { 8, 7, 4 },
     { 4, 6, 8 }, { 7, 8, 9 }, { 0, 7, 9 }, { 5, 7, 0 }, { 9, 10, 0 }, { 10, 1, 0 },
 };
-static Vec3f D_800D2AB4[11] = {
+Vec3f D_800D2AB4[11] = {
     { -218.0f, 131.0f, 0.0f }, { -435.0f, 0.0f, 0.0f },     { -336.0f, 0.0f, 218.0f },  { 0.0f, 0.0f, 435.0f },
     { 0.0f, 160.0f, 218.0f },  { -168.0f, 131.0f, 109.0f }, { 336.0f, 0.0f, 218.0f },   { 0.0f, 174.0f, 0.0f },
     { 435.0f, 0.0f, -204.0f }, { 0.0f, 0.0f, -435.0f },     { -318.0f, 0.0f, -218.0f },
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index 88ff4c93..aeaa775c 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -71,13 +71,13 @@ void func_demo_80048AC0(TeamId teamId) {
     }
 }
 
-static Vec3f D_demo_800C9F60[] = {
+Vec3f D_demo_800C9F60[] = {
     { 2000.0f, 2000.0f, 2000.0f },
     { -2000.0f, 2000.0f, 2000.0f },
     { 0.0f, -3000.0f, 3000.0f },
     { 5000.0f, -3000.0f, -3000.0f },
 };
-static f32 D_demo_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f };
+f32 D_demo_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f };
 
 void func_demo_80048CC4(ActorCutscene* this, s32 index) {
     Actor_Initialize(this);
@@ -260,7 +260,7 @@ void Cutscene_WarpZoneComplete(Player* player) {
     player->rockAngle = SIN_DEG(player->rockPhase);
 }
 
-static Vec3f D_demo_800C9FA0[] = {
+Vec3f D_demo_800C9FA0[] = {
     { 200.0f, -10.0f, 200.0f },
     { -200.0f, 20.0f, 200.0f },
     { 0.0f, 50.0f, 400.0f },
@@ -324,14 +324,14 @@ void func_demo_8004990C(Player* player) {
     player->bankAngle = player->rot.z + player->zRotBank + player->zRotBarrelRoll;
 }
 
-static f32 D_demo_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f };
-static f32 D_demo_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f };
-static f32 D_demo_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f };
-static f32 D_demo_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f };
-static f32 D_demo_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f };
-static f32 D_demo_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f };
-static s32 D_demo_800CA030[] = { 0, 0, 0, 1 };
-static s32 D_demo_800CA040[] = { 0, 0, 0, 0 };
+f32 D_demo_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f };
+f32 D_demo_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f };
+f32 D_demo_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f };
+f32 D_demo_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f };
+f32 D_demo_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f };
+f32 D_demo_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f };
+s32 D_demo_800CA030[] = { 0, 0, 0, 1 };
+s32 D_demo_800CA040[] = { 0, 0, 0, 0 };
 
 void func_demo_80049968(ActorCutscene* this, s32 index) {
     Actor_Initialize(this);
@@ -662,10 +662,10 @@ void Cutscene_LevelStart(Player* player) {
     }
 }
 
-static f32 D_demo_800CA050[] = { 210.0f, -210.0f, 0.0f };
-static f32 D_demo_800CA05C[] = { -60.0f, -60.0f, -120.0f };
-static f32 D_demo_800CA068[] = { -150.0f, -150.0f, -300.0f };
-static f32 D_demo_800CA074[] = { 360.0f, -360.0f, 0.0f };
+f32 D_demo_800CA050[] = { 210.0f, -210.0f, 0.0f };
+f32 D_demo_800CA05C[] = { -60.0f, -60.0f, -120.0f };
+f32 D_demo_800CA068[] = { -150.0f, -150.0f, -300.0f };
+f32 D_demo_800CA074[] = { 360.0f, -360.0f, 0.0f };
 
 void func_demo_8004A700(ActorCutscene* this, s32 index) {
     Actor_Initialize(this);
@@ -744,8 +744,8 @@ void func_demo_8004AA84(void) {
     }
 }
 
-static f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f };
-static f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f };
+f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f };
+f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f };
 
 void Cutscene_AllRangeMode(Player* player) {
     s32 pad;
@@ -1877,9 +1877,9 @@ void Cutscene_PlayerDown(Player* player) {
     }
 }
 
-static f32 D_demo_800CA098[] = { 1.0f, -0.9f, 0.7f };
-static f32 D_demo_800CA0A4[] = { 150.0f, 100.0f, 200.0f };
-static f32 D_demo_800CA0B0[] = { 200.0f, 300.0f, 500.0f };
+f32 D_demo_800CA098[] = { 1.0f, -0.9f, 0.7f };
+f32 D_demo_800CA0A4[] = { 150.0f, 100.0f, 200.0f };
+f32 D_demo_800CA0B0[] = { 200.0f, 300.0f, 500.0f };
 
 void func_demo_8004E4D4(ActorCutscene* this) {
     Vec3f sp54;
@@ -2440,36 +2440,36 @@ void ActorCutscene_Update(ActorCutscene* this) {
     }
 }
 
-static Vec3f D_demo_800CA0BC[] = {
+Vec3f D_demo_800CA0BC[] = {
     { -1373.0, 484.0, -374.0 },
     { 1373.0, 484.0, -374.0 },
     { -1373.0, -704.0, -374.0 },
     { 1373.0, -704.0, -374.0 },
 };
-static Vec3f D_demo_800CA0EC[] = {
+Vec3f D_demo_800CA0EC[] = {
     { 0.0, 40.0, -2278.0 },
     { 295.0, -92.0, -1301.0 },
     { -295.0, -92.0, -1301.0 },
 };
-static Vec3f D_demo_800CA110[8] = {
+Vec3f D_demo_800CA110[8] = {
     { 170.0f, -35.0f, -380.0f },   { -170.0f, -40.0f, -380.0f }, { 170.0f, -130.0f, -380.0f },
     { -170.0f, -140.0f, -380.0f }, { 140.0f, 40.0f, -250.0f },   { -150.0f, 40.0f, -250.0f },
     { 140.0f, 0.0f, -250.0f },     { -150.0f, 0.0f, -250.0f },
 };
-static f32 D_demo_800CA170[] = {
+f32 D_demo_800CA170[] = {
     0.15f, 0.45f, 0.75f, 1.3f, 0.75f, 0.45f, 0.15f, 0.0f,
 };
-static f32 D_demo_800CA190[] = { 5.0f, 5.2f };
-static f32 D_demo_800CA198[] = {
+f32 D_demo_800CA190[] = { 5.0f, 5.2f };
+f32 D_demo_800CA198[] = {
     0.5f, 1.5f, 2.5f, 1.5f, 0.5f, 0.2f, 0.2f,
 };
-static f32 D_demo_800CA1B4[] = {
+f32 D_demo_800CA1B4[] = {
     -30.0f, -60.0f, -90.0f, -120.0f, -150.0f, -180.0f, -200.0, -210.0,
 };
-static f32 D_demo_800CA1D4[] = {
+f32 D_demo_800CA1D4[] = {
     1.5f, 0.87f, 0.83f, 0.75f, 0.7f, 0.6f, 0.4f, 0.1f,
 };
-static Animation* D_demo_800CA1F4[] = {
+Animation* D_demo_800CA1F4[] = {
     &D_SY_60265B4, &D_SY_602B8DC, &D_SY_60034C4, &D_SY_602A2CC, &D_SY_602CEB4, &D_SY_602B778, &D_SY_601F3B8,
 };
 
diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c
index 474cf117..d4a89a61 100644
--- a/src/engine/fox_effect.c
+++ b/src/engine/fox_effect.c
@@ -65,14 +65,14 @@ void BonusText_Update(void) {
     }
 }
 
-static Gfx* sLargeBonusDLs[4][2] = {
+Gfx* sLargeBonusDLs[4][2] = {
     { D_1016410, D_1003130 },
     { D_10162A0, D_1003130 },
     { D_1016130, D_1003130 },
     { D_1015FC0, D_1003130 },
 };
 
-static Gfx* sSmallBonusDLs[10] = {
+Gfx* sSmallBonusDLs[10] = {
     D_1015810, D_1016410, D_10162A0, D_1016130, D_1015FC0, D_1015E50, D_10156A0, D_1015CE0, D_1015B70, D_1015320,
 };
 
@@ -303,7 +303,7 @@ void Effect_Effect385_Draw(Effect385* this) {
 }
 
 // Possibly the little sparks of electricity that come off the arwing and landmaster when low on health
-static f32 D_800D1534[][10] = {
+f32 D_800D1534[][10] = {
     { 38.45957f, -65.08043f, 8.068213f, 87.01006f, -86.956184f, -71.82677f, 37.854507f, 46.845963f, 23.723173f,
       84.2551f },
     { -77.50479f, 86.4889f, -8.664565f, -74.90449f, -42.23121f, 49.20716f, -18.885563f, -47.375793f, -58.059227f,
@@ -422,7 +422,7 @@ void Effect_Effect345_Draw(Effect345* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_64);
 }
 
-static s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 };
+s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 };
 
 void Effect_Effect346_Draw(Effect346* this) {
     s32 temp_ft3;
@@ -1049,7 +1049,7 @@ void Effect_Effect359_Update(Effect359* this) {
     this->unk_4A++;
 }
 
-static Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TI_6003760 };
+Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TI_6003760 };
 
 void Effect_Effect359_Draw(Effect359* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_68);
@@ -2043,7 +2043,7 @@ void Effect_Effect339_Update(EffectFireSmoke* this) {
     Math_SmoothStepToF(&this->scale1, 0.0f, 1.0f, 0.05f, 0.0f);
 }
 
-static Gfx* D_800D17A4[] = {
+Gfx* D_800D17A4[] = {
     D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200A5A0,
     D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0, D_BG_PLANET_2006360, D_BG_PLANET_200C6C0,
     D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0, D_BG_PLANET_2002120, D_BG_PLANET_2001090,
@@ -2051,12 +2051,12 @@ static Gfx* D_800D17A4[] = {
     D_BG_PLANET_200E7F0,
 };
 
-static f32 D_800D17F8[] = {
+f32 D_800D17F8[] = {
     1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.3f, 1.3f, 1.4f, 1.4f, 1.5f, 1.5f,
     1.6f, 1.6f, 1.7f, 1.7f, 1.8f, 1.8f, 1.9f, 1.9f, 2.0f, 2.0f,
 };
 
-static Color_RGBA32 D_800D184C[] = {
+Color_RGBA32 D_800D184C[] = {
     { 255, 255, 255, 255 }, { 255, 0, 0, 255 },     { 255, 40, 40, 255 },   { 255, 80, 80, 255 },
     { 255, 120, 120, 255 }, { 255, 160, 160, 255 }, { 255, 200, 200, 255 }, { 255, 240, 240, 255 },
     { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 },
@@ -2065,7 +2065,7 @@ static Color_RGBA32 D_800D184C[] = {
     { 0, 0, 0, 50 },
 };
 
-static Gfx* D_800D18A0[] = {
+Gfx* D_800D18A0[] = {
     D_BG_SPACE_20066C0, D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10,
     D_BG_SPACE_2004480, D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240,
     D_BG_SPACE_20019B0, D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000,
@@ -3481,8 +3481,8 @@ void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) {
     }
 }
 
-static f32 D_800D18E8 = 0.0f;
-static f32 D_800D18EC = 0.0f;
+f32 D_800D18E8 = 0.0f;
+f32 D_800D18EC = 0.0f;
 
 void Effect_Effect395_Update(Effect395* this) {
     f32 sp84;
@@ -4212,10 +4212,10 @@ void Effect_Effect399_Update(Effect399* this) {
 }
 
 // RGB Values. Used like an array of [8][3], but only matches this way.
-static s32 D_800D18F0[] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 };
+s32 D_800D18F0[] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 };
 
 // Alpha values
-static s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 };
+s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 };
 
 void Effect_Effect399_Draw(Effect399* this) {
     s32 tmp;
diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c
index 345b04d9..cafc06d7 100644
--- a/src/engine/fox_enmy.c
+++ b/src/engine/fox_enmy.c
@@ -31,7 +31,7 @@ ObjectInit* gLevelObjectInits[] = {
     D_KA_6011044,           D_BO_600FF74,      D_SZ_6006EB4,  D_VE2_6014D94,
     D_versus_302DE3C,
 };
-static s32 D_enmy_800CFDF4[] = {
+s32 D_enmy_800CFDF4[] = {
     /*  0 */ OBJ_SCENERY_CO_STONE_ARCH,
     /*  1 */ OBJ_ITEM_SILVER_RING,
     /*  2 */ OBJ_ITEM_SILVER_RING,
@@ -59,15 +59,15 @@ static s32 D_enmy_800CFDF4[] = {
     /* 24 */ OBJ_SCENERY_CO_STONE_ARCH,
     /* 25 */ OBJ_ITEM_SILVER_STAR,
 };
-static f32 D_enmy_800CFE5C[] = {
+f32 D_enmy_800CFE5C[] = {
     0.0f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f,  0.5f,  0.33f, 0.25f, 1.0f, 0.5f, 0.33f, 0.25f,
     1.0f, 1.0f, 1.0f, 1.0f,  1.0f,  -1.0f, -1.0f, -1.0f, -1.0f, 0.1f, 1.0f, 1.0f,  1.0f,
 };
-static Vec3f D_enmy_800CFEC4[] = {
+Vec3f D_enmy_800CFEC4[] = {
     { 0.0f, 0.0f, 50.0f }, { -50.0f, 0.0f, 0.0f }, { 50.0f, 0.0f, 0.0f },
     { 0.0f, 50.0f, 0.0f }, { 0.0f, 0.0f, -50.0f }, { 0.0f, -50.0f, 0.0f },
 };
-static Vec3f D_enmy_800CFF0C[] = {
+Vec3f D_enmy_800CFF0C[] = {
     { 0.0f, 0.0f, 0.0f },   { 0.0f, -90.0f, 0.0f }, { 0.0f, 90.0f, 0.0f },
     { -90.0f, 0.0f, 0.0f }, { 0.0f, 180.0f, 0.0f }, { 90.0f, 0.0f, 0.0f },
 };
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index 0a935802..e35f7a0a 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -237,14 +237,14 @@ void MeHopBot_Update(MeHopBot* this) {
 void MeMora_Update(MeMora* this) {
 }
 
-static s16 D_800CFF94[16] = {
+s16 D_800CFF94[16] = {
     0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70,
 };
-static u8 gMeMoraPartIdx[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
-static f32 gMeMoraScale[16] = {
+u8 gMeMoraPartIdx[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
+f32 gMeMoraScale[16] = {
     1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f,
 };
-static Gfx* gMemoraPartDL[3] = { aEnmySpMeMora1DL, aEnmySpMeMora2DL, aEnmySpMeMora3DL };
+Gfx* gMemoraPartDL[3] = { aEnmySpMeMora1DL, aEnmySpMeMora2DL, aEnmySpMeMora3DL };
 
 void MeMora_Dying(MeMora* this) {
     Vec3f sp34;
@@ -539,7 +539,8 @@ typedef enum DebrisType {
     DEBRIS_70 = 70,
 } DebrisType;
 
-static Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function
+Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function
+
 void ActorDebris_Update(ActorDebris* this) {
     f32 sp4C;
     f32 sp48;
@@ -945,7 +946,7 @@ typedef struct {
 
 // clang-format off
 
-static EventActorInfo sEventActorInfo[108] = {
+EventActorInfo sEventActorInfo[108] = {
     /*  EVID_VENOM_FIGHTER_1 */ { aVenomFighter1DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  EVID_VENOM_FIGHTER_2 */ { aVenomFighter2DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  EVID_VENOM_FIGHTER_2 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 },
@@ -1058,7 +1059,7 @@ static EventActorInfo sEventActorInfo[108] = {
 
 // clang-format on
 
-static Color_RGBA32 sEventTexLineColors[6] = {
+Color_RGBA32 sEventTexLineColors[6] = {
     // could be in-function
     { 255, 255, 255, 255 }, { 160, 160, 255, 255 }, { 80, 80, 255, 255 },
     { 80, 255, 80, 255 },   { 255, 80, 80, 255 },   { 255, 255, 80, 255 },
@@ -2824,7 +2825,7 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) {
 }
 
 // could be in-function, but probably weren't
-static Vec3f D_800D0DD4[56] = {
+Vec3f D_800D0DD4[56] = {
     { 158.0f, 256.0f, 1513.0f },   { 384.0f, 42.0f, 1187.0f },   { 284.0f, 129.0f, 769.0f },
     { 482.0f, 19.0f, 769.0f },     { 386.0f, 105.0f, 253.0f },   { 221.0f, 209.0f, 33.0f },
     { 78.0f, 263.0f, 637.0f },     { 78.0f, 263.0f, 76.0f },     { 18.0f, 263.0f, 1683.0f },
@@ -2845,7 +2846,7 @@ static Vec3f D_800D0DD4[56] = {
     { -73.0f, 337.0f, -426.0f },   { -73.0f, 548.0f, -411.0f },  { -65.0f, 391.0f, -1237.0f },
     { -193.0f, 250.0f, -1026.0f }, { -292.0f, 271.0f, -587.0f },
 };
-static Vec3f D_800D1074[24] = {
+Vec3f D_800D1074[24] = {
     { 100.0f, 55.0f, 450.0f },     { 117.0f, 57.0f, 738.0f },    { 14.0f, 31.0f, 894.0f },
     { 204.0f, 0.0f, -72.0f },      { 204.0f, 33.0f, -253.0f },   { 344.0f, 0.0f, -295.0f },
     { 344.0f, -51.0f, -457.0f },   { 87.0f, 124.0f, -699.0f },   { 169.0f, -40.0f, -564.0f },
@@ -2855,7 +2856,7 @@ static Vec3f D_800D1074[24] = {
     { -344.0f, -51.0f, -457.0f },  { -87.0f, 124.0f, -699.0f },  { -169.0f, -40.0f, -564.0f },
     { -113.0f, -147.0f, -367.0f }, { -112.0f, -146.0f, -13.0f }, { -69.0f, -118.0f, 158.0f },
 };
-static Vec3f D_800D1194[21] = {
+Vec3f D_800D1194[21] = {
     { 764.0f, 13.0f, 71.0f },    { 390.0f, 13.0f, 67.0f },    { 390.0f, 332.0f, 67.0f },   { 504.0f, 508.0f, 67.0f },
     { 251.0f, 508.0f, 67.0f },   { -35.0f, 341.0f, 67.0f },   { -35.0f, 673.0f, 67.0f },   { -354.0f, 594.0f, 67.0f },
     { -354.0f, 273.0f, 67.0f },  { -695.0f, 97.0f, 67.0f },   { -378.0f, -57.0f, 67.0f },  { -378.0f, -266.0f, 67.0f },
@@ -3021,7 +3022,8 @@ void ActorEvent_80072474(ActorEvent* this) {
     Math_SmoothStepToAngle(&this->fwork[15], this->fwork[16], 0.5f, 8.0f, 0.0f);
 }
 
-static Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function
+Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function
+
 void ActorEvent_Update(ActorEvent* this) {
     s32 spFC;
     f32 var_fv0;
@@ -3799,7 +3801,7 @@ void ActorEvent_Update(ActorEvent* this) {
     }
 }
 
-static UNK_TYPE D_800D129C[140] = { 0 }; // unused
+UNK_TYPE D_800D129C[140] = { 0 }; // unused
 
 bool ActorEvent_OverrideLimbDraw1(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
     Actor* this = thisx;
diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index 88550a7f..6cd74a2f 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -22,11 +22,11 @@ f32 gProjectFar;
 
 bool gShowReticles[4] = { true, true, true, true };
 bool D_game_800D2870 = false;
-static s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
-static s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
-static s32 sVsCameraULy[] = { 0, 0, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / 2 };
-static s32 sVsCameraLRy[] = { SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT - 1, SCREEN_HEIGHT - 1 };
-static s32 sLevelSceneIds[] = {
+s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
+s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
+s32 sVsCameraULy[] = { 0, 0, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / 2 };
+s32 sVsCameraLRy[] = { SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT - 1, SCREEN_HEIGHT - 1 };
+s32 sLevelSceneIds[] = {
     /* LEVEL_CORNERIA */ SCENE_CORNERIA,
     /* LEVEL_METEO */ SCENE_METEO,
     /* LEVEL_SECTOR_X */ SCENE_SECTOR_X,
diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c
index 3ef5166f..98b3d0b4 100644
--- a/src/engine/fox_tank.c
+++ b/src/engine/fox_tank.c
@@ -10,18 +10,18 @@ void func_tank_800481F4(Player* player);
 s32 func_tank_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot,
                        f32 zRot, f32 arg9, f32 argA, f32 argB);
 
-static u8 D_800C9F00 = 0;
-static u8 D_800C9F04 = 0;
-static u8 D_800C9F08 = 0;
-static s32 D_800C9F0C = 0; // unused.
-static f32 D_800C9F10 = 0.0f;
-static s32 D_800C9F14 = 0;
-static s32 D_800C9F18[2] = { 0, 0 }; // unused.
-static f32 D_800C9F20 = 0.0f;
-static f32 D_800C9F24 = 0.0f;
-static f32 D_800C9F28 = 0.0f;
+u8 D_800C9F00 = 0;
+u8 D_800C9F04 = 0;
+u8 D_800C9F08 = 0;
+s32 D_800C9F0C = 0; // unused.
+f32 D_800C9F10 = 0.0f;
+s32 D_800C9F14 = 0;
+s32 D_800C9F18[2] = { 0, 0 }; // unused.
+f32 D_800C9F20 = 0.0f;
+f32 D_800C9F24 = 0.0f;
+f32 D_800C9F28 = 0.0f;
 Vec3f D_tank_800C9F2C = { 0.0f, 0.0f, 0.0f };
-static s32 D_800C9F38 = 0; // unused
+s32 D_800C9F38 = 0; // unused
 
 void func_tank_80043280(u16* text0, u16* text1, f32 zRot) {
     s32 py;
@@ -873,7 +873,7 @@ void func_tank_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4,
     }
 }
 
-static f32 D_800C9F4C[5] = { 0.0f, -1.0f, 1.0f, 0.5f, -0.5f };
+f32 D_800C9F4C[5] = { 0.0f, -1.0f, 1.0f, 0.5f, -0.5f };
 
 void func_tank_80046704(Player* player) {
     s32 pad[7];