rightState -> rightWingState

14 files changed, 41 insertions, 41 deletions

diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c
index 115f16c7..99769bbd 100644
--- a/src/engine/fox_360.c
+++ b/src/engine/fox_360.c
@@ -199,7 +199,7 @@ void AllRange_GreatFoxRepair(Player* player) {
                 gCsCamEyeZ = 305.0f;
 
                 player->shields = Play_GetMaxShields();
-                player->arwing.rightState = WINGSTATE_INTACT;
+                player->arwing.rightWingState = WINGSTATE_INTACT;
                 player->arwing.leftState = WINGSTATE_INTACT;
 
                 if (gExpertMode) {
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index 7c4f5858..82fc373b 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -1689,9 +1689,9 @@ void Cutscene_ArwingDown360(Player* player) {
             func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 3.0f);
         }
 
-        if (player->arwing.rightState == WINGSTATE_INTACT) {
+        if (player->arwing.rightWingState == WINGSTATE_INTACT) {
             Play_SpawnDebris(1, player->hit1.x, player->hit1.y, player->hit1.z);
-            player->arwing.rightState = WINGSTATE_BROKEN;
+            player->arwing.rightWingState = WINGSTATE_BROKEN;
             func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
         }
         if (player->arwing.leftState == WINGSTATE_INTACT) {
@@ -1796,9 +1796,9 @@ void Cutscene_ArwingDownOnRails(Player* player) {
             func_enmy_80062C38(player->pos.x, player->pos.z);
         }
 
-        if (player->arwing.rightState == WINGSTATE_INTACT) {
+        if (player->arwing.rightWingState == WINGSTATE_INTACT) {
             Play_SpawnDebris(1, player->hit1.x, player->hit1.y, player->hit1.z);
-            player->arwing.rightState = WINGSTATE_NONE;
+            player->arwing.rightWingState = WINGSTATE_NONE;
             func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
         }
 
diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c
index e1a6d5fe..d717b922 100644
--- a/src/engine/fox_display.c
+++ b/src/engine/fox_display.c
@@ -459,10 +459,10 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
 
     switch (limbIndex) {
         case 13:
-            if (arwing->rightState == WINGSTATE_NONE) {
+            if (arwing->rightWingState == WINGSTATE_NONE) {
                 *gfxPtr = NULL;
             }
-            if (arwing->rightState == WINGSTATE_BROKEN) {
+            if (arwing->rightWingState == WINGSTATE_BROKEN) {
                 *gfxPtr = D_arwing_3015120;
             }
             if (D_display_800CA22C && ((gRightWingFlashTimer[0] % 2) != 0)) {
@@ -478,7 +478,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
 
         case 1:
         case 2:
-            if (arwing->rightState != 2) {
+            if (arwing->rightWingState != 2) {
                 *gfxPtr = NULL;
             }
             if (D_display_800CA22C && ((gRightWingFlashTimer[0] % 2) != 0)) {
@@ -493,7 +493,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
             break;
 
         case 12:
-            if (arwing->rightState == WINGSTATE_NONE) { // should be leftState?
+            if (arwing->rightWingState == WINGSTATE_NONE) { // should be leftState?
                 *gfxPtr = NULL;
             }
             if (arwing->leftState == WINGSTATE_BROKEN) {
@@ -679,12 +679,12 @@ void Display_Arwing(Player* player, s32 reflectY) {
         }
     } else {
         if (gVersusMode) {
-            if ((player->arwing.rightState == WINGSTATE_INTACT) && (player->arwing.leftState == WINGSTATE_INTACT)) {
+            if ((player->arwing.rightWingState == WINGSTATE_INTACT) && (player->arwing.leftState == WINGSTATE_INTACT)) {
                 gSPDisplayList(gMasterDisp++, D_versus_300EE80);
-            } else if ((player->arwing.rightState <= WINGSTATE_BROKEN) &&
+            } else if ((player->arwing.rightWingState <= WINGSTATE_BROKEN) &&
                        (player->arwing.leftState == WINGSTATE_INTACT)) {
                 gSPDisplayList(gMasterDisp++, D_versus_3010A90);
-            } else if ((player->arwing.rightState == WINGSTATE_INTACT) &&
+            } else if ((player->arwing.rightWingState == WINGSTATE_INTACT) &&
                        (player->arwing.leftState <= WINGSTATE_BROKEN)) {
                 gSPDisplayList(gMasterDisp++, D_versus_3011470);
             } else {
@@ -1245,7 +1245,7 @@ void Display_ArwingWingTrail_Draw(Player* player) {
             gSPDisplayList(gMasterDisp++, D_102A8A0);
             Matrix_Pop(&gGfxMatrix);
         }
-        if (player->arwing.rightState == WINGSTATE_INTACT) {
+        if (player->arwing.rightWingState == WINGSTATE_INTACT) {
             Matrix_Push(&gGfxMatrix);
             Matrix_Translate(gGfxMatrix, -sp5C, sp58, -100.0f, MTXF_APPLY);
             Matrix_RotateX(gGfxMatrix, M_DTOR * sp50, MTXF_APPLY);
diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c
index 34beeb77..b85685df 100644
--- a/src/engine/fox_edisplay.c
+++ b/src/engine/fox_edisplay.c
@@ -524,13 +524,13 @@ void func_edisplay_8005B388(Actor199* actor) {
                  (gCurrentLevel == LEVEL_KATINA) && (actor->index == 1)) ||
                 ((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) &&
                  (actor->state == 5))) {
-                D_edisplay_80161630.rightState = gPlayer[0].arwing.rightState;
+                D_edisplay_80161630.rightWingState = gPlayer[0].arwing.rightWingState;
                 D_edisplay_80161630.leftState = gPlayer[0].arwing.leftState;
             } else {
-                D_edisplay_80161630.rightState = D_edisplay_80161630.leftState = WINGSTATE_INTACT;
+                D_edisplay_80161630.rightWingState = D_edisplay_80161630.leftState = WINGSTATE_INTACT;
             }
         } else {
-            D_edisplay_80161630.rightState = D_edisplay_80161630.leftState = WINGSTATE_INTACT;
+            D_edisplay_80161630.rightWingState = D_edisplay_80161630.leftState = WINGSTATE_INTACT;
         }
         D_edisplay_80161630.unk_04 = actor->fwork[15];
         D_edisplay_80161630.unk_0C = actor->fwork[16];
diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c
index d593fe2b..c1c34ef6 100644
--- a/src/engine/fox_enmy.c
+++ b/src/engine/fox_enmy.c
@@ -2107,7 +2107,7 @@ void ActorSupplies_Update(ActorSupplies* this) {
             Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
             func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 5.0f);
 
-            if (((player[0].arwing.rightState <= WINGSTATE_BROKEN) ||
+            if (((player[0].arwing.rightWingState <= WINGSTATE_BROKEN) ||
                  (player[0].arwing.leftState <= WINGSTATE_BROKEN)) &&
                 (player[0].form != FORM_LANDMASTER)) {
                 this->itemDrop = DROP_WING_REPAIR;
@@ -2161,9 +2161,9 @@ void ActorSupplies_Draw(Actor* this) {
 void func_enmy_80067A40(void) {
     AUDIO_PLAY_SFX(NA_SE_WING_REPAIR, gPlayer[0].sfxSource, 0);
 
-    if (gPlayer[0].arwing.rightState <= WINGSTATE_BROKEN) {
+    if (gPlayer[0].arwing.rightWingState <= WINGSTATE_BROKEN) {
         gRightWingFlashTimer[0] = 1050;
-        gPlayer[0].arwing.rightState = WINGSTATE_INTACT;
+        gPlayer[0].arwing.rightWingState = WINGSTATE_INTACT;
     }
     if (gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN) {
         gLeftWingFlashTimer[0] = 1050;
@@ -2261,7 +2261,7 @@ void ItemPickup_Update(Item* this) {
 
 void ItemLasers_Update(ItemLasers* this) {
     if (!gVersusMode &&
-        ((gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN) || (gPlayer[0].arwing.rightState <= WINGSTATE_BROKEN))) {
+        ((gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN) || (gPlayer[0].arwing.rightWingState <= WINGSTATE_BROKEN))) {
         this->obj.id = OBJ_ITEM_WING_REPAIR;
         Object_SetInfo(&this->info, this->obj.id);
         this->timer_48 = 2000;
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index 760067a6..4e27e646 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -2688,7 +2688,7 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) {
             break;
 
         case EVC_WING_BROKEN:
-            if ((gPlayer[0].arwing.rightState <= WINGSTATE_BROKEN) ||
+            if ((gPlayer[0].arwing.rightWingState <= WINGSTATE_BROKEN) ||
                 (gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN)) {
                 ActorEvent_TriggerBranch(this);
             }
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index 7ebe456a..d69cd22e 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -169,7 +169,7 @@ void Player_WingEffects(Player* player) {
         if ((gLevelType == LEVELTYPE_PLANET) ||
             ((player->alternateView == true) && (gLevelMode == LEVELMODE_ON_RAILS))) {
             player->yBob = -SIN_DEG(player->bobPhase) * 0.5f;
-            if ((player->arwing.rightState <= WINGSTATE_BROKEN) || (player->arwing.leftState <= WINGSTATE_BROKEN)) {
+            if ((player->arwing.rightWingState <= WINGSTATE_BROKEN) || (player->arwing.leftState <= WINGSTATE_BROKEN)) {
                 player->rockAngle = SIN_DEG(player->rockPhase) * 5.0f;
             } else {
                 player->rockAngle = SIN_DEG(player->rockPhase) * 1.5f;
@@ -183,7 +183,7 @@ void Player_DamageEffects(Player* player) {
     f32 sp40;
 
     if (!player->alternateView || (gLevelMode == LEVELMODE_ALL_RANGE)) {
-        if (player->arwing.rightState <= WINGSTATE_BROKEN) {
+        if (player->arwing.rightWingState <= WINGSTATE_BROKEN) {
             if (((gGameFrameCount % 2U) == 0) && (gRightWingDebrisTimer[player->num] != 0)) {
                 func_effect_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->hit1.x, RAND_FLOAT(5.0f) + player->hit1.y,
                                      player->hit1.z, 1.0f);
@@ -823,11 +823,11 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) {
     if ((player->form == FORM_ARWING) && (gShieldAlpha[player->num] < 1.0f)) {
         if (side == 1) {
             gRightWingFlashTimer[player->num] = 30;
-            if (player->arwing.rightState == WINGSTATE_INTACT) {
+            if (player->arwing.rightWingState == WINGSTATE_INTACT) {
                 gRightWingHealth[player->num] -= damage;
                 if (gRightWingHealth[player->num] <= 0) {
                     Play_SpawnDebris(1, player->hit1.x, player->hit1.y, player->hit1.z);
-                    player->arwing.rightState = WINGSTATE_BROKEN;
+                    player->arwing.rightWingState = WINGSTATE_BROKEN;
                     func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
                     gRightWingDebrisTimer[player->num] = 50;
                     Player_PlaySfx(player->sfxSource, NA_SE_ARWING_WING_BROKEN, player->num);
@@ -1632,7 +1632,7 @@ void Player_UpdateHitbox(Player* player) {
         }
         Matrix_MultVec3f(gCalcMatrix, &sp3C, &player->hit2);
 
-        if (player->arwing.rightState == WINGSTATE_INTACT) {
+        if (player->arwing.rightWingState == WINGSTATE_INTACT) {
             sp3C.x = -40.0f;
         } else {
             sp3C.x = -30.0f;
@@ -3293,7 +3293,7 @@ bool Player_UpdateLockOn(Player* player) {
 void Player_Shoot(Player* player) {
     switch (player->form) {
         case FORM_ARWING:
-            if ((player->arwing.rightState <= WINGSTATE_BROKEN) || (player->arwing.leftState <= WINGSTATE_BROKEN)) {
+            if ((player->arwing.rightWingState <= WINGSTATE_BROKEN) || (player->arwing.leftState <= WINGSTATE_BROKEN)) {
                 gLaserStrength[player->num] = LASERS_SINGLE;
             }
 
@@ -3349,9 +3349,9 @@ void Player_ArwingBank(Player* player) {
     f32 sp38;
 
     sp3C = 0.0f;
-    if ((player->arwing.rightState <= WINGSTATE_BROKEN) && (player->arwing.leftState == WINGSTATE_INTACT)) {
+    if ((player->arwing.rightWingState <= WINGSTATE_BROKEN) && (player->arwing.leftState == WINGSTATE_INTACT)) {
         sp3C = -17.0f;
-    } else if ((player->arwing.leftState <= WINGSTATE_BROKEN) && (player->arwing.rightState == WINGSTATE_INTACT)) {
+    } else if ((player->arwing.leftState <= WINGSTATE_BROKEN) && (player->arwing.rightWingState == WINGSTATE_INTACT)) {
         sp3C = 17.0f;
     }
 
@@ -3668,7 +3668,7 @@ void Player_MoveArwing360(Player* player) {
     sp4C.x = 0.0f;
     sp4C.y = 0.0f;
 
-    if (player->arwing.rightState <= WINGSTATE_BROKEN) {
+    if (player->arwing.rightWingState <= WINGSTATE_BROKEN) {
         sp4C.x -= 2.5f;
         sp4C.y -= 2.5f;
     }
@@ -3943,7 +3943,7 @@ void Player_MoveArwingOnRails(Player* player) {
 
     Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp68, &sp50);
 
-    if (player->arwing.rightState <= WINGSTATE_BROKEN) {
+    if (player->arwing.rightWingState <= WINGSTATE_BROKEN) {
         player->vel.x += 2.5f;
         player->vel.y -= 2.5f;
     }
@@ -4416,7 +4416,7 @@ void Player_Setup(Player* playerx) {
         }
     }
 
-    player->arwing.rightState = WINGSTATE_INTACT;
+    player->arwing.rightWingState = WINGSTATE_INTACT;
     player->arwing.leftState = WINGSTATE_INTACT;
 
     if (gExpertMode) {
@@ -4520,7 +4520,7 @@ void Player_Setup(Player* playerx) {
         if (D_ctx_80177C9C != 0) {
             player->shields = D_ctx_80177C9C - 1;
             gGoldRingCount[0] = D_ctx_80177C94;
-            player->arwing.rightState = D_ctx_80177CAC;
+            player->arwing.rightWingState = D_ctx_80177CAC;
             player->arwing.leftState = D_ctx_80177CB4;
             gRightWingHealth[0] = D_ctx_80177CBC;
             gLeftWingHealth[0] = D_ctx_80177CC4;
diff --git a/src/mods/object_ram.c b/src/mods/object_ram.c
index e3a461ce..aee12afc 100644
--- a/src/mods/object_ram.c
+++ b/src/mods/object_ram.c
@@ -402,7 +402,7 @@ void CheatRam_Select(void) {
 }
 
 void CheatRam_RepairWings(void) {
-    if ((gPlayer[0].arwing.rightState <= WINGSTATE_BROKEN) || (gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN)) {
+    if ((gPlayer[0].arwing.rightWingState <= WINGSTATE_BROKEN) || (gPlayer[0].arwing.leftState <= WINGSTATE_BROKEN)) {
         func_enmy_80067A40();
     }
 }
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index 7c1ef9d7..59fe162d 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -1079,7 +1079,7 @@ void Ending_801926D4(void) {
         if (!gClearPlayerInfo) {
             D_ending_80198590 = gPlayer[0].arwing;
         } else {
-            D_ending_80198590.rightState = D_ending_80198590.leftState = WINGSTATE_INTACT;
+            D_ending_80198590.rightWingState = D_ending_80198590.leftState = WINGSTATE_INTACT;
         }
         AUDIO_PLAY_BGM(NA_BGM_STAFF_ROLL);
     }
diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c
index a3308147..4942bdaf 100644
--- a/src/overlays/ovl_i1/fox_ve1.c
+++ b/src/overlays/ovl_i1/fox_ve1.c
@@ -2376,7 +2376,7 @@ void Venom1_80198414(void) {
     D_ctx_80177C94 = gGoldRingCount[0];
     D_ctx_80177C9C = gPlayer[0].shields + 1;
     D_ctx_80177CA4 = gHitCount;
-    D_ctx_80177CAC = gPlayer[0].arwing.rightState;
+    D_ctx_80177CAC = gPlayer[0].arwing.rightWingState;
     D_ctx_80177CB4 = gPlayer[0].arwing.leftState;
     D_ctx_80177CBC = gRightWingHealth[0];
     D_ctx_80177CC4 = gLeftWingHealth[0];
diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c
index 650f86f7..14037d44 100644
--- a/src/overlays/ovl_i6/fox_andross.c
+++ b/src/overlays/ovl_i6/fox_andross.c
@@ -2594,9 +2594,9 @@ void Andross_AndAndross_Update(AndAndross* this) {
                 this->swork[8] = 0;
                 gControllerRumbleTimers[0] = 30;
 
-                if (player->arwing.rightState == 2) {
+                if (player->arwing.rightWingState == 2) {
                     gRightWingHealth[0] = 0;
-                    player->arwing.rightState = 1;
+                    player->arwing.rightWingState = 1;
                     Andross_Effect396_Spawn2(this->obj.pos.x, this->obj.pos.y - 200.0f, this->obj.pos.z,
                                              RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), 10.0f, 8);
                 }
diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c
index 7bd035f6..000488d0 100644
--- a/src/overlays/ovl_i6/fox_ve2.c
+++ b/src/overlays/ovl_i6/fox_ve2.c
@@ -124,7 +124,7 @@ void Venom2_UpdateEvents(ActorAllRange* this) {
                 D_ctx_80177C94 = gGoldRingCount[0];
                 D_ctx_80177C9C = player->shields + 1;
                 D_play_80161A5C = D_ctx_80177CA4 = gHitCount;
-                D_ctx_80177CAC = player->arwing.rightState;
+                D_ctx_80177CAC = player->arwing.rightWingState;
                 D_ctx_80177CB4 = player->arwing.leftState;
                 D_ctx_80177CBC = gRightWingHealth[0];
                 D_ctx_80177CC4 = gLeftWingHealth[0];
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index e8cb6ee3..47d0741e 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -2269,7 +2269,7 @@ void Map_801A116C(void) {
 
         Matrix_SetGfxMtx(&gMasterDisp);
 
-        arwing.rightState = arwing.leftState = WINGSTATE_INTACT;
+        arwing.rightWingState = arwing.leftState = WINGSTATE_INTACT;
         // clang-format off
         arwing.unk_18 = arwing.unk_1C = arwing.unk_20 = arwing.unk_24 = arwing.unk_04 =
         arwing.unk_08 = arwing.unk_0C = arwing.unk_10 = arwing.unk_28 = 0.0f;
diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c
index a38ab2e3..1ea5117a 100644
--- a/src/overlays/ovl_menu/fox_title.c
+++ b/src/overlays/ovl_menu/fox_title.c
@@ -2253,7 +2253,7 @@ void Title_8018D2B8(s32 arg0) {
 
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    arwing.rightState = arwing.leftState = WINGSTATE_INTACT;
+    arwing.rightWingState = arwing.leftState = WINGSTATE_INTACT;
     arwing.unk_18 = arwing.unk_1C = arwing.unk_20 = arwing.unk_24 = arwing.unk_04 = arwing.unk_08 = arwing.unk_0C =
         arwing.unk_10 = arwing.unk_28 = 0.0f;