mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-09-02 18:52:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hud, Title, Map & Option Docs (#272)

Browse Source 
* hud title and option docs

* hud docs

* aspMain vram comment

* more hud docs

* HUD docs

* Hud_ -> HUD_ consistency

* ActorMissileSeekModes

* fox_option docs

* more option docs

* more option docs

* more option docs

* fox_title docs

* more fox_title docs

* fox_map docs

* fix map TLUTs

* more fox_map docs

* jp1 explore

* explore us rev0

* SETUPDL comments

* format

* fox_map docs

* more fox_map docs
This commit is contained in:
Alejandro Asenjo Nitti
2024-09-13 00:59:33 -03:00
committed by GitHub
parent bfe2cd1c20
commit 53363d6619
140 changed files with 8764 additions and 6782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_360.c
+1 -1
View File
@@ -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;
src/engine/fox_beam.c
+6 -6
View File
@@ -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:
src/engine/fox_bg.c
+8 -4
View File
@@ -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,
src/engine/fox_context.c
+12 -2
View File
@@ -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
src/engine/fox_demo.c
+15 -15
View File
@@ -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) {
src/engine/fox_display.c
+32 -25
View File
@@ -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();
src/engine/fox_edata_info.c
+2 -2
View File
@@ -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 },
src/engine/fox_edisplay.c
+14 -14
View File
@@ -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:
src/engine/fox_effect.c
+17 -17
View File
@@ -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);
}
src/engine/fox_enmy.c
+1 -1
View File
@@ -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;
src/engine/fox_enmy2.c
+1 -1
View File
@@ -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);
src/engine/fox_game.c
+12 -12
View File
@@ -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();
}
src/engine/fox_hud.c
+930 -898
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_load.c
+2 -2
View File
@@ -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;
}
src/engine/fox_play.c
+15 -15
View File
@@ -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)) {
src/engine/fox_radio.c
+25 -25
View File
@@ -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)) &&
src/engine/fox_rcp_setup.c
+88
View File
@@ -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),
src/engine/fox_std_lib.c
+46 -42
View File
@@ -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]) {
src/engine/fox_tank.c
+2 -2
View File
@@ -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);
}
src/engine/fox_versus.c
+65 -61
View File
@@ -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;