diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c index c31474e7..d1542bb3 100644 --- a/src/engine/behavior_script.c +++ b/src/engine/behavior_script.c @@ -905,8 +905,6 @@ static BhvCommandProc BehaviorCmdTable[] = { // Execute the behavior script of the current object, process the object flags, and other miscellaneous code for updating objects. void cur_obj_update(void) { - UNUSED u32 unused; - u32 objFlags = gCurrentObject->oFlags; f32 distanceFromMario; BhvCommandProc bhvCmdProc; diff --git a/src/engine/level_script.c b/src/engine/level_script.c index 8cf8300c..7940c50e 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -963,7 +963,7 @@ struct LevelCommand *level_script_execute(struct LevelCommand *cmd) { } profiler_log_thread5_time(LEVEL_SCRIPT_EXECUTE); - init_rcp(1); + init_rcp(CLEAR_ZBUFFER); render_game(); end_master_display_list(); alloc_display_list(0); diff --git a/src/game/game_init.c b/src/game/game_init.c index 8997558d..491d6a15 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -382,7 +382,7 @@ void render_init(void) { gGfxSPTask = &gGfxPool->spTask; gDisplayListHead = gGfxPool->buffer; gGfxPoolEnd = (u8 *)(gGfxPool->buffer + GFX_POOL_SIZE); - init_rcp(1); + init_rcp(CLEAR_ZBUFFER); clear_frame_buffer(0); end_master_display_list(); exec_display_list(&gGfxPool->spTask); diff --git a/src/game/game_init.h b/src/game/game_init.h index 2a58e917..0c1d170d 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -24,6 +24,11 @@ struct DemoInput u8 buttonMask; }; +enum ZBmodes { + KEEP_ZBUFFER = 0, + CLEAR_ZBUFFER = 1, +}; + extern struct Controller gControllers[3]; extern OSContStatus gControllerStatuses[4]; extern OSContPad gControllerPads[4]; diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 3e212810..02701875 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -169,14 +169,14 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) { if (renderPhase == 0 || renderPhase == 2) { gSPLoadUcodeL(gDisplayListHead++, gspF3DLX2_Rej_fifo); - init_rcp(0); + init_rcp(KEEP_ZBUFFER); gSPClipRatio(gDisplayListHead++, FRUSTRATIO_2); } else if (renderPhase == 1) { gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_PosLight_fifo); - init_rcp(0); + init_rcp(KEEP_ZBUFFER); gSPClipRatio(gDisplayListHead++, FRUSTRATIO_1); } if (enableZBuffer != 0) @@ -216,7 +216,7 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) { case 1: renderPhase++; j = 1; i = 5; goto loopBegin; } gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_PosLight_fifo); - init_rcp(0); + init_rcp(KEEP_ZBUFFER); gSPClipRatio(gDisplayListHead++, FRUSTRATIO_1); #endif if (enableZBuffer != 0)