summaryrefslogtreecommitdiff
path: root/src/engine/fox_effect.c
diff options
context:
space:
mode:
authorAlejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>2024-09-13 00:59:33 -0300
committerGitHub <noreply@github.com>2024-09-13 00:59:33 -0300
commit53363d66192a83996b9c2c874ff7f18e69068311 (patch)
treef9460e8bcb87ea77ba4e64737e9a22cc4bd38d08 /src/engine/fox_effect.c
parentbfe2cd1c20638a93f61f787cbe666c38f5c66c96 (diff)
Hud, Title, Map & Option Docs (#272)
* 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
Diffstat (limited to 'src/engine/fox_effect.c')
-rw-r--r--src/engine/fox_effect.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c
index d4a89a61..4133d968 100644
--- a/src/engine/fox_effect.c
+++ b/src/engine/fox_effect.c
@@ -288,7 +288,7 @@ void Effect_Effect384_Draw(Effect384* this) {
break;
}
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -298,7 +298,7 @@ void Effect_Effect385_Draw(Effect385* this) {
RCP_SetupDL(&gMasterDisp, SETUPDL_38);
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 192, 255, this->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, this->unk_44);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -372,7 +372,7 @@ void Effect_Effect347_Draw(Effect347* this) {
void Effect_Effect351_Draw(Effect351* this) {
Graphics_SetScaleMtx(this->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->unk_4A);
- gSPDisplayList(gMasterDisp++, D_102A8A0);
+ gSPDisplayList(gMasterDisp++, aRadarMarkKaSaucererDL);
}
void Effect_Clouds_Draw(EffectClouds* this) {
@@ -442,7 +442,7 @@ void Effect_Effect346_Draw(Effect346* this) {
tmp = temp_ft3 * 4.0f;
gDPSetEnvColor(gMasterDisp++, D_800D173C[tmp + 0], D_800D173C[tmp + 1], D_800D173C[tmp + 2], 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
@@ -561,7 +561,7 @@ void Effect_Effect393_Draw(Effect393* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
Graphics_SetScaleMtx(this->scale2 * this->scale1);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
@@ -774,7 +774,7 @@ void Effect_Effect357_Draw(Effect357* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 80, 0, 255);
Graphics_SetScaleMtx(this->scale1);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 11:
@@ -878,7 +878,7 @@ void Effect_Effect357_Draw(Effect357* this) {
}
void Effect_Effect383_Update(Effect383* this) {
- Texture_Scroll(D_10190C0, 16, 32, 0);
+ Lib_Texture_Scroll(D_10190C0, 16, 32, 0);
gGroundClipMode = 2;
this->obj.rot.y += 1.0f;
Math_SmoothStepToF(&this->scale2, this->scale1, 0.05f, 1.5f, 0.001f);
@@ -3097,7 +3097,7 @@ void Effect_Effect398_Draw(Effect398* this) {
Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 3.0f, 1.5f, 3.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
}
}
@@ -3319,7 +3319,7 @@ void Effect_Effect394_Draw(Effect394* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 190, 255);
gDPSetEnvColor(gMasterDisp++, 239, 15, 0, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
}
}
@@ -3894,14 +3894,14 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 1:
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_101C2E0);
+ gSPDisplayList(gMasterDisp++, aStarDL);
break;
case 2:
@@ -3910,7 +3910,7 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 3:
@@ -3954,7 +3954,7 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 128, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 9:
@@ -3963,12 +3963,12 @@ void Effect_Effect395_Draw(Effect395* this) {
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->scale1);
gDPSetEnvColor(gMasterDisp++, 255, 255, 128, 255);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 10:
if (gPlayState != PLAY_PAUSE) {
- Texture_Scroll(D_A6_6012840, 16, 16, 0);
+ Lib_Texture_Scroll(D_A6_6012840, 16, 16, 0);
}
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Scale(gGfxMatrix, this->unk_60.x, this->unk_60.y, this->unk_60.z, MTXF_APPLY);
@@ -3982,7 +3982,7 @@ void Effect_Effect395_Draw(Effect395* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 111, 111, 111, (s32) this->scale1);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 255);
Graphics_SetScaleMtx(this->scale2);
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
break;
case 12:
@@ -4234,6 +4234,6 @@ void Effect_Effect399_Draw(Effect399* this) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1950[this->unk_44]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
}
- gSPDisplayList(gMasterDisp++, D_1024AC0);
+ gSPDisplayList(gMasterDisp++, aOrbDL);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}