summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormracsys <mracsys@gmail.com>2024-11-30 13:56:59 -0500
committerGitHub <noreply@github.com>2024-11-30 13:56:59 -0500
commite0bd123312977aebd661dad0bf68924169f0c550 (patch)
tree7abe0dcd12df6e59057b4201439f51fbdd64a03b /src
parentcddca30442934fe48d31cadc2e626d7bd9253216 (diff)
Document time-specific textures for Deku Tree and Gerudo Fortress similar to other scenes (#2310)
* rename time-specific scene file textures * linter fixes
Diffstat (limited to 'src')
-rw-r--r--src/code/z_scene_table.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index 24521f3aa..a64932f42 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -215,9 +215,9 @@ void Scene_DrawConfigDefault(PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 4735);
}
-void* D_8012A2F8[] = {
- gYdanTex_00BA18,
- gYdanTex_00CA18,
+void* sDekuTreeEntranceTextures[] = {
+ gDekuTreeDayEntranceTex,
+ gDekuTreeNightEntranceTex,
};
void Scene_DrawConfigDekuTree(PlayState* play) {
@@ -233,7 +233,8 @@ void Scene_DrawConfigDekuTree(PlayState* play) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[((void)0, gSaveContext.save.nightFlag)]));
+ gSPSegment(POLY_OPA_DISP++, 0x08,
+ SEGMENTED_TO_VIRTUAL(sDekuTreeEntranceTextures[((void)0, gSaveContext.save.nightFlag)]));
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 4783);
}
@@ -527,7 +528,7 @@ void Scene_DrawConfigThievesHideout(PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 5507);
}
-void* D_8012A330[] = {
+void* sWaterTempleEntranceTextures[] = {
gWaterTempleDayEntranceTex,
gWaterTempleNightEntranceTex,
};
@@ -544,9 +545,11 @@ void Scene_DrawConfigWaterTemple(PlayState* play) {
gameplayFrames = play->gameplayFrames;
#if !OOT_MQ
- gSPSegment(POLY_XLU_DISP++, 0x06, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
+ gSPSegment(POLY_XLU_DISP++, 0x06,
+ SEGMENTED_TO_VIRTUAL(sWaterTempleEntranceTextures[((void)0, gSaveContext.save.nightFlag)]));
#else
- gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
+ gSPSegment(POLY_XLU_DISP++, 0x08,
+ SEGMENTED_TO_VIRTUAL(sWaterTempleEntranceTextures[((void)0, gSaveContext.save.nightFlag)]));
#endif
if (spB0 == 1) {
@@ -966,11 +969,11 @@ void Scene_DrawConfigLonLonBuildings(PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 6528);
}
-void* sGuardHouseView2Textures[] = {
+void* sGuardHouseView1Textures[] = {
gGuardHouseOutSideView1DayTex,
gGuardHouseOutSideView1NightTex,
};
-void* sGuardHouseView1Textures[] = {
+void* sGuardHouseView2Textures[] = {
gGuardHouseOutSideView2DayTex,
gGuardHouseOutSideView2NightTex,
};
@@ -986,8 +989,8 @@ void Scene_DrawConfigMarketGuardHouse(PlayState* play) {
var = gSaveContext.save.nightFlag;
}
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var]));
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var]));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var]));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var]));
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1377,15 +1380,16 @@ void Scene_DrawConfigDesertColossus(PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7339);
}
-void* D_8012A380[] = {
- gSpot12_009678Tex,
- gSpot12_00DE78Tex,
+void* sGerudoFortressWallTextures[] = {
+ gGerudoFortressNightWallTex,
+ gGerudoFortressDayWallTex,
};
void Scene_DrawConfigGerudosFortress(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7363);
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[((void)0, gSaveContext.save.nightFlag)]));
+ gSPSegment(POLY_OPA_DISP++, 0x08,
+ SEGMENTED_TO_VIRTUAL(sGerudoFortressWallTextures[((void)0, gSaveContext.save.nightFlag)]));
CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7371);
}