replace all ArwingInfo unks for names

23 files changed, 135 insertions, 130 deletions

diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c
index a829bdd5..26a352da 100644
--- a/src/engine/fox_360.c
+++ b/src/engine/fox_360.c
@@ -170,7 +170,7 @@ void AllRange_GreatFoxRepair(Player* player) {
             player->pos.z = 0.0f;
             gCsCamAtZ = 0.0f;
             D_ctx_80177A48[0] = 1.0f;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             player->csState++;
             break;
 
@@ -230,7 +230,7 @@ void AllRange_GreatFoxRepair(Player* player) {
             player->rot.x += 0.4f;
             if (gCsFrameCount >= 130) {
                 player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
-                player->arwing.modelId = 0;
+                player->arwing.teamFaceId = 0;
                 player->unk_014 = 0;
                 player->unk_018 = 0;
                 player->unk_01C = 0;
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index 0a9f1a81..e4dd528d 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -130,7 +130,7 @@ void Cutscene_WarpZoneComplete(Player* player) {
             D_ctx_80177A48[0] = 0.0f;
             D_ctx_80177A48[1] = 0.0f;
             D_ctx_80177A48[2] = 0.0f;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             gCsFrameCount = 0;
             /* fallthrough */
         case 1:
@@ -776,7 +776,7 @@ void Cutscene_AllRangeMode(Player* player) {
             }
         }
     }
-    player->arwing.unk_10 = 0.0f;
+    player->arwing.bottomLeftFlapYrot = 0.0f;
     player->arwing.bottomRightFlapYrot = 0.0f;
     player->arwing.upperLeftFlapYrot = 0.0f;
     player->arwing.upperRightFlapYrot = 0.0f;
@@ -796,7 +796,7 @@ void Cutscene_AllRangeMode(Player* player) {
             D_ctx_80177A48[1] = 0.0f;
             D_ctx_80177A48[2] = 60.0f;
             D_ctx_80177A48[3] = 0.0f;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             player->csState++;
             gCsFrameCount = 0;
             /* fallthrough */
@@ -921,11 +921,11 @@ void Cutscene_CoComplete2(Player* player) {
             player->arwing.upperRightFlapYrot = 0.0f;
             player->arwing.upperLeftFlapYrot = 0.0f;
             player->arwing.bottomRightFlapYrot = 0.0f;
-            player->arwing.unk_10 = 0.0f;
+            player->arwing.bottomLeftFlapYrot = 0.0f;
             player->zRotBarrelRoll = 0.0f;
             player->zRotBank = 0.0f;
             player->boostSpeed = 0.0f;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             player->baseSpeed = 40.0f;
             /* fallthrough */
 
@@ -1020,7 +1020,7 @@ void Cutscene_CoComplete2(Player* player) {
             if (player->csTimer == 0) {
                 player->csState = 1;
                 player->csTimer = 150;
-                player->arwing.unk_10 = 0.0f;
+                player->arwing.bottomLeftFlapYrot = 0.0f;
                 player->arwing.bottomRightFlapYrot = 0.0f;
                 player->arwing.upperLeftFlapYrot = 0.0f;
                 player->arwing.upperRightFlapYrot = 0.0f;
@@ -1451,7 +1451,7 @@ void Cutscene_UTurn(Player* player) {
             Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f);
-            Math_SmoothStepToF(&player->arwing.unk_10, sp58.y, 0.3f, 100.0f, 0.0f);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->zRotBank, 0.0f, 0.1f, 15.0f, 0.0f);
             Math_SmoothStepToF(&player->aerobaticPitch, 190.0f, 0.1f, 6.0f, 0.001f);
 
@@ -1485,7 +1485,7 @@ void Cutscene_UTurn(Player* player) {
             sp58.z = -sp58.y;
 
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, sp58.z, 0.3f, 100.0f, 0.0f);
-            Math_SmoothStepToF(&player->arwing.unk_10, sp58.z, 0.3f, 100.0f, 0.0f);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, sp58.z, 0.3f, 100.0f, 0.0f);
 
             player->unk_190 = 2.0f;
             player->cam.eye.x += player->vel.x * 0.1f;
diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c
index 76d7fb97..dabc2a6a 100644
--- a/src/engine/fox_display.c
+++ b/src/engine/fox_display.c
@@ -535,24 +535,24 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
             rot->y -= arwing->bottomRightFlapYrot;
             break;
         case 5:
-            rot->y -= arwing->unk_10;
+            rot->y -= arwing->bottomLeftFlapYrot;
             break;
         case 6:
             rot->y -= arwing->upperLeftFlapYrot;
             break;
         case 12:
-            rot->z += arwing->unk_20;
+            rot->z += arwing->wingsYrot;
             break;
         case 13:
-            rot->z += arwing->unk_20;
+            rot->z += arwing->wingsYrot;
             break;
         case 4:
-            pos->z -= arwing->unk_14;
-            pos->x += arwing->unk_18;
+            pos->z -= arwing->laserGunsYpos;
+            pos->x += arwing->laserGunsXpos;
             break;
         case 8:
-            pos->z += arwing->unk_14;
-            pos->x += arwing->unk_18;
+            pos->z += arwing->laserGunsYpos;
+            pos->x += arwing->laserGunsXpos;
             break;
     }
     return false;
@@ -560,13 +560,13 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
 
 void Display_ArwingWings(ArwingInfo* arwing) {
     Vec3f sp68[30];
-    s32 modelId;
+    s32 teamFaceId;
 
     Matrix_Push(&gGfxMatrix);
 
-    arwing->unk_18 = 0.0f;
-    if (arwing->unk_14 < -7.0f) {
-        arwing->unk_18 = (-arwing->unk_14 - 7.0f) * 2.5f;
+    arwing->laserGunsXpos = 0.0f;
+    if (arwing->laserGunsYpos < -7.0f) {
+        arwing->laserGunsXpos = (-arwing->laserGunsYpos - 7.0f) * 2.5f;
     }
 
     if (gGameState == GSTATE_PLAY) {
@@ -584,31 +584,31 @@ void Display_ArwingWings(ArwingInfo* arwing) {
 
     D_display_800CA22C = false;
 
-    modelId = arwing->modelId;
+    teamFaceId = arwing->teamFaceId;
     if (D_display_800CA220 != 0) {
-        modelId = 1;
+        teamFaceId = 1;
     }
 
-    if (modelId != 0) {
+    if (teamFaceId != 0) {
         Matrix_Push(&gGfxMatrix);
         Matrix_Translate(gGfxMatrix, 0.0f, 6.4f, -16.5f, MTXF_APPLY);
-        Matrix_RotateY(gGfxMatrix, arwing->unk_34 * M_DTOR, MTXF_APPLY);
-        Matrix_RotateX(gGfxMatrix, arwing->unk_30 * M_DTOR, MTXF_APPLY);
+        Matrix_RotateY(gGfxMatrix, arwing->teamFaceYrot * M_DTOR, MTXF_APPLY);
+        Matrix_RotateX(gGfxMatrix, arwing->teamFaceXrot * M_DTOR, MTXF_APPLY);
         Matrix_Scale(gGfxMatrix, 1.0f / 70.925f, 1.0f / 70.925f, 1.0f / 70.925f, MTXF_APPLY);
         if (gGameState == GSTATE_ENDING) {
             Matrix_Scale(gGfxMatrix, 0.95f, 0.95f, 0.95f, MTXF_APPLY);
         }
         Matrix_SetGfxMtx(&gMasterDisp);
         if (gExpertMode) {
-            gSPDisplayList(gMasterDisp++, D_display_800CA27C[modelId - 1]);
+            gSPDisplayList(gMasterDisp++, D_display_800CA27C[teamFaceId - 1]);
         } else {
-            gSPDisplayList(gMasterDisp++, D_display_800CA26C[modelId - 1]);
+            gSPDisplayList(gMasterDisp++, D_display_800CA26C[teamFaceId - 1]);
         }
         Matrix_Pop(&gGfxMatrix);
     }
 
     Matrix_Translate(gGfxMatrix, 0.0f, 17.2f, -25.8f, MTXF_APPLY);
-    Matrix_RotateX(gGfxMatrix, arwing->unk_38 * M_DTOR, MTXF_APPLY);
+    Matrix_RotateX(gGfxMatrix, arwing->windshieldXrot * M_DTOR, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
     RCP_SetupDL_64_2();
 
@@ -694,7 +694,7 @@ void Display_Arwing(Player* player, s32 reflectY) {
         } else {
             if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_BOLSE)) {
                 player->arwing.unk_28 = player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot =
-                    player->arwing.upperLeftFlapYrot = player->arwing.unk_10 = 0.0f;
+                    player->arwing.upperLeftFlapYrot = player->arwing.bottomLeftFlapYrot = 0.0f;
             }
             D_display_800CA22C = true;
             gReflectY = reflectY;
@@ -1018,7 +1018,7 @@ void Display_ArwingLaserCharge(Player* player) {
         Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]);
 
         laserStrength = gLaserStrength[player->num];
-        if (player->arwing.unk_14 > -8.0f) {
+        if (player->arwing.laserGunsYpos > -8.0f) {
             laserStrength = LASERS_SINGLE;
         }
 
@@ -1620,8 +1620,8 @@ void Display_CsLevelCompleteHandleCamera(Player* player) {
 
     switch (D_display_800CA220) {
         case 0:
-            Math_SmoothStepToAngle(&player->arwing.unk_30, 0.0f, 0.2f, 3.0f, 0.0f);
-            Math_SmoothStepToAngle(&player->arwing.unk_34, 0.0f, 0.2f, 3.0f, 0.0f);
+            Math_SmoothStepToAngle(&player->arwing.teamFaceXrot, 0.0f, 0.2f, 3.0f, 0.0f);
+            Math_SmoothStepToAngle(&player->arwing.teamFaceYrot, 0.0f, 0.2f, 3.0f, 0.0f);
             gPlayCamEye.x = player->cam.eye.x;
             gPlayCamEye.y = player->cam.eye.y;
             gPlayCamEye.z = player->cam.eye.z;
@@ -1651,8 +1651,8 @@ void Display_CsLevelCompleteHandleCamera(Player* player) {
             }
             sp3C = 360.0f - sp3C;
 
-            Math_SmoothStepToAngle(&player->arwing.unk_30, sp38, 0.2f, 6.0f, 0.0f);
-            Math_SmoothStepToAngle(&player->arwing.unk_34, sp3C, 0.2f, 6.0f, 0.0f);
+            Math_SmoothStepToAngle(&player->arwing.teamFaceXrot, sp38, 0.2f, 6.0f, 0.0f);
+            Math_SmoothStepToAngle(&player->arwing.teamFaceYrot, sp3C, 0.2f, 6.0f, 0.0f);
 
             Math_SmoothStepToF(&D_display_800CA380, gControllerPress[0].stick_y * 0.75f, 0.1f, 2.0f, 0.0f);
             Math_SmoothStepToF(&D_display_800CA384, gControllerPress[0].stick_x * 3.0f, 0.1f, 5.0f, 0.0f);
diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c
index 297b701d..7a0676c7 100644
--- a/src/engine/fox_edisplay.c
+++ b/src/engine/fox_edisplay.c
@@ -535,16 +535,16 @@ void func_edisplay_8005B388(Actor199* actor) {
         D_edisplay_80161630.upperRightFlapYrot = actor->fwork[15];
         D_edisplay_80161630.upperLeftFlapYrot = actor->fwork[16];
         D_edisplay_80161630.bottomRightFlapYrot = actor->fwork[26];
-        D_edisplay_80161630.unk_10 = actor->fwork[27];
-        D_edisplay_80161630.unk_14 = D_edisplay_80161630.unk_18 = D_edisplay_80161630.unk_1C =
-            D_edisplay_80161630.unk_20 = D_edisplay_80161630.unk_38 = D_edisplay_80161630.unk_24 = 0.0f;
+        D_edisplay_80161630.bottomLeftFlapYrot = actor->fwork[27];
+        D_edisplay_80161630.laserGunsYpos = D_edisplay_80161630.laserGunsXpos = D_edisplay_80161630.wingsXrot =
+            D_edisplay_80161630.wingsYrot = D_edisplay_80161630.windshieldXrot = D_edisplay_80161630.wingsZrot = 0.0f;
         D_edisplay_80161630.unk_28 = actor->fwork[17];
-        D_edisplay_80161630.modelId = actor->iwork[14];
-        D_edisplay_80161630.unk_30 = actor->fwork[20];
-        D_edisplay_80161630.unk_34 = actor->fwork[19];
+        D_edisplay_80161630.teamFaceId = actor->iwork[14];
+        D_edisplay_80161630.teamFaceXrot = actor->fwork[20];
+        D_edisplay_80161630.teamFaceYrot = actor->fwork[19];
         if (gLevelType == LEVELTYPE_SPACE) {
-            D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot = D_edisplay_80161630.upperLeftFlapYrot =
-                D_edisplay_80161630.unk_10 = 0.0f;
+            D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot =
+                D_edisplay_80161630.upperLeftFlapYrot = D_edisplay_80161630.bottomLeftFlapYrot = 0.0f;
         }
         Display_ArwingWings(&D_edisplay_80161630);
     } else if (gLevelType == LEVELTYPE_PLANET) {
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index 6ea5aac8..d1913234 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -2570,25 +2570,25 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) {
             break;
 
         case EVC_SINGLE_LASER:
-            if (gPlayer[0].arwing.unk_14 > -8.0f) {
+            if (gPlayer[0].arwing.laserGunsYpos > -8.0f) {
                 ActorEvent_TriggerBranch(this);
             }
             break;
 
         case EVC_TWIN_LASER:
-            if ((gPlayer[0].arwing.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_TWIN)) {
+            if ((gPlayer[0].arwing.laserGunsYpos < -8.0f) && (gLaserStrength[0] == LASERS_TWIN)) {
                 ActorEvent_TriggerBranch(this);
             }
             break;
 
         case EVC_HYPER_LASER:
-            if ((gPlayer[0].arwing.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_HYPER)) {
+            if ((gPlayer[0].arwing.laserGunsYpos < -8.0f) && (gLaserStrength[0] == LASERS_HYPER)) {
                 ActorEvent_TriggerBranch(this);
             }
             break;
 
         case EVC_UNK3_LASER:
-            if ((gPlayer[0].arwing.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_UNK_3)) {
+            if ((gPlayer[0].arwing.laserGunsYpos < -8.0f) && (gLaserStrength[0] == LASERS_UNK_3)) {
                 ActorEvent_TriggerBranch(this);
             }
             break;
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index a63a3a04..5c823d7d 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -3027,7 +3027,7 @@ void Player_ArwingLaser(Player* player) {
     LaserStrength laser;
 
     laser = gLaserStrength[gPlayerNum];
-    if (player->arwing.unk_14 > -8.0f) {
+    if (player->arwing.laserGunsYpos > -8.0f) {
         laser = LASERS_SINGLE;
     }
 
@@ -3301,9 +3301,9 @@ void Player_Shoot(Player* player) {
 
             if (!Player_UpdateLockOn(player)) {
                 if (gLaserStrength[gPlayerNum] > LASERS_SINGLE) {
-                    Math_SmoothStepToF(&player->arwing.unk_14, -10.0f, 1.0f, 0.5f, 0.0f);
+                    Math_SmoothStepToF(&player->arwing.laserGunsYpos, -10.0f, 1.0f, 0.5f, 0.0f);
                 } else {
-                    Math_SmoothStepToF(&player->arwing.unk_14, 0.0f, 1.0f, 0.5f, 0.0f);
+                    Math_SmoothStepToF(&player->arwing.laserGunsYpos, 0.0f, 1.0f, 0.5f, 0.0f);
                 }
                 if (gShootButton[player->num] & gInputPress->button) {
                     Player_ArwingLaser(player);
@@ -3366,7 +3366,7 @@ void Player_ArwingBank(Player* player) {
             Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -70.0f, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, -70.0f, 0.3f, 100.0f, 0.f);
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, 70.0f, 0.3f, 100.0f, 0.f);
-            Math_SmoothStepToF(&player->arwing.unk_10, 70.0f, 0.3f, 100.0f, 0.f);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, 70.0f, 0.3f, 100.0f, 0.f);
             if (player->pos.y < (gGroundHeight + 70.0f)) {
                 player->pos.y += 6.0f;
             }
@@ -3380,7 +3380,7 @@ void Player_ArwingBank(Player* player) {
             Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 70.0f, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, 70.0f, 0.3f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, -70.0f, 0.3f, 100.0f, 0.0f);
-            Math_SmoothStepToF(&player->arwing.unk_10, -70.0f, 0.3f, 100.0f, 0.0f);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, -70.0f, 0.3f, 100.0f, 0.0f);
             if (player->pos.y < (gGroundHeight + 70.0f)) {
                 player->pos.y += 6.0f;
             }
@@ -3601,7 +3601,7 @@ void Player_MoveArwing360(Player* player) {
     Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -sp60 + sp5C, 0.1f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, -sp60 - sp5C, 0.1f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, -sp60 + sp58, 0.1f, 100.0f, 0.0f);
-    Math_SmoothStepToF(&player->arwing.unk_10, -sp60 - sp58, 0.1f, 100.0f, 0.0f);
+    Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, -sp60 - sp58, 0.1f, 100.0f, 0.0f);
 
     scale = 0.1f;
     if ((player->zRotBank > 10.0f) && (sp7C > 0)) {
@@ -3736,7 +3736,7 @@ void Player_PerformLoop(Player* player) {
     Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, sp58, 0.3f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, sp58, 0.3f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, sp58, 0.3f, 100.0f, 0.0f);
-    Math_SmoothStepToF(&player->arwing.unk_10, sp58, 0.3f, 100.0f, 0.0f);
+    Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, sp58, 0.3f, 100.0f, 0.0f);
 
     if (player->aerobaticPitch < 180.0f) {
         player->pos.y += 2.0f;
@@ -3864,7 +3864,7 @@ void Player_MoveArwingOnRails(Player* player) {
         Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, (-sp7C) + sp78, 0.1f, 100.0f, 0.0f);
         Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, (-sp7C) - sp78, 0.1f, 100.0f, 0.0f);
         Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, (-sp7C) + sp74, 0.1f, 100.0f, 0.0f);
-        Math_SmoothStepToF(&player->arwing.unk_10, (-sp7C) - sp74, 0.1f, 100.0f, 0.0f);
+        Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, (-sp7C) - sp74, 0.1f, 100.0f, 0.0f);
     }
 
     sp84 = 0.1f;
@@ -4793,7 +4793,7 @@ void Player_Setup(Player* playerx) {
     }
 
     if (gLaserStrength[gPlayerNum] > LASERS_SINGLE) {
-        player->arwing.unk_14 = -10.0f;
+        player->arwing.laserGunsYpos = -10.0f;
     }
     gPauseEnabled = false;
 }
@@ -5037,7 +5037,7 @@ void Player_ArwingBoost(Player* player) {
                 Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 0.0f, 0.5f, 100.0f, 0.0f);
                 Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, 0.0f, 0.5f, 100.0f, 0.0f);
                 Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, 0.0f, 0.5f, 100.0f, 0.0f);
-                Math_SmoothStepToF(&player->arwing.unk_10, 0.0f, 0.5f, 100.0f, 0.0f);
+                Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, 0.0f, 0.5f, 100.0f, 0.0f);
             }
             player->boostMeter += sp28;
             if (player->boostMeter > 90.0f) {
@@ -5135,7 +5135,7 @@ void Player_ArwingBrake(Player* player) {
             Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 90.0f, 0.2f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, -90.0f, 0.2f, 100.0f, 0.0f);
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, 90.0f, 0.2f, 100.0f, 0.0f);
-            Math_SmoothStepToF(&player->arwing.unk_10, -90.0f, 0.2f, 100.0f, 0.0f);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, -90.0f, 0.2f, 100.0f, 0.0f);
         }
 
         player->boostMeter += sp30;
@@ -5784,14 +5784,14 @@ void Player_Update(Player* player) {
         case PLAYERSTATE_1C8_LEVEL_INTRO:
             gShowHud = 0;
             gPauseEnabled = false;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             Cutscene_LevelStart(player);
             break;
 
         case PLAYERSTATE_1C8_ACTIVE:
             gShowHud = 1;
             Player_LowHealthMsg(player);
-            player->arwing.modelId = 0;
+            player->arwing.teamFaceId = 0;
             D_hud_80161704 = 255;
 
             if ((!gVersusMode || gVsMatchStart) && !player->somersault && (gInputPress->button & U_CBUTTONS) &&
@@ -5862,12 +5862,12 @@ void Player_Update(Player* player) {
                 gVsLockOnTimers[player->num][0] = gVsLockOnTimers[player->num][1] = gVsLockOnTimers[player->num][2] =
                     gVsLockOnTimers[player->num][3] = 0;
             }
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
 
             Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 0.0f, 0.1f, 5.0f, 0);
             Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, 0.0f, 0.1f, 5.0f, 0);
             Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, 0.0f, 0.1f, 5.0f, 0);
-            Math_SmoothStepToF(&player->arwing.unk_10, 0.0f, 0.1f, 5.0f, 0);
+            Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, 0.0f, 0.1f, 5.0f, 0);
 
             Player_UpdateShields(player);
             Cutscene_UTurn(player);
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index ec4bcfba..a43c0aad 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -845,25 +845,25 @@ void Ending_80191294(u32 arg0, AssetInfo* asset) {
     Matrix_SetGfxMtx(&gMasterDisp);
 
     D_ending_80198590.unk_28 = 0.0f;
-    D_ending_80198590.unk_10 = D_ending_80198590.unk_28;
-    D_ending_80198590.unk_14 = 0.0f;
-    D_ending_80198590.upperLeftFlapYrot = D_ending_80198590.unk_10;
+    D_ending_80198590.bottomLeftFlapYrot = D_ending_80198590.unk_28;
+    D_ending_80198590.laserGunsYpos = 0.0f;
+    D_ending_80198590.upperLeftFlapYrot = D_ending_80198590.bottomLeftFlapYrot;
     D_ending_80198590.bottomRightFlapYrot = D_ending_80198590.upperLeftFlapYrot;
     D_ending_80198590.upperRightFlapYrot = D_ending_80198590.bottomRightFlapYrot;
-    D_ending_80198590.unk_24 = D_ending_80198590.upperRightFlapYrot;
-    D_ending_80198590.unk_20 = D_ending_80198590.unk_24;
-    D_ending_80198590.unk_1C = D_ending_80198590.unk_20;
-    D_ending_80198590.unk_18 = D_ending_80198590.unk_1C;
+    D_ending_80198590.wingsZrot = D_ending_80198590.upperRightFlapYrot;
+    D_ending_80198590.wingsYrot = D_ending_80198590.wingsZrot;
+    D_ending_80198590.wingsXrot = D_ending_80198590.wingsYrot;
+    D_ending_80198590.laserGunsXpos = D_ending_80198590.wingsXrot;
 
     if ((arg0 > 520) && (arg0 < 720)) {
-        D_ending_80198590.modelId = 1;
+        D_ending_80198590.teamFaceId = 1;
     } else {
-        D_ending_80198590.modelId = 0;
+        D_ending_80198590.teamFaceId = 0;
     }
 
-    D_ending_80198590.unk_38 = 0.0f;
-    D_ending_80198590.unk_30 = +D_ending_801985F0.x;
-    D_ending_80198590.unk_34 = -D_ending_801985F0.y;
+    D_ending_80198590.windshieldXrot = 0.0f;
+    D_ending_80198590.teamFaceXrot = +D_ending_801985F0.x;
+    D_ending_80198590.teamFaceYrot = -D_ending_801985F0.y;
 
     Display_ArwingWings(&D_ending_80198590);
 }
diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c
index f0509026..c3fd6b13 100644
--- a/src/overlays/ovl_i1/fox_co.c
+++ b/src/overlays/ovl_i1/fox_co.c
@@ -2964,7 +2964,7 @@ void Corneria_LevelStart(Player* player) {
 
     Corneria_SpawnClouds();
 
-    player->arwing.unk_30 = 0;
+    player->arwing.teamFaceXrot = 0;
 
     switch (player->csState) {
         case 0: // LevelStart initialization
@@ -3037,7 +3037,7 @@ void Corneria_LevelStart(Player* player) {
             }
 
             if ((player->csTimer < 190) && (player->csTimer > 150)) {
-                Math_SmoothStepToF(&player->arwing.unk_24, 2.0f, 0.2f, 0.5f, 0.0f);
+                Math_SmoothStepToF(&player->arwing.wingsZrot, 2.0f, 0.2f, 0.5f, 0.0f);
             }
 
             if (player->csTimer < 150) {
@@ -3082,7 +3082,7 @@ void Corneria_LevelStart(Player* player) {
             }
 
             if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
-                player->arwing.unk_30 = 5.0f;
+                player->arwing.teamFaceXrot = 5.0f;
             }
             break;
 
@@ -3094,7 +3094,7 @@ void Corneria_LevelStart(Player* player) {
             }
 
             if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
-                player->arwing.unk_30 = 5.0f;
+                player->arwing.teamFaceXrot = 5.0f;
             }
 
             gCsCamEyeY = player->pos.y + 10.0f;
@@ -3103,7 +3103,7 @@ void Corneria_LevelStart(Player* player) {
 
         case 4:
             if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
-                player->arwing.unk_30 = 5.0f;
+                player->arwing.teamFaceXrot = 5.0f;
             }
 
             Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f);
@@ -3250,9 +3250,9 @@ void Corneria_LevelStart(Player* player) {
             }
 
             // Fox's head rotates back and forth as he speaks.
-            player->arwing.unk_30 = 0.0f;
+            player->arwing.teamFaceXrot = 0.0f;
             if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
-                player->arwing.unk_30 = 5.0f;
+                player->arwing.teamFaceXrot = 5.0f;
             }
 
             if (player->csTimer == 80) {
@@ -3366,7 +3366,7 @@ void Corneria_LevelStart(Player* player) {
     Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, D_ctx_80177A48[2], 0.2f, 1.0f, 0.0f);
 
     player->arwing.bottomRightFlapYrot = player->arwing.upperRightFlapYrot;
-    player->arwing.unk_10 = player->arwing.upperLeftFlapYrot;
+    player->arwing.bottomLeftFlapYrot = player->arwing.upperLeftFlapYrot;
 
     player->cam.eye.y -= 3.0f;
     player->cam.at.y -= 3.0f;
@@ -3450,7 +3450,8 @@ void Corneria_LevelComplete1(Player* player) {
     f32 temp_fa1;
     f32 temp_deg;
 
-    player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = 0.0f;
+    player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+        player->arwing.bottomLeftFlapYrot = 0.0f;
 
     Math_SmoothStepToF(&player->zRotBarrelRoll, 0.0f, 0.1f, 15.0f, 0.0f);
     Math_SmoothStepToF(&player->zRotBank, 0.0f, 0.1f, 15.0f, 0.0f);
diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c
index bf811364..b52d06fc 100644
--- a/src/overlays/ovl_i2/fox_me.c
+++ b/src/overlays/ovl_i2/fox_me.c
@@ -2020,7 +2020,7 @@ void Meteo_LevelStart(Player* player) {
             }
 
             if (gCsFrameCount > 660) {
-                player->arwing.modelId = 0;
+                player->arwing.teamFaceId = 0;
             }
 
             if (gCsFrameCount == 340) {
@@ -2238,7 +2238,7 @@ void Meteo_LevelComplete(Player* player) {
             D_ctx_80177A48[1] = 0.0f;
             D_ctx_80177A48[2] = 0.0f;
 
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
 
             gCsFrameCount = 0;
 
diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c
index 8853a624..9f07fd38 100644
--- a/src/overlays/ovl_i2/fox_sx.c
+++ b/src/overlays/ovl_i2/fox_sx.c
@@ -1741,7 +1741,7 @@ void SectorX_LevelComplete(Player* player) {
             D_ctx_80177A48[2] = 100.0f;
             D_ctx_80177A48[4] = 100.0f;
             D_ctx_80177A48[5] = 0.0f;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             Play_ClearObjectData();
 
         case 1:
diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c
index 8fc6689e..4891bb23 100644
--- a/src/overlays/ovl_i3/fox_a6.c
+++ b/src/overlays/ovl_i3/fox_a6.c
@@ -2653,7 +2653,7 @@ void Area6_LevelComplete(Player* player) {
         case 0:
             gCsFrameCount = 0;
             player->csState = 1;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             player->unk_194 = 5.0f;
             player->unk_190 = 2.0f;
             player->baseSpeed = 60.0f;
diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c
index ffeeb0c0..d2c3c147 100644
--- a/src/overlays/ovl_i3/fox_aq.c
+++ b/src/overlays/ovl_i3/fox_aq.c
@@ -700,7 +700,7 @@ void Aquas_801AA4BC(Player* player) {
                 Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -70.0f, 0.3f, 100.0f, 0);
                 Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, -70.0f, 0.3f, 100.0f, 0);
                 Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, 70.0f, 0.3f, 100.0f, 0);
-                Math_SmoothStepToF(&player->arwing.unk_10, 70.0f, 0.3f, 100.0f, 0);
+                Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, 70.0f, 0.3f, 100.0f, 0);
             }
         }
 
@@ -711,7 +711,7 @@ void Aquas_801AA4BC(Player* player) {
                 Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 70.0f, 0.3f, 100.0f, 0);
                 Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, 70.0f, 0.3f, 100.0f, 0);
                 Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, -70.0f, 0.3f, 100.0f, 0);
-                Math_SmoothStepToF(&player->arwing.unk_10, -70.0f, 0.3f, 100.0f, 0);
+                Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, -70.0f, 0.3f, 100.0f, 0);
             }
         }
 
diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c
index 2f716690..cb7fe63c 100644
--- a/src/overlays/ovl_i3/fox_so.c
+++ b/src/overlays/ovl_i3/fox_so.c
@@ -3149,8 +3149,9 @@ void Solar_LevelComplete(Player* player) {
             player->camRoll = player->aerobaticPitch = 0.0f;
             player->baseSpeed = 40.0f;
 
-            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 =
-                player->zRotBarrelRoll = player->zRotBank = player->boostSpeed = 0.0f;
+            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+                player->arwing.bottomLeftFlapYrot = player->zRotBarrelRoll = player->zRotBank = player->boostSpeed =
+                    0.0f;
             player->draw = true;
 
             gCsCamEyeX = player->cam.eye.x;
@@ -3243,7 +3244,7 @@ void Solar_LevelComplete(Player* player) {
                 player->pos.y = 200.0f;
                 player->pos.z = -(gPathProgress - 500.0f);
                 player->csState++;
-                player->arwing.modelId = 1;
+                player->arwing.teamFaceId = 1;
 
                 Audio_StartPlayerNoise(0);
 
@@ -3278,7 +3279,7 @@ void Solar_LevelComplete(Player* player) {
             gFillScreenAlphaStep = 4;
 
             if (gMsgCharIsPrinting) {
-                player->arwing.unk_30 = (s32) (gGameFrameCount % 2U) * 5.0f;
+                player->arwing.teamFaceXrot = (s32) (gGameFrameCount % 2U) * 5.0f;
             }
 
             switch (gCsFrameCount) {
diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c
index 49b5eecb..dafaab5b 100644
--- a/src/overlays/ovl_i3/fox_zo.c
+++ b/src/overlays/ovl_i3/fox_zo.c
@@ -4763,8 +4763,9 @@ void Zoness_LevelComplete(Player* player) {
             player->camRoll = 0.0f;
             player->baseSpeed = 40.0f;
             player->draw = true;
-            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 =
-                player->zRotBarrelRoll = player->zRotBank = player->boostSpeed = 0.0f;
+            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+                player->arwing.bottomLeftFlapYrot = player->zRotBarrelRoll = player->zRotBank = player->boostSpeed =
+                    0.0f;
 
             gCsCamEyeX = player->cam.eye.x;
             gCsCamEyeY = player->cam.eye.y;
@@ -4824,7 +4825,7 @@ void Zoness_LevelComplete(Player* player) {
                 Audio_KillSfxBySource(player->sfxSource);
                 gFillScreenAlpha = 250;
                 player->csTimer = 20;
-                player->arwing.modelId = 1;
+                player->arwing.teamFaceId = 1;
                 player->baseSpeed = 0.0f;
                 player->rot.x = 0.0f;
                 player->rot.y = 0.0f;
diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c
index 1e3ac8f8..523206f2 100644
--- a/src/overlays/ovl_i4/fox_bo.c
+++ b/src/overlays/ovl_i4/fox_bo.c
@@ -1461,7 +1461,7 @@ void Bolse_LevelComplete(Player* player) {
                 gCsFrameCount = 0;
                 gGroundHeight = -10000.0f;
                 player->hideShadow = true;
-                player->arwing.modelId = 1;
+                player->arwing.teamFaceId = 1;
                 AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EXPLOSION, actor50->sfxSource, 0);
                 Audio_StartPlayerNoise(0);
             }
diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c
index 1394c70e..f29d7441 100644
--- a/src/overlays/ovl_i4/fox_fo.c
+++ b/src/overlays/ovl_i4/fox_fo.c
@@ -676,13 +676,13 @@ void Fortuna_LevelComplete(Player* player) {
     player->arwing.upperRightFlapYrot = 0.0f;
     player->arwing.upperLeftFlapYrot = 0.0f;
     player->arwing.bottomRightFlapYrot = 0.0f;
-    player->arwing.unk_10 = 0.0f;
+    player->arwing.bottomLeftFlapYrot = 0.0f;
 
     Math_SmoothStepToF(&player->boostSpeed, 0.0f, 0.1f, 1.5f, 0.0f);
 
     switch (player->csState) {
         case -1:
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             player->rot.y = 0.0f;
             player->baseSpeed = 30.0f;
             player->yRot_114 = 180.0f;
@@ -841,7 +841,7 @@ void Fortuna_LevelComplete(Player* player) {
                 }
                 player->pos.z = -10000.0f;
                 gCsFrameCount = 0;
-                player->arwing.modelId = 1;
+                player->arwing.teamFaceId = 1;
                 player->wingPosition = 1;
                 SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 100);
                 SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 100);
diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c
index b0e912c6..47b05099 100644
--- a/src/overlays/ovl_i4/fox_ka.c
+++ b/src/overlays/ovl_i4/fox_ka.c
@@ -1800,7 +1800,7 @@ void Katina_LevelComplete(Player* player) {
     Vec3f dest;
     f32 angle;
 
-    player->arwing.unk_10 = 0.0f;
+    player->arwing.bottomLeftFlapYrot = 0.0f;
     player->arwing.upperLeftFlapYrot = 0.0f;
     player->arwing.bottomRightFlapYrot = 0.0f;
     player->arwing.upperRightFlapYrot = 0.0f;
diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c
index 86a2ca0e..e0e31d4b 100644
--- a/src/overlays/ovl_i5/fox_ma.c
+++ b/src/overlays/ovl_i5/fox_ma.c
@@ -6515,8 +6515,8 @@ void Macbeth_LevelComplete2(Player* player) {
             player->aerobaticPitch = 0.0f;
             player->camRoll = 0.0f;
             player->boostSpeed = 0.0f;
-            player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll =
-                player->zRotBank = 0.0f;
+            player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.bottomLeftFlapYrot =
+                player->zRotBarrelRoll = player->zRotBank = 0.0f;
             player->yBob = 0.0f;
             player->rockAngle = 0.0f;
             player->unk_16C = 0.0f;
@@ -6951,8 +6951,9 @@ void Macbeth_LevelComplete2(Player* player) {
                     player->yRot_114 = player->aerobaticPitch = player->camRoll = player->unk_174 = player->unk_178 =
                         player->unk_17C = player->unk_180 = player->unk_184 = player->arwing.upperRightFlapYrot =
                             player->unk_170 = player->unk_16C = player->rockAngle = player->yBob =
-                                player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 =
-                                    player->zRotBarrelRoll = player->zRotBank = player->boostSpeed = 0.0f;
+                                player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+                                    player->arwing.bottomLeftFlapYrot = player->zRotBarrelRoll = player->zRotBank =
+                                        player->boostSpeed = 0.0f;
 
                 player->baseSpeed = 5.0f;
 
diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c
index d989d5c0..6706dfc3 100644
--- a/src/overlays/ovl_i6/fox_andross.c
+++ b/src/overlays/ovl_i6/fox_andross.c
@@ -3857,12 +3857,13 @@ void Andross_80193C4C(Player* player) {
 
     Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 1.0f, 0.01f, 0.0f);
 
-    player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.unk_10 = 0.0f;
+    player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.upperLeftFlapYrot =
+        player->arwing.bottomLeftFlapYrot = 0.0f;
 
     switch (player->csState) {
         case 0:
             gCsFrameCount = 0;
-            player->arwing.modelId = 1;
+            player->arwing.teamFaceId = 1;
             D_ctx_80177A48[0] = 0.0f;
             if (player->aerobaticPitch > 180.0f) {
                 player->aerobaticPitch -= 360.0f;
diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c
index b1638c19..ee7133d6 100644
--- a/src/overlays/ovl_i6/fox_sy.c
+++ b/src/overlays/ovl_i6/fox_sy.c
@@ -2087,8 +2087,8 @@ void SectorY_LevelComplete(Player* player) {
             player->camRoll = 0.0f;
             player->baseSpeed = 40.0f;
             player->boostSpeed = 0.0f;
-            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 =
-                player->zRotBarrelRoll = player->zRotBank = 0.0f;
+            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+                player->arwing.bottomLeftFlapYrot = player->zRotBarrelRoll = player->zRotBank = 0.0f;
             player->draw = true;
             D_ctx_80177A48[8] = Math_RadToDeg(
                 Math_Atan2F(gPlayer[0].cam.eye.x - boss->obj.pos.x, gPlayer[0].cam.eye.z - boss->obj.pos.z));
@@ -2193,13 +2193,13 @@ void SectorY_LevelComplete(Player* player) {
                 D_ctx_80177A48[7] = 25.0f;
                 D_ctx_80177A48[8] = 500.0f;
                 D_ctx_80177A48[9] = 3600.0f;
-                player->arwing.modelId = 1;
+                player->arwing.teamFaceId = 1;
             }
             break;
 
         case 3:
             if ((gCsFrameCount < 720) && gMsgCharIsPrinting) {
-                player->arwing.unk_30 = (f32) (gGameFrameCount & 2) * 5.0f;
+                player->arwing.teamFaceXrot = (f32) (gGameFrameCount & 2) * 5.0f;
             }
 
             gFillScreenAlphaTarget = 0;
diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c
index 886c54fe..4bdc2eb5 100644
--- a/src/overlays/ovl_i6/fox_ve2.c
+++ b/src/overlays/ovl_i6/fox_ve2.c
@@ -305,7 +305,7 @@ void Venom2_LevelComplete(Player* player) {
     Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -var_fa0 + sp74, 0.1f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, -var_fa0 - sp74, 0.1f, 100.0f, 0.0f);
     Math_SmoothStepToF(&player->arwing.upperLeftFlapYrot, -var_fa0 + sp70, 0.1f, 100.0f, 0.0f);
-    Math_SmoothStepToF(&player->arwing.unk_10, -var_fa0 - sp70, 0.1f, 100.0f, 0.0f);
+    Math_SmoothStepToF(&player->arwing.bottomLeftFlapYrot, -var_fa0 - sp70, 0.1f, 100.0f, 0.0f);
     sp94 = player->pos.x - gBosses[0].obj.pos.x;
     sp90 = player->pos.y - (gBosses[0].obj.pos.y + 700.0f);
     sp8C = player->pos.z - gBosses[0].obj.pos.z;
@@ -313,9 +313,9 @@ void Venom2_LevelComplete(Player* player) {
     switch (player->csState) {
         case 0:
             player->csState++;
-            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 =
-                0.0f;
-            player->arwing.modelId = 1;
+            player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot =
+                player->arwing.bottomLeftFlapYrot = 0.0f;
+            player->arwing.teamFaceId = 1;
 
             D_ctx_80177A48[0] = 0.0f;
             D_ctx_80177A48[1] = 0.1f;
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index a26a34fe..1561816e 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -2271,15 +2271,15 @@ void Map_801A116C(void) {
 
         arwing.rightWingState = arwing.leftWingState = WINGSTATE_INTACT;
         // clang-format off
-        arwing.unk_18 = arwing.unk_1C = arwing.unk_20 = arwing.unk_24 = arwing.upperRightFlapYrot =
-        arwing.bottomRightFlapYrot = arwing.upperLeftFlapYrot = arwing.unk_10 = arwing.unk_28 = 0.0f;
+        arwing.laserGunsXpos = arwing.wingsXrot = arwing.wingsYrot = arwing.wingsZrot = arwing.upperRightFlapYrot =
+        arwing.bottomRightFlapYrot = arwing.upperLeftFlapYrot = arwing.bottomLeftFlapYrot = arwing.unk_28 = 0.0f;
         // clang-format on
 
-        arwing.unk_14 = 0.0f;
-        arwing.modelId = 1;
-        arwing.unk_30 = 0.0f;
-        arwing.unk_34 = 0.0f;
-        arwing.unk_38 = 0.0f;
+        arwing.laserGunsYpos = 0.0f;
+        arwing.teamFaceId = 1;
+        arwing.teamFaceXrot = 0.0f;
+        arwing.teamFaceYrot = 0.0f;
+        arwing.windshieldXrot = 0.0f;
 
         Display_ArwingWings(&arwing);
 
diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c
index 85096bb7..a1709772 100644
--- a/src/overlays/ovl_menu/fox_title.c
+++ b/src/overlays/ovl_menu/fox_title.c
@@ -2254,14 +2254,14 @@ void Title_8018D2B8(s32 arg0) {
     Matrix_SetGfxMtx(&gMasterDisp);
 
     arwing.rightWingState = arwing.leftWingState = WINGSTATE_INTACT;
-    arwing.unk_18 = arwing.unk_1C = arwing.unk_20 = arwing.unk_24 = arwing.upperRightFlapYrot = arwing.bottomRightFlapYrot =
-        arwing.upperLeftFlapYrot = arwing.unk_10 = arwing.unk_28 = 0.0f;
-
-    arwing.unk_14 = D_menu_801B84E8[arg0].unk_28;
-    arwing.modelId = D_menu_801B84E8[arg0].unk_34;
-    arwing.unk_30 = D_menu_801B84E8[arg0].unk_2C;
-    arwing.unk_34 = D_menu_801B84E8[arg0].unk_30;
-    arwing.unk_38 = D_menu_801B84E8[arg0].unk_24;
+    arwing.laserGunsXpos = arwing.wingsXrot = arwing.wingsYrot = arwing.wingsZrot = arwing.upperRightFlapYrot =
+        arwing.bottomRightFlapYrot = arwing.upperLeftFlapYrot = arwing.bottomLeftFlapYrot = arwing.unk_28 = 0.0f;
+
+    arwing.laserGunsYpos = D_menu_801B84E8[arg0].unk_28;
+    arwing.teamFaceId = D_menu_801B84E8[arg0].unk_34;
+    arwing.teamFaceXrot = D_menu_801B84E8[arg0].unk_2C;
+    arwing.teamFaceYrot = D_menu_801B84E8[arg0].unk_30;
+    arwing.windshieldXrot = D_menu_801B84E8[arg0].unk_24;
 
     Display_ArwingWings(&arwing);