mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-26 16:36:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

unk_0C -> upperLeftFlapYrot

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