summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/game.c4
-rw-r--r--src/code/graph.c2
-rw-r--r--src/code/z_debug.c2
-rw-r--r--src/code/z_demo.c1
-rw-r--r--src/code/z_draw.c2
-rw-r--r--src/code/z_eff_blure.c2
-rw-r--r--src/code/z_eff_ss_dead.c6
-rw-r--r--src/code/z_fcurve_data_skelanime.c2
-rw-r--r--src/code/z_kankyo.c1
-rw-r--r--src/code/z_message.c1
-rw-r--r--src/code/z_scene_table.c20
11 files changed, 5 insertions, 38 deletions
diff --git a/src/code/game.c b/src/code/game.c
index 7d290e332..ec67cde03 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -197,8 +197,6 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
Gfx_Close(polyOpaP, newDList);
POLY_OPA_DISP = newDList;
- if (1) {}
-
CLOSE_DISPS(gfxCtx, "../game.c", 800);
Debug_DrawText(gfxCtx);
@@ -238,8 +236,6 @@ void func_800C49F4(GraphicsContext* gfxCtx) {
Gfx_Close(polyOpaP, newDlist);
POLY_OPA_DISP = newDlist;
- if (1) {}
-
CLOSE_DISPS(gfxCtx, "../game.c", 865);
}
diff --git a/src/code/graph.c b/src/code/graph.c
index 92df90d8f..3e5df9145 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -246,8 +246,6 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
task->yield_data_ptr = gGfxSPTaskYieldBuffer;
- if (1) {}
-
task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer);
scTask->next = NULL;
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 652b6f643..7a38b3ded 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -308,8 +308,6 @@ void Debug_DrawText(GraphicsContext* gfxCtx) {
Gfx_Close(opaStart, gfx);
POLY_OPA_DISP = gfx;
- if (1) {}
-
CLOSE_DISPS(gfxCtx, "../z_debug.c", 664);
GfxPrint_Destroy(&printer);
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index efecba8de..f86e32dcc 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -2222,7 +2222,6 @@ void CutsceneHandler_RunScript(PlayState* play, CutsceneContext* csCtx) {
Gfx_Close(prevDisplayList, displayList);
POLY_OPA_DISP = displayList;
- if (1) {}
CLOSE_DISPS(play->state.gfxCtx, "../z_demo.c", 4108);
}
#endif
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index f890804eb..671b8d0e2 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -768,8 +768,6 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) {
Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
- if (1) {}
-
Gfx_SetupDL_25Opa(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_draw.c", 1140), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 47722faaf..09715288a 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -452,8 +452,6 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
vtx[2].v.cn[2] = sp7C.b;
vtx[2].v.cn[3] = sp7C.a;
- if (1) {} // Necessary to match
-
sp60.x = sp84.x;
sp60.y = sp84.y;
sp60.z = sp84.z;
diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c
index be283f773..c77b7f215 100644
--- a/src/code/z_eff_ss_dead.c
+++ b/src/code/z_eff_ss_dead.c
@@ -23,8 +23,6 @@ void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
POLY_OPA_DISP = displayListHead;
- if (1) {} // Necessary to match
-
CLOSE_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 129);
}
@@ -44,8 +42,6 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
POLY_OPA_DISP = displayListHead;
- if (1) {} // Necessary to match
-
CLOSE_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 153);
}
}
@@ -84,8 +80,6 @@ void func_80026690(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
POLY_XLU_DISP = displayListHead;
- if (1) {} // Necessary to match
-
CLOSE_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 194);
}
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index e4d4b8a77..2348fa13a 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -162,8 +162,6 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov
OPEN_DISPS(play->state.gfxCtx, "../z_fcurve_data_skelanime.c", 279);
- if (1) {}
-
Matrix_Push();
if ((overrideLimbDraw == NULL) ||
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index aeef9228c..f0f36341d 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -984,7 +984,6 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
gSPEndDisplayList(displayList++);
Gfx_Close(prevDisplayList, displayList);
POLY_OPA_DISP = displayList;
- if (1) {}
CLOSE_DISPS(play->state.gfxCtx, "../z_kankyo.c", 1690);
}
#endif
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 2aa9a3ff8..620a6d086 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -3870,7 +3870,6 @@ void Message_Draw(PlayState* play) {
Gfx_Close(polyOpaP, plusOne);
POLY_OPA_DISP = plusOne;
}
- if (1) {}
#endif
plusOne = Gfx_Open(polyOpaP = POLY_OPA_DISP);
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index b38aa2c8e..d1cd007ab 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -415,8 +415,6 @@ void Scene_DrawConfigWaterTemple(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 5535);
- if (1) {} // Necessary to match
-
spB0 = (play->roomCtx.unk_74[1] >> 8) & 0xFF;
spAC = play->roomCtx.unk_74[1] & 0xFF;
gameplayFrames = play->gameplayFrames;
@@ -709,8 +707,6 @@ void Scene_DrawConfigLakesideLaboratory(PlayState* play) {
32, 32));
gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TexScroll(play->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64));
- if (1) {}
-
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -748,8 +744,6 @@ void* sGTGEntranceTextures[] = {
void Scene_DrawConfigGerudoTrainingGround(PlayState* play) {
u32 gameplayFrames;
- if (0) {} // Necessary to match
-
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 6290);
gameplayFrames = play->gameplayFrames;
@@ -914,8 +908,6 @@ void* sForestTempleEntranceTextures[] = {
void Scene_DrawConfigForestTemple(PlayState* play) {
u32 gameplayFrames;
- if (0) {} // Necessary to match
-
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 6640);
gameplayFrames = play->gameplayFrames;
@@ -1042,8 +1034,6 @@ void Scene_DrawConfigZorasRiver(PlayState* play) {
(gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128,
32, 32));
- if (1) {}
-
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1177,8 +1167,6 @@ void Scene_DrawConfigZorasFountain(PlayState* play) {
Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
(gameplayFrames * 1) % 128, 32, 32));
- if (1) {}
-
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1552,8 +1540,6 @@ void Scene_DrawConfigInsideGanonsCastle(PlayState* play) {
gameplayFrames = play->gameplayFrames;
- if (1) {}
-
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 127 - gameplayFrames % 128,
(gameplayFrames * 1) % 512, 32, 128, 1, gameplayFrames % 128,
@@ -1659,7 +1645,8 @@ void (*sSceneDrawConfigs[SDC_MAX])(PlayState*) = {
};
void Scene_Draw(PlayState* play) {
- if ((R_HREG_MODE == HREG_MODE_SCENE_CONFIG) && OOT_DEBUG) {
+#if OOT_DEBUG
+ if (R_HREG_MODE == HREG_MODE_SCENE_CONFIG) {
if (R_SCENE_CONFIG_INIT != HREG_MODE_SCENE_CONFIG) {
R_SCENE_CONFIG_INIT = HREG_MODE_SCENE_CONFIG;
R_SCENE_CONFIG_DRAW_DEFAULT_DLIST = 1;
@@ -1694,4 +1681,7 @@ void Scene_Draw(PlayState* play) {
} else {
sSceneDrawConfigs[play->sceneDrawConfig](play);
}
+#else
+ sSceneDrawConfigs[play->sceneDrawConfig](play);
+#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 09:11:14 +0000