mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-28 17:20:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

unk_08 -> bottomRightFlapYrot

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2024-08-15 03:24:04 -03:00
parent 885a20e29f
commit 5f5c0d2edf
18 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_demo.c
+5 -5
View File
@@ -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;
src/engine/fox_display.c
+2 -2
View File
@@ -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;
src/engine/fox_edisplay.c
+2 -2
View File
@@ -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);
src/engine/fox_play.c
+8 -8
View File
@@ -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);