diff --git a/include/sf64player.h b/include/sf64player.h index 9e344d0b..25639979 100644 --- a/include/sf64player.h +++ b/include/sf64player.h @@ -131,7 +131,7 @@ typedef struct ArwingInfo { // ArArwingInfo /* 0x00 */ u8 rightWingState; // rightWingState /* 0x01 */ u8 leftWingState; // leftWingState /* 0x04 */ f32 upperRightFlapYrot; // upperRightFlapYrot - /* 0x08 */ f32 unk_08; // bottomRightFlapYrot + /* 0x08 */ f32 bottomRightFlapYrot; // bottomRightFlapYrot /* 0x0C */ f32 unk_0C; // upperLeftFlapYrot /* 0x10 */ f32 unk_10; // bottomLeftFlapYrot /* 0x14 */ f32 unk_14; // laserGunsYpos diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c index 6eb6fca7..8bdd4feb 100644 --- a/src/engine/fox_demo.c +++ b/src/engine/fox_demo.c @@ -777,7 +777,7 @@ void Cutscene_AllRangeMode(Player* player) { } } player->arwing.unk_10 = 0.0f; - player->arwing.unk_08 = 0.0f; + player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_0C = 0.0f; player->arwing.upperRightFlapYrot = 0.0f; @@ -920,7 +920,7 @@ void Cutscene_CoComplete2(Player* player) { player->csState++; player->arwing.upperRightFlapYrot = 0.0f; player->arwing.unk_0C = 0.0f; - player->arwing.unk_08 = 0.0f; + player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_10 = 0.0f; player->zRotBarrelRoll = 0.0f; player->zRotBank = 0.0f; @@ -1021,7 +1021,7 @@ void Cutscene_CoComplete2(Player* player) { player->csState = 1; player->csTimer = 150; player->arwing.unk_10 = 0.0f; - player->arwing.unk_08 = 0.0f; + player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_0C = 0.0f; player->arwing.upperRightFlapYrot = 0.0f; } @@ -1449,7 +1449,7 @@ void Cutscene_UTurn(Player* player) { } Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, 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.unk_10, sp58.y, 0.3f, 100.0f, 0.0f); Math_SmoothStepToF(&player->zRotBank, 0.0f, 0.1f, 15.0f, 0.0f); @@ -1480,7 +1480,7 @@ void Cutscene_UTurn(Player* player) { sp58.y = player->zRotBank * 0.3f; Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, sp58.y, 0.3f, 100.0f, 0.0f); + Math_SmoothStepToF(&player->arwing.bottomRightFlapYrot, sp58.y, 0.3f, 100.0f, 0.0f); sp58.z = -sp58.y; diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c index 3dcc595c..df67b55d 100644 --- a/src/engine/fox_display.c +++ b/src/engine/fox_display.c @@ -532,7 +532,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos rot->y -= arwing->upperRightFlapYrot; break; case 2: - rot->y -= arwing->unk_08; + rot->y -= arwing->bottomRightFlapYrot; break; case 5: rot->y -= arwing->unk_10; @@ -693,7 +693,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.unk_08 = + player->arwing.unk_28 = player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_0C = player->arwing.unk_10 = 0.0f; } D_display_800CA22C = true; diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c index 9ea4a027..0f10961d 100644 --- a/src/engine/fox_edisplay.c +++ b/src/engine/fox_edisplay.c @@ -534,7 +534,7 @@ void func_edisplay_8005B388(Actor199* actor) { } D_edisplay_80161630.upperRightFlapYrot = actor->fwork[15]; D_edisplay_80161630.unk_0C = actor->fwork[16]; - D_edisplay_80161630.unk_08 = actor->fwork[26]; + 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; @@ -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.unk_08 = D_edisplay_80161630.unk_0C = + D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot = D_edisplay_80161630.unk_0C = 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 e924c393..b047ea34 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -3364,7 +3364,7 @@ void Player_ArwingBank(Player* player) { sp38 = 0.2f; if (player->zRotBank < 70.0f) { Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -70.0f, 0.3f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, -70.0f, 0.3f, 100.0f, 0.f); + 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.unk_10, 70.0f, 0.3f, 100.0f, 0.f); if (player->pos.y < (gGroundHeight + 70.0f)) { @@ -3378,7 +3378,7 @@ void Player_ArwingBank(Player* player) { sp38 = 0.2f; if (player->zRotBank > -70.0f) { Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 70.0f, 0.3f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, 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.unk_10, -70.0f, 0.3f, 100.0f, 0.0f); if (player->pos.y < (gGroundHeight + 70.0f)) { @@ -3599,7 +3599,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.unk_08, -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.unk_10, -sp60 - sp58, 0.1f, 100.0f, 0.0f); @@ -3734,7 +3734,7 @@ void Player_PerformLoop(Player* player) { } Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, sp58, 0.3f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, 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.unk_10, sp58, 0.3f, 100.0f, 0.0f); @@ -3862,7 +3862,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.unk_08, (-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.unk_10, (-sp7C) - sp74, 0.1f, 100.0f, 0.0f); } @@ -5035,7 +5035,7 @@ void Player_ArwingBoost(Player* player) { if (gLevelType == LEVELTYPE_PLANET) { 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.unk_08, 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.unk_10, 0.0f, 0.5f, 100.0f, 0.0f); } @@ -5133,7 +5133,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.unk_08, -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.unk_10, -90.0f, 0.2f, 100.0f, 0.0f); } @@ -5865,7 +5865,7 @@ void Player_Update(Player* player) { player->arwing.modelId = 1; Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 0.0f, 0.1f, 5.0f, 0); - Math_SmoothStepToF(&player->arwing.unk_08, 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.unk_10, 0.0f, 0.1f, 5.0f, 0); diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index 6b44ced1..db7b5e0d 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -848,8 +848,8 @@ void Ending_80191294(u32 arg0, AssetInfo* asset) { 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.unk_08 = D_ending_80198590.unk_0C; - D_ending_80198590.upperRightFlapYrot = D_ending_80198590.unk_08; + D_ending_80198590.bottomRightFlapYrot = D_ending_80198590.unk_0C; + 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; diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index af6fc822..9586228f 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -3365,7 +3365,7 @@ void Corneria_LevelStart(Player* player) { 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); - player->arwing.unk_08 = player->arwing.upperRightFlapYrot; + player->arwing.bottomRightFlapYrot = player->arwing.upperRightFlapYrot; player->arwing.unk_10 = player->arwing.unk_0C; player->cam.eye.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.unk_08 = player->arwing.unk_10 = 0.0f; + player->arwing.upperRightFlapYrot = player->arwing.unk_0C = 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 60fdc829..4a15e754 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -698,7 +698,7 @@ void Aquas_801AA4BC(Player* player) { rotBankScale = 0.2f; if (player->zRotBank < 70.0f) { Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -70.0f, 0.3f, 100.0f, 0); - Math_SmoothStepToF(&player->arwing.unk_08, -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.unk_10, 70.0f, 0.3f, 100.0f, 0); } @@ -709,7 +709,7 @@ void Aquas_801AA4BC(Player* player) { rotBankScale = 0.2f; if (player->zRotBank > -70.0f) { Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, 70.0f, 0.3f, 100.0f, 0); - Math_SmoothStepToF(&player->arwing.unk_08, 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.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 54f9a014..9c860ae2 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.unk_08 = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.unk_0C = 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 8f1da9b5..3beb7cd6 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.unk_08 = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.unk_0C = 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 4312f9ae..d6a4fdf8 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -675,7 +675,7 @@ void Fortuna_LevelComplete(Player* player) { player->arwing.upperRightFlapYrot = 0.0f; player->arwing.unk_0C = 0.0f; - player->arwing.unk_08 = 0.0f; + player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.unk_10 = 0.0f; Math_SmoothStepToF(&player->boostSpeed, 0.0f, 0.1f, 1.5f, 0.0f); diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index 67ca5505..ab41ba7e 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -1802,7 +1802,7 @@ void Katina_LevelComplete(Player* player) { player->arwing.unk_10 = 0.0f; player->arwing.unk_0C = 0.0f; - player->arwing.unk_08 = 0.0f; + player->arwing.bottomRightFlapYrot = 0.0f; player->arwing.upperRightFlapYrot = 0.0f; player->aerobaticPitch = 0.0f; diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 3ba634b6..6e88ea65 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.unk_08 = player->arwing.unk_10 = player->zRotBarrelRoll = + player->arwing.unk_0C = 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.unk_08 = player->arwing.unk_10 = + player->arwing.unk_0C = 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 47932f0f..78186abb 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.unk_08 = player->arwing.unk_0C = player->arwing.unk_10 = 0.0f; + player->arwing.upperRightFlapYrot = player->arwing.bottomRightFlapYrot = player->arwing.unk_0C = 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 e25302a3..db5cb049 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.unk_08 = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.unk_0C = 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 906c33ec..a53f04a7 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -303,7 +303,7 @@ void Venom2_LevelComplete(Player* player) { } Math_SmoothStepToF(&player->arwing.upperRightFlapYrot, -var_fa0 + sp74, 0.1f, 100.0f, 0.0f); - Math_SmoothStepToF(&player->arwing.unk_08, -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.unk_10, -var_fa0 - sp70, 0.1f, 100.0f, 0.0f); sp94 = player->pos.x - gBosses[0].obj.pos.x; @@ -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.unk_08 = player->arwing.unk_10 = + player->arwing.upperRightFlapYrot = player->arwing.unk_0C = 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 e5242ed6..22d8985e 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.unk_08 = arwing.unk_0C = arwing.unk_10 = arwing.unk_28 = 0.0f; + arwing.bottomRightFlapYrot = arwing.unk_0C = 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 70b7e5a8..fe092646 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -2254,7 +2254,7 @@ 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.unk_08 = + 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.unk_14 = D_menu_801B84E8[arg0].unk_28;