Updates to sf64Mesg and a couple global names (#247)

* id start

* stuff

* comp and cam

* add errors

* names and such

* message fixes and names

5 files changed, 132 insertions, 154 deletions

diff --git a/src/engine/fox_boss.c b/src/engine/fox_boss.c
index 6d5d0858..722f116f 100644
--- a/src/engine/fox_boss.c
+++ b/src/engine/fox_boss.c
@@ -2,14 +2,14 @@
 
 s32 gBossFrameCount;
 
-s32 D_boss_800C9E90[] = {
+s32 gBossBgms[] = {
     NA_BGM_BOSS_CO, NA_BGM_BOSS_ME, NA_BGM_BOSS_SX, NA_BGM_BOSS_A6, NA_BGM_BOSS_SB, NA_BGM_BOSS_SY, NA_BGM_BOSS_VE,
     NA_BGM_BOSS_SO, NA_BGM_BOSS_ZO, NA_BGM_BOSS_VE, NA_BGM_BOSS_CO, NA_BGM_BOSS_MA, NA_BGM_BOSS_TI, NA_BGM_BOSS_AQ,
 };
 
 s32 PAD_boss_C9EC4[14] = { 0 };
 
-const f32 D_boss_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f };
+const f32 D_boss_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f }; // unused?
 
 void Boss_AwardBonus(Boss* boss) {
     s32 bonus;
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index 663d910d..bf8ad01b 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -19,97 +19,6 @@
 #include "assets/ast_katina.h"
 #include "assets/ast_allies.h"
 
-static 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 };
-
-static Vec3f D_demo_800C9FA0[] = {
-    { 200.0f, -10.0f, 200.0f },
-    { -200.0f, 20.0f, 200.0f },
-    { 0.0f, 50.0f, 400.0f },
-    { -2000.0f, -1000.0f, 0.0f },
-};
-
-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 };
-
-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 };
-
-static f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f };
-
-static f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f };
-
-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 };
-
-static 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[] = {
-    { 0.0, 40.0, -2278.0 },
-    { 295.0, -92.0, -1301.0 },
-    { -295.0, -92.0, -1301.0 },
-};
-
-static 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[] = {
-    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[] = {
-    0.5f, 1.5f, 2.5f, 1.5f, 0.5f, 0.2f, 0.2f,
-};
-
-static 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[] = {
-    1.5f, 0.87f, 0.83f, 0.75f, 0.7f, 0.6f, 0.4f, 0.1f,
-};
-
-static 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,
-};
-
 void func_demo_80048AC0(TeamId teamId) {
     s32 teamShield;
 
@@ -162,6 +71,14 @@ void func_demo_80048AC0(TeamId teamId) {
     }
 }
 
+static 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 };
+
 void func_demo_80048CC4(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
     actor->obj.status = OBJ_INIT;
@@ -338,6 +255,13 @@ void Cutscene_WarpZoneComplete(Player* player) {
     player->rockAngle = SIN_DEG(player->rockPhase);
 }
 
+static Vec3f D_demo_800C9FA0[] = {
+    { 200.0f, -10.0f, 200.0f },
+    { -200.0f, 20.0f, 200.0f },
+    { 0.0f, 50.0f, 400.0f },
+    { -2000.0f, -1000.0f, 0.0f },
+};
+
 void func_demo_80049630(ActorCutscene* this) {
     Vec3f sp3C;
     Vec3f sp30;
@@ -395,6 +319,15 @@ 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 };
+
 void func_demo_80049968(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
     actor->obj.status = OBJ_INIT;
@@ -721,6 +654,11 @@ 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 };
+
 void func_demo_8004A700(Actor* actor, s32 arg1) {
     Actor_Initialize(actor);
     actor->obj.status = OBJ_INIT;
@@ -795,6 +733,9 @@ 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 };
+
 void Cutscene_AllRangeMode(Player* player) {
     s32 pad;
     Vec3f sp70;
@@ -817,9 +758,9 @@ void Cutscene_AllRangeMode(Player* player) {
         } else if (gCurrentLevel != LEVEL_TRAINING) {
             Radio_PlayMessage(gMsg_ID_20180, RCID_FOX);
             if (gCurrentLevel == LEVEL_SECTOR_Y) {
-                Audio_PlaySequence(SEQ_PLAYER_BGM, D_boss_800C9E90[gCurrentLevel], 0, 2);
+                Audio_PlaySequence(SEQ_PLAYER_BGM, gBossBgms[gCurrentLevel], 0, 2);
             } else {
-                AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]);
+                AUDIO_PLAY_BGM(gBossBgms[gCurrentLevel]);
             }
         }
     }
