diff --git a/include/sf64player.h b/include/sf64player.h index 25639979..b52e76f1 100644 --- a/include/sf64player.h +++ b/include/sf64player.h @@ -132,7 +132,7 @@ typedef struct ArwingInfo { // ArArwingInfo /* 0x01 */ u8 leftWingState; // leftWingState /* 0x04 */ f32 upperRightFlapYrot; // upperRightFlapYrot /* 0x08 */ f32 bottomRightFlapYrot; // bottomRightFlapYrot - /* 0x0C */ f32 unk_0C; // upperLeftFlapYrot + /* 0x0C */ f32 upperLeftFlapYrot; // upperLeftFlapYrot /* 0x10 */ f32 unk_10; // bottomLeftFlapYrot /* 0x14 */ f32 unk_14; // laserGunsYpos /* 0x18 */ f32 unk_18; // laserGunsXpos diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c index 8bdd4feb..0a9f1a81 100644 --- a/src/engine/fox_demo.c +++ b/src/engine/fox_demo.c @@ -778,7 +778,7 @@ void Cutscene_AllRangeMode(Player* player) { } player->arwing.unk_10 = 0.0f; player->arwing.bottomRightFlapYrot = 0.0f; - player->arwing.unk_0C = 0.0f; + player->arwing.upperLeftFlapYrot = 0.0f; player->arwing.upperRightFlapYrot = 0.0f; Math_SmoothStepToF(&player->rot.x, 0.0f, 0.1f, 5.0f, 0.0f); @@ -919,7 +919,7 @@ void Cutscene_CoComplete2(Player* player) { D_ctx_80177A48[2] = 0.0f; player->csState++; player->arwing.upperRightFlapYrot = 0.0f; - player->arwing.unk_0C = 0.0f; + player->arwing.upperLeftFlapYrot = 0.0f; player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_10 = 0.0f; player->zRotBarrelRoll = 0.0f; @@ -1022,7 +1022,7 @@ void Cutscene_CoComplete2(Player* player) { player->csTimer = 150; player->arwing.unk_10 = 0.0f; player->arwing.bottomRightFlapYrot = 0.0f; - player->arwing.unk_0C = 0.0f; + player->arwing.upperLeftFlapYrot = 0.0f; player->arwing.upperRightFlapYrot = 0.0f; } break; @@ -1450,7 +1450,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.unk_0C, 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->zRotBank, 0.0f, 0.1f, 15.0f, 0.0f); Math_SmoothStepToF(&player->aerobaticPitch, 190.0f, 0.1f, 6.0f, 0.001f); @@ -1484,7 +1484,7 @@ void Cutscene_UTurn(Player* player) { sp58.z = -sp58.y; - Math_SmoothStepToF(&player->arwing.unk_0C, sp58.z, 0.3f, 100.0f, 0.0f); + 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); player->unk_190 = 2.0f; diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c index df67b55d..76d7fb97 100644 --- a/src/engine/fox_display.c +++ b/src/engine/fox_display.c @@ -538,7 +538,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos rot->y -= arwing->unk_10; break; case 6: - rot->y -= arwing->unk_0C; + rot->y -= arwing->upperLeftFlapYrot; break; case 12: rot->z += arwing->unk_20; @@ -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.unk_0C = player->arwing.unk_10 = 0.0f; + player->arwing.upperLeftFlapYrot = player->arwing.unk_10 = 0.0f; } D_display_800CA22C = true; gReflectY = reflectY; diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c index 0f10961d..297b701d 100644 --- a/src/engine/fox_edisplay.c +++ b/src/engine/fox_edisplay.c @@ -533,7 +533,7 @@ void func_edisplay_8005B388(Actor199* actor) { D_edisplay_80161630.rightWingState = D_edisplay_80161630.leftWingState = WINGSTATE_INTACT; } D_edisplay_80161630.upperRightFlapYrot = actor->fwork[15]; - D_edisplay_80161630.unk_0C = actor->fwork[16]; + 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 = @@ -543,7 +543,7 @@ void func_edisplay_8005B388(Actor199* actor) { D_edisplay_80161630.unk_30 = actor->fwork[20]; D_edisplay_80161630.unk_34 = actor->fwork[19]; if (gLevelType == LEVELTYPE_SPACE) { - D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot = D_edisplay_80161630.unk_0C = + D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot = D_edisplay_80161630.upperLeftFlapYrot = D_edisplay_80161630.unk_10 = 0.0f; } Display_ArwingWings(&D_edisplay_80161630); diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index b047ea34..a63a3a04 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -3365,7 +3365,7 @@ void Player_ArwingBank(Player* player) { if (player->zRotBank < 70.0f) { 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.unk_0C, 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); if (player->pos.y < (gGroundHeight + 70.0f)) { player->pos.y += 6.0f; @@ -3379,7 +3379,7 @@ void Player_ArwingBank(Player* player) { if (player->zRotBank > -70.0f) { 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.unk_0C, -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); if (player->pos.y < (gGroundHeight + 70.0f)) { player->pos.y += 6.0f; @@ -3600,7 +3600,7 @@ void Player_MoveArwing360(Player* player) { Math_SmoothStepToF(&player->arwing.unk_28, 0.0f, 0.1f, 100.0f, 0.0f); 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.unk_0C, -sp60 + sp58, 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); scale = 0.1f; @@ -3735,7 +3735,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.unk_0C, 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); if (player->aerobaticPitch < 180.0f) { @@ -3863,7 +3863,7 @@ void Player_MoveArwingOnRails(Player* player) { Math_SmoothStepToF(&player->arwing.unk_28, 0.0f, 0.1f, 100.0f, 0.0f); 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.unk_0C, (-sp7C) + sp74, 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); } @@ -5036,7 +5036,7 @@ void Player_ArwingBoost(Player* player) { player->arwing.unk_28 += (35.0f - player->arwing.unk_28) * 0.1f; 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.unk_0C, 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); } player->boostMeter += sp28; @@ -5134,7 +5134,7 @@ void Player_ArwingBrake(Player* player) { if (gLevelType == LEVELTYPE_PLANET) { 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.unk_0C, 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); } @@ -5866,7 +5866,7 @@ void Player_Update(Player* player) { 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.unk_0C, 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); Player_UpdateShields(player); diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index db7b5e0d..ec4bcfba 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -847,8 +847,8 @@ void Ending_80191294(u32 arg0, AssetInfo* asset) { 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.unk_0C = D_ending_80198590.unk_10; - D_ending_80198590.bottomRightFlapYrot = D_ending_80198590.unk_0C; + D_ending_80198590.upperLeftFlapYrot = D_ending_80198590.unk_10; + 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; diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index 9586228f..f0509026 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -3363,10 +3363,10 @@ void Corneria_LevelStart(Player* player) { Math_SmoothStepToF(&player->cam.at.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0.0f); Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, D_ctx_80177A48[1], 0.2f, 1.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_0C, D_ctx_80177A48[2], 0.2f, 1.0f, 0.0f); + 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.unk_0C; + player->arwing.unk_10 = player->arwing.upperLeftFlapYrot; player->cam.eye.y -= 3.0f; player->cam.at.y -= 3.0f; @@ -3450,7 +3450,7 @@ void Corneria_LevelComplete1(Player* player) { f32 temp_fa1; f32 temp_deg; - player->arwing.upperRightFlapYrot = player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = 0.0f; + player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = 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_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index 4a15e754..ffeeb0c0 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -699,7 +699,7 @@ void Aquas_801AA4BC(Player* player) { if (player->zRotBank < 70.0f) { 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.unk_0C, 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); } } @@ -710,7 +710,7 @@ void Aquas_801AA4BC(Player* player) { if (player->zRotBank > -70.0f) { 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.unk_0C, -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); } } diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index 9c860ae2..2f716690 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -3149,7 +3149,7 @@ void Solar_LevelComplete(Player* player) { player->camRoll = player->aerobaticPitch = 0.0f; player->baseSpeed = 40.0f; - player->arwing.upperRightFlapYrot = player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll = player->zRotBank = player->boostSpeed = 0.0f; player->draw = true; diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 3beb7cd6..49b5eecb 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -4763,7 +4763,7 @@ void Zoness_LevelComplete(Player* player) { player->camRoll = 0.0f; player->baseSpeed = 40.0f; player->draw = true; - player->arwing.upperRightFlapYrot = player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll = player->zRotBank = player->boostSpeed = 0.0f; gCsCamEyeX = player->cam.eye.x; diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c index d6a4fdf8..1394c70e 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -674,7 +674,7 @@ void Fortuna_LevelComplete(Player* player) { } player->arwing.upperRightFlapYrot = 0.0f; - player->arwing.unk_0C = 0.0f; + player->arwing.upperLeftFlapYrot = 0.0f; player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_10 = 0.0f; diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index ab41ba7e..b0e912c6 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -1801,7 +1801,7 @@ void Katina_LevelComplete(Player* player) { f32 angle; player->arwing.unk_10 = 0.0f; - player->arwing.unk_0C = 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 6e88ea65..86a2ca0e 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -6515,7 +6515,7 @@ void Macbeth_LevelComplete2(Player* player) { player->aerobaticPitch = 0.0f; player->camRoll = 0.0f; player->boostSpeed = 0.0f; - player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll = + player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll = player->zRotBank = 0.0f; player->yBob = 0.0f; player->rockAngle = 0.0f; @@ -6951,7 +6951,7 @@ 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.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = + player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = 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 78186abb..d989d5c0 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -3857,7 +3857,7 @@ 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.unk_0C = player->arwing.unk_10 = 0.0f; + player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.unk_10 = 0.0f; switch (player->csState) { case 0: diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index db5cb049..b1638c19 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -2087,7 +2087,7 @@ void SectorY_LevelComplete(Player* player) { player->camRoll = 0.0f; player->baseSpeed = 40.0f; player->boostSpeed = 0.0f; - player->arwing.upperRightFlapYrot = player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = player->zRotBarrelRoll = player->zRotBank = 0.0f; player->draw = true; D_ctx_80177A48[8] = Math_RadToDeg( diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index a53f04a7..886c54fe 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -304,7 +304,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.unk_0C, -var_fa0 + sp70, 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); sp94 = player->pos.x - gBosses[0].obj.pos.x; sp90 = player->pos.y - (gBosses[0].obj.pos.y + 700.0f); @@ -313,7 +313,7 @@ void Venom2_LevelComplete(Player* player) { switch (player->csState) { case 0: player->csState++; - player->arwing.upperRightFlapYrot = player->arwing.unk_0C = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.upperLeftFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_10 = 0.0f; player->arwing.modelId = 1; diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 22d8985e..a26a34fe 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -2272,7 +2272,7 @@ 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.unk_0C = arwing.unk_10 = arwing.unk_28 = 0.0f; + arwing.bottomRightFlapYrot = arwing.upperLeftFlapYrot = arwing.unk_10 = arwing.unk_28 = 0.0f; // clang-format on arwing.unk_14 = 0.0f; diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index fe092646..85096bb7 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -2255,7 +2255,7 @@ void Title_8018D2B8(s32 arg0) { arwing.rightWingState = arwing.leftWingState = WINGSTATE_INTACT; arwing.unk_18 = arwing.unk_1C = arwing.unk_20 = arwing.unk_24 = arwing.upperRightFlapYrot = arwing.bottomRightFlapYrot = - arwing.unk_0C = arwing.unk_10 = arwing.unk_28 = 0.0f; + 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;