Initial cleanup

HackerN64 · Jun 6, 2024 · 762f5b6 · 762f5b6
1 parent 5223a53
commit 762f5b6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/include/config/config_debug.h b/include/config/config_debug.h
@@ -31,7 +31,7 @@
 #define BOOT_TO_SCENE true
 #define BOOT_TO_SCENE_NEW_GAME_ONLY false
 #define BOOT_TO_FILE_SELECT false
-#define BOOT_TO_MAP_SELECT true
+#define BOOT_TO_MAP_SELECT false
 
 /**
  * Use file 1 to load the map select from the file select

diff --git a/include/z64.h b/include/z64.h
@@ -431,7 +431,7 @@ typedef struct PlayState {
     /* 0x117A4 */ ObjectContext objectCtx;
     /* 0x11CBC */ RoomContext roomCtx;
     /* 0x11D34 */ TransitionActorContext transiActorCtx;
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
                   OcclusionPlaneContext occPlaneCtx;
 #endif
     /* 0x11D3C */ void (*playerInit)(Player* player, struct PlayState* play, FlexSkeletonHeader* skelHeader);

diff --git a/include/z64scene.h b/include/z64scene.h
@@ -316,7 +316,7 @@ typedef struct {
     /* 0x04 */ u32 area;
 } SCmdMiscSettings;
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
 typedef struct {
     /* 0x00 */ u8  code;
     /* 0x01 */ u8  count;
@@ -351,7 +351,7 @@ typedef union {
     SCmdEchoSettings      echoSettings;
     SCmdMiscSettings      miscSettings;
     SCmdAltHeaders        altHeaders;
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
     SCmdOccPlaneCandList  occPlaneCandList;
 #endif
 } SceneCmd; // size = 0x8
@@ -506,7 +506,7 @@ typedef enum {
     /* 0x17 */ SCENE_CMD_ID_CUTSCENE_DATA,
     /* 0x18 */ SCENE_CMD_ID_ALTERNATE_HEADER_LIST,
     /* 0x19 */ SCENE_CMD_ID_MISC_SETTINGS,
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
                SCENE_CMD_ID_OCC_PLANE_CAND_LIST,
 #endif
     /* 0x1A */ SCENE_CMD_ID_MAX
@@ -591,7 +591,7 @@ typedef enum {
 #define SCENE_CMD_MISC_SETTINGS(sceneCamType, worldMapLocation) \
     { SCENE_CMD_ID_MISC_SETTINGS, sceneCamType, CMD_W(worldMapLocation) }
 
-#ifdef ENABLE_F3DEX3_OCCLUSION_PLANES
+#ifdef ENABLE_F3DEX3
 #define SCENE_CMD_OCCLUSION_PLANE_CANDIDATES_LIST(numPlanes, planeList) \
     { SCENE_CMD_ID_OCC_PLANE_CAND_LIST, numPlanes, CMD_PTR(planeList) }
 #endif

diff --git a/src/code/z_play.c b/src/code/z_play.c
@@ -1285,7 +1285,7 @@ void Play_Draw(PlayState* this) {
 
         gSPSegment(POLY_OPA_DISP++, 0x01, this->billboardMtx);
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
         OcclusionPlane_Draw_Start(this);
 #endif
 
@@ -1385,7 +1385,7 @@ void Play_Draw(PlayState* this) {
             Environment_DrawSkyboxFilters(this);
         }
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
         OcclusionPlane_Draw_Phase(this, OCCLUSION_PLANE_PHASE_PRE_SCENE);
 #endif
         if (!IS_DEBUG || (R_HREG_MODE != HREG_MODE_PLAY) || (R_PLAY_DRAW_ENV_FLAGS & PLAY_ENV_DRAW_LIGHTNING)) {
@@ -1417,7 +1417,7 @@ void Play_Draw(PlayState* this) {
         if (!IS_DEBUG || (R_HREG_MODE != HREG_MODE_PLAY) || R_PLAY_DRAW_SKYBOX) {
             if ((this->skyboxCtx.drawType != SKYBOX_DRAW_128) &&
                 (GET_ACTIVE_CAM(this)->setting != CAM_SET_PREREND_FIXED)) {
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
                 OcclusionPlane_Draw_Phase(this, OCCLUSION_PLANE_PHASE_PRE_SKY_2);
 #endif
                 Vec3f quakeOffset;
@@ -1430,7 +1430,7 @@ void Play_Draw(PlayState* this) {
             }
         }
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
         OcclusionPlane_Draw_Phase(this, OCCLUSION_PLANE_PHASE_PRE_ACTORS);
 #endif
         if (this->envCtx.precipitation[PRECIP_RAIN_CUR] != 0) {
@@ -1549,7 +1549,7 @@ void Play_Draw(PlayState* this) {
             Skybox_UpdateMatrix(&this->skyboxCtx, this->view.eye.x, this->view.eye.y, this->view.eye.z);
         }
     }
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
     OcclusionPlane_Draw_PostCamUpdate(this);
 #endif
 
@@ -1692,7 +1692,7 @@ void Play_InitScene(PlayState* this, s32 spawn) {
 
     this->numActorEntries = 0;
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
     OcclusionPlane_NewScene(this);
 #endif
     Object_InitContext(this, &this->objectCtx);

diff --git a/src/code/z_scene.c b/src/code/z_scene.c
@@ -483,7 +483,7 @@ BAD_RETURN(s32) Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) {
     }
 }
 
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
 BAD_RETURN(s32) Scene_CommandOccPlaneCandList(PlayState* play, SceneCmd* cmd){
     play->occPlaneCtx.list = SEGMENTED_TO_VIRTUAL(cmd->occPlaneCandList.list);
     play->occPlaneCtx.count = cmd->occPlaneCandList.count;
@@ -537,7 +537,7 @@ SceneCmdHandlerFunc gSceneCmdHandlers[SCENE_CMD_ID_MAX] = {
     Scene_CommandCutsceneData,             // SCENE_CMD_ID_CUTSCENE_DATA
     Scene_CommandAlternateHeaderList,      // SCENE_CMD_ID_ALTERNATE_HEADER_LIST
     Scene_CommandMiscSettings,             // SCENE_CMD_ID_MISC_SETTINGS
-#if ENABLE_F3DEX3_OCCLUSION_PLANES
+#if ENABLE_F3DEX3
     Scene_CommandOccPlaneCandList,         // SCENE_CMD_ID_OCC_PLANE_CAND_LIST
 #endif
 };