summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/fox_360.c2
-rw-r--r--src/engine/fox_beam.c12
-rw-r--r--src/engine/fox_bg.c12
-rw-r--r--src/engine/fox_context.c14
-rw-r--r--src/engine/fox_demo.c30
-rw-r--r--src/engine/fox_display.c57
-rw-r--r--src/engine/fox_edata_info.c4
-rw-r--r--src/engine/fox_edisplay.c28
-rw-r--r--src/engine/fox_effect.c34
-rw-r--r--src/engine/fox_enmy.c2
-rw-r--r--src/engine/fox_enmy2.c2
-rw-r--r--src/engine/fox_game.c24
-rw-r--r--src/engine/fox_hud.c1828
-rw-r--r--src/engine/fox_load.c4
-rw-r--r--src/engine/fox_play.c30
-rw-r--r--src/engine/fox_radio.c50
-rw-r--r--src/engine/fox_rcp_setup.c88
-rw-r--r--src/engine/fox_std_lib.c88
-rw-r--r--src/engine/fox_tank.c4
-rw-r--r--src/engine/fox_versus.c126
20 files changed, 1294 insertions, 1145 deletions
diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c
index d1be5ea4..a283479b 100644
--- a/src/engine/fox_360.c
+++ b/src/engine/fox_360.c
@@ -2223,7 +2223,7 @@ void ActorAllRange_Update(ActorAllRange* this) {
ActorAllRange_ApplyDamage(this);
radarMark = &gRadarMarks[this->index];
- radarMark->status = 1;
+ radarMark->enabled = true;
if (this->aiType == AI360_MISSILE) {
radarMark->type = 100;
diff --git a/src/engine/fox_beam.c b/src/engine/fox_beam.c
index adb02894..ffe9c215 100644
--- a/src/engine/fox_beam.c
+++ b/src/engine/fox_beam.c
@@ -1306,7 +1306,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
gDPSetEnvColor(gMasterDisp++, 0, 128, 255, 255);
}
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
} else {
Matrix_Scale(gGfxMatrix, shot->scale, shot->scale, shot->scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -1422,7 +1422,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 0, shot->unk_58);
gDPSetEnvColor(gMasterDisp++, 32, 16, 16, shot->unk_58);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
} else if (shot->unk_5C == 0) {
if (shot->scale > 1.5f) {
break;
@@ -1457,10 +1457,10 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
}
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_Pop(&gGfxMatrix);
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, MTXF_APPLY);
@@ -1468,7 +1468,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.3f, MTXF_APPLY);
}
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
} else {
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPDisplayList(gMasterDisp++, D_10231A0);
@@ -1487,7 +1487,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 128, 128, 255);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
break;
case PLAYERSHOT_GFOX_LASER:
diff --git a/src/engine/fox_bg.c b/src/engine/fox_bg.c
index 09669d29..4b623be9 100644
--- a/src/engine/fox_bg.c
+++ b/src/engine/fox_bg.c
@@ -45,12 +45,16 @@ u16 gStarColors[16] = {
0x294B, 0x18DF, 0x294B, 0x1085, 0x39FF, 0x108B, 0x18CD, 0x108B,
};
Gfx* sSunDLs[13] = {
- D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_BG_PLANET_20112C0, D_102A8A0,
- D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_BG_PLANET_20112C0, D_102A8A0,
+ aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL,
+ aRadarMarkKaSaucererDL, D_BG_PLANET_20112C0, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL,
+ aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, D_BG_PLANET_20112C0,
+ aRadarMarkKaSaucererDL,
};
Gfx* sKaSunDLs[13] = {
- D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0,
- D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0,
+ aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL,
+ aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL,
+ aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL, aRadarMarkKaSaucererDL,
+ aRadarMarkKaSaucererDL,
};
f32 sSunShifts[13] = {
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f, 13.0f, 20.0f, 35.0f, 40.0f, 50.0f, 50.0f, 70.0f,
diff --git a/src/engine/fox_context.c b/src/engine/fox_context.c
index cfe7acf3..7396c973 100644
--- a/src/engine/fox_context.c
+++ b/src/engine/fox_context.c
@@ -18,6 +18,11 @@ LevelMode gLevelMode;
DrawMode gDrawMode;
s32 gPlayerNum;
s32 gCamCount;
+/**
+ * gTeamShields[1] = Falco
+ * gTeamShields[2] = Slippy
+ * gTeamShields[3] = Peppy
+ */
s32 gTeamShields[6];
s32 gSavedTeamShields[6];
s32 gPrevPlanetSavedTeamShields[6];
@@ -46,6 +51,11 @@ s32 gTitleState;
s32 gMainController;
s32 gMapState;
s32 gMissionNumber;
+/**
+ * 0x 00 FF 00 00 Peppy
+ * 0x 00 00 FF 00 Slippy
+ * 0x 00 00 00 FF Falco
+ */
s32 gMissionTeamStatus[7];
s32 gMissionHitCount[7];
PlanetId gMissionPlanet[7];
@@ -351,8 +361,8 @@ s32 gLeftWingDebrisTimer[4];
s32 gBombCount[4];
s32 gVsPoints[4];
s32 gVsKills[4][10];
-s32 gVsMatchOver;
-s32 gVsMatchStart;
+s32 gVsMatchWon;
+bool gVsMatchStart;
bool gChangeTo360;
Vec3f gTeamArrowsViewPos[10];
f32 D_ctx_80177F20[65]; // Seem to be an early implementation of RadarMark
diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c
index aeaa775c..224c0e8e 100644
--- a/src/engine/fox_demo.c
+++ b/src/engine/fox_demo.c
@@ -167,11 +167,11 @@ void Cutscene_WarpZoneComplete(Player* player) {
break;
case 200:
- gShowLevelClearStatusScreen = 1;
+ gShowLevelClearStatusScreen = true;
break;
case 400:
- gShowLevelClearStatusScreen = 0;
+ gShowLevelClearStatusScreen = false;
break;
case 420:
@@ -623,7 +623,7 @@ void Cutscene_LevelStart(Player* player) {
break;
case LEVEL_AQUAS:
- HUD_AquasStart(player);
+ Aquas_CsLevelStart(player);
break;
case LEVEL_AREA_6:
@@ -1251,11 +1251,11 @@ void Cutscene_CoComplete2(Player* player) {
switch (gCsFrameCount) {
case 961:
- gShowLevelClearStatusScreen = 1;
+ gShowLevelClearStatusScreen = true;
break;
case 1161:
- gShowLevelClearStatusScreen = 0;
+ gShowLevelClearStatusScreen = false;
break;
case 1255:
@@ -1389,7 +1389,7 @@ void Cutscene_LevelComplete(Player* player) {
case FORM_BLUE_MARINE:
if (gCurrentLevel == LEVEL_AQUAS) {
- HUD_AquasComplete(player);
+ Aquas_CsLevelComplete(player);
}
break;
}
@@ -2301,7 +2301,7 @@ void func_demo_8004F798(ActorCutscene* this) {
void ActorCutscene_Update(ActorCutscene* this) {
if (gCurrentLevel == LEVEL_AQUAS) {
- func_hud_80093164(this);
+ Aquas_CsIntroActors_Update(this);
return;
}
@@ -2499,7 +2499,7 @@ void func_demo_8004FCB8(ActorCutscene* this, s32 arg1) {
Matrix_RotateY(gGfxMatrix, angle, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
}
}
@@ -2565,7 +2565,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
RCP_SetupDL_49();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->iwork[0]);
gDPSetEnvColor(gMasterDisp++, 255, 255, 00, this->iwork[0]);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 20:
@@ -2764,7 +2764,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
gDPSetEnvColor(gMasterDisp++, this->iwork[4], this->iwork[5], this->iwork[6], this->iwork[7]);
Matrix_Scale(gGfxMatrix, this->scale, this->fwork[4], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 38:
@@ -2794,7 +2794,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
Matrix_RotateX(gGfxMatrix, -x, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Math_SmoothStepToF(&this->fwork[0], 0.0f, 0.1f, 0.2f, 0.05f);
}
@@ -2826,7 +2826,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
Matrix_RotateX(gGfxMatrix, -x, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Math_SmoothStepToF(&this->fwork[6], 0.00f, 0.1f, 0.6f, 0);
}
break;
@@ -2856,7 +2856,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
Matrix_Scale(gGfxMatrix, this->fwork[0], this->fwork[0], this->fwork[0], MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
if (this->iwork[0] != 0) {
this->iwork[0] -= 7;
@@ -2899,11 +2899,11 @@ void Cutscene_DrawGreatFox(void) {
PRINTF("d Enm->wrk0 %d\n");
if (gGameState == GSTATE_TITLE) {
- dList = D_TITLE_60320E0;
+ dList = aTitleArwingEngineGlowDL;
} else if (gGameState == GSTATE_ENDING) {
dList = D_END_7010970;
} else {
- dList = D_1024AC0;
+ dList = aOrbDL;
}
if (gCurrentLevel == LEVEL_TITANIA) {
diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c
index 91014a98..77927cd2 100644
--- a/src/engine/fox_display.c
+++ b/src/engine/fox_display.c
@@ -333,8 +333,8 @@ void Display_Landmaster(Player* player) {
Matrix_Pop(&gGfxMatrix);
}
-Gfx* D_display_800CA26C[] = { D_arwing_3000090, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 };
-Gfx* D_display_800CA27C[] = { D_arwing_3001C90, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 };
+Gfx* sFaceDL[] = { aAwFoxHeadDL, aAwFalcoHeadDL, aAwSlippyHeadDL, aAwPeppyHeadDL };
+Gfx* sExpertFaceDL[] = { aAwJamesHeadDL, aAwFalcoHeadDL, aAwSlippyHeadDL, aAwPeppyHeadDL };
f32 D_display_800CA28C = 2.0f;
f32 D_display_800CA290 = 13.0f;
f32 D_display_800CA294 = -10.0f;
@@ -361,7 +361,7 @@ void Display_LandmasterMuzzleFlash(Player* player) {
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
}
Matrix_Pop(&gGfxMatrix);
@@ -463,7 +463,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
*gfxPtr = NULL;
}
if (arwing->rightWingState == WINGSTATE_BROKEN) {
- *gfxPtr = D_arwing_3015120;
+ *gfxPtr = aAwLeftWingBrokenDL;
}
if (D_display_800CA22C && ((gRightWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
@@ -497,7 +497,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
*gfxPtr = NULL;
}
if (arwing->leftWingState == WINGSTATE_BROKEN) {
- *gfxPtr = D_arwing_3014BF0;
+ *gfxPtr = aAwRightWingBrokenDL;
}
if (D_display_800CA22C && ((gLeftWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
@@ -595,20 +595,23 @@ void Display_ArwingWings(ArwingInfo* arwing) {
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[drawFace - 1]);
+ gSPDisplayList(gMasterDisp++, sExpertFaceDL[drawFace - 1]);
} else {
- gSPDisplayList(gMasterDisp++, D_display_800CA26C[drawFace - 1]);
+ gSPDisplayList(gMasterDisp++, sFaceDL[drawFace - 1]);
}
Matrix_Pop(&gGfxMatrix);
}
Matrix_Translate(gGfxMatrix, 0.0f, 17.2f, -25.8f, MTXF_APPLY);
- Matrix_RotateX(gGfxMatrix, arwing->windshieldXrot * M_DTOR, MTXF_APPLY);
+ Matrix_RotateX(gGfxMatrix, arwing->cockpitGlassXrot * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_64_2();
@@ -674,7 +677,7 @@ void Display_Arwing(Player* player, s32 reflectY) {
Matrix_Translate(gGfxMatrix, 0.0f, -8.0f, 5.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_arwing_30131F0);
+ gSPDisplayList(gMasterDisp++, aAwCockpitViewDL);
Matrix_Pop(&gGfxMatrix);
}
} else {
@@ -808,7 +811,7 @@ void Display_PlayerShadow_Draw(Player* player) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_Pop(&gGfxMatrix);
break;
@@ -833,7 +836,7 @@ void Display_DrawEngineGlow(EngineGlowColor color) {
gDPSetEnvColor(gMasterDisp++, 255, 64, 0, 255);
break;
}
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
void Display_LandmasterEngineGlow_Draw(Player* player) {
@@ -927,8 +930,8 @@ void Display_UnusedShield(Player* player) {
gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) gShieldAlpha[player->num]);
gSPDisplayList(gMasterDisp++, aUnusedShieldDL);
Matrix_Pop(&gGfxMatrix);
- Texture_Scroll(aUnusedShieldTex, 32, 32, 3);
- Texture_Scroll(aUnusedShieldTex, 32, 32, 3);
+ Lib_Texture_Scroll(aUnusedShieldTex, 32, 32, 3);
+ Lib_Texture_Scroll(aUnusedShieldTex, 32, 32, 3);
}
}
@@ -990,10 +993,10 @@ void Display_ArwingLaserCharge(Player* player) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_Pop(&gGfxMatrix);
if (player->alternateView && (gLevelMode == LEVELMODE_ON_RAILS)) {
@@ -1008,7 +1011,7 @@ void Display_ArwingLaserCharge(Player* player) {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, MTXF_APPLY);
}
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Matrix_Pop(&gGfxMatrix);
}
@@ -1039,7 +1042,7 @@ void Display_ArwingLaserCharge(Player* player) {
Matrix_Scale(gGfxMatrix, gMuzzleFlashScale[player->num], gMuzzleFlashScale[player->num], 1.0f,
MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Matrix_Pop(&gGfxMatrix);
break;
@@ -1060,7 +1063,7 @@ void Display_ArwingLaserCharge(Player* player) {
Matrix_Scale(gGfxMatrix, gMuzzleFlashScale[player->num], gMuzzleFlashScale[player->num], 1.0f,
MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@@ -1068,7 +1071,7 @@ void Display_ArwingLaserCharge(Player* player) {
Matrix_Scale(gGfxMatrix, gMuzzleFlashScale[player->num], gMuzzleFlashScale[player->num], 1.0f,
MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Matrix_Pop(&gGfxMatrix);
break;
@@ -1119,11 +1122,11 @@ void Display_LandmasterLaserCharge(Player* player) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_Pop(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, MTXF_APPLY);
@@ -1134,7 +1137,7 @@ void Display_LandmasterLaserCharge(Player* player) {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, MTXF_APPLY);
}
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -1243,7 +1246,7 @@ void Display_ArwingWingTrail_Draw(Player* player) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_DTOR * sp54, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
Matrix_Pop(&gGfxMatrix);
}
if (player->arwing.rightWingState == WINGSTATE_INTACT) {
@@ -1256,7 +1259,7 @@ void Display_ArwingWingTrail_Draw(Player* player) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_DTOR * sp54, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -1712,7 +1715,9 @@ void Display_Update(void) {
tempVec.x = camPlayer->cam.eye.x - camPlayer->pos.x;
tempVec.y = camPlayer->cam.eye.y - camPlayer->pos.y;
tempVec.z = camPlayer->cam.eye.z - (camPlayer->trueZpos + camPlayer->zPath);
+
Matrix_MultVec3f(gCalcMatrix, &tempVec, &gPlayCamEye);
+
gPlayCamEye.x += camPlayer->pos.x;
gPlayCamEye.y += camPlayer->pos.y;
gPlayCamEye.z += camPlayer->trueZpos + camPlayer->zPath;
@@ -1720,7 +1725,9 @@ void Display_Update(void) {
tempVec.x = camPlayer->cam.at.x - camPlayer->pos.x;
tempVec.y = camPlayer->cam.at.y - camPlayer->pos.y;
tempVec.z = camPlayer->cam.at.z - (camPlayer->trueZpos + camPlayer->zPath);
+
Matrix_MultVec3f(gCalcMatrix, &tempVec, &gPlayCamAt);
+
gPlayCamAt.x += camPlayer->pos.x;
gPlayCamAt.y += camPlayer->pos.y;
gPlayCamAt.z += camPlayer->trueZpos + camPlayer->zPath;
@@ -1900,7 +1907,7 @@ void Display_Update(void) {
if ((gCamCount != 1) &&
((camPlayer->state_1C8 == PLAYERSTATE_1C8_ACTIVE) || (camPlayer->state_1C8 == PLAYERSTATE_1C8_U_TURN))) {
HUD_Draw();
- HUD_DrawEdgeArrows();
+ HUD_EdgeArrows_Update();
}
Matrix_Pop(&gGfxMatrix);
Display_DrawHelpAlert();
diff --git a/src/engine/fox_edata_info.c b/src/engine/fox_edata_info.c
index a5dc6c08..cad96ccd 100644
--- a/src/engine/fox_edata_info.c
+++ b/src/engine/fox_edata_info.c
@@ -424,7 +424,7 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_BOSS_SX_SPYBORG_RIGHT_ARM */ {(void*) SectorX_SxSpyborgRightArm_Draw, 2, (ObjectFunc) SectorX_SxSpyborgRightArm_Update, aSxSpyborgRightArmHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_TI_GORAS */ {(void*) Titania_TiGoras_Draw, 1, (ObjectFunc) Titania_TiGoras_Update, aTiGorasHitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO_SARUMARINE */ {(void*) Zoness_ZoSarumarine_Draw, 2, (ObjectFunc) Zoness_ZoSarumarine_Update, aZoSarumarineHitbox, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
- /* OBJ_BOSS_FO_BASE */ {(void*) HUD_FoBase_Draw, 1, (ObjectFunc) HUD_FoBase_Update, aFoBaseHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
+ /* OBJ_BOSS_FO_BASE */ {(void*) FoBase_Draw, 1, (ObjectFunc) FoBase_Update, aFoBaseHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_BO_BASE */ {(void*) BoBase_Draw, 1, (ObjectFunc) BoBase_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_BO_BASE_SHIELD */ {(void*) BoBaseShield_Draw, 1, (ObjectFunc) BoBaseShield_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_BO_BASE_CORE */ {(void*) Bolse_BoBaseCore_Draw, 2, (ObjectFunc) Bolse_BoBaseCore_Update, aBoBaseCoreHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
@@ -479,7 +479,7 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_EFFECT_360 */ {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect360_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_361 */ {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect361_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_362 */ {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect362_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
- /* OBJ_EFFECT_363 */ {(void*) Hud_Effect363_Draw, 1, (ObjectFunc) Hud_Effect363_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
+ /* OBJ_EFFECT_363 */ {(void*) Aquas_Effect363_Draw, 1, (ObjectFunc) Aquas_Effect363_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_364 */ {(void*) Effect_Effect364_Draw, 1, (ObjectFunc) Effect_Effect364_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_365 */ {(void*) Effect_Effect365_Draw, 1, (ObjectFunc) Effect_Effect365_Update, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_366 */ {(void*) Effect_Effect366_Draw, 1, (ObjectFunc) Aquas_Effect366_Update, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 },
diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c
index ded922f6..0fc75bd5 100644
--- a/src/engine/fox_edisplay.c
+++ b/src/engine/fox_edisplay.c
@@ -252,23 +252,23 @@ void ActorDebris_Draw(ActorDebris* this) {
Matrix_Translate(gGfxMatrix, 18.0f, 15.0f, -15.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_arwing_3016660);
+ gSPDisplayList(gMasterDisp++, aAwLeftWingDL);
break;
case 1:
Matrix_Translate(gGfxMatrix, -18.0f, 15.0f, -15.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_arwing_3015D80);
+ gSPDisplayList(gMasterDisp++, aAwRightWingDL);
break;
case 2:
Graphics_SetScaleMtx(this->scale);
- gSPDisplayList(gMasterDisp++, D_arwing_30155E0);
+ gSPDisplayList(gMasterDisp++, aAwFlap1DL);
break;
case 3:
- gSPDisplayList(gMasterDisp++, D_arwing_3011720);
+ gSPDisplayList(gMasterDisp++, aAwLaserGun1DL);
break;
case 4:
@@ -509,7 +509,7 @@ void Actor_DrawEngineAndContrails(Actor* this) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_DTOR * sp54, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -70.0f, -10.0f, -100.0f, MTXF_APPLY);
@@ -518,7 +518,7 @@ void Actor_DrawEngineAndContrails(Actor* this) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_DTOR * sp54, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -581,7 +581,7 @@ void ActorTeamArwing_Draw(ActorTeamArwing* this) {
gActorTeamArwing.bottomRightFlapYrot = this->fwork[26];
gActorTeamArwing.bottomLeftFlapYrot = this->fwork[27];
gActorTeamArwing.laserGunsYpos = gActorTeamArwing.laserGunsXpos = gActorTeamArwing.wingsXrot =
- gActorTeamArwing.wingsYrot = gActorTeamArwing.windshieldXrot = gActorTeamArwing.wingsZrot = 0.0f;
+ gActorTeamArwing.wingsYrot = gActorTeamArwing.cockpitGlassXrot = gActorTeamArwing.wingsZrot = 0.0f;
gActorTeamArwing.unk_28 = this->fwork[17];
gActorTeamArwing.drawFace = this->iwork[14];
gActorTeamArwing.teamFaceXrot = this->fwork[20];
@@ -680,7 +680,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_Scale(gGfxMatrix, 1.2f, 0.0f, 1.2f, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
@@ -704,7 +704,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_Scale(gGfxMatrix, temp_fv0, temp_fv0, temp_fv0, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
default:
@@ -731,7 +731,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
}
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Graphics_SetScaleMtx(150.0f);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
break;
case OBJ_BOSS_CO_CARRIER:
@@ -778,7 +778,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_Scale(gGfxMatrix, gActors[index].scale, 1.0f, gActors[index].scale, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case OBJ_ACTOR_TI_DESERT_CRAWLER:
@@ -793,7 +793,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_Scale(gGfxMatrix, 6.0f, 1.0f, 7.5f, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case OBJ_ACTOR_TI_BOMB:
@@ -806,7 +806,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.2f, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case OBJ_ACTOR_MA_BOULDER:
@@ -815,7 +815,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case OBJ_BOSS_VE1_GOLEMECH:
diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c
index d4a89a61..4133d968 100644
--- a/src/engine/fox_effect.c
+++ b/src/engine/fox_effect.c
@@ -288,7 +288,7 @@ void Effect_Effect384_Draw(Effect384* this) {
break;
}
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -298,7 +298,7 @@ void Effect_Effect385_Draw(Effect385* this) {
RCP_SetupDL(&gMasterDisp, SETUPDL_38);
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 192, 255, this->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, this->unk_44);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -372,7 +372,7 @@ void Effect_Effect347_Draw(Effect347* this) {
void Effect_Effect351_Draw(Effect351* this) {
Graphics_SetScaleMtx(this->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->unk_4A);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
}
void Effect_Clouds_Draw(EffectClouds* this) {
@@ -442,7 +442,7 @@ void Effect_Effect346_Draw(Effect346* this) {
tmp = temp_ft3 * 4.0f;
gDPSetEnvColor(gMasterDisp++, D_800D173C[tmp + 0], D_800D173C[tmp + 1], D_800D173C[tmp + 2], 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
@@ -561,7 +561,7 @@ void Effect_Effect393_Draw(Effect393* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
Graphics_SetScaleMtx(this->scale2 * this->scale1);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -774,7 +774,7 @@ void Effect_Effect357_Draw(Effect357* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 80, 0, 255);
Graphics_SetScaleMtx(this->scale1);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 11:
@@ -878,7 +878,7 @@ void Effect_Effect357_Draw(Effect357* this) {
}
void Effect_Effect383_Update(Effect383* this) {
- Texture_Scroll(D_10190C0, 16, 32, 0);
+ Lib_Texture_Scroll(D_10190C0, 16, 32, 0);
gGroundClipMode = 2;
this->obj.rot.y += 1.0f;
Math_SmoothStepToF(&this->scale2, this->scale1, 0.05f, 1.5f, 0.001f);
@@ -3097,7 +3097,7 @@ void Effect_Effect398_Draw(Effect398* this) {
Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 3.0f, 1.5f, 3.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
}
}
@@ -3319,7 +3319,7 @@ void Effect_Effect394_Draw(Effect394* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 190, 255);
gDPSetEnvColor(gMasterDisp++, 239, 15, 0, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
}
}
@@ -3894,14 +3894,14 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 1:
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
break;
case 2:
@@ -3910,7 +3910,7 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 3:
@@ -3954,7 +3954,7 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 128, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 9:
@@ -3963,12 +3963,12 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->scale1);
gDPSetEnvColor(gMasterDisp++, 255, 255, 128, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 10:
if (gPlayState != PLAY_PAUSE) {
- Texture_Scroll(D_A6_6012840, 16, 16, 0);
+ Lib_Texture_Scroll(D_A6_6012840, 16, 16, 0);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Scale(gGfxMatrix, this->unk_60.x, this->unk_60.y, this->unk_60.z, MTXF_APPLY);
@@ -3982,7 +3982,7 @@ void Effect_Effect395_Draw(Effect395* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 111, 111, 111, (s32) this->scale1);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 12:
@@ -4234,6 +4234,6 @@ void Effect_Effect399_Draw(Effect399* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1950[this->unk_44]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
}
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c
index cafc06d7..431df8af 100644
--- a/src/engine/fox_enmy.c
+++ b/src/engine/fox_enmy.c
@@ -2131,7 +2131,7 @@ void ActorSupplies_Update(ActorSupplies* this) {
Object_Kill(&this->obj, this->sfxSource);
}
}
- gRadarMarks[63].status = 1;
+ gRadarMarks[63].enabled = true;
gRadarMarks[63].type = 103;
gRadarMarks[63].pos.x = this->obj.pos.x;
gRadarMarks[63].pos.y = this->obj.pos.y;
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index e35f7a0a..b1847580 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -109,7 +109,7 @@ void CoWaterfall_Update(CoWaterfall* this) {
Vec3f sp24;
Vec3f sp18;
- Texture_Scroll(D_CO_60038F8, 32, 32, 1);
+ Lib_Texture_Scroll(D_CO_60038F8, 32, 32, 1);
if ((gGameFrameCount % 4) == 0) {
Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, MTXF_NEW);
diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index 6cd74a2f..81ed9d83 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -376,11 +376,11 @@ void Game_Update(void) {
case GSTATE_SHOW_LOGO:
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
gGameState++;
break;
@@ -400,11 +400,11 @@ void Game_Update(void) {
case GSTATE_LOGO_WAIT:
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
break;
case GSTATE_START:
@@ -556,7 +556,7 @@ void Game_Update(void) {
gDPFillRectangle(gMasterDisp++, SCREEN_MARGIN, SCREEN_HEIGHT / 2 - 1 - 1, SCREEN_WIDTH - SCREEN_MARGIN,
SCREEN_HEIGHT / 2 + 1);
- HUD_dummy_8008CB8C();
+ HUD_8008CB8C();
}
partialFill = false;
@@ -568,7 +568,7 @@ void Game_Update(void) {
Radio_Draw();
if (gShowHud) {
HUD_Draw();
- HUD_DrawEdgeArrows();
+ HUD_EdgeArrows_Update();
}
HUD_DrawBossHealth();
}
diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c
index 8d1dec54..f94ab410 100644
--- a/src/engine/fox_hud.c
+++ b/src/engine/fox_hud.c
@@ -1,13 +1,6 @@
#include "sf64math.h"
+#include "fox_hud.h"
#include "prevent_bss_reordering.h"
-typedef struct {
- /* 0x00 */ u8* unk_00;
- /* 0x04 */ s32 width;
- /* 0x08 */ s32 height;
- /* 0x0C */ u8* unk_0C;
- /* 0x10 */ s32 unk_10;
- /* 0x14 */ s32 unk_14;
-} UnkStruct_D_800D1AEC;
Vec3f D_801616A0;
Vec3f D_801616B0;
@@ -37,8 +30,8 @@ f32 D_80161778;
f32 D_8016177C;
f32 D_80161780;
f32 D_80161784;
-s32 D_80161788;
-s32 D_8016178C;
+s32 D_80161788; // Looks like a timer related to RadioDamage
+s32 D_8016178C; // Looks like a timer related to RadioDamage
s32 D_80161790;
s32 D_80161794;
s32 D_80161798;
@@ -52,10 +45,10 @@ s32 gMedalStatus;
s32 gMedalFlashTimer;
s32 D_801617C0[10];
s32 D_801617E8[10];
-s32 D_80161810[10];
-s32 D_80161838[10];
-s32 D_80161860[20];
-f32 D_801618B0[20];
+s32 sPauseScreenIwork[10];
+s32 sPauseScreenTimer[10];
+s32 sGoldRingsIwork[20];
+f32 sGoldRingsFwork[20];
s32 D_80161900[20];
#include "global.h"
@@ -88,7 +81,7 @@ s32 D_80161900[20];
#include "assets/ast_allies.h"
#include "assets/ast_star_wolf.h"
-void func_hud_80087788(void);
+void HUD_TeammateStatus_Draw(void);
s16 D_hud_800D1970 = 0;
@@ -104,9 +97,9 @@ f32 D_800D19E0[] = { 1.0f, 1.0f, 1.0f, 1.0f };
f32 D_800D19F0 = 0.0f;
-s32 D_800D19F4 = 0;
+s32 sHudBombCount = 0;
-s32 D_800D19F8 = 0;
+BombCounterStates sBombCounterState = BOMB_COUNTER_INIT;
s32 D_800D19FC = 0;
@@ -117,90 +110,88 @@ Vtx D_800D1A00[] = {
{ 10, -10, 0, 0, 0, 0, 255, 255, 255, 255 },
};
-Gfx D_800D1A40[] = {
+Gfx sRadioDamageDL[] = {
gsSPVertex(D_800D1A00, 4, 0),
gsSP1Quadrangle(1, 2, 3, 0, 0),
gsSPEndDisplayList(),
};
-void func_hud_80084930(f32 arg0, f32 arg1, s32 arg2) {
- u8* D_800D1A58[] = {
- D_arwing_3000000,
- D_blue_marine_3000000,
- D_landmaster_3000000,
- };
- u16* D_800D1A64[] = {
- D_arwing_3000080,
- D_blue_marine_3000080,
- D_landmaster_3000080,
- };
+// Used in the status screen, and when losing a life
+void HUD_LivesCount1_Draw(f32 xPos, f32 yPos, s32 lifeCount) {
+ u8* sLifeIconTex[] = { aArwingLifeIconTex, aBlueMarineLifeIconTex, aLandmasterLifeIconTex };
+ u16* sLifeIconTLUT[] = { aArwingLifeIconTLUT, aBlueMarineLifeIconTLUT, aLandmasterLifeIconTLUT };
Player* player;
- s32 var_t0;
- s32 var_v0;
- s32 i;
+ s32 lifeIconIdx;
+ s32 maxLives;
+ s32 digits;
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- player = gPlayer;
- var_t0 = 0;
+ player = &gPlayer[0];
+ lifeIconIdx = 0; // default
switch (player->form) {
case FORM_ARWING:
- var_t0 = 0;
+ lifeIconIdx = 0;
break;
case FORM_LANDMASTER:
- var_t0 = 1;
+ lifeIconIdx = 1;
break;
case FORM_BLUE_MARINE:
- var_t0 = 2;
+ lifeIconIdx = 2;
break;
}
- TextureRect_CI4(&gMasterDisp, D_800D1A58[var_t0], D_800D1A64[var_t0], 16, 16, arg0, arg1 - 2.0f, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0 + 16.0f, arg1 + 7.0f, 1.0f, 1.0f);
+ // Draw Icon
+ Lib_TextureRect_CI4(&gMasterDisp, sLifeIconTex[lifeIconIdx], sLifeIconTLUT[lifeIconIdx], 16, 16, xPos, yPos - 2.0f,
+ 1.0f, 1.0f);
+ // Draw X
+ Lib_TextureRect_CI4(&gMasterDisp, aXTex, aXTLUT, 16, 7, xPos + 16.0f, yPos + 7.0f, 1.0f, 1.0f);
- if (arg2 >= 0) {
- arg0 += 11.0f;
- arg1 -= 1.0f;
+ if (lifeCount >= 0) {
+ xPos += 11.0f;
+ yPos -= 1.0f;
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- var_v0 = 10;
-
- if (arg2 < 0) {
- arg2 = 0;
+ if (lifeCount < 0) {
+ lifeCount = 0;
}
- if (arg2 > 99) {
- arg2 = 99;
+ if (lifeCount > 99) {
+ lifeCount = 99;
}
- for (var_v0 = 10, i = 1; arg2 >= var_v0; i++) {
- var_v0 *= 10;
+ // Count digits
+ for (maxLives = 10, digits = 1; lifeCount >= maxLives; digits++) {
+ maxLives *= 10;
}
- arg0 += 16.0f + 8 * (2 - i);
- func_hud_800869A0(arg0, arg1, arg2, 1.0f, 1, 99);
+ xPos += 16.0f + 8 * (2 - digits);
+ HUD_Number_Draw(xPos, yPos, lifeCount, 1.0f, true, 99);
}
}
-void func_hud_80084B94(s32 arg0) {
+// Wrench drawn on top of teammates when they're down
+void HUD_TeamDownWrench_Draw(s32 arg0) {
s32 i;
- Vec3f D_800D1A70[] = {
+ Vec3f sTeamDownWrenchPos[] = {
{ 191.0f, -129.0f, -600.0f },
{ 0.0f, -129.0f, -600.0f },
{ -191.0f, -129.0f, -600.0f },
};
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
+
if (arg0 == 0) {
for (i = 1; i < 4; i++) {
if (((gTeamShields[i] != 0) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) &&
(gTeamShields[i] <= 0) && (gTeamShields[i] != -2)) {
Matrix_Push(&gGfxMatrix);
- Matrix_Translate(gGfxMatrix, D_800D1A70[i - 1].x, D_800D1A70[i - 1].y, D_800D1A70[i - 1].z, MTXF_APPLY);
+ Matrix_Translate(gGfxMatrix, sTeamDownWrenchPos[i - 1].x, sTeamDownWrenchPos[i - 1].y,
+ sTeamDownWrenchPos[i - 1].z, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.68f, 0.68f, 1.0f, MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, M_PI / 4, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -225,7 +216,7 @@ void func_hud_80084B94(s32 arg0) {
}
}
-void func_hud_80084E78(Gfx** gfxP, u8* texture, u16* palette, u32 tWidth, u32 tHeight, f32 xPos, f32 yPos, f32 xScale,
+void TextureRect_CI8_2(Gfx** gfxP, u8* texture, u16* palette, u32 tWidth, u32 tHeight, f32 xPos, f32 yPos, f32 xScale,
f32 yScale, f32 xWidth, f32 yWidth) {
gDPPipeSync((*gfxP)++);
gDPLoadTLUT((*gfxP)++, 256, 256, palette);
@@ -236,73 +227,83 @@ void func_hud_80084E78(Gfx** gfxP, u8* texture, u16* palette, u32 tWidth, u32 tH
(s32) (1 / xScale * (32 * 32)), (s32) (1 / yScale * (32 * 32)));
}
-void func_hud_800853A4(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
- TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
+void HUD_MsgWindowBg_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+ Lib_TextureRect_CI8(&gMasterDisp, aMsgWindowBgTex, aMsgWindowBgTLUT, 24, 17, xPos, yPos, xScale, yScale);
}
-void func_hud_80085404(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
- TextureRect_CI4(&gMasterDisp, D_1011280, D_10116A0, 48, 44, xPos, yPos, xScale, yScale);
+void HUD_RadarWindowFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+ Lib_TextureRect_CI4(&gMasterDisp, aRadarFrameTex, aRadarFrameTLUT, 48, 44, xPos, yPos, xScale, yScale);
}
-void func_hud_80085464(f32 arg0, f32 arg1) {
- TextureRect_CI4(&gMasterDisp, D_1011AC0, D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f);
+void HUD_IncomingMsgButton_Draw(f32 xPos, f32 yPos) {
+ Lib_TextureRect_CI4(&gMasterDisp, aIncomingMsgButtonTex, aIncomingMsgButtonTLUT, 16, 26, xPos, yPos, 1.0f, 1.0f);
}
-void func_hud_800854BC(f32 arg0, f32 arg1) {
- TextureRect_CI4(&gMasterDisp, D_1011BB0, D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f);
+void HUD_IncomingMsgSignal1_Draw(f32 xPos, f32 yPos) {
+ Lib_TextureRect_CI4(&gMasterDisp, aIncomingMsgSignal1Tex, aIncomingMsgSignal1TLUT, 16, 26, xPos, yPos, 1.0f, 1.0f);
}
-void func_hud_80085514(f32 arg0, f32 arg1) {
- TextureRect_CI4(&gMasterDisp, D_1011CA0, D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f);
+void HUD_IncomingMsgSignal2_Draw(f32 xPos, f32 yPos) {
+ Lib_TextureRect_CI4(&gMasterDisp, aIncomingMsgSignal2Tex, aIncomingMsgSignal2TLUT, 16, 26, xPos, yPos, 1.0f, 1.0f);
}
-void func_hud_8008556C(f32 arg0, f32 arg1) {
- TextureRect_CI4(&gMasterDisp, D_1011D90, D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f);
+void HUD_IncomingMsgSignal3_Draw(f32 xPos, f32 yPos) {
+ Lib_TextureRect_CI4(&gMasterDisp, aIncomingMsgSignal3Tex, aIncomingMsgSignal3TLUT, 16, 26, xPos, yPos, 1.0f, 1.0f);
}
-void func_hud_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
- TextureRect_IA8_MirX(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
+// Right part of the Player shield gauge frame
+void HUD_ShieldGaugeEdgeRight_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+ Lib_TextureRect_IA8_MirX(&gMasterDisp, aShieldGaugeFrameEdgeTex, 8, 12, xPos, yPos, xScale, yScale);
}
-void func_hud_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
- TextureRect_IA8(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
+// Left part of the Player shield gauge frame
+void HUD_ShieldGaugeEdgeLeft_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+ Lib_TextureRect_IA8(&gMasterDisp, aShieldGaugeFrameEdgeTex, 8, 12, xPos, yPos, xScale, yScale);
}
-void func_hud_8008566C(f32 x, f32 y, f32 arg2, f32 arg3) {
- TextureRect_IA8(&gMasterDisp, D_10030D0, 8, 12, x, y, arg2, arg3);
+// Top and bottom parts of the Player shield gauge frame
+void HUD_ShieldGaugeFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+ Lib_TextureRect_IA8(&gMasterDisp, aShieldGaugeFrameTex, 8, 12, xPos, yPos, xScale, yScale);
}
-void func_hud_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
- func_hud_80084E78(&gMasterDisp, D_1013580, D_1013700, 48, 12, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f);
+void HUD_ShieldGaugeBars_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale, f32 arg4) {
+ TextureRect_CI8_2(&gMasterDisp, aShieldGaugeTex, aShieldGaugeTLUT, 48, 12, xPos, yPos, xScale, yScale, 48.0f * arg4,
+ 8.0f);
}
-void func_hud_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void HUD_BoostGaugeFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
if (gVersusMode) {
- TextureRect_IA8(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_IA8(&gMasterDisp, aVsBoostGaugeFrameTex, 32, 5, xPos, yPos, xScale, yScale);
} else {
- TextureRect_IA8(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_IA8(&gMasterDisp, aBoostGaugeFrameTex, 48, 9, xPos, yPos, xScale, yScale);
}
}
-void func_hud_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void HUD_BoostGaugeOverheat_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
if (gVersusMode) {
- TextureRect_CI8(&gMasterDisp, D_versus_300D3C0, D_versus_300D408, 24, 3, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_CI8(&gMasterDisp, aVsBoostGaugeOverheatTex, aVsBoostGaugeOverheatTLUT, 24, 3, xPos, yPos,
+ xScale, yScale);
} else {
- TextureRect_CI8(&gMasterDisp, D_10128C0, D_1012988, 40, 5, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_CI8(&gMasterDisp, aBoostGaugeOverheatTex, aBoostGaugeOverheatTLUT, 40, 5, xPos, yPos, xScale,
+ yScale);
}
}
-void func_hud_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void HUD_BoostGaugeCool_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
if (gVersusMode) {
- TextureRect_CI8(&gMasterDisp, D_versus_300D350, D_versus_300D398, 24, 3, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_CI8(&gMasterDisp, aVsBoostGaugeCoolTex, aVsBoostGaugeCoolTLUT, 24, 3, xPos, yPos, xScale,
+ yScale);
} else {
- TextureRect_CI8(&gMasterDisp, D_10127D0, D_1012898, 40, 5, arg0, arg1, arg2, arg3);
+ Lib_TextureRect_CI8(&gMasterDisp, aBoostGaugeCoolTex, aBoostGaugeCoolTLUT, 40, 5, xPos, yPos, xScale, yScale);
}
}
-void func_hud_80085944(void) {
- Gfx* D_800D1A94[] = { D_101C170, D_101C000, D_101BE90, D_101BD20, D_101BBB0, D_101BA40,
- D_101B8D0, D_101B760, D_101B5F0, D_101B480, D_101B310, D_101B1A0 };
+void HUD_GoldRings_Draw(void) {
+ Gfx* sGoldRingDLs[] = {
+ aGoldRingFrame1DL, aGoldRingFrame2DL, aGoldRingFrame3DL, aGoldRingFrame4DL,
+ aGoldRingFrame5DL, aGoldRingFrame6DL, aGoldRingFrame7DL, aGoldRingFrame8DL,
+ aGoldRingFrame9DL, aGoldRingFrame10DL, aGoldRingFrame11DL, aGoldRingFrame12DL,
+ };
s32 i;
s32 j;
f32 D_800D1AC4[] = { 0.0f, -30.0f, -26.0f, -22.0f, -18.0f };
@@ -310,14 +311,14 @@ void func_hud_80085944(void) {
f32 scale;
f32 x;
f32 y;
- s32 temp;
+ s32 goldRingFrameIdx;
- D_801618B0[6] += 0.7f;
- if (D_801618B0[6] >= 12.0f) {
- D_801618B0[6] = 0.0f;
+ sGoldRingsFwork[6] += 0.7f;
+ if (sGoldRingsFwork[6] >= 12.0f) {
+ sGoldRingsFwork[6] = 0.0f;
}
- if (D_80161900[4]) {
+ if (D_80161900[4] != 0) {
D_80161900[4]--;
}
@@ -336,9 +337,9 @@ void func_hud_80085944(void) {
i--;
- D_80161860[1 + i] = 1;
+ sGoldRingsIwork[1 + i] = 1;
D_80161900[0 + i] = 14;
- D_801618B0[2 + i] = 0.0f;
+ sGoldRingsFwork[2 + i] = 0.0f;
if (i == 2) {
D_80161900[4] = 28;
@@ -349,8 +350,9 @@ void func_hud_80085944(void) {
}
}
+ // One for each gold ring slot
for (i = 0; i < 3; i++) {
- switch (D_80161860[i + 1]) {
+ switch (sGoldRingsIwork[i + 1]) {
case 0:
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
Matrix_Push(&gGfxMatrix);
@@ -369,7 +371,7 @@ void func_hud_80085944(void) {
Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 0, 50);
- gSPDisplayList(gMasterDisp++, D_1012110);
+ gSPDisplayList(gMasterDisp++, aGoldRingEmptySlotDL);
Matrix_Pop(&gGfxMatrix);
break;
@@ -377,9 +379,9 @@ void func_hud_80085944(void) {
case 2:
if (D_80161900[i]) {
if (D_80161900[i + 0] >= 7) {
- D_801618B0[i + 2] += 0.15f;
+ sGoldRingsFwork[i + 2] += 0.15f;
} else {
- D_801618B0[i + 2] -= 0.15f;
+ sGoldRingsFwork[i + 2] -= 0.15f;
}
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
@@ -387,16 +389,17 @@ void func_hud_80085944(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_800D1AC4[i + 1], D_800D1AD8[i + 1], -100.0f, MTXF_NEW);
- Matrix_RotateZ(gGfxMatrix, M_DTOR * D_801618B0[0], MTXF_APPLY);
- Matrix_Scale(gGfxMatrix, D_801618B0[i + 2], D_801618B0[i + 2], D_801618B0[i + 2], MTXF_APPLY);
+ Matrix_RotateZ(gGfxMatrix, M_DTOR * sGoldRingsFwork[0], MTXF_APPLY);
+ Matrix_Scale(gGfxMatrix, sGoldRingsFwork[i + 2], sGoldRingsFwork[i + 2], sGoldRingsFwork[i + 2],
+ MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
Matrix_Pop(&gGfxMatrix);
}
if (D_80161900[i] < 7) {
- if (D_80161860[i + 1] == 2) {
+ if (sGoldRingsIwork[i + 1] == 2) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
} else {
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
@@ -418,12 +421,12 @@ void func_hud_80085944(void) {
Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- if (D_80161860[i + 1] == 2) {
+ if (sGoldRingsIwork[i + 1] == 2) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 0, 50);
- gSPDisplayList(gMasterDisp++, D_1012110);
+ gSPDisplayList(gMasterDisp++, aGoldRingEmptySlotDL);
} else {
- temp = D_801618B0[6];
- gSPDisplayList(gMasterDisp++, D_800D1A94[temp]);
+ goldRingFrameIdx = sGoldRingsFwork[6];
+ gSPDisplayList(gMasterDisp++, sGoldRingDLs[goldRingFrameIdx]);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -436,31 +439,31 @@ void func_hud_80085944(void) {
if ((gGoldRingCount[1] && ((gGoldRingCount[1] % 3) == 0)) && (D_80161900[4] == 1)) {
for (j = 0; j < 4; j++) {
- if (D_80161860[j + 1] == 1) {
- D_80161860[j + 1] = 2;
+ if (sGoldRingsIwork[j + 1] == 1) {
+ sGoldRingsIwork[j + 1] = 2;
D_80161900[j + 0] = 14;
- D_801618B0[j + 2] = 0.0f;
+ sGoldRingsFwork[j + 2] = 0.0f;
D_80161900[4] = 28;
} else {
- D_80161860[j + 1] = 0;
+ sGoldRingsIwork[j + 1] = 0;
D_80161900[j + 0] = 14;
- D_801618B0[j + 2] = 0.0f;
+ sGoldRingsFwork[j + 2] = 0.0f;
}
}
}
- D_801618B0[0] += 35.0f;
- D_801618B0[1] += 10.0f;
+ sGoldRingsFwork[0] += 35.0f;
+ sGoldRingsFwork[1] += 10.0f;
}
-void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
- f32 temp = 0.82f;
+void HUD_TeamShields_Draw(f32 xPos, f32 yPos, s32 arg2) {
+ f32 xScale = 0.82f;
s32 pad;
RCP_SetupDL(&gMasterDisp, SETUPDL_75);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if (arg2 != 0) {
- func_hud_800856C0((8.0f * temp) + arg0, arg1 + 2.0f, temp, 1.0f, arg2 / 255.0f);
+ HUD_ShieldGaugeBars_Draw((8.0f * xScale) + xPos, yPos + 2.0f, xScale, 1.0f, arg2 / 255.0f);
}
if ((arg2 <= 0) && (arg2 != -2) &&
@@ -468,20 +471,20 @@ void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if ((arg2 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE)) {
- Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, " OK ");
+ Graphics_DisplaySmallText(xPos + (8.0f * xScale) + 4.0f, yPos + 2.0f, 1.0f, 1.0f, " OK ");
} else {
- Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, "DOWN");
+ Graphics_DisplaySmallText(xPos + (8.0f * xScale) + 4.0f, yPos + 2.0f, 1.0f, 1.0f, "DOWN");
}
}
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_80085618(arg0, arg1, temp, 1.0f);
- func_hud_800855C4(arg0 + (7.0f * temp) + (temp * 6.0f) * 8.0f, arg1, 1.0f, 1.0f);
- func_hud_8008566C(arg0 + (7.0f * temp), arg1, temp * 6.0f, 1.0f);
+ HUD_ShieldGaugeEdgeLeft_Draw(xPos, yPos, xScale, 1.0f);
+ HUD_ShieldGaugeEdgeRight_Draw(xPos + (7.0f * xScale) + (xScale * 6.0f) * 8.0f, yPos, 1.0f, 1.0f);
+ HUD_ShieldGaugeFrame_Draw(xPos + (7.0f * xScale), yPos, xScale * 6.0f, 1.0f);
}
-s32 func_hud_800863C8(void) {
+s32 HUD_GetLevelIndex(void) {
s32 ret = 0;
switch (gCurrentLevel) {
@@ -542,29 +545,29 @@ s32 func_hud_800863C8(void) {
return ret;
}
-UnkStruct_D_800D1AEC D_800D1AEC[] = {
- { aLargeText_1, 16, 15, D_CO_6000000, 128, 28 }, { aLargeText_2, 16, 15, D_ME_6000000, 96, 28 },
- { aLargeText_2, 16, 15, D_SY_6000000, 176, 12 }, { aLargeText_3, 16, 15, D_FO_6000000, 168, 28 },
- { aLargeText_3, 16, 15, D_KA_6000000, 168, 28 }, { aLargeText_3, 16, 15, D_AQ_6000000, 96, 13 },
- { aLargeText_4, 16, 15, D_SX_6000000, 176, 12 }, { aLargeText_4, 16, 15, D_SO_6000000, 112, 13 },
- { aLargeText_4, 16, 15, D_ZO_6000000, 112, 28 }, { aLargeText_5, 16, 15, D_TI_6000000, 96, 28 },
- { aLargeText_5, 16, 15, D_MA_6000000, 160, 28 }, { aLargeText_5, 16, 15, D_SZ_6000000, 176, 12 },
- { aLargeText_6, 16, 15, D_BO_6000000, 168, 19 }, { aLargeText_6, 16, 15, D_A6_6000000, 104, 28 },
- { aLargeText_7, 16, 15, D_VE1_6000D80, 128, 28 }, { aLargeText_7, 16, 15, D_VE2_60012D0, 128, 28 },
- { aLargeText_7, 16, 15, D_ANDROSS_C000A80, 128, 28 }, { aLargeText_0, 16, 15, aTextTraining, 80, 12 },
+LevelTitleCard sLevelTitleCard[] = {
+ { aLargeText_1, 16, 15, aCoTitleCardTex, 128, 28 }, { aLargeText_2, 16, 15, aMeTitleCardTex, 96, 28 },
+ { aLargeText_2, 16, 15, aSyTitleCardTex, 176, 12 }, { aLargeText_3, 16, 15, aFoTitleCardTex, 168, 28 },
+ { aLargeText_3, 16, 15, aKaTitleCardTex, 168, 28 }, { aLargeText_3, 16, 15, aAqTitleCardTex, 96, 13 },
+ { aLargeText_4, 16, 15, aSxTitleCardTex, 176, 12 }, { aLargeText_4, 16, 15, aSoTitleCardTex, 112, 13 },
+ { aLargeText_4, 16, 15, aZoTitleCardTex, 112, 28 }, { aLargeText_5, 16, 15, aTiTitleCardTex, 96, 28 },
+ { aLargeText_5, 16, 15, aMaTitleCardTex, 160, 28 }, { aLargeText_5, 16, 15, aSzTitleCardTex, 176, 12 },
+ { aLargeText_6, 16, 15, aBoTitleCardTex, 168, 19 }, { aLargeText_6, 16, 15, aA6TitleCardTex, 104, 28 },
+ { aLargeText_7, 16, 15, aVe1TitleCardTex, 128, 28 }, { aLargeText_7, 16, 15, aVe2TitleCardTex, 128, 28 },
+ { aLargeText_7, 16, 15, aAndTitleCardTex, 128, 28 }, { aLargeText_0, 16, 15, aTrTitleCardTex, 80, 12 },
};
-void func_hud_80086444(void) {
+void HUD_VenomTitleCard_Draw(void) {
s32 i = 9;
s32 j;
- u8* D_800D1C9C[] = { D_VE1_6001B80, D_VE2_60020D0 };
- s32 D_800D1CA4[] = { 128, 104 };
- s32 D_800D1CAC[] = { 19, 19 };
- f32 D_800D1CB4[] = { 96.0f, 112.0f };
- f32 D_800D1CBC[] = { 89.0f, 89.0f };
- f32 D_800D1CC4[] = { 2.0f, 5.0f };
- f32 D_800D1CCC[] = { 1.6f, 1.6f };
+ u8* sVenomTitleCardDLs[] = { D_VE1_6001B80, D_VE2_60020D0 };
+ s32 sVenomTitleCardWidths[] = { 128, 104 };
+ s32 D_800D1CAC[] = { 19, 19 }; // unused
+ f32 sVenomTitleCardHeights[] = { 96.0f, 112.0f };
+ f32 sVenomTitleCardxPos[] = { 89.0f, 89.0f };
+ f32 D_800D1CC4[] = { 2.0f, 5.0f }; // unused
+ f32 D_800D1CCC[] = { 1.6f, 1.6f }; // unused
switch (gCurrentLevel) {
case LEVEL_VENOM_2:
@@ -584,15 +587,16 @@ void func_hud_80086444(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (j = 0; j < 19; j++) {
- TextureRect_IA8(&gMasterDisp, D_800D1C9C[i] + (D_800D1CA4[i] * j), D_800D1CA4[i], 1, D_800D1CB4[i],
- D_800D1CBC[i] + j - 28.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sVenomTitleCardDLs[i] + (sVenomTitleCardWidths[i] * j),
+ sVenomTitleCardWidths[i], 1, sVenomTitleCardHeights[i],
+ sVenomTitleCardxPos[i] + j - 28.0f, 1.0f, 1.0f);
}
}
}
-void func_hud_80086664(f32 x, f32 y) {
+void HUD_TitleCard_Draw(f32 x, f32 y) {
s32 i;
- s32 j;
+ s32 levelIdx;
f32 x0;
f32 y0;
f32 x1;
@@ -600,7 +604,7 @@ void func_hud_80086664(f32 x, f32 y) {
f32 x2;
f32 y2;
- j = func_hud_800863C8();
+ levelIdx = HUD_GetLevelIndex();
x0 = x;
y0 = y;
@@ -608,11 +612,10 @@ void func_hud_80086664(f32 x, f32 y) {
x1 = x0 + 72.0f;
y1 = y0;
- x2 = x0 - ((D_800D1AEC[j].unk_10 - 88.0f - D_800D1AEC[j].width) / 2.0f);
-
+ x2 = x0 - (sLevelTitleCard[levelIdx].titleCardWidth - 88.0f - sLevelTitleCard[levelIdx].width) / 2.0f;
y2 = y0 + 19.0f + 8.0f;
- if (j == 7) {
+ if (levelIdx == 7) { // LEVEL_SECTOR_Z
x2 += 4.0f;
}
@@ -655,67 +658,67 @@ void func_hud_80086664(f32 x, f32 y) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- if ((j != 14) && (j != 15)) {
- TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
+ if ((levelIdx != 14) && (levelIdx != 15)) { // LEVEL_KATINA || LEVEL_FORTUNA
+ Lib_TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x1 + 28.0f,
- y1 + 4.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[levelIdx].levelIdxTex, sLevelTitleCard[levelIdx].width,
+ sLevelTitleCard[levelIdx].height, x1 + 28.0f, y1 + 4.0f, 1.0f, 1.0f);
} else {
- func_hud_80086444();
+ HUD_VenomTitleCard_Draw();
}
- for (i = 0; i < D_800D1AEC[j].unk_14; i++) {
- TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i), D_800D1AEC[j].unk_10, 1, x2,
- y2 + i, 1.0f, 1.0f);
+ for (i = 0; i < sLevelTitleCard[levelIdx].titleCardHeight; i++) {
+ Lib_TextureRect_IA8(&gMasterDisp,
+ sLevelTitleCard[levelIdx].titleCardTex + (sLevelTitleCard[levelIdx].titleCardWidth * i),
+ sLevelTitleCard[levelIdx].titleCardWidth, 1, x2, y2 + i, 1.0f, 1.0f);
}
if ((gSavedObjectLoadIndex == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
(gCurrentLevel != LEVEL_TRAINING)) {
- func_hud_80087788();
- func_hud_80084B94(0);
+ HUD_TeammateStatus_Draw();
+ HUD_TeamDownWrench_Draw(0);
}
if (gCurrentLevel != LEVEL_TRAINING) {
- func_hud_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]);
+ HUD_LivesCount1_Draw(132.0f, 124.0f, gLifeCount[gPlayerNum]);
}
}
-void func_hud_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5) {
- s32 var_s2;
+void HUD_Number_Draw(f32 xPos, f32 yPos, s32 k, f32 scale, bool skipLeadingZeroes, s32 maxNumber) {
+ bool shouldDraw;
s32 i;
s32 j;
-
- u8* D_800D1CD4[] = {
+ u8* sNumber[] = {
aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9,
};
- if (arg4 != 0) {
- var_s2 = false;
+ if (skipLeadingZeroes) {
+ shouldDraw = false;
} else {
- var_s2 = true;
+ shouldDraw = true;
}
- i = arg5 + 1;
+ i = maxNumber + 1;
k %= i;
for (i /= 10; i != 1; i /= 10) {
j = k / i;
- if ((j != 0) || (var_s2 == true)) {
- TextureRect_IA8(&gMasterDisp, D_800D1CD4[j], 16, 15, arg0, arg1, arg3, arg3);
- arg0 += 13.0f * arg3;
+ if ((j != 0) || (shouldDraw == true)) {
+ Lib_TextureRect_IA8(&gMasterDisp, sNumber[j], 16, 15, xPos, yPos, scale, scale);
+ xPos += 13.0f * scale;
k %= i;
- var_s2 = true;
+ shouldDraw = true;
}
}
- TextureRect_IA8(&gMasterDisp, D_800D1CD4[k], 16, 15, arg0, arg1, arg3, arg3);
+ Lib_TextureRect_IA8(&gMasterDisp, sNumber[k], 16, 15, xPos, yPos, scale, scale);
}
-void func_hud_80086C08(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+void HUD_MsgWindowBg_Draw2(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 128, 96);
gDPSetAlphaDither(gMasterDisp++, G_AD_DISABLE);
- TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
+ Lib_TextureRect_CI8(&gMasterDisp, aMsgWindowBgTex, aMsgWindowBgTLUT, 24, 17, xPos, yPos, xScale, yScale);
}
void HUD_DrawLevelStartStatusScreen(void) {
@@ -736,13 +739,13 @@ void HUD_DrawLevelStartStatusScreen(void) {
sp18 = 81.0f;
if (gLevelStartStatusScreenTimer != 0) {
- func_hud_80086C08(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f);
+ HUD_MsgWindowBg_Draw2(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f);
if (gCurrentLevel != LEVEL_TRAINING) {
- func_hud_80086C08(122.0f, 122.0f, 2.9f, 1.2f);
+ HUD_MsgWindowBg_Draw2(122.0f, 122.0f, 2.9f, 1.2f);
}
- func_hud_80086664(temp, sp18 - 24.0f);
+ HUD_TitleCard_Draw(temp, sp18 - 24.0f);
}
}
@@ -750,9 +753,9 @@ f32 D_800D1CFC = 0.0f;
void HUD_DrawLevelClearScreen(void) {
s32 i;
- s32 j;
- s32 temp;
- bool boolTemp;
+ s32 levelIdx;
+ LevelClearScreenState levelClearState;
+ MissionStatus missionStatus;
f32 x;
f32 y;
@@ -760,37 +763,36 @@ void HUD_DrawLevelClearScreen(void) {
gLevelClearScreenTimer--;
}
- boolTemp = gMissionStatus;
+ missionStatus = gMissionStatus;
if ((gCurrentLevel == LEVEL_TITANIA) || (gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_VENOM_1) ||
(gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_AREA_6) || (gCurrentLevel == LEVEL_AQUAS) ||
(gCurrentLevel == LEVEL_SOLAR)) {
- boolTemp = true;
+ missionStatus = MISSION_ACCOMPLISHED;
}
- temp = 0;
-
+ levelClearState = LEVEL_CLEAR_STATE_0;
if (gCurrentLevel == LEVEL_AQUAS) {
if (gLevelClearScreenTimer <= 100) {
- temp = 5;
+ levelClearState = LEVEL_CLEAR_STATE_5;
}
if (gLevelClearScreenTimer <= 96) {
- temp = 5;
+ levelClearState = LEVEL_CLEAR_STATE_5;
}
if (gLevelClearScreenTimer <= 92) {
- temp = 4;
+ levelClearState = LEVEL_CLEAR_STATE_4;
}
if (gLevelClearScreenTimer <= 87) {
- temp = 3;
+ levelClearState = LEVEL_CLEAR_STATE_3;
}
if (gLevelClearScreenTimer <= 82) {
- temp = 2;
+ levelClearState = LEVEL_CLEAR_STATE_2;
}
if (gLevelClearScreenTimer <= 77) {
- temp = 1;
+ levelClearState = LEVEL_CLEAR_STATE_1;
}
if (gLevelClearScreenTimer == 0) {
- temp = 0;
+ levelClearState = LEVEL_CLEAR_STATE_0;
}
if ((gLevelClearScreenTimer == 92) || (gLevelClearScreenTimer == 87) || (gLevelClearScreenTimer == 82) ||
@@ -799,30 +801,30 @@ void HUD_DrawLevelClearScreen(void) {
}
} else {
if (gLevelClearScreenTimer <= 100) {
- temp = 5;
+ levelClearState = LEVEL_CLEAR_STATE_5;
}
if (gLevelClearScreenTimer <= 90) {
- temp = 5;
+ levelClearState = LEVEL_CLEAR_STATE_5;
}
if (gLevelClearScreenTimer <= 80) {
- temp = 4;
+ levelClearState = LEVEL_CLEAR_STATE_4;
}
if (gLevelClearScreenTimer <= 72) {
- temp = 3;
+ levelClearState = LEVEL_CLEAR_STATE_3;
}
if (gLevelClearScreenTimer <= 64) {
- temp = 2;
+ levelClearState = LEVEL_CLEAR_STATE_2;
}
if (gLevelClearScreenTimer <= 56) {
- temp = 1;
+ levelClearState = LEVEL_CLEAR_STATE_1;
}
if (gLevelClearScreenTimer == 0) {
- temp = 0;
+ levelClearState = LEVEL_CLEAR_STATE_0;
}
if ((gLevelClearScreenTimer == 80) || (gLevelClearScreenTimer == 72) || (gLevelClearScreenTimer == 64) ||
(gLevelClearScreenTimer == 56)) {
- if (!boolTemp) {
+ if (missionStatus == MISSION_COMPLETE) {
AUDIO_PLAY_SFX(NA_SE_MISSION_COMPLETE, gDefaultSfxSource, 4);
} else {
AUDIO_PLAY_SFX(NA_SE_MISSION_ACCOMPLISHED, gDefaultSfxSource, 4);
@@ -830,7 +832,7 @@ void HUD_DrawLevelClearScreen(void) {
}
}
- switch (temp) {
+ switch (levelClearState) {
case 0:
D_800D1CFC = 330.0f;
break;
@@ -851,60 +853,60 @@ void HUD_DrawLevelClearScreen(void) {
break;
}
- j = func_hud_800863C8();
+ levelIdx = HUD_GetLevelIndex();
- if (temp != 0) {
+ if (levelClearState != LEVEL_CLEAR_STATE_0) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
x = 98.0f;
y = 64.0f;
}
- switch (temp) {
- case 1:
- if (boolTemp) {
+ switch (levelClearState) {
+ case LEVEL_CLEAR_STATE_1:
+ if (missionStatus != MISSION_COMPLETE) {
for (i = 0; i < 11; i++) {
- TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 2, x + 50.0f, y + 50.0f + (2 * i),
- 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 2, x + 50.0f,
+ y + 50.0f + (2 * i), 1.0f, 1.0f);
}
- TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i),
- 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i),
+ 1.0f, 1.0f);
} else {
for (i = 0; i < 10; i++) {
- TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i),
+ 1.0f, 1.0f);
}
- TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
+ 1.0f);
}
- case 2:
- if (boolTemp) {
+ case LEVEL_CLEAR_STATE_2:
+ if (missionStatus != MISSION_COMPLETE) {
for (i = 0; i < 11; i++) {
- TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 2, x - 62.0f, y + 50.0f + (2 * i),
- 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 2, x - 62.0f,
+ y + 50.0f + (2 * i), 1.0f, 1.0f);
}
- TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i),
+ 1.0f, 1.0f);
} else {
for (i = 0; i < 11; i++) {
- TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i),
+ 1.0f, 1.0f);
}
- TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
+ 1.0f);
}
- case 3:
- TextureRect_IA8(&gMasterDisp, aTextMISSION, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
+ case LEVEL_CLEAR_STATE_3:
+ Lib_TextureRect_IA8(&gMasterDisp, aTextMISSION, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
- case 4:
- TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x, y, 1.0f, 1.0f);
- TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x + 112.0f,
- y, 1.0f, 1.0f);
+ case LEVEL_CLEAR_STATE_4:
+ Lib_TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x, y, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[levelIdx].levelIdxTex, sLevelTitleCard[levelIdx].width,
+ sLevelTitleCard[levelIdx].height, x + 112.0f, y, 1.0f, 1.0f);
- case 5:
- func_hud_80086C08(30.0f + D_800D1CFC, 60.0f, 10.97f, 4.78f);
+ case LEVEL_CLEAR_STATE_5:
+ HUD_MsgWindowBg_Draw2(30.0f + D_800D1CFC, 60.0f, 10.97f, 4.78f);
break;
default:
@@ -912,9 +914,10 @@ void HUD_DrawLevelClearScreen(void) {
}
}
-void func_hud_80087530(f32 x, f32 y, s32 number) {
- u8* D_800D1D00[] = { D_arwing_3000000, D_blue_marine_3000000, D_landmaster_3000000 };
- u16* D_800D1D0C[] = { D_arwing_3000080, D_blue_marine_3000080, D_landmaster_3000080 };
+// Used in gameplay hud
+void HUD_LivesCount2_Draw(f32 x, f32 y, s32 number) {
+ u8* sLivesCounterTexs[] = { aArwingLifeIconTex, aBlueMarineLifeIconTex, aLandmasterLifeIconTex };
+ u16* sLivesCounterTLUTs[] = { aArwingLifeIconTLUT, aBlueMarineLifeIconTLUT, aLandmasterLifeIconTLUT };
Player* player = &gPlayer[0];
f32 x0;
f32 x1;
@@ -968,19 +971,19 @@ void func_hud_80087530(f32 x, f32 y, s32 number) {
}
x2 += (2 - i) * 4;
- TextureRect_CI4(&gMasterDisp, D_800D1D00[form], D_800D1D0C[form], 16, 16, x0, y0, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, x1, y1, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, sLivesCounterTexs[form], sLivesCounterTLUTs[form], 16, 16, x0, y0, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aXTex, aXTLUT, 16, 7, x1, y1, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplayHUDNumber(x2, y2, number);
}
-void func_hud_80087788(void) {
- u16* D_800D1D18[] = { D_10050E0, D_100BAC0, D_100D900, D_10032A0 };
- u8* D_800D1D28[] = { aTextPeppy, aTextSlippy, aTextFalco };
+void HUD_TeammateStatus_Draw(void) {
+ u16* sPortraitTex[] = { aFoxPortraitTex, aPeppyPortraitTex, aSlippyPortraitTex, aFalcoPortraitTex };
+ u8* sText[] = { aTextPeppy, aTextSlippy, aTextFalco };
s32 shield;
- s32 D_800D1D34[] = { 48, 56, 48 }; // width
- s32 D_800D1D40[] = { 10, 10, 8 }; // height
+ s32 sTextWidth[] = { 48, 56, 48 };
+ s32 sTextHeght[] = { 10, 10, 8 };
s32 i;
s32 j;
f32 x[3][3], y[3][3];
@@ -1007,12 +1010,11 @@ void func_hud_80087788(void) {
y[2][2] = y[1][2];
for (j = 0; j < 3; j++) {
-
- func_hud_80086C08(x[j][0] - 6.0f, y[j][1] - 1.0f, 2.4f, 0.7f);
+ HUD_MsgWindowBg_Draw2(x[j][0] - 6.0f, y[j][1] - 1.0f, 2.4f, 0.7f);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_IA8(&gMasterDisp, D_800D1D28[j], D_800D1D34[j], D_800D1D40[j], x[j][1], y[j][1], 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sText[j], sTextWidth[j], sTextHeght[j], x[j][1], y[j][1], 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
shield = gTeamShields[3 - j];
@@ -1024,17 +1026,17 @@ void func_hud_80087788(void) {
}
for (i = 0; i < 2; i++) {
- TextureRect_RGBA16(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * i), 44, 20, x[j][0],
- y[j][0] + (f32) (20 * i), 1.0f, 1.0f);
+ Lib_TextureRect_RGBA16(&gMasterDisp, sPortraitTex[j + 1] + (44 * 20 * i), 44, 20, x[j][0],
+ y[j][0] + (f32) (20 * i), 1.0f, 1.0f);
}
- TextureRect_RGBA16(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * 2), 44, 4, x[j][0], y[j][0] + 40.0f, 1.0f,
- 1.0f);
+ Lib_TextureRect_RGBA16(&gMasterDisp, sPortraitTex[j + 1] + (44 * 20 * 2), 44, 4, x[j][0], y[j][0] + 40.0f, 1.0f,
+ 1.0f);
- func_hud_80086110(x[j][2], y[j][2], shield);
+ HUD_TeamShields_Draw(x[j][2], y[j][2], shield);
}
}
-void HUD_DrawLevelClearStatusScreen(void) {
+void HUD_LevelClearStatusScreen_Draw(void) {
s32 i;
s32 temp;
f32 x0;
@@ -1052,12 +1054,12 @@ void HUD_DrawLevelClearStatusScreen(void) {
f32 y5;
f32 y6;
- if (gShowLevelClearStatusScreen == 0) {
+ if (gShowLevelClearStatusScreen == false) {
Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP);
D_801617C0[0] = 0;
}
- if ((gPlayState != PLAY_PAUSE) && (gShowLevelClearStatusScreen == 1) && (D_801617E8[0] == 0)) {
+ if ((gPlayState != PLAY_PAUSE) && (gShowLevelClearStatusScreen == true) && (D_801617E8[0] == 0)) {
switch (D_801617C0[0]) {
case 0:
D_801617C0[5] = gHitCount;
@@ -1076,7 +1078,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
D_801617C0[4] = gHitCount / 2;
D_801617C0[6] = 0;
- func_hud_800884E4();
+ HUD_SetMissionTeamStatus();
break;
case 1:
@@ -1153,7 +1155,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
D_801617E8[0] = 10;
D_801617C0[0]++;
} else {
- if (((gGameFrameCount % 2) == 0)) {
+ if ((gGameFrameCount % 2) == 0) {
AUDIO_PLAY_SFX(NA_SE_ONE_UP, gDefaultSfxSource, 4);
D_801617C0[3]++;
}
@@ -1175,7 +1177,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
D_801617C0[6]--;
}
- if (gShowLevelClearStatusScreen == 1) {
+ if (gShowLevelClearStatusScreen == true) {
x0 = 128.0f;
y0 = 30.0f;
@@ -1197,9 +1199,9 @@ void HUD_DrawLevelClearStatusScreen(void) {
x6 = x2 - 56.0f + 16.0f;
y6 = y3 + 18.0f;
- func_hud_80086C08(x0 - 4.0f, y0 - 4.0f, 2.9f, 3.6f);
- func_hud_80086C08(x3 - 4.0f, y3 - 4.0f, 10.0f, 1.0f);
- func_hud_80086C08(x6 - 12.0f, y6 + 8.0f, 5.2f, 1.0f);
+ HUD_MsgWindowBg_Draw2(x0 - 4.0f, y0 - 4.0f, 2.9f, 3.6f);
+ HUD_MsgWindowBg_Draw2(x3 - 4.0f, y3 - 4.0f, 10.0f, 1.0f);
+ HUD_MsgWindowBg_Draw2(x6 - 12.0f, y6 + 8.0f, 5.2f, 1.0f);
if (D_801617C0[1] < 0) {
D_801617C0[1] = 0;
@@ -1229,33 +1231,32 @@ void HUD_DrawLevelClearStatusScreen(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 90, 160, 200, 255);
- func_hud_800869A0(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, 0, 999);
+ HUD_Number_Draw(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, false, 999);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_IA8(&gMasterDisp, aTextEnemiesDown, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextEnemiesDown, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
- func_hud_800869A0(x1, y1 + 12.0f, D_801617C0[1], 1.0f, 1, 999);
+ HUD_Number_Draw(x1, y1 + 12.0f, D_801617C0[1], 1.0f, true, 999);
- TextureRect_IA8(&gMasterDisp, aTextAccumTotal, 128, 10, x3, y3, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextAccumTotal, 128, 10, x3, y3, 1.0f, 1.0f);
- func_hud_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999);
+ HUD_Number_Draw(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, true, 9999);
if ((D_801617C0[6] % 2) == 0) {
- func_hud_80087530(232.0f, 90.0f, D_801617C0[3]);
+ HUD_LivesCount2_Draw(232.0f, 90.0f, D_801617C0[3]);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_IA8(&gMasterDisp, aTextStatusOfTeam, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aTextStatusOfTeam, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
- func_hud_80087788();
- func_hud_80084B94(0);
- func_hud_8008B5B0(20.0f, 18.0f);
+ HUD_TeammateStatus_Draw();
+ HUD_TeamDownWrench_Draw(0);
+ HUD_PlayerShieldGauge_Draw(20.0f, 18.0f);
}
}
-
-void func_hud_800884E4(void) {
+void HUD_SetMissionTeamStatus(void) {
s32 mask;
s32 i;
@@ -1272,7 +1273,7 @@ void func_hud_800884E4(void) {
}
}
-void func_hud_80088564(void) {
+void HUD_Bolse_Area6_SaveData(void) {
PlanetId planetId;
if ((gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_AREA_6)) {
@@ -1317,74 +1318,75 @@ void HUD_DrawStatusScreens(void) {
}
HUD_DrawLevelStartStatusScreen();
HUD_DrawLevelClearScreen();
- HUD_DrawLevelClearStatusScreen();
+ HUD_LevelClearStatusScreen_Draw();
}
-s32 func_hud_800886B8(void) {
- s32 var_v1 = 0;
- f32 var_fv1 = gInputPress->stick_y;
+s32 HUD_PauseScreenInput(void) {
+ s32 ret = 0;
+ f32 stickY = gInputPress->stick_y;
- if ((var_fv1 != 0.0f) && (D_80161810[4] != 0)) {
+ if ((stickY != 0.0f) && (sPauseScreenIwork[4] != 0)) {
return 0;
}
- D_80161810[4] = 0;
+ sPauseScreenIwork[4] = 0;
- if (fabsf(var_fv1) < 30.0f) {
- var_fv1 = 0.0f;
+ if (fabsf(stickY) < 30.0f) {
+ stickY = 0.0f;
}
- if (var_fv1 != 0.0f) {
- if (D_80161810[2] == 0) {
- if (var_fv1 > 0) {
- var_v1 = 1;
+ if (stickY != 0.0f) {
+ if (sPauseScreenIwork[2] == 0) {
+ if (stickY > 0) {
+ ret = 1;
} else {
- var_v1 = -1;
+ ret = -1;
}
- D_80161810[2] = 1;
+ sPauseScreenIwork[2] = 1;
}
} else {
- D_80161810[2] = 0;
+ sPauseScreenIwork[2] = 0;
}
- return var_v1;
+
+ return ret;
}
-void func_hud_80088784(s32 arg0) {
- Gfx* D_800D1D4C[] = {
+void HUD_LoseLifeExplosion_Draw(s32 animFrames) {
+ Gfx* sLoseLifePlanetAnimDLs[] = {
D_BG_PLANET_200B630, D_BG_PLANET_200A5A0, D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0,
D_BG_PLANET_2006360, D_BG_PLANET_200C6C0, D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0,
D_BG_PLANET_2002120, D_BG_PLANET_2001090, D_BG_SPACE_2000000, D_BG_PLANET_2010A30, D_BG_PLANET_20101A0,
D_BG_PLANET_200F910, D_BG_PLANET_200F080, D_BG_PLANET_200E7F0,
};
- Gfx* D_800D1D94[] = {
+ Gfx* sLoseLifeSpaceAnimDLs[] = {
D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10, D_BG_SPACE_2004480,
D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240, D_BG_SPACE_20019B0,
D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000,
};
- s32 D_800D1DC8[] = {
+ s32 sLoseLifePrimColors[] = {
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 200, 150, 100, 50,
};
- if (arg0 != 0) {
- arg0--;
+ if (animFrames != 0) {
+ animFrames--;
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
- gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1DC8[arg0]);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sLoseLifePrimColors[animFrames]);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 3.9f, -3.3f, -100.0f, MTXF_NEW);
Matrix_Scale(gGfxMatrix, 0.37f, 0.37f, 0.37f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
if (gLevelType == LEVELTYPE_PLANET) {
- gSPDisplayList(gMasterDisp++, D_800D1D4C[arg0]);
+ gSPDisplayList(gMasterDisp++, sLoseLifePlanetAnimDLs[animFrames]);
} else {
- gSPDisplayList(gMasterDisp++, D_800D1D94[arg0]);
+ gSPDisplayList(gMasterDisp++, sLoseLifeSpaceAnimDLs[animFrames]);
}
Matrix_Pop(&gGfxMatrix);
}
}
-void func_hud_80088970(void) {
+void HUD_PauseScreen_Update(void) {
s32 i;
s32 j;
Player* player;
@@ -1398,50 +1400,52 @@ void func_hud_80088970(void) {
s32 temp;
s32 ret;
- D_80161838[0]++;
+ sPauseScreenTimer[0]++;
if (gPlayState != PLAY_PAUSE) {
- D_80161838[0] = 0;
- D_80161838[1] = 0;
+ sPauseScreenTimer[0] = 0;
+ sPauseScreenTimer[1] = 0;
// clang-format off
- for(i = 0; i < 5; i++) { D_80161810[i] = 0; }
+ for (i = 0; i < 5; i++) { \
+ sPauseScreenIwork[i] = 0;
+ }
// clang-format on
- D_80161810[4] = 1;
+ sPauseScreenIwork[4] = 1;
}
- if (D_80161810[0] >= 2) {
+ if (sPauseScreenIwork[0] >= 2) {
gPauseEnabled = false;
}
player = &gPlayer[gPlayerNum];
if ((gPlayState == PLAY_PAUSE) && (gLevelStartStatusScreenTimer == 0) && !gVersusMode) {
- switch (D_80161810[0]) {
+ switch (sPauseScreenIwork[0]) {
case 0:
- D_80161838[0] = 0;
- D_80161810[1] = 0;
- D_80161810[0] = 1;
+ sPauseScreenTimer[0] = 0;
+ sPauseScreenIwork[1] = 0;
+ sPauseScreenIwork[0] = 1;
break;
case 1:
- ret = func_hud_800886B8();
+ ret = HUD_PauseScreenInput();
if (ret != 0) {
- D_80161838[0] = 0;
- if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) {
- D_80161810[1] ^= 1;
+ sPauseScreenTimer[0] = 0;
+ if (((ret > 0) && (sPauseScreenIwork[1] == 1)) || ((ret < 0) && (sPauseScreenIwork[1] == 0))) {
+ sPauseScreenIwork[1] ^= 1;
AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
}
}
if (gInputPress->button & B_BUTTON) {
- D_80161810[0] = 10;
+ sPauseScreenIwork[0] = 10;
}
if (gInputPress->button & A_BUTTON) {
- if (D_80161810[1] == 0) {
- D_80161810[0] = 10;
+ if (sPauseScreenIwork[1] == 0) {
+ sPauseScreenIwork[0] = 10;
} else {
- D_80161810[0] = 2;
+ sPauseScreenIwork[0] = 2;
}
}
break;
@@ -1468,13 +1472,13 @@ void func_hud_80088970(void) {
gFillScreenAlpha = 255;
if (gLifeCount[gPlayerNum] == 0) {
- D_80161810[0] = 3;
+ sPauseScreenIwork[0] = 3;
} else {
- D_80161810[0] = 3;
+ sPauseScreenIwork[0] = 3;
}
- D_80161838[1] = 0;
- D_80161838[0] = 0;
+ sPauseScreenTimer[1] = 0;
+ sPauseScreenTimer[0] = 0;
case 3:
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0, 0, 0, 255);
@@ -1496,29 +1500,29 @@ void func_hud_80088970(void) {
} else {
if (gFillScreenAlpha == 0) {
if (gLevelType == LEVELTYPE_PLANET) {
- if (D_80161838[1] == 0) {
+ if (sPauseScreenTimer[1] == 0) {
Audio_PlayDeathSequence();
}
- if (D_80161838[1] == 10) {
+ if (sPauseScreenTimer[1] == 10) {
gLifeCount[gPlayerNum]--;
}
- D_80161838[1]++;
- if (D_80161838[1] > 18) {
- D_80161810[0] = 4;
- D_80161838[1] = 0;
+ sPauseScreenTimer[1]++;
+ if (sPauseScreenTimer[1] > 18) {
+ sPauseScreenIwork[0] = 4;
+ sPauseScreenTimer[1] = 0;
}
} else {
- if (D_80161838[1] == 0) {
+ if (sPauseScreenTimer[1] == 0) {
Audio_PlayDeathSequence();
}
- if (D_80161838[1] == 6) {
+ if (sPauseScreenTimer[1] == 6) {
gLifeCount[gPlayerNum]--;
}
- D_80161838[1]++;
- if (D_80161838[1] > 13) {
- D_80161810[0] = 4;
- D_80161838[1] = 0;
+ sPauseScreenTimer[1]++;
+ if (sPauseScreenTimer[1] > 13) {
+ sPauseScreenIwork[0] = 4;
+ sPauseScreenTimer[1] = 0;
}
}
}
@@ -1527,7 +1531,7 @@ void func_hud_80088970(void) {
case 4:
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, 0, 0, 0, 255);
- if (D_80161838[0] < 140) {
+ if (sPauseScreenTimer[0] < 140) {
break;
}
@@ -1539,7 +1543,7 @@ void func_hud_80088970(void) {
if (gFillScreenAlpha > 255) {
gFillScreenAlpha = 255;
}
- if (D_80161838[0] < 160) {
+ if (sPauseScreenTimer[0] < 160) {
break;
}
@@ -1584,11 +1588,12 @@ void func_hud_80088970(void) {
}
}
- if ((D_80161810[3] == 0) && (gPlayState == PLAY_PAUSE) && !gVersusMode && (gLevelStartStatusScreenTimer == 0)) {
- switch (D_80161810[0]) {
+ if ((sPauseScreenIwork[3] == 0) && (gPlayState == PLAY_PAUSE) && !gVersusMode &&
+ (gLevelStartStatusScreenTimer == 0)) {
+ switch (sPauseScreenIwork[0]) {
case 0:
case 1:
- j = func_hud_800863C8();
+ j = HUD_GetLevelIndex();
x0 = 140.0f;
y0 = 92.0f + 4.0f;
@@ -1596,10 +1601,10 @@ void func_hud_80088970(void) {
x1 = x0 - 28.0f;
y1 = y0 + 18.0f;
- x2 = 160.0f - (D_800D1AEC[j].unk_10 / 2.0f);
+ x2 = 160.0f - (sLevelTitleCard[j].titleCardWidth / 2.0f);
y2 = y0 - 40.0f;
- func_hud_80086C08(69.0f, y2 - 4.0f, 7.6f, 2.1f);
+ HUD_MsgWindowBg_Draw2(69.0f, y2 - 4.0f, 7.6f, 2.1f);
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
@@ -1640,17 +1645,18 @@ void func_hud_80088970(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- for (i = 0; i < D_800D1AEC[j].unk_14; i++) {
- TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i),
- D_800D1AEC[j].unk_10, 1, x2, y2 + i, 1.0f, 1.0f);
+ for (i = 0; i < sLevelTitleCard[j].titleCardHeight; i++) {
+ Lib_TextureRect_IA8(&gMasterDisp,
+ sLevelTitleCard[j].titleCardTex + (sLevelTitleCard[j].titleCardWidth * i),
+ sLevelTitleCard[j].titleCardWidth, 1, x2, y2 + i, 1.0f, 1.0f);
}
- func_hud_80086C08(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f);
+ HUD_MsgWindowBg_Draw2(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
- if (D_80161810[1] == 0) {
- temp = (D_80161838[0] % 20);
+ if (sPauseScreenIwork[1] == 0) {
+ temp = (sPauseScreenTimer[0] % 20);
if (temp >= 10) {
temp = 20 - temp;
}
@@ -1662,10 +1668,10 @@ void func_hud_80088970(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 64, 64, 255);
}
- TextureRect_IA8(&gMasterDisp, D_1000000, 64, 10, x0 - 12.0f, y0, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_1000000, 64, 10, x0 - 12.0f, y0, 1.0f, 1.0f);
- if (D_80161810[1] == 1) {
- temp = (D_80161838[0] % 20);
+ if (sPauseScreenIwork[1] == 1) {
+ temp = (sPauseScreenTimer[0] % 20);
if (temp >= 10) {
temp = 20 - temp;
}
@@ -1678,26 +1684,26 @@ void func_hud_80088970(void) {
}
if (gCurrentLevel == LEVEL_TRAINING) {
- TextureRect_IA8(&gMasterDisp, D_TR_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_TR_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
} else {
if (gLifeCount[gPlayerNum]) {
- TextureRect_IA8(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
} else {
- TextureRect_IA8(&gMasterDisp, D_1000640, 96, 22, x1, y1, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_1000640, 96, 22, x1, y1, 1.0f, 1.0f);
}
}
if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) {
- func_hud_80087788();
- func_hud_80084B94(0);
+ HUD_TeammateStatus_Draw();
+ HUD_TeamDownWrench_Draw(0);
}
break;
case 3:
case 4:
if (gCurrentLevel != LEVEL_TRAINING) {
- func_hud_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]);
- func_hud_80088784(D_80161838[1]);
+ HUD_LivesCount1_Draw(132.0f, 124.0f, gLifeCount[gPlayerNum]);
+ HUD_LoseLifeExplosion_Draw(sPauseScreenTimer[1]);
}
break;
@@ -1707,50 +1713,50 @@ void func_hud_80088970(void) {
}
}
-void func_hud_80089670(void) {
+void HUD_RadarMark_Item_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 18.64f, 21.04f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
-void func_hud_80089710(void) {
+void HUD_RadarMark_Enemy_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
}
-void func_hud_800897B0(void) {
+void HUD_RadarMark_Boss_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 130.0f, 130.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024830);
+ gSPDisplayList(gMasterDisp++, aRadarMarkBossDL);
}
-void func_hud_80089850(void) {
+void HUD_RadarMark_KaSaucerer_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 125.0f, 125.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
}
-void func_hud_800898F0(void) {
+void HUD_RadarMark_Missile_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_1);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 208, 80, 255);
Matrix_Scale(gGfxMatrix, 30.0f, 30.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_SZ_6004570);
+ gSPDisplayList(gMasterDisp++, aSzMissileRadarMarkDL);
}
f32 D_800D1E10 = 0.0f;
-void func_hud_80089994(s32 arg0) {
- s32 D_800D1E14[][4] = {
+void HUD_RadarMark_Arwing_Draw(s32 colorIdx) {
+ s32 arwingMarkColor[][4] = {
{ 177, 242, 12, 255 }, { 89, 121, 6, 128 }, { 90, 90, 255, 255 }, { 45, 45, 128, 128 },
{ 0, 179, 67, 255 }, { 0, 90, 34, 128 }, { 255, 30, 0, 255 }, { 128, 15, 0, 128 },
};
@@ -1766,14 +1772,14 @@ void func_hud_80089994(s32 arg0) {
}
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
- gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D1E14[arg0][0], D_800D1E14[arg0][1], D_800D1E14[arg0][2],
- D_800D1E14[arg0][3]);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, arwingMarkColor[colorIdx][0], arwingMarkColor[colorIdx][1],
+ arwingMarkColor[colorIdx][2], arwingMarkColor[colorIdx][3]);
Matrix_Scale(gGfxMatrix, var_fv1, var_fv2, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1015510);
+ gSPDisplayList(gMasterDisp++, aRadarMarkArwingDL);
}
-void func_hud_80089AF4(void) {
+void HUD_RadarMark_StarWolf_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, MTXF_APPLY);
@@ -1781,15 +1787,15 @@ void func_hud_80089AF4(void) {
gSPDisplayList(gMasterDisp++, aStarWolfRadarMarkDL);
}
-void func_hud_80089B94(void) {
+void HUD_RadarMark_Katt_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 92, 92, 255);
Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_D0098B0);
+ gSPDisplayList(gMasterDisp++, aKattRadarMarkDL);
}
-void func_hud_80089C38(void) {
+void HUD_RadarMark_Supplies_Draw(void) {
s32 alpha;
RCP_SetupDL(&gMasterDisp, SETUPDL_12);
@@ -1807,111 +1813,113 @@ void func_hud_80089C38(void) {
gSPDisplayList(gMasterDisp++, D_1024230);
}
-void func_hud_80089D28(void) {
- s32 gb;
+void HUD_RadarMissileAlarm_Draw(void) {
+ s32 colorGB;
RCP_SetupDL(&gMasterDisp, SETUPDL_1);
- gb = gGameFrameCount % 21;
+ colorGB = gGameFrameCount % 21;
- if (gb > 10) {
- gb = 20 - gb;
+ if (colorGB > 10) {
+ colorGB = 20 - colorGB;
}
- gb *= 25.5f;
+ colorGB *= 25.5f;
- if ((gb == 10) || (gb == 0)) {
- // clang-format off
- //! FAKE: Probably a MACRO
- if (1) {AUDIO_PLAY_SFX(NA_SE_MISSILE_ALARM, gDefaultSfxSource, 4);}
- // clang-format on
+ // clang-format off
+ if ((colorGB == 10) || (colorGB == 0)) { \
+ AUDIO_PLAY_SFX(NA_SE_MISSILE_ALARM, gDefaultSfxSource, 4);
}
+ // clang-format on
- gDPSetPrimColor(gMasterDisp++, 0, 0, 255, gb, gb, 255);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
Matrix_Translate(gGfxMatrix, 0.0f, -185.92001f, 0, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 3.55f, 0.13f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024230);
}
-void HUD_RadarMark_Draw(s32 arg0) {
- s32 var_a1;
- s32 var_a1_2;
+void HUD_RadarMark_Draw(s32 type) {
+ s32 arwingMarkColor;
+ s32 playernum;
- switch (arg0) {
- case 0:
- case 1:
- case 2:
- case 3:
- var_a1_2 = var_a1 = arg0;
- if (gCamCount != 1) {
- if (arg0 == 1) {
- var_a1 = 3;
+ switch (type) {
+ case RADARMARK_FOX:
+ case RADARMARK_FALCO:
+ case RADARMARK_SLIPPY:
+ case RADARMARK_PEPPY:
+ playernum = arwingMarkColor = type;
+
+ if (gCamCount != 1) { // Multiplayer
+ if (type == RADARMARK_FALCO) {
+ arwingMarkColor = 3;
}
- if (arg0 == 3) {
- var_a1 = 1;
+ if (type == RADARMARK_PEPPY) {
+ arwingMarkColor = 1;
}
- if (gPlayer[arg0].state_1C8 == PLAYERSTATE_1C8_VS_STANDBY) {
+ if (gPlayer[type].state_1C8 == PLAYERSTATE_1C8_VS_STANDBY) {
break;
}
}
- if ((var_a1_2 == gPlayerNum) && (gGameFrameCount & 2)) {
- var_a1 = (var_a1 * 2) + 1;
+
+ if ((playernum == gPlayerNum) && (gGameFrameCount & 2)) {
+ arwingMarkColor = (arwingMarkColor * 2) + 1;
} else {
- var_a1 = var_a1 * 2;
+ arwingMarkColor = arwingMarkColor * 2;
}
- func_hud_80089994(var_a1);
+
+ HUD_RadarMark_Arwing_Draw(arwingMarkColor);
break;
- case 4:
- case 5:
- case 6:
- case 7:
- func_hud_80089AF4();
+ case RADARMARK_WOLF:
+ case RADARMARK_LEON:
+ case RADARMARK_PIGMA:
+ case RADARMARK_ANDREW:
+ HUD_RadarMark_StarWolf_Draw();
break;
- case 8:
- func_hud_80089B94();
+ case RADARMARK_KATT:
+ HUD_RadarMark_Katt_Draw();
break;
- case 100:
- func_hud_800898F0();
+ case RADARMARK_MISSILE:
+ HUD_RadarMark_Missile_Draw();
break;
- case 101:
- func_hud_80089850();
+ case RADARMARK_KA_SAUCERER:
+ HUD_RadarMark_KaSaucerer_Draw();
break;
- case 102:
- func_hud_800897B0();
+ case RADARMARK_BOSS:
+ HUD_RadarMark_Boss_Draw();
break;
- case 103:
+ case RADARMARK_SUPPIES:
if (gVersusMode == true) {
- func_hud_80089670();
+ HUD_RadarMark_Item_Draw();
} else {
- func_hud_80089C38();
+ HUD_RadarMark_Supplies_Draw();
}
break;
- case 200:
- case 201:
- func_hud_80089670();
+ case RADARMARK_ITEM_1:
+ case RADARMARK_ITEM_2:
+ HUD_RadarMark_Item_Draw();
break;
- case 999:
+ case RADARMARK_NOTHING:
break;
default:
- func_hud_80089710();
+ HUD_RadarMark_Enemy_Draw();
break;
}
}
-void func_hud_8008A07C(f32 x, f32 y) {
- f32 D_800D1E94[] = { 20.0f, 180.0f, 20.0f, 180.0f };
- f32 D_800D1EA4[] = { 72.0f, 72.0f, 192.0f, 192.0f };
+void HUD_RadarWindow_Draw(f32 x, f32 y) {
+ f32 sVsRadarWindowXpos[] = { 20.0f, 180.0f, 20.0f, 180.0f };
+ f32 sVsRadarWindowYpos[] = { 72.0f, 72.0f, 192.0f, 192.0f };
f32 xPos;
f32 yPos;
f32 xScale;
@@ -1919,14 +1927,14 @@ void func_hud_8008A07C(f32 x, f32 y) {
f32 xScale1;
f32 yScale1;
- if (gCamCount != 1) {
- xPos = D_800D1E94[gPlayerNum];
- yPos = D_800D1EA4[gPlayerNum];
+ if (gCamCount != 1) { // Versus mode
+ xPos = sVsRadarWindowXpos[gPlayerNum];
+ yPos = sVsRadarWindowYpos[gPlayerNum];
xScale = 1.21f;
yScale = 1.69f;
xScale1 = 0.70f;
yScale1 = 0.70f;
- } else {
+ } else { // Simple player mode
xPos = x - 32.0f;
yPos = y - 14.0f;
xScale = 2.98f;
@@ -1937,13 +1945,12 @@ void func_hud_8008A07C(f32 x, f32 y) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170);
- func_hud_800853A4(xPos + 1.0f, yPos + 1.0f, xScale, yScale);
-
+ HUD_MsgWindowBg_Draw(xPos + 1.0f, yPos + 1.0f, xScale, yScale);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_80085404(xPos, yPos, xScale1, yScale1);
+ HUD_RadarWindowFrame_Draw(xPos, yPos, xScale1, yScale1);
}
-void func_hud_8008A240(void) {
+void HUD_RadarMarks_Setup(void) {
s32 i;
Item* item;
@@ -1951,7 +1958,7 @@ void func_hud_8008A240(void) {
if (gPlayer[i].state_1C8 == PLAYERSTATE_1C8_NEXT) {
continue;
}
- gRadarMarks[i].status = 1;
+ gRadarMarks[i].enabled = true;
gRadarMarks[i].type = i;
gRadarMarks[i].yRot = gPlayer[i].yRot_114 + gPlayer[i].rot.y;
gRadarMarks[i].pos.z = gPlayer[i].trueZpos;
@@ -1961,7 +1968,7 @@ void func_hud_8008A240(void) {
continue;
}
- if (gVersusMode && gVersusStage == VS_STAGE_SECTOR_Z) {
+ if (gVersusMode && (gVersusStage == VS_STAGE_SECTOR_Z)) {
continue;
}
@@ -1978,10 +1985,10 @@ void func_hud_8008A240(void) {
}
}
- if (gVersusMode == 1) {
- for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) {
+ if (gVersusMode == true) {
+ for (i = 0, item = &gItems[0]; i < ARRAY_COUNT(gItems); i++, item++) {
if (item->obj.status >= OBJ_ACTIVE) {
- gRadarMarks[item->index + 50].status = 1;
+ gRadarMarks[item->index + 50].enabled = true;
gRadarMarks[item->index + 50].type = 103;
gRadarMarks[item->index + 50].pos.x = item->obj.pos.x;
gRadarMarks[item->index + 50].pos.y = item->obj.pos.y;
@@ -1992,7 +1999,7 @@ void func_hud_8008A240(void) {
}
}
-s32 func_hud_8008A4DC(void) {
+s32 HUD_RadarMarks_Update(void) {
s32 i;
f32 scale;
f32 x1;
@@ -2066,7 +2073,7 @@ s32 func_hud_8008A4DC(void) {
y = 162.000f;
x1 += D_800D1E10 * temp3;
} else {
- if (!gVsMatchStart || (D_versus_80178750 != 0)) {
+ if (!gVsMatchStart || gVsMatchOver) {
return 0;
}
temp2 = 13000.00f;
@@ -2077,8 +2084,8 @@ s32 func_hud_8008A4DC(void) {
y1 = -166.00f;
}
- func_hud_8008A240();
- func_hud_8008A07C(x, y);
+ HUD_RadarMarks_Setup();
+ HUD_RadarWindow_Draw(x, y);
if (!gVersusMode &&
((gCurrentLevel == LEVEL_SECTOR_Z) || (gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2) ||
@@ -2089,15 +2096,15 @@ s32 func_hud_8008A4DC(void) {
switch (gCurrentLevel) {
case LEVEL_SECTOR_Z:
- TextureRect_IA8(&gMasterDisp, D_SZ_60012D0, 16, 9, 251.0f + D_800D1E10, 181.0f, 1.00f, 1.00f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_SZ_60012D0, 16, 9, 251.0f + D_800D1E10, 181.0f, 1.00f, 1.00f);
break;
case LEVEL_FORTUNA:
- TextureRect_IA8(&gMasterDisp, D_FO_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_FO_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
case LEVEL_BOLSE:
- TextureRect_IA8(&gMasterDisp, D_BO_6000C80, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_BO_6000C80, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
case LEVEL_SECTOR_Y:
@@ -2108,16 +2115,16 @@ s32 func_hud_8008A4DC(void) {
if ((y < 150.0f) || (y > 206.0f)) {
break;
}
- TextureRect_IA8(&gMasterDisp, D_SY_6000840, 64, 64, 250.0f + D_800D1E10, temp, 0.25f, 0.25f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_SY_6000840, 64, 64, 250.0f + D_800D1E10, temp, 0.25f, 0.25f);
}
break;
case LEVEL_KATINA:
- TextureRect_IA8(&gMasterDisp, D_KA_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_KA_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f);
break;
case LEVEL_VENOM_2:
- TextureRect_IA8(&gMasterDisp, D_VE2_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_VE2_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
}
}
@@ -2127,13 +2134,13 @@ s32 func_hud_8008A4DC(void) {
if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_hud_80161710 != 0)) {
Matrix_Push(&gGfxMatrix);
- func_hud_80089D28();
+ HUD_RadarMissileAlarm_Draw();
Matrix_Pop(&gGfxMatrix);
D_hud_80161710--;
}
for (i = ARRAY_COUNT(gRadarMarks) - 1; i >= 0; i--) {
- if ((gRadarMarks[i].status == 0) || (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f)) ||
+ if ((gRadarMarks[i].enabled == 0) || (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f)) ||
(fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f))) {
continue;
}
@@ -2152,34 +2159,33 @@ s32 func_hud_8008A4DC(void) {
HUD_RadarMark_Draw(gRadarMarks[i].type);
Matrix_Pop(&gGfxMatrix);
- gRadarMarks[i].status = 0;
+ gRadarMarks[i].enabled = false;
}
Matrix_Pop(&gGfxMatrix);
return 0;
}
-// Why is this function here in fox_hud? Weird.
-s32 ActorMissileSeek_ModeCheck(s32 missileSeekMode) {
+s32 ActorMissileSeek_ModeCheck(ActorMissileSeekMode mode) {
Actor* actor;
s32 i;
s32 ret = 0;
for (i = 0, actor = &gActors[0]; i < 60; i++, actor++) {
- switch (missileSeekMode) {
- case 0: // follows teammates
+ switch (mode) {
+ case MISSILE_SEEK_TEAMMATES:
if ((actor->obj.status == OBJ_ACTIVE) && (actor->obj.id == OBJ_MISSILE_SEEK_TEAM)) {
ret++;
}
break;
- case 1: // follows player
+ case MISSILE_SEEK_PLAYER:
if ((actor->obj.status == OBJ_ACTIVE) && (actor->obj.id == OBJ_MISSILE_SEEK_PLAYER)) {
ret++;
}
break;
- case 2: // follows either
+ case MISSILE_SEEK_EITHER:
if (((actor->obj.id == OBJ_MISSILE_SEEK_TEAM) || (actor->obj.id == OBJ_MISSILE_SEEK_PLAYER)) &&
(actor->obj.status == OBJ_ACTIVE)) {
ret++;
@@ -2244,7 +2250,7 @@ void HUD_RadioCharacterName_Draw(void) {
}
}
-void func_hud_8008B044(void) {
+void HUD_IncomingMsg_Update(void) {
switch (D_80161798) {
case 0:
if (gCallTimer == 0) {
@@ -2280,34 +2286,35 @@ void func_hud_8008B044(void) {
}
}
-void func_hud_8008B1B0(void) {
- f32 temp = 142.0f;
- f32 temp2 = 18.0f;
+void HUD_IncomingMsg_Draw(void) {
+ f32 xPos = 142.0f;
+ f32 yPos = 18.0f;
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
switch (D_80161790 / 2) {
case 3:
- func_hud_8008556C(temp + 31.0f, temp2);
+ HUD_IncomingMsgSignal3_Draw(xPos + 31.0f, yPos);
case 2:
- func_hud_80085514(temp + 24.0f, temp2);
+ HUD_IncomingMsgSignal2_Draw(xPos + 24.0f, yPos);
case 1:
- func_hud_800854BC(temp + 18.0f, temp2);
+ HUD_IncomingMsgSignal1_Draw(xPos + 18.0f, yPos);
case 0:
- func_hud_80085464(temp, temp2);
+ HUD_IncomingMsgButton_Draw(xPos, yPos);
break;
+
default:
break;
}
}
-void func_hud_8008B2A4(void) {
+void HUD_IncomingMsg(void) {
if (gPlayState != PLAY_PAUSE) {
- func_hud_8008B044();
+ HUD_IncomingMsg_Update();
}
if (gCallTimer != 0) {
- func_hud_8008B1B0();
+ HUD_IncomingMsg_Draw();
}
}
@@ -2315,7 +2322,7 @@ s32 D_800D1EB4 = 255;
s32 D_800D1EB8 = 255;
s32 D_800D1EBC = 255;
-void func_hud_8008B2F0(void) {
+void HUD_PlayerShieldGauge_Update(void) {
f32 shields;
switch (D_hud_80161730) {
@@ -2377,77 +2384,78 @@ void func_hud_8008B2F0(void) {
}
}
-void func_hud_8008B5B0(f32 x, f32 y) {
+void HUD_PlayerShieldGauge_Draw(f32 x, f32 y) {
RCP_SetupDL(&gMasterDisp, SETUPDL_75);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_800856C0(x + 8.0f, y + 2.0f, D_801617A8, 1.0f, D_801617AC);
+ HUD_ShieldGaugeBars_Draw(x + 8.0f, y + 2.0f, D_801617A8, 1.0f, D_801617AC);
+
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D1EB4, D_800D1EB8, D_800D1EBC, 255);
- func_hud_80085618(x, y, 1.0f, 1.0f);
- func_hud_800855C4(x + 7.0f + (D_801617A8 * 6.0f * 8.0f), y, 1.0f, 1.0f);
- func_hud_8008566C(x + 7.0f, y, D_801617A8 * 6.0f, 1.0f);
+ HUD_ShieldGaugeEdgeLeft_Draw(x, y, 1.0f, 1.0f);
+ HUD_ShieldGaugeEdgeRight_Draw(x + 7.0f + (D_801617A8 * 6.0f * 8.0f), y, 1.0f, 1.0f);
+ HUD_ShieldGaugeFrame_Draw(x + 7.0f, y, D_801617A8 * 6.0f, 1.0f);
}
-void func_hud_8008B734(void) {
- func_hud_8008B2F0();
- func_hud_8008B5B0(20.0f, 18.0f);
- func_hud_80085944();
+void HUD_PlayerShield_GoldRings(void) {
+ HUD_PlayerShieldGauge_Update();
+ HUD_PlayerShieldGauge_Draw(20.0f, 18.0f);
+ HUD_GoldRings_Draw();
}
-s32 func_hud_8008B774(void) {
+s32 HUD_RadioDamage_Type(void) {
s32 i;
s32 ret = 0;
s32 temp;
switch (gCurrentRadioPortrait) {
- case 0:
- case 1:
+ case RCID_FOX:
+ case RCID_FOX + 1:
i = 0;
break;
- case 10:
- case 11:
+ case RCID_FALCO:
+ case RCID_FALCO + 1:
temp = 1;
i = 1;
break;
- case 20:
- case 21:
+ case RCID_SLIPPY:
+ case RCID_SLIPPY + 1:
temp = 2;
i = 2;
break;
- case 30:
- case 31:
+ case RCID_PEPPY:
+ case RCID_PEPPY + 1:
temp = 3;
i = 3;
break;
- case 240:
- case 241:
- case 200:
- case 201:
+ case RCID_WOLF:
+ case RCID_WOLF + 1:
+ case RCID_WOLF_2:
+ case RCID_WOLF_2 + 1:
i = 4;
break;
- case 260:
- case 261:
- case 220:
- case 221:
+ case RCID_LEON:
+ case RCID_LEON + 1:
+ case RCID_LEON_2:
+ case RCID_LEON_2 + 1:
i = 5;
break;
- case 250:
- case 251:
- case 210:
- case 211:
+ case RCID_PIGMA:
+ case RCID_PIGMA + 1:
+ case RCID_PIGMA_2:
+ case RCID_PIGMA_2 + 1:
i = 6;
break;
- case 270:
- case 271:
- case 230:
- case 231:
+ case RCID_ANDREW:
+ case RCID_ANDREW + 1:
+ case RCID_ANDREW_2:
+ case RCID_ANDREW_2 + 1:
i = 7;
break;
@@ -2478,12 +2486,14 @@ s32 func_hud_8008B774(void) {
}
switch (i) {
+ // Fox
case 0:
if (gPlayer[0].radioDamageTimer != 0) {
ret = 1;
}
break;
+ // Star Wolf
case 4:
case 5:
case 6:
@@ -2502,6 +2512,7 @@ s32 func_hud_8008B774(void) {
case 9:
break;
+ // Teammates
default:
if (gActors[i].timer_0C6 != 0) {
ret = 1;
@@ -2512,8 +2523,8 @@ s32 func_hud_8008B774(void) {
return ret;
}
-void func_hud_8008B9E8(void) {
- s32 temp;
+void HUD_RadioDamage_Update(void) {
+ s32 radioDamageType;
// clang-format off
if ((D_8016178C != 0) && (D_8016178C != 1)) { D_8016178C--; }
@@ -2526,11 +2537,11 @@ void func_hud_8008B9E8(void) {
if ((D_80161788 == 0) && (D_8016178C == 0)) {
if ((gRadioState >= 4) && (gCurrentRadioPortrait != RCID_STATIC) &&
(gCurrentRadioPortrait != RCID_STATIC + 1)) {
- temp = func_hud_8008B774();
- if (temp == 1) {
+ radioDamageType = HUD_RadioDamage_Type();
+ if (radioDamageType == RCID_FOX + 1) {
D_80161788 = 20;
}
- if (temp == 2) {
+ if (radioDamageType == RCID_STATIC) {
D_8016178C = 60;
}
} else {
@@ -2544,7 +2555,7 @@ void func_hud_8008B9E8(void) {
}
}
-void func_hud_8008BAE4(void) {
+void HUD_RadioDamage_Draw(void) {
s32 r;
s32 g;
s32 b;
@@ -2567,80 +2578,79 @@ void func_hud_8008BAE4(void) {
Matrix_Translate(gGfxMatrix, -53.9f, -38.5f, -139.4f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_800D1A40);
+ gSPDisplayList(gMasterDisp++, sRadioDamageDL);
Matrix_Pop(&gGfxMatrix);
}
}
-void func_hud_8008BC80(void) {
+void HUD_RadioDamage(void) {
if (gPlayState != PLAY_PAUSE) {
- func_hud_8008B9E8();
- func_hud_8008BAE4();
+ HUD_RadioDamage_Update();
+ HUD_RadioDamage_Draw();
}
}
-s32 func_hud_8008BCBC(s32 arg0) {
- s32 temp = 10;
- s32 ret;
+s32 HUD_CountDigits(s32 number) {
+ s32 threshold = 10;
+ s32 digitCount;
- if (arg0 < 0) {
- arg0 = (s64) -arg0;
+ if (number < 0) {
+ number *= -1; // Convert to absolute value if negative
}
- ret = 1;
-
- while (arg0 >= temp) {
- ret++;
- temp *= 10;
+ for (digitCount = 1; threshold <= number; digitCount++) {
+ threshold *= 10;
}
- return ret;
+ return digitCount;
}
-void func_hud_8008BD00(u8* texturePtr, s32 xPos, s32 yPos, u8 arg3) {
+void HUD_Texture_Scroll(u8* texturePtr, s32 xPos, s32 yPos, u8 type) {
u8* texture = SEGMENTED_TO_VIRTUAL(texturePtr);
- u8 temp;
+ u8 pixel;
s32 x;
s32 y;
- switch (arg3) {
- case 0:
+ switch (type) {
+ case 0: // Upwards vertical scroll
for (x = 0; x < xPos; x++) {
- temp = texture[x];
+ pixel = texture[x];
for (y = 1; y < yPos; y++) {
texture[(y - 1) * xPos + x] = texture[y * xPos + x];
}
- texture[(yPos - 1) * xPos + x] = temp;
+ texture[(yPos - 1) * xPos + x] = pixel;
}
break;
- case 1:
+ case 1: // Downwards vertical scroll
for (x = 0; x < xPos; x++) {
- temp = texture[(yPos - 1) * xPos + x];
+ pixel = texture[(yPos - 1) * xPos + x];
for (y = yPos - 2; y >= 0; y--) {
texture[(y + 1) * xPos + x] = texture[y * xPos + x];
}
- texture[x] = temp;
+ texture[x] = pixel;
}
break;
- case 2:
+ case 2: // Right horizontal scroll
for (y = 0; y < yPos; y++) {
- temp = texture[y * xPos + xPos - 1];
+ pixel = texture[y * xPos + xPos - 1];
for (x = xPos - 2; x >= 0; x--) {
texture[y * xPos + x + 1] = texture[y * xPos + x];
}
- texture[y * xPos] = temp;
+ texture[y * xPos] = pixel;
}
break;
- case 3:
+ case 3: // Left horizontal scroll
for (y = 0; y < yPos; y++) {
- temp = texture[y * xPos];
+ pixel = texture[y * xPos];
// clang-format off
- for (x = 1; x < xPos; x++) { texture[y * xPos + x - 1] = texture[y * xPos + x]; }
+ for (x = 1; x < xPos; x++) { \
+ texture[y * xPos + x - 1] = texture[y * xPos + x];
+ }
+ texture[(y * xPos) + xPos - 1] = pixel;
// clang-format on
- texture[(y * xPos) + xPos - 1] = temp;
}
break;
@@ -2649,7 +2659,7 @@ void func_hud_8008BD00(u8* texturePtr, s32 xPos, s32 yPos, u8 arg3) {
}
}
-void func_hud_8008C104(u16* srcTexture, u16* dstTexture) {
+void HUD_Texture_Wave(u16* srcTexture, u16* dstTexture) {
u16 *src, *dst;
u16 buffer[1024];
f32 rowPhase;
@@ -2664,7 +2674,7 @@ void func_hud_8008C104(u16* srcTexture, u16* dstTexture) {
src = SEGMENTED_TO_VIRTUAL(srcTexture);
dst = SEGMENTED_TO_VIRTUAL(dstTexture);
- Texture_Scroll(srcTexture, width, height, 1);
+ Lib_Texture_Scroll(srcTexture, width, height, 1);
halfHeight = height / 2;
@@ -2692,7 +2702,7 @@ void func_hud_8008C104(u16* srcTexture, u16* dstTexture) {
src[(((halfHeight - offset) + (halfHeight - 1)) * width) + j];
}
}
- Texture_Mottle(dst, buffer, 2);
+ Lib_Texture_Mottle(dst, buffer, 2);
}
void HUD_DisplaySmallNumber(f32 xPos, f32 yPos, f32 scale, s32 number) {
@@ -2704,34 +2714,35 @@ void HUD_DisplaySmallNumber(f32 xPos, f32 yPos, f32 scale, s32 number) {
for (i = 10; i != 1; i /= 10) {
if ((xPos > 0.0f) && (yPos > 0.0f)) {
- TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
+ Lib_TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
}
xPos += 9.0f * scale;
number %= i;
}
if ((xPos > 0.0f) && (yPos > 0.0f)) {
- TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
+ Lib_TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
}
}
-void func_hud_8008C5C8(f32 arg0, f32 arg1, f32 arg2, s32 arg3) {
- u16* D_800D1EE8[] = {
- D_10050E0,
- D_100BAC0,
- D_100D900,
- D_10032A0,
+void HUD_VsModePortraitTex_Draw(f32 xPos, f32 yPos, f32 scale, s32 idx) {
+ u16* sVsModeFaceDL[] = {
+ aFoxPortraitTex,
+ aPeppyPortraitTex,
+ aSlippyPortraitTex,
+ aFalcoPortraitTex,
};
s32 i;
for (i = 0; i < 2; i++) {
- TextureRect_RGBA16(&gMasterDisp, D_800D1EE8[arg3] + (44 * 20 * i), 44, 20, arg0, (20 * i * arg2) + arg1, arg2,
- arg2);
+ Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[idx] + (44 * 20 * i), 44, 20, xPos, (20 * i * scale) + yPos,
+ scale, scale);
}
- TextureRect_RGBA16(&gMasterDisp, D_800D1EE8[arg3] + 44 * 20 * 2, 44, 4, arg0, (40.0f * arg2) + arg1, arg2, arg2);
+ Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[idx] + 44 * 20 * 2, 44, 4, xPos, (40.0f * scale) + yPos, scale,
+ scale);
}
-void func_hud_8008C6F4(s32 idx, s32 arg1) {
+void HUD_EdgeArrows_Draw(s32 idx, bool arg1) {
f32 D_800D1EF8[] = { 0.0f, 0.0f, -9.0f, 9.0f, 10.0f, 10.0f, 10.0f, 10.0f, 0.0f, 0.0f, -8.0f, 8.0f };
f32 D_800D1F28[] = { -7.0f, 7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 8.0f, -8.0f, 0.0f, 0.0f };
f32 D_800D1F58[] = {
@@ -2752,7 +2763,7 @@ void func_hud_8008C6F4(s32 idx, s32 arg1) {
Matrix_RotateZ(gGfxMatrix, M_DTOR * D_800D1F88[idx], MTXF_APPLY);
}
- if (arg1 != 0) {
+ if (arg1) {
Matrix_Translate(gGfxMatrix, D_800D1EF8[idx] + D_800D1FE8[idx], D_800D1F28[idx] + D_800D2018[idx],
D_800D1F58[idx], MTXF_APPLY);
} else {
@@ -2765,12 +2776,12 @@ void func_hud_8008C6F4(s32 idx, s32 arg1) {
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 150);
- gSPDisplayList(gMasterDisp++, D_1024990);
+ gSPDisplayList(gMasterDisp++, aArrowDL);
Matrix_Pop(&gGfxMatrix);
}
-void HUD_DrawEdgeArrows(void) {
+void HUD_EdgeArrows_Update(void) {
s32 D_800D2048[] = {
0x80, 0x40, 0x20, 0x10, 8 | 2, 8 | 1, 4 | 2, 4 | 1, 8, 4, 2, 1,
};
@@ -2789,30 +2800,31 @@ void HUD_DrawEdgeArrows(void) {
j = (D_800D2048[i] ^ 0xFF) & j;
if (gGameFrameCount & 4) {
- func_hud_8008C6F4(i, 0);
+ HUD_EdgeArrows_Draw(i, false);
}
if ((gGameFrameCount - 2) & 4) {
- func_hud_8008C6F4(i, 1);
+ HUD_EdgeArrows_Draw(i, true);
}
}
- func_hud_8008BD00(D_1024A58, 8, 8, 2);
+ HUD_Texture_Scroll(D_1024A58, 8, 8, 2);
}
}
-s32 HUD_dummy_8008CB8C(void) {
+// Unused
+s32 HUD_8008CB8C(void) {
return 0;
}
-void func_hud_8008CB98(f32 arg0, f32 arg1, f32 arg2) {
- TextureRect_IA8(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2);
+void HUD_StarTex_Draw(f32 arg0, f32 arg1, f32 arg2) {
+ Lib_TextureRect_IA8(&gMasterDisp, aVsStarTex, 8, 8, arg0, arg1, arg2, arg2);
}
-void func_hud_8008CBE4(void) {
- f32 D_800D2078[] = { 62.0f, 222.0f, 62.0f, 222.0f }; // X
- f32 D_800D2088[] = { 86.0f, 86.0f, 206.0f, 206.0f }; // Y
- s32 D_800D2098[] = { 177, 255, 0, 30 }; // R
- s32 D_800D20A8[] = { 242, 30, 179, 30 }; // G
- s32 D_800D20B8[] = { 12, 0, 67, 255 }; // B
+void HUD_KillCountStars_Update(void) {
+ f32 xPos[] = { 62.0f, 222.0f, 62.0f, 222.0f };
+ f32 yPos[] = { 86.0f, 86.0f, 206.0f, 206.0f };
+ s32 r[] = { 177, 255, 0, 30 };
+ s32 g[] = { 242, 30, 179, 30 };
+ s32 b[] = { 12, 0, 67, 255 };
s32 i;
s32 j;
@@ -2866,45 +2878,46 @@ void func_hud_8008CBE4(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_77);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- gDPSetEnvColor(gMasterDisp++, D_800D2098[j], D_800D20A8[j], D_800D20B8[j], 0);
+ gDPSetEnvColor(gMasterDisp++, r[j], g[j], b[j], 0);
- func_hud_8008CB98(D_800D2078[gPlayerNum] + (i * 9.0f), D_800D2088[gPlayerNum], 1.0f);
+ HUD_StarTex_Draw(xPos[gPlayerNum] + (i * 9.0f), yPos[gPlayerNum], 1.0f);
}
break;
}
}
-void func_hud_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void HUD_VS_ShieldGaugeFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
s32 i;
for (i = 0; i < 3; i++) {
- TextureRect_IA8(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
- arg2, arg3);
+ Lib_TextureRect_IA8(&gMasterDisp, aVsShieldGaugeFrameTex + 2 * ((80 * 8 * i) / 2), 80, 8, xPos,
+ (8 * i * yScale) + yPos, xScale, yScale);
}
- TextureRect_IA8(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
- arg3);
+ Lib_TextureRect_IA8(&gMasterDisp, aVsShieldGaugeFrameTex + 2 * ((80 * 8 * i) / 2), 80, 2, xPos,
+ (8 * i * yScale) + yPos, xScale, yScale);
}
-void func_hud_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
- u32 var_t8 = 48.0f * arg4;
+void HUD_VS_ShieldGaugeTex_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale, f32 width) {
+ u32 xWidth = 48.0f * width;
- func_hud_80084E78(&gMasterDisp, D_versus_300D440, D_versus_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
+ TextureRect_CI8_2(&gMasterDisp, aVsShieldGaugeTex, aVsShieldGaugeTLUT, 48, 4, xPos, yPos, xScale, yScale, xWidth,
+ 4);
}
-void func_hud_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, arg0, arg1, arg2, arg3);
+void HUD_VS_BombIcon_Draw(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, arg0, arg1, arg2, arg3);
}
-void func_hud_8008D250(void) {
- f32 D_800D20C8[] = { 113.0f, 273.0f, 113.0f, 273.0f };
- f32 D_800D20D8[] = { 79.0f, 79.0f, 199.0f, 199.0f };
+void HUD_VsModePortrait_Draw(void) {
+ f32 faceXpos[] = { 113.0f, 273.0f, 113.0f, 273.0f };
+ f32 faceYpos[] = { 79.0f, 79.0f, 199.0f, 199.0f };
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_8008C5C8(D_800D20C8[gPlayerNum], D_800D20D8[gPlayerNum], 0.54f, gPlayerNum);
+ HUD_VsModePortraitTex_Draw(faceXpos[gPlayerNum], faceYpos[gPlayerNum], 0.54f, gPlayerNum);
}
-void func_hud_8008D31C(void) {
+void HUD_VS_ShieldGauge_Draw(void) {
f32 D_800D20E8[] = { 60.0f, 220.0f, 60.0f, 220.0f };
f32 D_800D20F8[] = { 78.0f, 78.0f, 198.0f, 198.0f };
@@ -2912,20 +2925,20 @@ void func_hud_8008D31C(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_8008D0DC(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f,
- D_800D19E0[gPlayerNum]);
+ HUD_VS_ShieldGaugeTex_Draw(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f,
+ D_800D19E0[gPlayerNum]);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_8008CFB8(D_800D20E8[gPlayerNum], D_800D20F8[gPlayerNum], 1.0f, 1.0f);
+ HUD_VS_ShieldGaugeFrame_Draw(D_800D20E8[gPlayerNum], D_800D20F8[gPlayerNum], 1.0f, 1.0f);
}
-void func_hud_8008D4F0(f32 arg0, f32 arg1) {
- f32 D_800D2108[] = {
+void HUD_BoostGauge_Draw(f32 xPos, f32 yPos) {
+ f32 boostGaugeXpos[] = {
110.0f, 270.0f, 110.0f, 270.0f, 0.0f,
};
- f32 D_800D211C[] = {
+ f32 boostGaugeYpos[] = {
16.0f, 16.0f, 136.0f, 136.0f, 0.0f,
};
f32 temp_fv0;
@@ -2935,20 +2948,20 @@ void func_hud_8008D4F0(f32 arg0, f32 arg1) {
f32 temp;
f32 sp60;
s32 temp_t9;
- s32 var_v1;
+ s32 playerNum;
if (gVersusMode) {
temp = 2.0f;
sp60 = 1.0f;
- var_v1 = gPlayerNum;
+ playerNum = gPlayerNum;
sp68 = 24.0f;
} else {
temp = 2.0f;
sp60 = 2.0f;
sp68 = 40.0f;
- var_v1 = 4;
- D_800D2108[var_v1] = arg0;
- D_800D211C[var_v1] = arg1;
+ playerNum = 4; // index for Single Player
+ boostGaugeXpos[playerNum] = xPos;
+ boostGaugeYpos[playerNum] = yPos;
}
temp_fs0 = gPlayer[gPlayerNum].boostMeter * (1.0f / 90.0f);
@@ -2957,64 +2970,68 @@ void func_hud_8008D4F0(f32 arg0, f32 arg1) {
temp2 = sp68 * temp_fs0;
if (!gPlayer[gPlayerNum].boostCooldown) {
- Math_SmoothStepToF(&D_800D19AC[var_v1], 255.0f, 0.4f, 100.0f, 0.01f);
+ Math_SmoothStepToF(&D_800D19AC[playerNum], 255.0f, 0.4f, 100.0f, 0.01f);
} else {
- Math_SmoothStepToF(&D_800D19AC[var_v1], 100.0f, 0.4f, 100.0f, 0.01f);
+ Math_SmoothStepToF(&D_800D19AC[playerNum], 100.0f, 0.4f, 100.0f, 0.01f);
}
- temp_t9 = D_800D19AC[var_v1];
+ temp_t9 = D_800D19AC[playerNum];
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, temp_t9, temp_t9, temp_t9, 255);
if (temp_fv0 > 0.01f) {
- func_hud_80085890(D_800D2108[var_v1] + temp + temp2, D_800D211C[var_v1] + sp60, temp_fv0, 1.0f);
+ HUD_BoostGaugeCool_Draw(boostGaugeXpos[playerNum] + temp + temp2, boostGaugeYpos[playerNum] + sp60, temp_fv0,
+ 1.0f);
}
if (temp_fs0 > 0.01f) {
- func_hud_800857DC(D_800D2108[var_v1] + temp + 1.0f, D_800D211C[var_v1] + sp60, temp_fs0, 1.0f);
+ HUD_BoostGaugeOverheat_Draw(boostGaugeXpos[playerNum] + temp + 1.0f, boostGaugeYpos[playerNum] + sp60, temp_fs0,
+ 1.0f);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_80085740(D_800D2108[var_v1], D_800D211C[var_v1], 1.0f, 1.0f);
+ HUD_BoostGaugeFrame_Draw(boostGaugeXpos[playerNum], boostGaugeYpos[playerNum], 1.0f, 1.0f);
}
-void func_hud_8008D7F4(void) {
- s32 D_800D2130[] = { 146, 165, 146, 165 };
- s32 D_800D2140[] = { 106, 106, 125, 125 };
- s32 D_800D2150[] = { 177, 255, 0, 30 };
- s32 D_800D2160[] = { 242, 30, 179, 30 };
- s32 D_800D2170[] = { 12, 0, 67, 255 };
+void HUD_VS_PlayerNumber_Draw(void) {
+ s32 playerNumberXpos[] = { 146, 165, 146, 165 };
+ s32 playerNumberYpos[] = { 106, 106, 125, 125 };
+ s32 playerNumberR[] = { 177, 255, 0, 30 };
+ s32 playerNumberG[] = { 242, 30, 179, 30 };
+ s32 playerNumberB[] = { 12, 0, 67, 255 };
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
- gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D2150[gPlayerNum], D_800D2160[gPlayerNum], D_800D2170[gPlayerNum], 255);
- Graphics_DisplayHUDNumber(D_800D2130[gPlayerNum], D_800D2140[gPlayerNum], gPlayerNum + 1);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, playerNumberR[gPlayerNum], playerNumberG[gPlayerNum],
+ playerNumberB[gPlayerNum], 255);
+ Graphics_DisplayHUDNumber(playerNumberXpos[gPlayerNum], playerNumberYpos[gPlayerNum], gPlayerNum + 1);
}
-s32 D_800D2180[4] = { 0, 0, 0, 0 };
-s32 D_800D2190[4] = { 0, 0, 0, 0 };
+s32 sVsSavedBombCount[4] = { 0, 0, 0, 0 }; // Set but not used
+s32 sVsBombCountFlashTimer[4] = { 0, 0, 0, 0 };
f32 D_800D21A0 = 255.0f;
f32 D_800D21A4 = 0.0f;
-void func_hud_8008D984(void) {
- s32 D_800D21A8[] = { 146, 165, 146, 165 };
- s32 D_800D21B8[] = { 94, 94, 137, 137 };
+void HUD_VS_BombCount_Draw(void) {
+ s32 bombIconXpos[] = { 146, 165, 146, 165 };
+ s32 bombIconYpos[] = { 94, 94, 137, 137 };
- if (gBombCount[gPlayerNum] != D_800D2180[gPlayerNum]) {
- D_800D2180[gPlayerNum] = gBombCount[gPlayerNum];
+ if (gBombCount[gPlayerNum] != sVsSavedBombCount[gPlayerNum]) {
+ sVsSavedBombCount[gPlayerNum] = gBombCount[gPlayerNum];
if (gBombCount[gPlayerNum] == 0) {
- D_800D2190[gPlayerNum] = 0;
+ sVsBombCountFlashTimer[gPlayerNum] = 0;
} else {
- D_800D2190[gPlayerNum] = 30;
+ sVsBombCountFlashTimer[gPlayerNum] = 30;
}
}
- if (D_800D2190[gPlayerNum] != 0) {
- D_800D2190[gPlayerNum]--;
+ if (sVsBombCountFlashTimer[gPlayerNum] != 0) {
+ sVsBombCountFlashTimer[gPlayerNum]--;
}
- if (((D_800D2190[gPlayerNum] & 2) != 0) || ((D_800D2190[gPlayerNum] == 0) && (gBombCount[gPlayerNum] != 0))) {
+ if (((sVsBombCountFlashTimer[gPlayerNum] & 2) != 0) ||
+ ((sVsBombCountFlashTimer[gPlayerNum] == 0) && (gBombCount[gPlayerNum] != 0))) {
RCP_SetupDL_78();
if (gBombCount[gPlayerNum] >= 2) {
if (Math_SmoothStepToF(&D_800D21A4, D_800D21A0, 0.4f, 100.0f, 0.1f) == 0.0f) {
@@ -3028,38 +3045,38 @@ void func_hud_8008D984(void) {
D_800D21A4 = 255.0f;
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D21A4);
- func_hud_8008D1F0(D_800D21A8[gPlayerNum], D_800D21B8[gPlayerNum], 1.0f, 1.0f);
+ HUD_VS_BombIcon_Draw(bombIconXpos[gPlayerNum], bombIconYpos[gPlayerNum], 1.0f, 1.0f);
}
}
-void func_hud_8008DC34(void) {
- if (gVsMatchStart && (D_versus_80178750 == 0)) {
- func_hud_8008D250();
- func_hud_8008D7F4();
- func_hud_8008D4F0(0, 0);
- func_hud_8008D31C();
- func_hud_8008D984();
+void HUD_VS_DrawHUD(void) {
+ if (gVsMatchStart && !gVsMatchOver) {
+ HUD_VsModePortrait_Draw();
+ HUD_VS_PlayerNumber_Draw();
+ HUD_BoostGauge_Draw(0, 0);
+ HUD_VS_ShieldGauge_Draw();
+ HUD_VS_BombCount_Draw();
}
- if (D_versus_80178750 == 0) {
- func_hud_8008CBE4();
+ if (!gVsMatchOver) {
+ HUD_KillCountStars_Update();
}
}
-void func_hud_8008DCB0(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4) {
+void HUD_VS_X_Draw(f32 xPos, f32 yPos, s32 r, s32 g, s32 b) {
RCP_SetupDL_78();
- gDPSetPrimColor(gMasterDisp++, 0, 0, arg2, arg3, arg4, D_hud_80161708);
- TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0, arg1, 1.0f, 1.0f);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, D_hud_80161708);
+ Lib_TextureRect_CI4(&gMasterDisp, aXTex, aXTLUT, 16, 7, xPos, yPos, 1.0f, 1.0f);
}
-void func_hud_8008DD78(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) {
+void HUD_VS_LivesCount_Draw(f32 xPos, f32 yPos, s32 number, s32 r, s32 g, s32 b) {
RCP_SetupDL_78();
- gDPSetPrimColor(gMasterDisp++, 0, 0, arg3, arg4, arg5, D_hud_80161708);
+ gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, D_hud_80161708);
- if (arg2 >= 10) {
- Graphics_DisplayHUDNumber((s32) arg0 - (func_hud_8008BCBC(arg2) * 8) + 11, arg1, arg2);
+ if (number >= 10) {
+ Graphics_DisplayHUDNumber((s32) xPos - (HUD_CountDigits(number) * 8) + 11, yPos, number);
} else {
- Graphics_DisplayHUDNumber(arg0, arg1, arg2);
+ Graphics_DisplayHUDNumber(xPos, yPos, number);
}
}
@@ -3091,10 +3108,10 @@ void HUD_DrawBossHealth(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_CI4(&gMasterDisp, D_1011A40, D_1011AB0, 32, 7, temp2, temp3, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, D_1011A40, D_1011AB0, 32, 7, temp2, temp3, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
- TextureRect_IA8(&gMasterDisp, D_1002040, 40, 12, sp3C, temp1, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_1002040, 40, 12, sp3C, temp1, 1.0f, 1.0f);
if (sp3C >= 25.0f) {
Math_SmoothStepToF(&D_801616C4, 0.88f, 0.3f, 0.2f, 0.1f);
@@ -3103,7 +3120,7 @@ void HUD_DrawBossHealth(void) {
if ((D_801616C4 >= 0.1f) && (sp3C >= 25.0f)) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_CI8(&gMasterDisp, D_10129C0, D_1013090, 16, 109, temp4, temp5, 1.0f, D_801616C4);
+ Lib_TextureRect_CI8(&gMasterDisp, D_10129C0, D_1013090, 16, 109, temp4, temp5, 1.0f, D_801616C4);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
@@ -3126,7 +3143,7 @@ void HUD_DrawBossHealth(void) {
temp6 = sp3C + 8.0f;
temp7 = 101.0f - ((2200.0f / 69.0f) * D_801616C8) + temp1;
if (D_801616C8 > 0.0f) {
- TextureRect_RGBA16(&gMasterDisp, D_Tex_800D99F8, 32, 32, temp6, temp7, 0.2f, D_801616C8);
+ Lib_TextureRect_RGBA16(&gMasterDisp, D_Tex_800D99F8, 32, 32, temp6, temp7, 0.2f, D_801616C8);
}
}
} else {
@@ -3157,7 +3174,8 @@ void HUD_DisplayCountdown(f32 xPos, f32 yPos, s32* countdown, f32 scale) {
if ((i % 2) != 0) {
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * scale) + xPos, yPos, scale, scale);
+ Lib_TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * scale) + xPos, yPos, scale,
+ scale);
} else {
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@@ -3169,7 +3187,7 @@ void HUD_DisplayCountdown(f32 xPos, f32 yPos, s32* countdown, f32 scale) {
}
void HUD_DrawCountdown(s32* countdown, f32 scale) {
- //! FAKE:
+ //! FAKE: Weird control flow
if (1) {}
if (gPlayState != PLAY_PAUSE) {
@@ -3197,83 +3215,83 @@ void HUD_DrawCountdown(s32* countdown, f32 scale) {
}
}
-void func_hud_8008E5E8(void) {
+void HUD_Radar(void) {
if (gVersusMode) {
- func_hud_8008DC34();
+ HUD_VS_DrawHUD();
}
- func_hud_8008A4DC();
+ HUD_RadarMarks_Update();
}
-void func_hud_8008E620(f32 arg0, f32 arg1) {
+void HUD_Hitpoints_Update(f32 xPos, f32 yPos) {
f32 r;
f32 g;
f32 b;
- s32 ret;
+ bool medalStatus;
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_METEO:
- ret = Play_CheckMedalStatus(200);
+ medalStatus = Play_CheckMedalStatus(200);
break;
case LEVEL_FORTUNA:
- ret = Play_CheckMedalStatus(50);
+ medalStatus = Play_CheckMedalStatus(50);
break;
case LEVEL_SECTOR_X:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_TITANIA:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_BOLSE:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_SECTOR_Y:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_KATINA:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_SOLAR:
- ret = Play_CheckMedalStatus(100);
+ medalStatus = Play_CheckMedalStatus(100);
break;
case LEVEL_MACBETH:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_AQUAS:
- ret = Play_CheckMedalStatus(150);
+ medalStatus = Play_CheckMedalStatus(150);
break;
case LEVEL_ZONESS:
- ret = Play_CheckMedalStatus(250);
+ medalStatus = Play_CheckMedalStatus(250);
break;
case LEVEL_SECTOR_Z:
- ret = Play_CheckMedalStatus(100);
+ medalStatus = Play_CheckMedalStatus(100);
break;
case LEVEL_AREA_6:
- ret = Play_CheckMedalStatus(300);
+ medalStatus = Play_CheckMedalStatus(300);
break;
case LEVEL_VENOM_ANDROSS:
case LEVEL_VENOM_2:
- ret = Play_CheckMedalStatus(200);
+ medalStatus = Play_CheckMedalStatus(200);
break;
default:
- ret = false;
+ medalStatus = false;
break;
}
@@ -3281,9 +3299,9 @@ void func_hud_8008E620(f32 arg0, f32 arg1) {
gMedalFlashTimer--;
}
- if (ret != gMedalStatus) {
+ if (medalStatus != gMedalStatus) {
gMedalFlashTimer = 30;
- gMedalStatus = ret;
+ gMedalStatus = medalStatus;
}
if ((gMedalFlashTimer % 2) != 0) {
@@ -3291,7 +3309,7 @@ void func_hud_8008E620(f32 arg0, f32 arg1) {
g = 255;
b = 255;
} else {
- if (ret != 0) {
+ if (medalStatus) {
r = 200;
g = 100;
b = 50;
@@ -3301,121 +3319,123 @@ void func_hud_8008E620(f32 arg0, f32 arg1) {
b = 200;
}
}
+
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255);
- func_hud_80094D20(arg0, arg1);
+ HUD_Hitpoints_Draw(xPos, yPos);
}
-void func_hud_8008E9EC(f32 arg0, f32 arg1) {
- func_hud_8008E620(arg0, arg1);
- func_hud_8008B734();
+void HUD_Shield_GoldRings_HitPoints(f32 xPos, f32 yPos) {
+ HUD_Hitpoints_Update(xPos, yPos);
+ HUD_PlayerShield_GoldRings();
}
-void func_hud_8008EA14(f32 x, f32 y) {
+void HUD_BombCounter_Draw(f32 x, f32 y) {
s32 i;
s32 sp68;
f32 temp_fv0;
f32 temp;
+ // Max bombs
if (gBombCount[gPlayerNum] > 9) {
gBombCount[gPlayerNum] = 9;
}
- switch (D_800D19F8) {
- case 0:
- D_800D19F4 = gBombCount[gPlayerNum];
+ switch (sBombCounterState) {
+ case BOMB_COUNTER_INIT:
+ sHudBombCount = gBombCount[gPlayerNum];
sp68 = 0;
- D_800D19F8 = 1;
+ sBombCounterState = BOMB_COUNTER_STATE_1;
D_80161770 = D_80161774 = D_80161778 = 255.0f;
D_8016177C = D_80161780 = D_80161784 = 255.0f;
break;
- case 1:
- temp_fv0 = gBombCount[gPlayerNum] - D_800D19F4;
+ case BOMB_COUNTER_STATE_1:
+ temp_fv0 = gBombCount[gPlayerNum] - sHudBombCount;
if (temp_fv0 > 0.0f) {
- D_800D19F4++;
- if (D_800D19F4 > 5) {
+ sHudBombCount++;
+ if (sHudBombCount > 5) {
sp68 = 0;
break;
}
- if (D_800D19F4 == 5) {
+ if (sHudBombCount == 5) {
D_800D19F0 = 0.0f;
sp68 = 4;
- D_800D19F8 = 6;
+ sBombCounterState = BOMB_COUNTER_STATE_6;
break;
} else {
D_800D19F0 = 0.0f;
sp68 = 3;
- D_800D19F8 = 5;
+ sBombCounterState = BOMB_COUNTER_STATE_5;
}
break;
}
if (temp_fv0 < 0.0f) {
- D_800D19F8 = 2;
+ sBombCounterState = BOMB_COUNTER_STATE_2;
}
sp68 = 0;
break;
- case 2:
- D_800D19F4--;
+ case BOMB_COUNTER_STATE_2:
+ sHudBombCount--;
sp68 = 0;
- D_800D19F8 = 1;
- if (D_800D19F4 <= 3) {
+ sBombCounterState = BOMB_COUNTER_STATE_1;
+ if (sHudBombCount <= 3) {
D_800D19F0 = 0.0f;
sp68 = 2;
- D_800D19F8 = 4;
+ sBombCounterState = BOMB_COUNTER_STATE_4;
break;
}
- if (D_800D19F4 == 4) {
+ if (sHudBombCount == 4) {
D_800D19F0 = 0.0f;
sp68 = 1;
- D_800D19F8 = 3;
+ sBombCounterState = BOMB_COUNTER_STATE_3;
break;
}
break;
- case 3:
+ case BOMB_COUNTER_STATE_3:
sp68 = 1;
if (Math_SmoothStepToF(&D_800D19F0, 10.0f, 0.3f, 10.0f, 0.1f) == 0.0f) {
- D_800D19F8 = 1;
+ sBombCounterState = BOMB_COUNTER_STATE_1;
D_800D19F0 = 10.0f;
sp68 = 1;
}
break;
- case 4:
+ case BOMB_COUNTER_STATE_4:
sp68 = 2;
if (Math_SmoothStepToF(&D_800D19F0, 10.0f, 0.3f, 10.0f, 0.1f) == 0.0f) {
- D_800D19F8 = 1;
+ sBombCounterState = BOMB_COUNTER_STATE_1;
D_800D19F0 = 10.0f;
sp68 = 2;
}
break;
- case 5:
+ case BOMB_COUNTER_STATE_5:
sp68 = 3;
- if (Math_SmoothStepToF(&D_800D19F0, 20.0f + ((D_800D19F4 - 1) * 10), 0.3f, 10.0f, 0.001f) == 0.0f) {
- D_800D19F8 = 1;
- D_800D19F0 = 20.0f + ((D_800D19F4 - 1) * 10);
+ if (Math_SmoothStepToF(&D_800D19F0, 20.0f + ((sHudBombCount - 1) * 10), 0.3f, 10.0f, 0.001f) == 0.0f) {
+ sBombCounterState = BOMB_COUNTER_STATE_1;
+ D_800D19F0 = 20.0f + ((sHudBombCount - 1) * 10);
sp68 = 3;
}
break;
- case 6:
+ case BOMB_COUNTER_STATE_6:
sp68 = 4;
if (Math_SmoothStepToF(&D_800D19F0, 10.0f, 0.3f, 10.0f, 0.1f) == 0.0f) {
- D_800D19F8 = 7;
+ sBombCounterState = BOMB_COUNTER_STATE_7;
D_800D19F0 = 0.0f;
sp68 = 5;
}
break;
- case 7:
+ case BOMB_COUNTER_STATE_7:
sp68 = 5;
if (0.0f == Math_SmoothStepToF(&D_800D19F0, 12.0f, 0.3f, 10.0f, 5.0f)) {
- D_800D19F8 = 1;
+ sBombCounterState = BOMB_COUNTER_STATE_1;
D_800D19F0 = 0.0f;
sp68 = 0;
}
@@ -3445,86 +3465,96 @@ void func_hud_8008EA14(f32 x, f32 y) {
switch (sp68) {
case 0:
- if (D_800D19F4 >= 5) {
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
- func_hud_8008DCB0(x + 14.0f, y + 2.0f, D_8016177C, D_80161780, D_80161784);
- func_hud_8008DD78(x + 29.0f, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784);
+ if (sHudBombCount >= 5) {
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x, y, 1.0f, 1.0f);
+ HUD_VS_X_Draw(x + 14.0f, y + 2.0f, D_8016177C, D_80161780, D_80161784);
+ HUD_VS_LivesCount_Draw(x + 29.0f, y + 1.0f, sHudBombCount, D_8016177C, D_80161780, D_80161784);
} else {
- for (i = (D_800D19F4 - 1); i >= 0; i--) {
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
+ for (i = (sHudBombCount - 1); i >= 0; i--) {
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (30.0f - (i * 10)),
+ y, 1.0f, 1.0f);
}
}
break;
case 1:
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 3.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 2.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 1.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 0.0f), y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (D_800D19F0 * 3.0f), y, 1.0f,
+ 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (D_800D19F0 * 2.0f), y, 1.0f,
+ 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (D_800D19F0 * 1.0f), y, 1.0f,
+ 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (D_800D19F0 * 0.0f), y, 1.0f,
+ 1.0f);
break;
case 2:
- for (i = D_800D19F4; i >= 0; i--) {
+ for (i = sHudBombCount; i >= 0; i--) {
if (i == 0) {
temp = D_800D19F0 * 4.0f;
} else {
temp = D_800D19F0;
}
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)) + temp, y, 1.0f,
- 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16,
+ x + (30.0f - (i * 10)) + temp, y, 1.0f, 1.0f);
}
break;
case 3:
- for (i = (D_800D19F4 - 2); i >= 0; i--) {
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
+ for (i = (sHudBombCount - 2); i >= 0; i--) {
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + (30.0f - (i * 10)), y,
+ 1.0f, 1.0f);
}
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 50.0f - D_800D19F0, y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + 50.0f - D_800D19F0, y, 1.0f,
+ 1.0f);
break;
case 4:
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 30.0f - (D_800D19F0 * 3.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 20.0f - (D_800D19F0 * 2.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 10.0f - (D_800D19F0 * 1.0f), y, 1.0f, 1.0f);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + 30.0f - (D_800D19F0 * 3.0f),
+ y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + 20.0f - (D_800D19F0 * 2.0f),
+ y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x + 10.0f - (D_800D19F0 * 1.0f),
+ y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x, y, 1.0f, 1.0f);
break;
case 5:
- func_hud_8008DCB0(x + D_800D19F0, y + 2.0f, D_8016177C, D_80161780, D_80161784);
- func_hud_8008DD78(x + 15.0f + D_800D19F0, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784);
- TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
+ HUD_VS_X_Draw(x + D_800D19F0, y + 2.0f, D_8016177C, D_80161780, D_80161784);
+ HUD_VS_LivesCount_Draw(x + 15.0f + D_800D19F0, y + 1.0f, sHudBombCount, D_8016177C, D_80161780, D_80161784);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsBombIconTex, aVsBombIconTLUT, 16, 16, x, y, 1.0f, 1.0f);
break;
case 6:
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_CI4(&gMasterDisp, D_blue_marine_3000090, D_blue_marine_3000120, 32, 9, x + 1.0f, y, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, D_blue_marine_3000090, D_blue_marine_3000120, 32, 9, x + 1.0f, y, 1.0f,
+ 1.0f);
break;
}
}
-void func_hud_8008F94C(void) {
- func_hud_8008E5E8();
+void HUD_VS_Radar(void) {
+ HUD_Radar();
}
-void func_hud_8008F96C(void) {
+void HUD_SinglePlayer(void) {
if (gPlayState != PLAY_PAUSE) {
- func_hud_8008E5E8();
+ HUD_Radar();
}
RCP_SetupDL_36();
-
if ((gLevelMode != LEVELMODE_TURRET) && (D_hud_80161708 != 0)) {
- func_hud_8008D4F0(246.0f, 28.0f);
- func_hud_8008EA14(250.0f, 38.0f);
+ HUD_BoostGauge_Draw(246.0f, 28.0f);
+ HUD_BombCounter_Draw(250.0f, 38.0f);
}
- func_hud_8008B2A4();
+ HUD_IncomingMsg();
if (D_hud_80161708 != 0) {
- func_hud_8008E9EC(24.0f, 30.0f);
+ HUD_Shield_GoldRings_HitPoints(24.0f, 30.0f);
if (gCurrentLevel != LEVEL_TRAINING) {
- func_hud_80087530(248.0f, 11.0f, gLifeCount[gPlayerNum]);
+ HUD_LivesCount2_Draw(248.0f, 11.0f, gLifeCount[gPlayerNum]);
}
}
@@ -3542,14 +3572,14 @@ void HUD_Draw(void) {
for (i = 0; i < 10; i++) {
D_801617E8[i] = 0;
D_801617C0[i] = 0;
- D_80161838[i] = 0;
- D_80161810[i] = 0;
+ sPauseScreenTimer[i] = 0;
+ sPauseScreenIwork[i] = 0;
}
for (i = 0; i < 20; i++) {
D_80161900[i] = 0;
- D_80161860[i] = 0;
- D_801618B0[i] = 0.0f;
+ sGoldRingsIwork[i] = 0;
+ sGoldRingsFwork[i] = 0.0f;
}
if (gGoldRingCount[0] != 0) {
@@ -3560,7 +3590,7 @@ void HUD_Draw(void) {
for (i = 0; i < goldRings; i++) {
if (goldRings != 3) {
- D_80161860[i + 1] = 1;
+ sGoldRingsIwork[i + 1] = 1;
}
}
gGoldRingCount[1] = gGoldRingCount[0];
@@ -3568,7 +3598,7 @@ void HUD_Draw(void) {
gGoldRingCount[1] = 0;
}
- D_800D19F8 = 0;
+ sBombCounterState = BOMB_COUNTER_INIT;
D_80161788 = 0;
D_8016178C = 0;
gMedalStatus = 0;
@@ -3639,15 +3669,15 @@ void HUD_Draw(void) {
}
if (gCamCount != 1) {
- func_hud_8008F94C();
+ HUD_VS_Radar();
} else {
- func_hud_8008F96C();
+ HUD_SinglePlayer();
}
- func_hud_8008BC80();
- func_hud_80088970();
+ HUD_RadioDamage();
+ HUD_PauseScreen_Update();
}
-void HUD_FoBase_Draw(Boss* boss) {
+void FoBase_Draw(Boss* boss) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, aFoBaseDL2);
RCP_SetupDL_34(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -3658,7 +3688,7 @@ void HUD_FoBase_Draw(Boss* boss) {
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
}
-void func_hud_8008FFF0(FoBase* this, s32 arg1) {
+void FoBase_BurnEffects(FoBase* this, s32 timer) {
Vec3s D_800D21C8[] = {
{ -385, 54, 233 }, { -324, 148, 193 }, { -267, 186, 136 }, { -128, 430, 180 }, { -231, 584, 140 },
{ -431, 551, -120 }, { -285, 516, -32 }, { -285, 601, 18 }, { 300, 596, 18 }, { 300, 529, -65 },
@@ -3673,8 +3703,8 @@ void func_hud_8008FFF0(FoBase* this, s32 arg1) {
f32 temp;
s32 temp2;
- if (arg1 >= 7000) {
- temp2 = arg1 - 7000;
+ if (timer >= 7000) {
+ temp2 = timer - 7000;
if (temp2 > 1596) {
temp2 = 1596;
@@ -3700,14 +3730,14 @@ void func_hud_8008FFF0(FoBase* this, s32 arg1) {
}
}
-s32 HUD_FoBase_ExplodeCs(FoBase* this) {
+s32 FoBase_ExplodeCs(FoBase* this) {
Vec3f dest;
Vec3f src;
Player* player;
s32 csState = 0;
if (this->swork[0] == 1) {
- func_hud_8008FFF0(this, 8596);
+ FoBase_BurnEffects(this, 8596);
player = &gPlayer[0];
csState = 1;
@@ -3808,7 +3838,7 @@ s32 HUD_FoBase_ExplodeCs(FoBase* this) {
return csState;
}
-void HUD_FoBase_Update(FoBase* this) {
+void FoBase_Update(FoBase* this) {
switch (this->state) {
case 0:
if ((this->fwork[1] == 255.0f) && (this->fwork[2] == 212.0f)) {
@@ -3829,13 +3859,13 @@ void HUD_FoBase_Update(FoBase* this) {
}
break;
}
- func_hud_8008FFF0(this, gAllRangeEventTimer);
+ FoBase_BurnEffects(this, gAllRangeEventTimer);
}
-bool func_hud_8009092C(ActorTeamBoss* this) {
+bool ActorTeamBoss_SetTarget(ActorTeamBoss* this) {
bool ret = false;
Boss* boss;
- s32 i = 0;
+ s32 i;
if (this->aiIndex != 0) {
return true;
@@ -3858,7 +3888,7 @@ bool func_hud_8009092C(ActorTeamBoss* this) {
return ret;
}
-bool func_hud_80090A00(ActorTeamBoss* this) {
+bool ActorTeamBoss_SlippyEscapeFromTiBoss(ActorTeamBoss* this) {
switch (this->iwork[5]) {
case 0:
this->fwork[8] = 0.0f;
@@ -3932,10 +3962,10 @@ bool func_hud_80090A00(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80090CCC(ActorTeamBoss* this) {
+bool ActorTeamBoss_Attack(ActorTeamBoss* this) {
bool ret = false;
- if (func_hud_8009092C(this)) {
+ if (ActorTeamBoss_SetTarget(this)) {
this->fwork[6] = gBosses[this->aiIndex].obj.pos.z;
this->fwork[5] = gBosses[this->aiIndex].obj.pos.y;
this->fwork[4] = gBosses[this->aiIndex].obj.pos.x;
@@ -3974,11 +4004,11 @@ bool func_hud_80090CCC(ActorTeamBoss* this) {
return ret;
}
-s32 func_hud_80090E8C(ActorTeamBoss* this) {
+s32 ActorTeamBoss_FlyAroundAllRange(ActorTeamBoss* this) {
f32 x;
f32 y;
f32 z;
- f32 var_fv1_2;
+ f32 range;
if (this->timer_0BC == 0) {
if (gLevelType == LEVELTYPE_SPACE) {
@@ -4000,13 +4030,13 @@ s32 func_hud_80090E8C(ActorTeamBoss* this) {
}
if (this->aiType == AI360_FALCO) {
- var_fv1_2 = 3000.0f;
+ range = 3000.0f;
} else {
- var_fv1_2 = 5000.0f;
+ range = 5000.0f;
}
- if ((var_fv1_2 < fabsf(this->obj.pos.x - gBosses[0].obj.pos.x)) &&
- (var_fv1_2 < fabsf(this->obj.pos.z - gBosses[0].obj.pos.z))) {
+ if ((range < fabsf(this->obj.pos.x - gBosses[0].obj.pos.x)) &&
+ (range < fabsf(this->obj.pos.z - gBosses[0].obj.pos.z))) {
this->state = 0;
}
@@ -4017,7 +4047,7 @@ s32 func_hud_80090E8C(ActorTeamBoss* this) {
return false;
}
-bool func_hud_800910C0(ActorTeamBoss* this) {
+bool ActorTeamBoss_FlyAroundOnRails(ActorTeamBoss* this) {
f32 var_fv1;
if (this->timer_0BC == 0) {
@@ -4048,15 +4078,15 @@ bool func_hud_800910C0(ActorTeamBoss* this) {
return false;
}
-void func_hud_80091254(ActorTeamBoss* this) {
+void ActorTeamBoss_FlyAround(ActorTeamBoss* this) {
if (gLevelMode == LEVELMODE_ALL_RANGE) {
- func_hud_80090E8C(this);
+ ActorTeamBoss_FlyAroundAllRange(this);
} else {
- func_hud_800910C0(this);
+ ActorTeamBoss_FlyAroundOnRails(this);
}
}
-bool func_hud_80091298(ActorTeamBoss* this) {
+bool ActorTeamBoss_FlyAlongPlayer(ActorTeamBoss* this) {
this->fwork[1] = gPlayer[0].baseSpeed + 10.0f;
this->fwork[3] = 3.6f;
this->fwork[4] = gPlayer[0].pos.x + ((f32) (this->aiType - 2) * 700.0f);
@@ -4070,7 +4100,7 @@ bool func_hud_80091298(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80091368(ActorTeamBoss* this) {
+bool ActorTeamBoss_Retreat(ActorTeamBoss* this) {
switch (this->iwork[5]) {
case 0:
this->fwork[5] = 20000.0f;
@@ -4113,26 +4143,26 @@ bool func_hud_80091368(ActorTeamBoss* this) {
return false;
}
-void func_hud_800914FC(ActorTeamBoss* this) {
+void ActorTeamBoss_SetAction(ActorTeamBoss* this) {
switch (this->state) {
case 0:
- if (!func_hud_80090CCC(this)) {
+ if (!ActorTeamBoss_Attack(this)) {
break;
}
case 1:
- func_hud_80091254(this);
+ ActorTeamBoss_FlyAround(this);
break;
case 2:
- func_hud_80091298(this);
+ ActorTeamBoss_FlyAlongPlayer(this);
break;
case 3:
- func_hud_80091368(this);
+ ActorTeamBoss_Retreat(this);
break;
case 7:
- func_hud_80090A00(this);
+ ActorTeamBoss_SlippyEscapeFromTiBoss(this);
break;
}
@@ -4149,7 +4179,7 @@ void func_hud_800914FC(ActorTeamBoss* this) {
}
}
-bool func_hud_800915FC(ActorTeamBoss* this) {
+bool ActorTeamBoss_ObstacleCheck(ActorTeamBoss* this) {
s32 i;
f32 y;
Vec3f vec;
@@ -4203,7 +4233,7 @@ bool func_hud_800915FC(ActorTeamBoss* this) {
return ret;
}
-bool func_hud_80091864(ActorTeamBoss* this) {
+bool ActorTeamBoss_SetFlyingAngle(ActorTeamBoss* this) {
f32 sp44;
f32 sp40;
f32 sp3C;
@@ -4220,7 +4250,7 @@ bool func_hud_80091864(ActorTeamBoss* this) {
sp40 = Math_RadToDeg(Math_Atan2F(x, z));
sp44 = Math_RadToDeg(Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))));
- if ((func_hud_800915FC(this) != 0) && (this->iwork[4] == 0)) {
+ if (ActorTeamBoss_ObstacleCheck(this) && (this->iwork[4] == 0)) {
sp44 += 40.0f;
if (sp44 >= 360.0f) {
sp44 -= 360.0f;
@@ -4262,7 +4292,7 @@ bool func_hud_80091864(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80091B90(ActorTeamBoss* this) {
+bool ActorTeamBoss_SetFlyingSpeed(ActorTeamBoss* this) {
Vec3f vec;
this->obj.rot.x = -this->rot_0F4.x;
@@ -4290,7 +4320,7 @@ bool func_hud_80091B90(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80091CF8(ActorTeamBoss* this) {
+bool ActorTeamBoss_SetBoost(ActorTeamBoss* this) {
if (this->iwork[1] != 0) {
if (this->fwork[10] < 0.1f) {
this->fwork[10] = 20.0f;
@@ -4309,7 +4339,7 @@ bool func_hud_80091CF8(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80091DF4(ActorTeamBoss* this) {
+bool ActorTeamBoss_Shoot(ActorTeamBoss* this) {
Vec3f src;
Vec3f dest;
@@ -4326,14 +4356,14 @@ bool func_hud_80091DF4(ActorTeamBoss* this) {
return false;
}
-bool func_hud_80091F00(ActorTeamBoss* this) {
- u8 temp_v0 = this->dmgType;
- Vec3f sp40;
- Vec3f sp34;
+bool ActorTeamBoss_HandleDamage(ActorTeamBoss* this) {
+ u8 prevDmgType = this->dmgType;
+ Vec3f src;
+ Vec3f dest;
this->dmgType = DMG_NONE;
- if ((this->state == 3) || (temp_v0 == DMG_EXPLOSION)) {
+ if ((this->state == 3) || (prevDmgType == DMG_EXPLOSION)) {
return false;
}
@@ -4344,23 +4374,25 @@ bool func_hud_80091F00(ActorTeamBoss* this) {
this->timer_0C6 = 20;
AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
+
func_effect_8007D10C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 1.5f);
+
Matrix_RotateY(gCalcMatrix, this->rot_0F4.y * M_DTOR, MTXF_NEW);
if (Rand_ZeroOne() < 0.5f) {
- sp40.x = -20.0f;
+ src.x = -20.0f;
} else {
- sp40.x = 20.0f;
+ src.x = 20.0f;
}
- sp40.y = RAND_FLOAT_CENTERED(20.0f);
- sp40.z = 0.0f;
+ src.y = RAND_FLOAT_CENTERED(20.0f);
+ src.z = 0.0f;
- Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp40, &sp34);
+ Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest);
- this->fwork[13] = sp34.x;
- this->fwork[14] = sp34.y;
- this->fwork[12] = sp34.z;
+ this->fwork[13] = dest.x;
+ this->fwork[14] = dest.y;
+ this->fwork[12] = dest.z;
gTeamShields[this->aiType] = this->health;
@@ -4414,8 +4446,8 @@ bool func_hud_80091F00(ActorTeamBoss* this) {
return false;
}
-void func_hud_80092244(ActorTeamBoss* this) {
- gRadarMarks[this->index].status = 1;
+void ActorTeamBoss_Radarmarks_Init(ActorTeamBoss* this) {
+ gRadarMarks[this->index].enabled = true;
gRadarMarks[this->index].type = this->aiType;
gRadarMarks[this->index].pos.x = this->obj.pos.x;
gRadarMarks[this->index].pos.y = this->obj.pos.y;
@@ -4423,7 +4455,7 @@ void func_hud_80092244(ActorTeamBoss* this) {
gRadarMarks[this->index].yRot = this->rot_0F4.y + 180.0f;
}
-void func_hud_800922F4(ActorTeamBoss* this) {
+void ActorTeamBoss_DmgEffect(ActorTeamBoss* this) {
s32 mask;
if ((gTeamShields[this->aiType] < 64) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) {
@@ -4451,7 +4483,7 @@ void func_hud_800922F4(ActorTeamBoss* this) {
}
}
-bool func_hud_800924E0(ActorTeamBoss* this) {
+bool ActorTeamBoss_SomerSault(ActorTeamBoss* this) {
Vec3f src;
Vec3f dest;
f32 var_fv0;
@@ -4468,7 +4500,6 @@ bool func_hud_800924E0(ActorTeamBoss* this) {
}
var_fv0 = 60.0f;
-
if (this->fwork[19] > 240.0f) {
var_fv0 = -50.0f;
}
@@ -4517,7 +4548,7 @@ bool func_hud_800924E0(ActorTeamBoss* this) {
return ret;
}
-bool func_hud_800927A0(ActorTeamBoss* this) {
+bool ActorTeamBoss_UTurn(ActorTeamBoss* this) {
Vec3f src;
Vec3f dest;
f32 sp54;
@@ -4685,19 +4716,19 @@ void ActorTeamBoss_Init(ActorTeamBoss* this) {
}
void ActorTeamBoss_Update(ActorTeamBoss* this) {
- f32 var_fv1;
+ f32 range;
this->health = gTeamShields[this->aiType];
switch (this->work_048) {
case 0:
- func_hud_800914FC(this);
- func_hud_80091864(this);
- func_hud_80091B90(this);
- func_hud_80091DF4(this);
+ ActorTeamBoss_SetAction(this);
+ ActorTeamBoss_SetFlyingAngle(this);
+ ActorTeamBoss_SetFlyingSpeed(this);
+ ActorTeamBoss_Shoot(this);
if (this->dmgType != DMG_NONE) {
- func_hud_80091F00(this);
+ ActorTeamBoss_HandleDamage(this);
}
if (this->state == 3) {
@@ -4706,19 +4737,19 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) {
switch (gCurrentLevel) {
case LEVEL_SECTOR_Z:
- var_fv1 = 20000.0f;
+ range = 20000.0f;
break;
case LEVEL_CORNERIA:
- var_fv1 = 8000.0f;
+ range = 8000.0f;
break;
case LEVEL_BOLSE:
- var_fv1 = 10000.0f;
+ range = 10000.0f;
break;
default:
- var_fv1 = 12500.0f;
+ range = 12500.0f;
break;
}
@@ -4729,7 +4760,7 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) {
}
if ((gLevelMode == LEVELMODE_ALL_RANGE) &&
- (fabsf(this->obj.pos.x > var_fv1) || fabsf(this->obj.pos.z > var_fv1)) &&
+ (fabsf(this->obj.pos.x > range) || fabsf(this->obj.pos.z > range)) &&
(gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) {
this->work_048 = 2;
this->work_04A = 1;
@@ -4737,14 +4768,14 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) {
break;
case 1:
- if (func_hud_800924E0(this) != 0) {
+ if (ActorTeamBoss_SomerSault(this) != 0) {
this->work_048 = 0;
this->iwork[9] = RAND_INT(30.0f) + 90;
}
break;
case 2:
- if (func_hud_800927A0(this) != 0) {
+ if (ActorTeamBoss_UTurn(this) != 0) {
this->work_04A = 0;
this->work_048 = this->work_04A;
this->iwork[9] = RAND_INT(30.0f) + 90;
@@ -4752,9 +4783,9 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) {
break;
}
- func_hud_80091CF8(this);
- func_hud_800922F4(this);
- func_hud_80092244(this);
+ ActorTeamBoss_SetBoost(this);
+ ActorTeamBoss_DmgEffect(this);
+ ActorTeamBoss_Radarmarks_Init(this);
if (this->iwork[9] != 0) {
this->iwork[9]--;
@@ -4762,7 +4793,7 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) {
this->iwork[10] = 0;
}
-void func_hud_80093164(ActorCutscene* this) {
+void Aquas_CsIntroActors_Update(ActorCutscene* this) {
Vec3f src;
Vec3f dest;
Player* player = &gPlayer[0];
@@ -4807,7 +4838,7 @@ void func_hud_80093164(ActorCutscene* this) {
this->obj.rot.z = -this->rot_0F4.z;
}
-void func_hud_80093310(void) {
+void Aquas_CsIntroGreatFox_Init(void) {
ActorCutscene* actor = &gActors[0];
Actor_Initialize(actor);
@@ -4821,7 +4852,7 @@ void func_hud_80093310(void) {
AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
}
-void func_hud_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
+void Aquas_Effect363_Spawn(f32 x, f32 y, f32 z, f32 arg3) {
s32 i;
Effect* effect = &gEffects[ARRAY_COUNT(gEffects) - 1];
Player* player = gPlayer;
@@ -4881,7 +4912,7 @@ f32 D_800D22CC = 260.0f;
s32 D_800D22D0 = 50;
s32 D_800D22D4 = 2;
-void HUD_AquasStart(Player* player) {
+void Aquas_CsLevelStart(Player* player) {
Vec3f D_800D22D8[] = { { -1730.0f, 1600.0f, -6690.0f },
{ -830.0f, 1600.0f, -7380.0f },
{ 0.0f, 1600.0f, -7380.0f } };
@@ -4913,7 +4944,7 @@ void HUD_AquasStart(Player* player) {
switch (player->csState) {
case 0:
- func_hud_80093310();
+ Aquas_CsIntroGreatFox_Init();
gCsFrameCount = 0;
gDrawBackdrop = 1;
gAqDrawMode = 1;
@@ -4964,7 +4995,7 @@ void HUD_AquasStart(Player* player) {
y = dest.y;
z = dest.z;
- func_hud_800933D8(x, y, z, 20.0f);
+ Aquas_Effect363_Spawn(x, y, z, 20.0f);
i = (i + 1) % 32;
}
@@ -4983,7 +5014,7 @@ void HUD_AquasStart(Player* player) {
y = dest.y;
z = dest.z;
- func_hud_800933D8(x, y, z, 20.0f);
+ Aquas_Effect363_Spawn(x, y, z, 20.0f);
i = (i + 1) % 32;
}
@@ -5163,10 +5194,10 @@ void HUD_AquasStart(Player* player) {
if ((player->unk_018 > -200.0f) && (D_ctx_80177A10[8] < 6)) {
if (D_ctx_80177A10[8] < 2) {
- func_hud_800933D8(player->pos.x, player->pos.y - 400.0f, player->pos.z, 20.0f);
+ Aquas_Effect363_Spawn(player->pos.x, player->pos.y - 400.0f, player->pos.z, 20.0f);
}
if (D_ctx_80177A10[8] >= 2) {
- func_hud_800933D8(player->pos.x, player->pos.y, player->pos.z, 10.0f);
+ Aquas_Effect363_Spawn(player->pos.x, player->pos.y, player->pos.z, 10.0f);
}
D_ctx_80177A10[8]++;
}
@@ -5249,7 +5280,7 @@ void HUD_AquasStart(Player* player) {
gCsCamAtZ = player->pos.z + (gPathProgress - 1.0f);
if (((player->csTimer % 2) == 0) && (player->csTimer > 962)) {
- func_hud_800933D8(player->pos.x, player->pos.y, player->pos.z + 50.0f, 20.0f);
+ Aquas_Effect363_Spawn(player->pos.x, player->pos.y, player->pos.z + 50.0f, 20.0f);
}
if (player->csTimer <= 900) {
@@ -5308,7 +5339,7 @@ f32 D_800D24C0[] = { 128.0f, 128.0f, 255.0f, 128.0f };
s32 D_800D24C8[] = { 0, 900 };
f32 D_800D24CC = 0.02f;
-void Hud_Effect363_Update(Effect363* this) {
+void Aquas_Effect363_Update(Effect363* this) {
Player* player = &gPlayer[0];
if ((player->state_1C8 == PLAYERSTATE_1C8_LEVEL_INTRO) && (gCurrentLevel == LEVEL_AQUAS) && (player->csState < 2)) {
@@ -5365,7 +5396,7 @@ void Hud_Effect363_Update(Effect363* this) {
}
}
-void Hud_Effect363_Draw(Effect363* this) {
+void Aquas_Effect363_Draw(Effect363* this) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_INTRO) && (gCurrentLevel == LEVEL_AQUAS) &&
(gPlayer[0].csState < 2)) {
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
@@ -5385,7 +5416,7 @@ void stub_80094D10(void) {
void stub_80094D18(void) {
}
-void func_hud_80094D20(f32 x, f32 y) {
+void HUD_Hitpoints_Draw(f32 x, f32 y) {
u8* D_800D24DC[] = { aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9 };
s32 D_800D2504[] = { 100, 10, 1 };
@@ -5455,13 +5486,13 @@ void func_hud_80094D20(f32 x, f32 y) {
}
if (xScale != 0.0f) {
- TextureRect_IA8(&gMasterDisp, D_800D24DC[temp], 16, 15, x1, y1, xScale, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D24DC[temp], 16, 15, x1, y1, xScale, 1.0f);
}
boolTemp = true;
}
if (!boolTemp && (xScale != 0.0f)) {
- TextureRect_IA8(&gMasterDisp, D_800D24DC[0], 16, 15, x1, y1, xScale, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D24DC[0], 16, 15, x1, y1, xScale, 1.0f);
}
x += 13.0f;
@@ -5506,7 +5537,7 @@ void func_hud_80094D20(f32 x, f32 y) {
}
if (xScale != 0.0f) {
- TextureRect_IA8(&gMasterDisp, D_800D24DC[temp3], 16, 15, x1, y1, xScale, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D24DC[temp3], 16, 15, x1, y1, xScale, 1.0f);
}
if ((gHitCount != gDisplayedHitCount) && (D_hud_80161720[0] == 0.0f) && (D_hud_80161720[1] == 0.0f) &&
@@ -5520,16 +5551,16 @@ void func_hud_80094D20(f32 x, f32 y) {
}
}
-void func_hud_80095350(ActorCutscene* this) {
+void Aquas_Camera_Setup(ActorCutscene* this) {
Actor_Initialize(this);
this->obj.status = OBJ_ACTIVE;
this->obj.id = OBJ_ACTOR_CUTSCENE;
- this->animFrame = 9999;
+ this->animFrame = 9999; // Invalid model type
Object_SetInfo(&this->info, this->obj.id);
}
-void func_hud_800953A0(ActorCutscene* this, s32 arg1) {
- Vec3f D_800D2510[] = {
+void Aquas_AqBump2_Setup(ActorCutscene* this, s32 posIdx) {
+ Vec3f sAqBump2Pos[] = {
{ 1800.0f, 0.0f, -4000.0f },
{ -1000.0f, 0.0f, -4800.0f },
{ 800.0f, 0.0f, -5600.0f },
@@ -5539,14 +5570,14 @@ void func_hud_800953A0(ActorCutscene* this, s32 arg1) {
Actor_Initialize(this);
this->obj.status = OBJ_ACTIVE;
this->obj.id = OBJ_ACTOR_CUTSCENE;
- this->obj.pos = D_800D2510[arg1];
+ this->obj.pos = sAqBump2Pos[posIdx];
this->obj.pos.z -= gPathProgress;
this->animFrame = 45;
Object_SetInfo(&this->info, this->obj.id);
}
-void func_hud_8009546C(ActorCutscene* this, s32 arg1) {
- Vec3f D_800D2540[] = {
+void Aquas_AqCoralReef2_Setup(ActorCutscene* this, s32 posIdx) {
+ Vec3f sAqCoralReef2Pos[] = {
{ 1300.0f, 0.0f, -2000.0f }, { -1000.0f, 0.0f, -3000.0f }, { 800.0f, 0.0f, 0.0f },
{ -1200.0f, 0.0f, -1000.0f }, { -1400.0f, 0.0f, 700.0f },
};
@@ -5554,30 +5585,31 @@ void func_hud_8009546C(ActorCutscene* this, s32 arg1) {
Actor_Initialize(this);
this->obj.status = OBJ_ACTIVE;
this->obj.id = OBJ_ACTOR_CUTSCENE;
- this->obj.pos = D_800D2540[arg1];
+ this->obj.pos = sAqCoralReef2Pos[posIdx];
this->obj.pos.z -= gPathProgress;
this->animFrame = 46;
Object_SetInfo(&this->info, this->obj.id);
}
-void func_hud_80095538(Actor* actor, s32 index) {
- Vec3f D_800D257C[] = {
+void Aquas_AqRock_Setup(ActorCutscene* this, s32 posIdx) {
+ Vec3f sAqRockPos[] = {
{ 0.0f, 0.0f, -200.0f }, { -300.0f, 0.0f, -700.0f }, { 400.0f, 0.0f, -900.0f },
{ 300.0f, 0.0f, -1700.0f }, { -260.0f, 0.0f, -2000.0f }, { -200.0f, 0.0f, -2600.0f },
};
- Actor_Initialize(actor);
- actor->obj.status = OBJ_ACTIVE;
- actor->obj.id = OBJ_ACTOR_CUTSCENE;
- actor->obj.pos = D_800D257C[index];
- actor->obj.pos.z -= gPathProgress;
- actor->animFrame = 47;
- Object_SetInfo(&actor->info, actor->obj.id);
+ Actor_Initialize(this);
+ this->obj.status = OBJ_ACTIVE;
+ this->obj.id = OBJ_ACTOR_CUTSCENE;
+ this->obj.pos = sAqRockPos[posIdx];
+ this->obj.pos.z -= gPathProgress;
+ this->animFrame = 47;
+ Object_SetInfo(&this->info, this->obj.id);
}
-void HUD_AquasComplete(Player* player) {
+
+void Aquas_CsLevelComplete(Player* player) {
s32 i;
s32 j;
- Actor* actor;
+ ActorCutscene* camera;
f32 x;
f32 y;
f32 z;
@@ -5589,7 +5621,7 @@ void HUD_AquasComplete(Player* player) {
Vec3f dest;
s32 shield;
- actor = &gActors[0];
+ camera = &gActors[0];
switch (player->csState) {
case 0:
@@ -5746,37 +5778,37 @@ void HUD_AquasComplete(Player* player) {
player->zPath = gPathProgress = 0;
j = 0;
- func_hud_80095350(actor);
+ Aquas_Camera_Setup(camera);
j++;
for (i = 0; i < 6; i++, j++) {
- func_hud_80095538(&gActors[j], i);
+ Aquas_AqRock_Setup(&gActors[j], i);
}
for (i = 0; i < 5; i++, j++) {
- func_hud_8009546C(&gActors[j], i);
+ Aquas_AqCoralReef2_Setup(&gActors[j], i);
}
for (i = 0; i < 4; i++, j++) {
- func_hud_800953A0(&gActors[j], i);
+ Aquas_AqBump2_Setup(&gActors[j], i);
}
player->pos.z -= gPathProgress;
player->trueZpos = player->pos.z;
- actor->fwork[1] = 0.0f;
- actor->fwork[2] = 600.0f;
- actor->fwork[3] = 2600.0f;
- actor->fwork[7] = 0.5f;
+ camera->fwork[1] = 0.0f;
+ camera->fwork[2] = 600.0f;
+ camera->fwork[3] = 2600.0f;
+ camera->fwork[7] = 0.5f;
- actor->rot_0F4.y = 130.0f;
+ camera->rot_0F4.y = 130.0f;
- src.x = actor->fwork[1];
- src.y = actor->fwork[2];
- src.z = actor->fwork[3];
+ src.x = camera->fwork[1];
+ src.y = camera->fwork[2];
+ src.z = camera->fwork[3];
Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y, player->trueZpos + gPathProgress, MTXF_NEW);
- Matrix_RotateY(gCalcMatrix, -(M_DTOR * actor->rot_0F4.y), MTXF_APPLY);
+ Matrix_RotateY(gCalcMatrix, -(M_DTOR * camera->rot_0F4.y), MTXF_APPLY);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
player->cam.at.x = gCsCamAtX = player->pos.x;
@@ -5800,22 +5832,22 @@ void HUD_AquasComplete(Player* player) {
case 12:
if ((gCsFrameCount >= 380) && (gCsFrameCount < 640 + 280)) {
- Math_SmoothStepToF(&actor->fwork[2], 0.0f, 0.02f, 1000.0f, 0.001f);
- Math_SmoothStepToF(&actor->fwork[3], 300.0f, 0.02f, 1000.0f, 0.001f);
+ Math_SmoothStepToF(&camera->fwork[2], 0.0f, 0.02f, 1000.0f, 0.001f);
+ Math_SmoothStepToF(&camera->fwork[3], 300.0f, 0.02f, 1000.0f, 0.001f);
}
if (gCsFrameCount >= 920) {
- Math_SmoothStepToF(&actor->fwork[3], 200.0f, 0.02f, 1000.0f, 0.001f);
+ Math_SmoothStepToF(&camera->fwork[3], 200.0f, 0.02f, 1000.0f, 0.001f);
}
if (gCsFrameCount >= 1120) {
- Math_SmoothStepToF(&actor->fwork[7], 0.1f, 0.05f, 1000.0f, 0.001f);
+ Math_SmoothStepToF(&camera->fwork[7], 0.1f, 0.05f, 1000.0f, 0.001f);
}
if (gCsFrameCount >= 1200) {
- Math_SmoothStepToF(&actor->fwork[3], 800.0f, 0.02f, 1000.0f, 0.001f);
+ Math_SmoothStepToF(&camera->fwork[3], 800.0f, 0.02f, 1000.0f, 0.001f);
Math_SmoothStepToF(&player->baseSpeed, 5.0f, 0.1f, 1000.0f, 0.001f);
} else {
- actor->fwork[4] = player->pos.x;
- actor->fwork[5] = player->pos.y;
- actor->fwork[6] = player->trueZpos + gPathProgress;
+ camera->fwork[4] = player->pos.x;
+ camera->fwork[5] = player->pos.y;
+ camera->fwork[6] = player->trueZpos + gPathProgress;
}
if (gCsFrameCount < 1200) {
@@ -5829,20 +5861,20 @@ void HUD_AquasComplete(Player* player) {
}
D_ctx_80177A48[0] = 0.05f;
- actor->rot_0F4.y += actor->fwork[7];
- if ((actor->rot_0F4.y) < 0.0f) {
- actor->rot_0F4.y += 360.0f;
+ camera->rot_0F4.y += camera->fwork[7];
+ if ((camera->rot_0F4.y) < 0.0f) {
+ camera->rot_0F4.y += 360.0f;
}
- if ((actor->rot_0F4.y) > 360.0f) {
- actor->rot_0F4.y -= 360.0f;
+ if ((camera->rot_0F4.y) > 360.0f) {
+ camera->rot_0F4.y -= 360.0f;
}
- src.x = actor->fwork[1];
- src.y = actor->fwork[2];
- src.z = actor->fwork[3];
+ src.x = camera->fwork[1];
+ src.y = camera->fwork[2];
+ src.z = camera->fwork[3];
- Matrix_Translate(gCalcMatrix, actor->fwork[4], actor->fwork[5], actor->fwork[6], MTXF_NEW);
- Matrix_RotateY(gCalcMatrix, -(M_DTOR * actor->rot_0F4.y), MTXF_APPLY);
+ Matrix_Translate(gCalcMatrix, camera->fwork[4], camera->fwork[5], camera->fwork[6], MTXF_NEW);
+ Matrix_RotateY(gCalcMatrix, -(M_DTOR * camera->rot_0F4.y), MTXF_APPLY);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
gCsCamEyeX = dest.x;
@@ -5919,11 +5951,11 @@ void HUD_AquasComplete(Player* player) {
break;
case 1000:
- gShowLevelClearStatusScreen = 1;
+ gShowLevelClearStatusScreen = true;
break;
case 1200:
- gShowLevelClearStatusScreen = 0;
+ gShowLevelClearStatusScreen = false;
break;
}
@@ -5974,7 +6006,7 @@ void HUD_AquasComplete(Player* player) {
Math_SmoothStepToF(&player->cam.at.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.001f);
}
-void func_hud_80096A74(Player* player) {
+void Venom1_LevelStart2(Player* player) {
Vec3f src, dest;
s32 button;
diff --git a/src/engine/fox_load.c b/src/engine/fox_load.c
index 4f05552d..bd428569 100644
--- a/src/engine/fox_load.c
+++ b/src/engine/fox_load.c
@@ -179,14 +179,14 @@ u8 Load_SceneSetup(u8 sceneId, u8 sceneSetup) {
case SCENE_LOGO:
changeScene = Load_SceneFiles(&sNoOvl_Logo[sceneSetup]); // Logo does not load an overlay file
if (changeScene == true) {
- AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_14);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_MA);
}
break;
case SCENE_CREDITS:
changeScene = Load_SceneFiles(&sOvlending_Ending[sceneSetup]);
break;
default:
- (void) "DMA MODE ERROR %d\n";
+ PRINTF("DMA MODE ERROR %d\n");
changeScene = false;
break;
}
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index b49886e4..bf0a8986 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -2674,7 +2674,7 @@ void Player_ResetVsData(void) {
gLaserStrength[i] = LASERS_SINGLE;
gBombCount[i] = 0;
}
- gVsMatchStart = gVsMatchOver = false;
+ gVsMatchStart = gVsMatchWon = false;
}
void Player_InitVersus(void) {
@@ -2721,7 +2721,7 @@ void Play_Init(void) {
gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer =
gAllRangeSuppliesSent = 0;
D_display_800CA220 = 0;
- gShowLevelClearStatusScreen = 0;
+ gShowLevelClearStatusScreen = false;
if (gCurrentLevel != LEVEL_VERSUS) {
gSceneSetup = 0;
@@ -5834,7 +5834,7 @@ void Player_Update(Player* player) {
player->csState = 0;
Camera_FollowPlayer(player, player->attacker - 1, 1);
} else {
- if (gVsMatchStart == 1) {
+ if (gVsMatchStart == true) {
gVsMatchStart++;
for (i = 0; i < 4; i++) {
Player_PlaySfx(gPlayer[i].sfxSource, NA_SE_ARWING_BOOST, gPlayer[i].num);
@@ -5928,7 +5928,7 @@ void Player_Update(Player* player) {
player->draw = false;
if (gPlayerInactive[player->num] == true) {
Camera_FollowPlayer(player, player->attacker - 1, 0);
- } else if (!gVsMatchOver && (player->csState != 0)) {
+ } else if (!gVsMatchWon && (player->csState != 0)) {
player->csState = 0;
Player_Initialize(player);
Player_Setup(player);
@@ -6733,7 +6733,7 @@ void Play_UpdateLevel(void) {
break;
case LEVEL_METEO:
- Texture_Scroll(D_102FF08, 8, 8, 1);
+ Lib_Texture_Scroll(D_102FF08, 8, 8, 1);
/* fallthrough */
case LEVEL_SECTOR_X:
if (gLevelPhase == 1) {
@@ -6757,26 +6757,26 @@ void Play_UpdateLevel(void) {
break;
case LEVEL_CORNERIA:
- func_hud_8008C104(D_CO_603EB38, D_CO_6028A60);
+ HUD_Texture_Wave(D_CO_603EB38, D_CO_6028A60);
if ((gGameFrameCount % 2) != 0) {
- Texture_Scroll(D_CO_600CBD8, 64, 32, 3);
+ Lib_Texture_Scroll(D_CO_600CBD8, 64, 32, 3);
}
break;
case LEVEL_AQUAS:
- func_hud_8008C104(D_AQ_603158C, D_AQ_602ACC0);
+ HUD_Texture_Wave(D_AQ_603158C, D_AQ_602ACC0);
break;
case LEVEL_SOLAR:
Play_UpdateDynaFloor();
for (gPathTexScroll; gPathTexScroll >= 10.0f; gPathTexScroll -= 10.0f) {
- Texture_Scroll(D_SO_6005710, 32, 32, 1);
+ Lib_Texture_Scroll(D_SO_6005710, 32, 32, 1);
}
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_NEXT) {
- Texture_Scroll(D_SO_6005710, 32, 32, 1);
+ Lib_Texture_Scroll(D_SO_6005710, 32, 32, 1);
}
- Texture_Mottle(D_SO_601E1E8, D_SO_6020F60, 3);
+ Lib_Texture_Mottle(D_SO_601E1E8, D_SO_6020F60, 3);
if (gPlayer[0].pos.y > 600.0f) {
cycleMask = 8 - 1;
@@ -6827,7 +6827,7 @@ void Play_UpdateLevel(void) {
RAND_FLOAT(10.0f) + 20.0f); // check
}
- func_hud_8008C104(D_SO_60229A4, D_SO_6010198);
+ HUD_Texture_Wave(D_SO_60229A4, D_SO_6010198);
if (gPlayer[0].shields == 0) {
gSoShieldsEmpty = 1;
@@ -6837,13 +6837,13 @@ void Play_UpdateLevel(void) {
case LEVEL_ZONESS:
Play_UpdateDynaFloor();
for (gPathTexScroll; gPathTexScroll >= 20.0f; gPathTexScroll -= 20.0f) {
- Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
+ Lib_Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
}
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_NEXT) {
- Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
+ Lib_Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
}
- func_hud_8008C104(D_ZO_602C2CC, D_ZO_600D990);
+ HUD_Texture_Wave(D_ZO_602C2CC, D_ZO_600D990);
if (Play_CheckDynaFloorCollision(&sp3C, &sp40, gPlayer[0].cam.eye.x, gPlayer[0].cam.eye.y,
gPlayer[0].cam.eye.z - gPathProgress)) {
diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c
index 3a6200f6..c3faae27 100644
--- a/src/engine/fox_radio.c
+++ b/src/engine/fox_radio.c
@@ -169,7 +169,7 @@ void func_radio_800BAAE8(void) {
sRadioUseRedBox = true;
/* fallthrough */
case RCID_FOX:
- radioPortraitTex = D_10050E0;
+ radioPortraitTex = aFoxPortraitTex;
break;
case RCID_FOX_RED + 1:
sRadioUseRedBox = true;
@@ -187,7 +187,7 @@ void func_radio_800BAAE8(void) {
sRadioUseRedBox = true;
/* fallthrough */
case RCID_FALCO:
- radioPortraitTex = D_10032A0;
+ radioPortraitTex = aFalcoPortraitTex;
break;
case RCID_FALCO_RED + 1:
sRadioUseRedBox = true;
@@ -199,7 +199,7 @@ void func_radio_800BAAE8(void) {
sRadioUseRedBox = true;
/* fallthrough */
case RCID_SLIPPY:
- radioPortraitTex = D_100D900;
+ radioPortraitTex = aSlippyPortraitTex;
break;
case RCID_SLIPPY_RED + 1:
sRadioUseRedBox = true;
@@ -211,7 +211,7 @@ void func_radio_800BAAE8(void) {
sRadioUseRedBox = true;
/* fallthrough */
case RCID_PEPPY:
- radioPortraitTex = D_100BAC0;
+ radioPortraitTex = aPeppyPortraitTex;
break;
case RCID_PEPPY_RED + 1:
sRadioUseRedBox = true;
@@ -428,22 +428,22 @@ void func_radio_800BAAE8(void) {
if (mirror) {
for (i = 0, j = 0; i < 2; i++, j += 44 * 20) {
- TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
- gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
- gRadioPortraitScaleY);
+ Lib_TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
+ gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY),
+ 1.0f, gRadioPortraitScaleY);
}
- TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
- gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
- gRadioPortraitScaleY);
+ Lib_TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
+ gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
+ gRadioPortraitScaleY);
} else {
for (i = 0, j = 0; i < 2; i++, j += 44 * 20) {
- TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
- gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
- gRadioPortraitScaleY);
+ Lib_TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
+ gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
+ gRadioPortraitScaleY);
}
- TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
- gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
- gRadioPortraitScaleY);
+ Lib_TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
+ gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
+ gRadioPortraitScaleY);
}
}
}
@@ -471,13 +471,13 @@ void func_radio_800BB388(void) {
switch (gGameState) {
case GSTATE_TITLE:
case GSTATE_ENDING:
- texture = D_TITLE_601D750;
- palette = D_TITLE_601DB50;
+ texture = aNoControllerBgTex;
+ palette = aNoControllerBgTLUT;
break;
case GSTATE_PLAY:
- texture = D_1013170;
- palette = D_1013570;
+ texture = aMsgWindowBgTex;
+ palette = aMsgWindowBgTLUT;
break;
}
@@ -487,8 +487,8 @@ void func_radio_800BB388(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
}
- TextureRect_CI8(&gMasterDisp, texture, palette, 32, 32, gRadioTextBoxPosX, gRadioTextBoxPosY + 16.0f + sp30,
- gRadioTextBoxScaleX, gRadioTextBoxScaleY);
+ Lib_TextureRect_CI8(&gMasterDisp, texture, palette, 32, 32, gRadioTextBoxPosX, gRadioTextBoxPosY + 16.0f + sp30,
+ gRadioTextBoxScaleX, gRadioTextBoxScaleY);
}
if (gRadioTextBoxScaleY == 1.3f) {
@@ -712,11 +712,11 @@ void Radio_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
- func_hud_80084B94(1);
+ HUD_TeamDownWrench_Draw(1);
}
if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
(gCurrentRadioPortrait != RCID_1000)) {
- func_hud_80086110(22.0f, 165.0f, gTeamShields[idx]);
+ HUD_TeamShields_Draw(22.0f, 165.0f, gTeamShields[idx]);
}
}
@@ -764,7 +764,7 @@ void Radio_Draw(void) {
}
if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
(gCurrentRadioPortrait != RCID_1000)) {
- func_hud_80086110(22.0f, 165.0f, gActors[idx].health * 2.55f);
+ HUD_TeamShields_Draw(22.0f, 165.0f, gActors[idx].health * 2.55f);
}
}
if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
diff --git a/src/engine/fox_rcp_setup.c b/src/engine/fox_rcp_setup.c
index 1623f140..d13ff44f 100644
--- a/src/engine/fox_rcp_setup.c
+++ b/src/engine/fox_rcp_setup.c
@@ -2,6 +2,7 @@
Gfx gRcpSetupDLs[][9] = {
{
+ /* SETUPDL_0 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -15,6 +16,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_1 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -28,6 +30,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_2 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -41,6 +44,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_3 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -54,6 +58,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_4 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -67,6 +72,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_5 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -80,6 +86,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_6 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -93,6 +100,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_7 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -106,6 +114,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_8 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -119,6 +128,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_9 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -132,6 +142,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_10 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -146,6 +157,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_11 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -159,6 +171,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_12 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -172,6 +185,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_13 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -185,6 +199,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_14 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -198,6 +213,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_15 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -211,6 +227,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_16 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -224,6 +241,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_17 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -237,6 +255,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_18 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -250,6 +269,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_19 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -263,6 +283,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_20 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -276,6 +297,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_21 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -289,6 +311,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_22 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -302,6 +325,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_23 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -315,6 +339,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_24 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -328,6 +353,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_25 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -341,6 +367,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_26 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -357,6 +384,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_27 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -370,6 +398,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_28 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -384,6 +413,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_29 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -397,6 +427,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_30 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -410,6 +441,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_31 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -424,6 +456,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_32 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -437,6 +470,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_33 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -450,6 +484,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_34 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -463,6 +498,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_35 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -477,6 +513,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_36 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -490,6 +527,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_37 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -503,6 +541,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_38 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -517,6 +556,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_39 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -530,6 +570,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_40 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -543,6 +584,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_41 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -556,6 +598,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_42 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -569,6 +612,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_43 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -582,6 +626,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_44 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -595,6 +640,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_45 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -608,6 +654,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_46 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -621,6 +668,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_47 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -634,6 +682,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_48 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -647,6 +696,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_49 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -661,6 +711,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_50 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -674,6 +725,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_51 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -689,6 +741,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_52 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -702,6 +755,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_53 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -715,6 +769,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_54 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -728,6 +783,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_55 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -741,6 +797,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_56 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -754,6 +811,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_57 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -767,6 +825,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_58 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -780,6 +839,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_59 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -793,6 +853,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_60 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -806,6 +867,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_61 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -819,6 +881,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_62 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -832,6 +895,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_63 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -846,6 +910,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_64 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -859,6 +924,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_65 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -872,6 +938,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_66 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -885,6 +952,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_67 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -899,6 +967,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_68 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -913,6 +982,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_69 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -927,6 +997,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_70 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -943,6 +1014,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_71 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -958,6 +1030,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_72 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -975,6 +1048,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_73 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -988,6 +1062,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_74 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1001,6 +1076,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_75 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1014,6 +1090,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_76 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1027,6 +1104,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_77 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1041,6 +1119,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_78 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1054,6 +1133,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_79 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1067,6 +1147,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_80 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1080,6 +1161,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_81 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1093,6 +1175,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_82 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1109,6 +1192,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_83 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1122,6 +1206,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_84 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1135,6 +1220,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_85 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1148,6 +1234,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_86 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
@@ -1164,6 +1251,7 @@ Gfx gRcpSetupDLs[][9] = {
gsSPEndDisplayList(),
},
{
+ /* SETUPDL_87 */
gsDPPipeSync(),
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index 2e678ca7..86289379 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -25,7 +25,7 @@ s32 Graphics_Printf(const char* fmt, ...) {
return 0;
}
-void Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
+void Lib_Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
u16* pixel = SEGMENTED_TO_VIRTUAL(texture);
u16 tempPxl;
s32 u;
@@ -71,7 +71,7 @@ void Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
}
}
-void Texture_Mottle(u16* dst, u16* src, u8 mode) {
+void Lib_Texture_Mottle(u16* dst, u16* src, u8 mode) {
s32 u;
s32 v;
u8* dst8;
@@ -538,8 +538,8 @@ s32 Math_PursueVec3f(Vec3f* pos, Vec3f* target, Vec3f* rot, f32 stepSize, f32 sc
return (VEC3F_MAG(&diff)) < dist;
}
-void TextureRect_CI4(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_CI4(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -548,8 +548,8 @@ void TextureRect_CI4(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 hei
(s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_CI4_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
- f32 xScale, f32 yScale) {
+void Lib_TextureRect_CI4_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
+ f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -558,8 +558,8 @@ void TextureRect_CI4_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u3
G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_CI4_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
- f32 xScale, f32 yScale) {
+void Lib_TextureRect_CI4_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
+ f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -568,8 +568,8 @@ void TextureRect_CI4_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u3
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_CI4_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
- f32 xScale, f32 yScale) {
+void Lib_TextureRect_CI4_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
+ f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -578,8 +578,8 @@ void TextureRect_CI4_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u3
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
-void TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTLUT_pal256((*gfxPtr)++, palette);
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_CI, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -588,7 +588,8 @@ void TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 hei
(s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+void Lib_TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -596,8 +597,8 @@ void TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 x
(s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_RGBA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -605,7 +606,7 @@ void TextureRect_RGBA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_IA8(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+void Lib_TextureRect_IA8(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -613,8 +614,8 @@ void TextureRect_IA8(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos,
(s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_IA8_FlipMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA8_FlipMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
@@ -623,8 +624,8 @@ void TextureRect_IA8_FlipMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height,
(s32) (1.0f / xScale * 1024.0f));
}
-void TextureRect_IA8_FlipMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA8_FlipMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
@@ -633,8 +634,8 @@ void TextureRect_IA8_FlipMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f));
}
-void TextureRect_IA8_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA8_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -642,8 +643,8 @@ void TextureRect_IA8_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_IA8_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA8_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -651,7 +652,8 @@ void TextureRect_IA8_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
-void TextureRect_IA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+void Lib_TextureRect_IA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -659,8 +661,8 @@ void TextureRect_IA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPo
(s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_IA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -668,8 +670,8 @@ void TextureRect_IA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f3
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
-void TextureRect_IA16_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA16_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -677,8 +679,8 @@ void TextureRect_IA16_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f3
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
-void TextureRect_IA16_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
- f32 yScale) {
+void Lib_TextureRect_IA16_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -686,7 +688,8 @@ void TextureRect_IA16_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f
(u16) (s32) (-1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
-void TextureRect_RGBA32(Gfx** gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
+void Lib_TextureRect_RGBA32(Gfx** gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
+ f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@@ -781,15 +784,15 @@ void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
- TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos,
- 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos,
+ yPos, 1.0f, 1.0f);
startNumber = true;
xPos += 9;
number %= place;
}
}
- TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos, 1.0f,
- 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos,
+ 1.0f, 1.0f);
}
u8* sSmallNumberTex[] = { aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
@@ -803,13 +806,13 @@ void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
- TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
startNumber = true;
xPos += 9;
number %= place;
}
}
- TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
char sSmallChars[] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ!:-.0123456789";
@@ -961,7 +964,8 @@ void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
if ((text[0] == 'W') || (text[0] == 'X')) {
width = 32;
}
- TextureRect_IA8(&gMasterDisp, sLargeCharTex[charIndex], width, 15, xPosCurrent, yPos, xScale, yScale);
+ Lib_TextureRect_IA8(&gMasterDisp, sLargeCharTex[charIndex], width, 15, xPosCurrent, yPos, xScale,
+ yScale);
}
startPrint = true;
xPosCurrent += (sLargeCharWidths[charIndex] * xScale) + 2.0f;
@@ -1102,13 +1106,13 @@ void Graphics_DisplayLargeNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
- TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
startNumber = true;
xPos += 13;
number %= place;
}
}
- TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
}
void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char* text) {
@@ -1127,7 +1131,7 @@ void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
if (var_t0 > 30) {
width = 16;
}
- TextureRect_IA8(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
+ Lib_TextureRect_IA8(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
if (1) {}
}
switch (text[0]) {
diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c
index 98b3d0b4..967aed0b 100644
--- a/src/engine/fox_tank.c
+++ b/src/engine/fox_tank.c
@@ -486,7 +486,7 @@ void func_tank_80044868(Player* player) {
}
}
if (player->baseSpeed > 0.0f) {
- Texture_Scroll(D_landmaster_3002E80, 32, 32, 0);
+ Lib_Texture_Scroll(D_landmaster_3002E80, 32, 32, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && !gBossActive) {
func_tank_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f);
}
@@ -495,7 +495,7 @@ void func_tank_80044868(Player* player) {
}
}
if (player->baseSpeed > 10.0f) {
- Texture_Scroll(D_landmaster_3002E80, 32, 32, 0);
+ Lib_Texture_Scroll(D_landmaster_3002E80, 32, 32, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && !gBossActive) {
func_tank_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f);
}
diff --git a/src/engine/fox_versus.c b/src/engine/fox_versus.c
index 0ea9aa97..9b39e5ea 100644
--- a/src/engine/fox_versus.c
+++ b/src/engine/fox_versus.c
@@ -7,7 +7,7 @@
#define VS_TIE 99
-s32 D_versus_80178750;
+bool gVsMatchOver;
s32 gVsMatchState;
s32 D_versus_80178758;
s32 sUnlockLandmaster;
@@ -84,19 +84,19 @@ void Versus_Exit(void) {
}
void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) {
- TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale);
+ Lib_TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale);
}
void func_versus_800BC8D8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
- TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 8, xPos,
- yPos + (8 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 8, xPos,
+ yPos + (8 * i * scale), scale, scale);
}
- TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 7, xPos,
- yPos + (8 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 7, xPos,
+ yPos + (8 * i * scale), scale, scale);
}
void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
@@ -106,8 +106,8 @@ void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
s32 i;
for (i = 0; i < 5; i++) {
- TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale] + (D_800D4AB0[yScale] * 8 * i), D_800D4AA4[yScale],
- D_800D4AB0[yScale], 8, xPos, yPos + (8 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale] + (D_800D4AB0[yScale] * 8 * i), D_800D4AA4[yScale],
+ D_800D4AB0[yScale], 8, xPos, yPos + (8 * i * scale), scale, scale);
}
}
@@ -115,11 +115,11 @@ void func_versus_800BCB44(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
- TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 8, xPos,
- yPos + (8 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 8, xPos,
+ yPos + (8 * i * scale), scale, scale);
}
- TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 7, xPos,
- yPos + (8 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 7, xPos,
+ yPos + (8 * i * scale), scale, scale);
}
void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) {
@@ -129,19 +129,19 @@ void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4)
s32 i;
for (i = 0; i < 3; i++) {
- TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4],
- 8, xPos, yPos + (8 * i * yScale), xScale, yScale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4],
+ D_800D4AE8[arg4], 8, xPos, yPos + (8 * i * yScale), xScale, yScale);
}
- TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4], 1,
- xPos, yPos + (8 * i * yScale), xScale, yScale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4],
+ 1, xPos, yPos + (8 * i * yScale), xScale, yScale);
}
void func_versus_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
s32 i;
for (i = 0; i < 6; i++) {
- TextureRect_CI8(&gMasterDisp, D_versus_3001420 + (256 * 7 * i), D_versus_3003E20, 256, 7, xPos,
- yPos + (7 * i * yScale), xScale, yScale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_3001420 + (256 * 7 * i), D_versus_3003E20, 256, 7, xPos,
+ yPos + (7 * i * yScale), xScale, yScale);
}
}
@@ -149,66 +149,66 @@ void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 12; i++) {
- TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 2, xPos,
- yPos + (2 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 2, xPos,
+ yPos + (2 * i * scale), scale, scale);
}
- TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 1, xPos,
- yPos + (2 * i * scale), scale, scale);
+ Lib_TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 1, xPos,
+ yPos + (2 * i * scale), scale, scale);
}
void func_versus_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
- TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
+ Lib_TextureRect_CI8(&gMasterDisp, aMsgWindowBgTex, aMsgWindowBgTLUT, 24, 17, xPos, yPos, xScale, yScale);
}
void func_versus_800BD05C(f32 xPos, f32 yPos, f32 scale) {
- TextureRect_CI4(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale);
+ Lib_TextureRect_CI4(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD0B4(f32 xPos, f32 yPos, f32 scale) {
- TextureRect_CI4(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale);
+ Lib_TextureRect_CI4(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD10C(f32 xPos, f32 yPos, f32 scale) {
- TextureRect_CI4(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale);
+ Lib_TextureRect_CI4(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD164(f32 xPos, f32 yPos) {
- TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD1B0(f32 xPos, f32 yPos) {
- TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD1FC(f32 xPos, f32 yPos) {
- TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD248(f32 xPos, f32 yPos) {
- TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD2A0(f32 xPos, f32 yPos) {
- TextureRect_CI8(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI8(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD2F8(f32 xPos, f32 yPos) {
- TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD350(f32 xPos, f32 yPos) {
- TextureRect_CI8(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI8(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD3A8(f32 xPos, f32 yPos) {
s32 i;
for (i = 0; i < 8; i++) {
- TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 8, xPos,
- yPos + (i * 8), 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex + ((80 * 8 * i) / 2), aVsHandicapFrameTLUT, 80, 8, xPos,
+ yPos + (i * 8), 1.0f, 1.0f);
}
- TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 7, xPos,
- yPos + (i * 8), 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex + ((80 * 8 * i) / 2), aVsHandicapFrameTLUT, 80, 7, xPos,
+ yPos + (i * 8), 1.0f, 1.0f);
}
void func_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
@@ -223,21 +223,21 @@ void func_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
for (i /= 10; i != 1; i /= 10) {
j = arg2 / i;
if (j || (var_s2 == true)) {
- TextureRect_IA8(&gMasterDisp, D_800D4AF8[j / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4AF8[j / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
xPos += 9.0f;
arg2 %= i;
var_s2 = true;
}
}
- TextureRect_IA8(&gMasterDisp, D_800D4AF8[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4AF8[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD720(f32 xPos, f32 yPos) {
- TextureRect_IA8(&gMasterDisp, D_versus_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aVsStarTex, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD76C(f32 xPos, f32 yPos) {
- TextureRect_CI4(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
@@ -247,23 +247,23 @@ void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
for (i = 10; i != 1; i /= 10) {
if ((xPos > 0) && (yPos > 0)) {
- TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
xPos += 9.0f;
arg2 %= i;
}
if ((xPos > 0) && (yPos > 0)) {
- TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
}
void func_versus_800BD9FC(f32 xPos, f32 yPos) {
- TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BDA54(f32 xPos, f32 yPos) {
- TextureRect_IA8(&gMasterDisp, aSmallText_L, 8, 8, xPos, yPos, 1.0f, 1.0f);
+ Lib_TextureRect_IA8(&gMasterDisp, aSmallText_L, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
@@ -282,15 +282,19 @@ void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
temp1 = arg2 / i;
temp2 = arg3 / i;
if (temp1 == temp2) {
- TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, 15, xPos, yPos, 0.7f, 0.7f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, 15, xPos, yPos, 0.7f, 0.7f);
} else {
if (temp3 > y3) {
- TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2] + (16 * arg4), 16, 15 - arg4, xPos, yPos, 0.7f, 0.7f);
- TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, arg4, xPos, yPos + (15 - arg4) * 0.7f, 0.7f, 0.7f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2] + (16 * arg4), 16, 15 - arg4, xPos, yPos, 0.7f,
+ 0.7f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, arg4, xPos, yPos + (15 - arg4) * 0.7f, 0.7f,
+ 0.7f);
}
if (temp3 < y3) {
- TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2], 16, 15 - arg4, xPos, yPos + (arg4 * 0.7f), 0.7f, 0.7f);
- TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1] + (16 * (15 - arg4)), 16, arg4, xPos, yPos, 0.7f, 0.7f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2], 16, 15 - arg4, xPos, yPos + (arg4 * 0.7f), 0.7f,
+ 0.7f);
+ Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1] + (16 * (15 - arg4)), 16, arg4, xPos, yPos, 0.7f,
+ 0.7f);
}
}
xPos += 13.0f * 0.7f;
@@ -388,7 +392,7 @@ s32 Versus_DrawCountdown(f32 xPos, f32 yPos, s32* countdown) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
- TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, 120.0f, 115.0f, 3.33f, 0.53f);
+ Lib_TextureRect_CI8(&gMasterDisp, aMsgWindowBgTex, aMsgWindowBgTLUT, 24, 17, 120.0f, 115.0f, 3.33f, 0.53f);
xTemp = 0.0f;
@@ -790,7 +794,7 @@ bool Versus_CheckForWinner(void) {
}
if ((sVsPlayerCount == 1) && (numDown == 4)) {
- gVsMatchOver = true;
+ gVsMatchWon = true;
sVsWinner = VS_TIE;
} else {
for (i = 0; i < 4; i++) {
@@ -818,7 +822,7 @@ bool Versus_CheckForWinner(void) {
}
gPlayer[j].state_1C8 = PLAYERSTATE_1C8_VS_STANDBY;
}
- gVsMatchOver = true;
+ gVsMatchWon = true;
sVsWinner = i;
}
break;
@@ -833,7 +837,7 @@ bool Versus_CheckForWinner(void) {
}
}
if ((sVsPlayerCount == 1) && (numDown == 4)) {
- gVsMatchOver = true;
+ gVsMatchWon = true;
sVsWinner = VS_TIE;
} else {
if (numDown >= 2) {
@@ -857,7 +861,7 @@ bool Versus_CheckForWinner(void) {
}
gPlayer[j].state_1C8 = PLAYERSTATE_1C8_VS_STANDBY;
}
- gVsMatchOver = true;
+ gVsMatchWon = true;
}
break;
@@ -958,7 +962,7 @@ bool Versus_CheckForWinner(void) {
gPlayer[j].state_1C8 = PLAYERSTATE_1C8_VS_STANDBY;
}
- gVsMatchOver = true;
+ gVsMatchWon = true;
break;
default:
@@ -1043,7 +1047,7 @@ s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) {
Graphics_DisplaySmallText(x + 45.0f, y, 1.0f, 1.0f, "SCORE");
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_800869A0(x + 18.0f, y + 16.0f, D_800D4A94, 1.0f, 0, 9999);
+ HUD_Number_Draw(x + 18.0f, y + 16.0f, D_800D4A94, 1.0f, 0, 9999);
} else {
if (arg2 < 4) {
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
@@ -1262,7 +1266,7 @@ s32 func_versus_800C0E78(void) {
Graphics_DisplaySmallText(D_800D4C90[i], D_800D4CA4[i], 1.0f, 1.0f, D_800D4C80[i]);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- func_hud_800869A0(D_800D4C90[i], D_800D4CA4[i] + 9.0f, D_80178838[i], 1.0f, 0, 999);
+ HUD_Number_Draw(D_800D4C90[i], D_800D4CA4[i] + 9.0f, D_80178838[i], 1.0f, 0, 999);
}
}
@@ -1329,7 +1333,7 @@ void Versus_InitMatch(void) {
sVsMatchMenuOption = 0;
sVsWinner = VS_TIE;
D_801787B8 = 0;
- D_versus_80178750 = 0;
+ gVsMatchOver = false;
gBgColor = 0;
D_80178830 = 0;
D_800D4A90 = 0;
@@ -1538,7 +1542,7 @@ bool Versus_Update(void) {
break;
}
- D_versus_80178750 = 1;
+ gVsMatchOver = true;
gVsMatchState = VS_STATE_6;
func_versus_800C024C();
}
@@ -1660,7 +1664,7 @@ bool Versus_Update(void) {
if (D_80178830 > 224) {
Versus_Exit();
- D_menu_801B827C = 1;
+ gGoToTitle = true;
}
}
break;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:15:36 +0000