@@ -1923,6 +1864,10 @@ 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 };
+
 void func_demo_8004E4D4(ActorCutscene* this) {
     Vec3f sp54;
     Vec3f sp48;
@@ -2482,6 +2427,39 @@ void ActorCutscene_Update(ActorCutscene* this) {
     }
 }
 
+static 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[] = {
+    { 0.0, 40.0, -2278.0 },
+    { 295.0, -92.0, -1301.0 },
+    { -295.0, -92.0, -1301.0 },
+};
+static 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[] = {
+    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[] = {
+    0.5f, 1.5f, 2.5f, 1.5f, 0.5f, 0.2f, 0.2f,
+};
+static 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[] = {
+    1.5f, 0.87f, 0.83f, 0.75f, 0.7f, 0.6f, 0.4f, 0.1f,
+};
+static 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,
+};
+
 void func_demo_8004FCB8(Actor* actor, s32 arg1) {
     f32 angle;
     f32 scale;
diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c
index fc3a41c8..29467f71 100644
--- a/src/engine/fox_hud.c
+++ b/src/engine/fox_hud.c
@@ -1538,7 +1538,7 @@ void func_hud_80088970(void) {
                 gFillScreenAlpha += 32;
                 if (gFillScreenAlpha > 255) {
                     gFillScreenAlpha = 255;
-                };
+                }
                 if (D_80161838[0] < 160) {
                     break;
                 }
@@ -2523,7 +2523,7 @@ void func_hud_8008B9E8(void) {
 
     if ((D_80161788 == 0) && (D_8016178C == 0)) {
         if ((gRadioState >= 4) && (gCurrentRadioPortrait != RCID_STATIC) &&
-            (gCurrentRadioPortrait != RCID_STATIC_FLIP)) {
+            (gCurrentRadioPortrait != RCID_STATIC + 1)) {
             temp = func_hud_8008B774();
             if (temp == 1) {
                 D_80161788 = 20;
@@ -2536,7 +2536,7 @@ void func_hud_8008B9E8(void) {
         }
     }
 
-    if ((gCurrentRadioPortrait == RCID_STATIC) || (gCurrentRadioPortrait == RCID_STATIC_FLIP)) {
+    if ((gCurrentRadioPortrait == RCID_STATIC) || (gCurrentRadioPortrait == RCID_STATIC + 1)) {
         D_80161788 = 0;
         D_8016178C = 0;
     }
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index 5949dd79..af3dd807 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -42,7 +42,7 @@ s32 D_play_80161A58; // unused
 s32 D_play_80161A5C; // saved hit count for venom -> andross
 u16 gScreenFlashTimer;
 u16 gDropHitCountItem;
-s32 sPlayWingSplash;
+s32 sPlayWingSplashSfx;
 Environment* sEnvironment;
 
 #define MEM_ARRAY_ALLOCATE(arr, count) ((arr) = Memory_Allocate((count) * sizeof(*(arr))))
@@ -245,7 +245,7 @@ void Player_WaterEffects(Player* player) {
         Matrix_MultVec3f(gCalcMatrix, &sp48, &sp30);
         if (player->pos.y < (gGroundHeight + 100.0f)) {
             if ((sp3C.y < gGroundHeight + 80.0f) && ((gGameFrameCount % 2) == 0)) {
-                if (sPlayWingSplash) {}
+                if (sPlayWingSplashSfx) {}
                 func_effect_8007ACE0(sp3C.x, gGroundHeight, sp3C.z, 0.1f, 2.0f,
                                      player->rot.y + player->yRot_114 + 20.0f);
             }
@@ -255,12 +255,12 @@ void Player_WaterEffects(Player* player) {
             }
         }
         if ((sp30.y < gGroundHeight + 80.0f) || (sp3C.y < gGroundHeight + 80.0f)) {
-            if (!sPlayWingSplash) {
-                sPlayWingSplash = true;
+            if (!sPlayWingSplashSfx) {
+                sPlayWingSplashSfx = true;
                 AUDIO_PLAY_SFX(NA_SE_SPLASH_LEVEL_S, player->sfxSource, 0);
             }
         } else {
-            sPlayWingSplash = false;
+            sPlayWingSplashSfx = false;
             Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_SPLASH_LEVEL_S);
         }
     }
diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c
index 0840ead8..b579fc2d 100644
--- a/src/engine/fox_radio.c
+++ b/src/engine/fox_radio.c
@@ -171,16 +171,16 @@ void func_radio_800BAAE8(void) {
         case RCID_FOX:
             radioPortraitTex = D_10050E0;
             break;
-        case RCID_FOX_RED_OPEN:
+        case RCID_FOX_RED + 1:
             sRadioUseRedBox = true;
             /* fallthrough */
-        case RCID_FOX_OPEN:
+        case RCID_FOX + 1:
             radioPortraitTex = D_1006000;
             break;
         case RCID_FOX_EXPERT:
             radioPortraitTex = D_1006F20;
             break;
-        case RCID_FOX_EXPERT_OPEN:
+        case RCID_FOX_EXPERT + 1:
             radioPortraitTex = D_1007E40;
             break;
         case RCID_FALCO_RED:
@@ -189,10 +189,10 @@ void func_radio_800BAAE8(void) {
         case RCID_FALCO:
             radioPortraitTex = D_10032A0;
             break;
-        case RCID_FALCO_RED_OPEN:
+        case RCID_FALCO_RED + 1:
             sRadioUseRedBox = true;
             /* fallthrough */
-        case RCID_FALCO_OPEN:
+        case RCID_FALCO + 1:
             radioPortraitTex = D_10041C0;
             break;
         case RCID_SLIPPY_RED:
@@ -201,10 +201,10 @@ void func_radio_800BAAE8(void) {
         case RCID_SLIPPY:
             radioPortraitTex = D_100D900;
             break;
-        case RCID_SLIPPY_RED_OPEN:
+        case RCID_SLIPPY_RED + 1:
             sRadioUseRedBox = true;
             /* fallthrough */
-        case RCID_SLIPPY_OPEN:
+        case RCID_SLIPPY + 1:
             radioPortraitTex = D_100E820;
             break;
         case RCID_PEPPY_RED:
@@ -213,112 +213,112 @@ void func_radio_800BAAE8(void) {
         case RCID_PEPPY:
             radioPortraitTex = D_100BAC0;
             break;
-        case RCID_PEPPY_RED_OPEN:
+        case RCID_PEPPY_RED + 1:
             sRadioUseRedBox = true;
             /* fallthrough */
-        case RCID_PEPPY_OPEN:
+        case RCID_PEPPY + 1:
             radioPortraitTex = D_100C9E0;
             break;
         case RCID_WOLF:
             radioPortraitTex = D_STAR_WOLF_F00B580;
             break;
-        case RCID_WOLF_OPEN:
+        case RCID_WOLF + 1:
             radioPortraitTex = D_STAR_WOLF_F00C4A0;
             break;
         case RCID_PIGMA:
             radioPortraitTex = D_STAR_WOLF_F003C80;
             break;
-        case RCID_PIGMA_OPEN:
+        case RCID_PIGMA + 1:
             radioPortraitTex = D_STAR_WOLF_F004BA0;
             break;
         case RCID_LEON:
             radioPortraitTex = D_STAR_WOLF_F007900;
             break;
-        case RCID_LEON_OPEN:
+        case RCID_LEON + 1:
             radioPortraitTex = D_STAR_WOLF_F008820;
             break;
         case RCID_ANDREW:
             radioPortraitTex = D_STAR_WOLF_F000000;
             break;
-        case RCID_ANDREW_OPEN:
+        case RCID_ANDREW + 1:
             radioPortraitTex = D_STAR_WOLF_F000F20;
             break;
         case RCID_WOLF_2:
             radioPortraitTex = D_STAR_WOLF_F00D3C0;
             break;
-        case RCID_WOLF_2_OPEN:
+        case RCID_WOLF_2 + 1:
             radioPortraitTex = D_STAR_WOLF_F00E2E0;
             break;
         case RCID_PIGMA_2:
             radioPortraitTex = D_STAR_WOLF_F005AC0;
             break;
-        case RCID_PIGMA_2_OPEN:
+        case RCID_PIGMA_2 + 1:
             radioPortraitTex = D_STAR_WOLF_F0069E0;
             break;
         case RCID_LEON_2:
             radioPortraitTex = D_STAR_WOLF_F009740;
             break;
-        case RCID_LEON_2_OPEN:
+        case RCID_LEON_2 + 1:
             radioPortraitTex = D_STAR_WOLF_F00A660;
             break;
         case RCID_ANDREW_2:
             radioPortraitTex = D_STAR_WOLF_F001E40;
             break;
-        case RCID_ANDREW_2_OPEN:
+        case RCID_ANDREW_2 + 1:
             radioPortraitTex = D_STAR_WOLF_F002D60;
             break;
         case RCID_BOSS_CORNERIA:
             radioPortraitTex = D_CO_6026420;
             break;
-        case RCID_BOSS_CORNERIA_OPEN:
+        case RCID_BOSS_CORNERIA + 1:
             radioPortraitTex = D_CO_6027340;
             break;
         case RCID_BOSS_CORNERIA2:
             radioPortraitTex = D_CO_60245E0;
             break;
-        case RCID_BOSS_CORNERIA2_OPEN:
+        case RCID_BOSS_CORNERIA2 + 1:
             radioPortraitTex = D_CO_6025500;
             break;
         case RCID_BOSS_METEO:
             radioPortraitTex = D_ME_601C8E0;
             break;
-        case RCID_BOSS_METEO_OPEN:
+        case RCID_BOSS_METEO + 1:
             radioPortraitTex = D_ME_601D800;
             break;
         case RCID_BOSS_AREA6:
             radioPortraitTex = D_A6_60047E0;
             break;
-        case RCID_BOSS_AREA6_OPEN:
+        case RCID_BOSS_AREA6 + 1:
             radioPortraitTex = D_A6_6005700;
             break;
         case RCID_CAIMAN_AREA6:
             radioPortraitTex = D_A6_60029A0;
             break;
-        case RCID_CAIMAN_AREA6_OPEN:
+        case RCID_CAIMAN_AREA6 + 1:
             radioPortraitTex = D_A6_60038C0;
             break;
         case RCID_BOSS_ZONESS:
             radioPortraitTex = D_ZO_6014510;
             break;
-        case RCID_BOSS_ZONESS_OPEN:
+        case RCID_BOSS_ZONESS + 1:
             radioPortraitTex = D_ZO_6015430;
             break;
         case RCID_BOSS_SECTORX:
             radioPortraitTex = D_SX_6020FB0;
             break;
-        case RCID_BOSS_SECTORX_OPEN:
+        case RCID_BOSS_SECTORX + 1:
             radioPortraitTex = D_SX_6021ED0;
             break;
         case RCID_BOSS_SECTORY:
             radioPortraitTex = D_SY_6018F30;
             break;
-        case RCID_BOSS_SECTORY_OPEN:
+        case RCID_BOSS_SECTORY + 1:
             radioPortraitTex = D_SY_6019E50;
             break;
         case RCID_BOSS_MACBETH:
             radioPortraitTex = D_MA_6010C20;
             break;
-        case RCID_BOSS_MACBETH_OPEN:
+        case RCID_BOSS_MACBETH + 1:
             radioPortraitTex = D_MA_6011B40;
             break;
         case RCID_ROB64_RED:
@@ -328,17 +328,17 @@ void func_radio_800BAAE8(void) {
         case RCID_ROB64_2:
             radioPortraitTex = D_1009C80;
             break;
-        case RCID_ROB64_RED_OPEN:
+        case RCID_ROB64_RED + 1:
             sRadioUseRedBox = true;
             /* fallthrough */
-        case RCID_ROB64_OPEN:
-        case RCID_ROB64_2_OPEN:
+        case RCID_ROB64 + 1:
+        case RCID_ROB64_2 + 1:
             radioPortraitTex = D_100ABA0;
             break;
         case RCID_KATT:
             radioPortraitTex = D_D003DF0;
             break;
-        case RCID_KATT_OPEN:
+        case RCID_KATT + 1:
             radioPortraitTex = D_D004D10;
             break;
         case RCID_ANDROSS_RED:
@@ -349,8 +349,8 @@ void func_radio_800BAAE8(void) {
             }
             sRadioUseRedBox = true;
             break;
-        case RCID_ANDROSS_RED_OPEN:
-        case RCID_ANDROSS_OPEN:
+        case RCID_ANDROSS_RED + 1:
+        case RCID_ANDROSS + 1:
             radioPortraitTex = D_D001090;
             if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) {
                 radioPortraitTex = D_A6_6001A80;
@@ -360,40 +360,40 @@ void func_radio_800BAAE8(void) {
         case RCID_JAMES:
             radioPortraitTex = D_D005C30;
             break;
-        case RCID_JAMES_OPEN:
+        case RCID_JAMES + 1:
             radioPortraitTex = D_D006B50;
             break;
         case RCID_BILL:
             radioPortraitTex = D_D001FB0;
             break;
-        case RCID_BILL_OPEN:
+        case RCID_BILL + 1:
             radioPortraitTex = D_D002ED0;
             break;
         case RCID_GEN_PEPPER:
             radioPortraitTex = D_D007A70;
             break;
-        case RCID_GEN_PEPPER_OPEN:
+        case RCID_GEN_PEPPER + 1:
             radioPortraitTex = D_D008990;
             break;
         case RCID_ROB64_TITLE:
             radioPortraitTex = D_GREAT_FOX_E00E100;
             break;
-        case RCID_ROB64_TITLE_OPEN:
+        case RCID_ROB64_TITLE + 1:
             radioPortraitTex = D_GREAT_FOX_E00F020;
             break;
         case RCID_GEN_PEPPER_TITLE:
             radioPortraitTex = D_GREAT_FOX_E00FF40;
             break;
-        case RCID_GEN_PEPPER_TITLE_OPEN:
+        case RCID_GEN_PEPPER_TITLE + 1:
             radioPortraitTex = D_GREAT_FOX_E010E60;
             break;
         case RCID_TR:
             radioPortraitTex = D_TR_6000900;
             break;
-        case RCID_TR_OPEN:
+        case RCID_TR + 1:
             radioPortraitTex = D_TR_6001820;
             break;
-        case RCID_STATIC_FLIP:
+        case RCID_STATIC + 1:
             mirror = true;
             /* fallthrough */
         case RCID_STATIC:
@@ -541,7 +541,7 @@ void Radio_Draw(void) {
             }
             gCurrentRadioPortrait = RCID_STATIC;
             if ((gGameFrameCount % 2) != 0) {
-                gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                gCurrentRadioPortrait = RCID_STATIC + 1;
             }
             break;
 
@@ -552,7 +552,7 @@ void Radio_Draw(void) {
             }
             gCurrentRadioPortrait = RCID_STATIC;
             if ((gGameFrameCount % 2) != 0) {
-                gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                gCurrentRadioPortrait = RCID_STATIC + 1;
             }
             break;
 
@@ -659,7 +659,7 @@ void Radio_Draw(void) {
             }
             gCurrentRadioPortrait = RCID_STATIC;
             if ((gGameFrameCount % 2) != 0) {
-                gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                gCurrentRadioPortrait = RCID_STATIC + 1;
             }
             gRadioTextBoxScaleY -= 0.26f;
             if (gRadioTextBoxScaleY < 0.0f) {
@@ -676,7 +676,7 @@ void Radio_Draw(void) {
             }
             gCurrentRadioPortrait = RCID_STATIC;
             if ((gGameFrameCount % 2) != 0) {
-                gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                gCurrentRadioPortrait = RCID_STATIC + 1;
             }
             break;
 
@@ -707,14 +707,14 @@ void Radio_Draw(void) {
                 idx = TEAM_ID_PEPPY;
             }
             if ((gTeamShields[idx] <= 0) && (gGameFrameCount & 4) && (gTeamShields[idx] != -2) &&
-                (gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC_FLIP) &&
+                (gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1) &&
                 (gCurrentRadioPortrait != RCID_1000)) {
                 RCP_SetupDL(&gMasterDisp, 0x4C);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
                 Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
                 func_hud_80084B94(1);
             }
-            if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC_FLIP)) &&
+            if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
                 (gCurrentRadioPortrait != RCID_1000)) {
                 func_hud_80086110(22.0f, 165.0f, gTeamShields[idx]);
             }
@@ -757,17 +757,17 @@ void Radio_Draw(void) {
 
             if ((gActors[idx].obj.status != OBJ_ACTIVE) && (gGameFrameCount & 4) &&
                 (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (gCurrentRadioPortrait != RCID_STATIC) &&
-                (gCurrentRadioPortrait != RCID_STATIC_FLIP) && (gCurrentRadioPortrait != RCID_1000)) {
+                (gCurrentRadioPortrait != RCID_STATIC + 1) && (gCurrentRadioPortrait != RCID_1000)) {
                 RCP_SetupDL(&gMasterDisp, 0x4C);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
                 Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
             }
-            if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC_FLIP)) &&
+            if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
                 (gCurrentRadioPortrait != RCID_1000)) {
                 func_hud_80086110(22.0f, 165.0f, gActors[idx].health * 2.55f);
             }
         }
-        if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC_FLIP)) &&
+        if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
             (gCurrentRadioPortrait != RCID_1000)) {
             func_hud_8008AD94();
         }
@@ -816,7 +816,7 @@ void func_radio_800BC040(void) {
                 gCurrentRadioPortrait = RCID_STATIC;
 
                 if ((gGameFrameCount % 2) != 0) {
-                    gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                    gCurrentRadioPortrait = RCID_STATIC + 1;
                 }
                 break;
 
@@ -862,7 +862,7 @@ void func_radio_800BC040(void) {
                 gCurrentRadioPortrait = RCID_STATIC;
 
                 if ((gGameFrameCount % 2) != 0) {
-                    gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                    gCurrentRadioPortrait = RCID_STATIC + 1;
                 }
 
                 gRadioTextBoxScaleY -= 0.015f;
@@ -880,7 +880,7 @@ void func_radio_800BC040(void) {
                 }
                 gCurrentRadioPortrait = RCID_STATIC;
                 if ((gGameFrameCount % 2) != 0) {
-                    gCurrentRadioPortrait = RCID_STATIC_FLIP;
+                    gCurrentRadioPortrait = RCID_STATIC + 1;
                 }
                 break;