From 147c92fd0eb3c3f559f75f119bdb36ec0c04aff2 Mon Sep 17 00:00:00 2001 From: a Date: Fri, 4 Jul 2025 15:11:00 -0400 Subject: [PATCH] gDisplayListHead++ -> MASTERDL --- src/game/area.c | 10 +- src/game/game_init.c | 112 +++++----- src/game/game_init.h | 1 + src/game/hud.c | 60 ++--- src/game/ingame_menu.c | 374 ++++++++++++++++---------------- src/game/print.c | 18 +- src/game/profiler.c | 30 +-- src/game/rendering_graph_node.c | 32 +-- src/game/screen_transition.c | 44 ++-- src/init/memory.c | 2 +- src/menu/file_select.c | 146 ++++++------- src/menu/star_select.c | 44 ++-- 12 files changed, 437 insertions(+), 436 deletions(-) diff --git a/src/game/area.c b/src/game/area.c index 082bed0f..a75a4ce7 100644 --- a/src/game/area.c +++ b/src/game/area.c @@ -370,18 +370,18 @@ void render_game(void) { if (gCurrentArea != NULL && !gWarpTransition.pauseRendering) { geo_process_root(gCurrentArea->unk04, D_8032CE74, D_8032CE78, gFBSetColor); - gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_8032CF00)); + gSPViewport(MASTERDL, VIRTUAL_TO_PHYSICAL(&D_8032CF00)); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - BORDER_HEIGHT); render_hud(); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); render_text_labels(); do_cutscene_handler(); print_displaying_credits_entry(); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - BORDER_HEIGHT); gMenuOptSelectIndex = render_menus_and_dialogs(); if (gMenuOptSelectIndex != MENU_OPT_NONE) { @@ -391,7 +391,7 @@ void render_game(void) { if (D_8032CE78 != NULL) { make_viewport_clip_rect(D_8032CE78); } else { - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - BORDER_HEIGHT); } diff --git a/src/game/game_init.c b/src/game/game_init.c index 529d5bb6..5e02d8b7 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -85,47 +85,47 @@ struct DemoInput gRecordedDemoInput = { 0 }; * Sets the initial RDP (Reality Display Processor) rendering settings. */ void init_rdp(void) { - gDPPipeSync(gDisplayListHead++); - gDPPipelineMode(gDisplayListHead++, G_PM_1PRIMITIVE); + gDPPipeSync(MASTERDL); + gDPPipelineMode(MASTERDL, G_PM_1PRIMITIVE); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE); + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetCombineMode(MASTERDL, G_CC_SHADE, G_CC_SHADE); - gDPSetTextureLOD(gDisplayListHead++, G_TL_TILE); - gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPSetTextureDetail(gDisplayListHead++, G_TD_CLAMP); - gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); - gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP); - gDPSetTextureConvert(gDisplayListHead++, G_TC_FILT); + gDPSetTextureLOD(MASTERDL, G_TL_TILE); + gDPSetTextureLUT(MASTERDL, G_TT_NONE); + gDPSetTextureDetail(MASTERDL, G_TD_CLAMP); + gDPSetTexturePersp(MASTERDL, G_TP_PERSP); + gDPSetTextureFilter(MASTERDL, G_TF_BILERP); + gDPSetTextureConvert(MASTERDL, G_TC_FILT); - gDPSetCombineKey(gDisplayListHead++, G_CK_NONE); - gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); - gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetColorDither(gDisplayListHead++, G_CD_MAGICSQ); - gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetCombineKey(MASTERDL, G_CK_NONE); + gDPSetAlphaCompare(MASTERDL, G_AC_NONE); + gDPSetRenderMode(MASTERDL, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetColorDither(MASTERDL, G_CD_MAGICSQ); + gDPSetCycleType(MASTERDL, G_CYC_FILL); #if defined(VERSION_SH) || defined(VERSION_CN) - gDPSetAlphaDither(gDisplayListHead++, G_AD_PATTERN); + gDPSetAlphaDither(MASTERDL, G_AD_PATTERN); #endif - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); } /** * Sets the initial RSP (Reality Signal Processor) settings. */ void init_rsp(void) { - gSPClearGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CULL_BOTH | G_FOG + gSPClearGeometryMode(MASTERDL, G_SHADE | G_SHADING_SMOOTH | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD); - gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CULL_BACK | G_LIGHTING); + gSPSetGeometryMode(MASTERDL, G_SHADE | G_SHADING_SMOOTH | G_CULL_BACK | G_LIGHTING); - gSPNumLights(gDisplayListHead++, NUMLIGHTS_1); - gSPTexture(gDisplayListHead++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gSPNumLights(MASTERDL, NUMLIGHTS_1); + gSPTexture(MASTERDL, 0, 0, 0, G_TX_RENDERTILE, G_OFF); // @bug Failing to set the clip ratio will result in warped triangles in F3DEX2 // without this change: https://jrra.zone/n64/doc/n64man/gsp/gSPClipRatio.htm #ifdef F3DEX_GBI_2 - gSPClipRatio(gDisplayListHead++, FRUSTRATIO_1); + gSPClipRatio(MASTERDL, FRUSTRATIO_1); #endif } @@ -133,16 +133,16 @@ void init_rsp(void) { * Initialize the z buffer for the current frame. */ void init_z_buffer(void) { - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetDepthSource(gDisplayListHead++, G_ZS_PIXEL); - gDPSetDepthImage(gDisplayListHead++, gPhysicalZBuffer); + gDPSetDepthSource(MASTERDL, G_ZS_PIXEL); + gDPSetDepthImage(MASTERDL, gPhysicalZBuffer); - gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gPhysicalZBuffer); - gDPSetFillColor(gDisplayListHead++, + gDPSetColorImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gPhysicalZBuffer); + gDPSetFillColor(MASTERDL, GPACK_ZDZ(G_MAXFBZ, 0) << 16 | GPACK_ZDZ(G_MAXFBZ, 0)); - gDPFillRectangle(gDisplayListHead++, 0, BORDER_HEIGHT, SCREEN_WIDTH - 1, + gDPFillRectangle(MASTERDL, 0, BORDER_HEIGHT, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - BORDER_HEIGHT); } @@ -150,12 +150,12 @@ void init_z_buffer(void) { * Tells the RDP which of the three framebuffers it shall draw to. */ void select_framebuffer(void) { - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); - gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + gDPSetCycleType(MASTERDL, G_CYC_1CYCLE); + gDPSetColorImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gPhysicalFramebuffers[sRenderingFramebuffer]); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT - BORDER_HEIGHT); } @@ -164,19 +164,19 @@ void select_framebuffer(void) { * Information about the color argument: https://jrra.zone/n64/doc/n64man/gdp/gDPSetFillColor.htm */ void clear_framebuffer(s32 color) { - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetRenderMode(MASTERDL, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCycleType(MASTERDL, G_CYC_FILL); - gDPSetFillColor(gDisplayListHead++, color); - gDPFillRectangle(gDisplayListHead++, + gDPSetFillColor(MASTERDL, color); + gDPFillRectangle(MASTERDL, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), BORDER_HEIGHT, GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - BORDER_HEIGHT - 1); - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + gDPSetCycleType(MASTERDL, G_CYC_1CYCLE); } /** @@ -193,35 +193,35 @@ void clear_viewport(Vp *viewport, s32 color) { vpLrx = GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(SCREEN_WIDTH - vpLrx); #endif - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetRenderMode(MASTERDL, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCycleType(MASTERDL, G_CYC_FILL); - gDPSetFillColor(gDisplayListHead++, color); - gDPFillRectangle(gDisplayListHead++, vpUlx, vpUly, vpLrx, vpLry); + gDPSetFillColor(MASTERDL, color); + gDPFillRectangle(MASTERDL, vpUlx, vpUly, vpLrx, vpLry); - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + gDPSetCycleType(MASTERDL, G_CYC_1CYCLE); } /** * Draw the horizontal screen borders. */ void draw_screen_borders(void) { - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetRenderMode(MASTERDL, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetCycleType(MASTERDL, G_CYC_FILL); - gDPSetFillColor(gDisplayListHead++, GPACK_RGBA5551(0, 0, 0, 0) << 16 | GPACK_RGBA5551(0, 0, 0, 0)); + gDPSetFillColor(MASTERDL, GPACK_RGBA5551(0, 0, 0, 0) << 16 | GPACK_RGBA5551(0, 0, 0, 0)); #if BORDER_HEIGHT != 0 - gDPFillRectangle(gDisplayListHead++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), 0, + gDPFillRectangle(MASTERDL, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), 0, GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, BORDER_HEIGHT - 1); - gDPFillRectangle(gDisplayListHead++, + gDPFillRectangle(MASTERDL, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), SCREEN_HEIGHT - BORDER_HEIGHT, GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - 1); #endif @@ -237,7 +237,7 @@ void make_viewport_clip_rect(Vp *viewport) { s16 vpLrx = (viewport->vp.vtrans[0] + viewport->vp.vscale[0]) / 4 - 1; s16 vpLry = (viewport->vp.vtrans[1] + viewport->vp.vscale[1]) / 4 - 1; - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, vpUlx, vpPly, vpLrx, vpLry); + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, vpUlx, vpPly, vpLrx, vpLry); } /** @@ -288,8 +288,8 @@ void end_master_display_list(void) { draw_profiler(); } - gDPFullSync(gDisplayListHead++); - gSPEndDisplayList(gDisplayListHead++); + gDPFullSync(MASTERDL); + gSPEndDisplayList(MASTERDL); create_gfx_task_structure(); } diff --git a/src/game/game_init.h b/src/game/game_init.h index ff227f67..2e1d2fcd 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -10,6 +10,7 @@ #include "init/memory.h" #define GFX_POOL_SIZE 6400 // Size of how large the master display list (gDisplayListHead) can be +#define MASTERDL gDisplayListHead++ struct GfxPool { Gfx buffer[GFX_POOL_SIZE]; diff --git a/src/game/hud.c b/src/game/hud.c index 2d94dce7..7d49619e 100644 --- a/src/game/hud.c +++ b/src/game/hud.c @@ -57,10 +57,10 @@ static s16 sCameraHUDStatus = CAM_STATUS_NONE; * Renders a rgba16 16x16 glyph texture from a table list. */ void render_hud_tex_lut(s32 x, s32 y, u8 *texture) { - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture); - gSPDisplayList(gDisplayListHead++, &dl_hud_img_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 15) << 2, (y + 15) << 2, + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture); + gSPDisplayList(MASTERDL, &dl_hud_img_load_tex_block); + gSPTextureRectangle(MASTERDL, x << 2, y << 2, (x + 15) << 2, (y + 15) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10); } @@ -68,17 +68,17 @@ void render_hud_tex_lut(s32 x, s32 y, u8 *texture) { * Renders a rgba16 8x8 glyph texture from a table list. */ void render_hud_small_tex_lut(s32 x, s32 y, u8 *texture) { - gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, + gDPSetTile(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD); - gDPTileSync(gDisplayListHead++); - gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0, G_TX_RENDERTILE, 0, + gDPTileSync(MASTERDL); + gDPSetTile(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 3, G_TX_NOLOD, G_TX_CLAMP, 3, G_TX_NOLOD); - gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 7) << 2, (y + 7) << 2, G_TX_RENDERTILE, + gDPSetTileSize(MASTERDL, G_TX_RENDERTILE, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC); + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)); + gSPTextureRectangle(MASTERDL, x << 2, y << 2, (x + 7) << 2, (y + 7) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10); } @@ -88,13 +88,13 @@ void render_hud_small_tex_lut(s32 x, s32 y, u8 *texture) { void render_power_meter_health_segment(s16 numHealthWedges) { u8 *(*healthLUT)[] = segmented_to_virtual(&power_meter_health_segments_lut); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, (*healthLUT)[numHealthWedges - 1]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)); - gSP1Triangle(gDisplayListHead++, 0, 1, 2, 0); - gSP1Triangle(gDisplayListHead++, 0, 2, 3, 0); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)); + gSP1Triangle(MASTERDL, 0, 1, 2, 0); + gSP1Triangle(MASTERDL, 0, 2, 3, 0); } /** @@ -110,17 +110,17 @@ void render_dl_power_meter(s16 numHealthWedges) { guTranslate(mtx, (f32) sPowerMeterHUD.x, (f32) sPowerMeterHUD.y, 0); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx++), + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(mtx++), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); - gSPDisplayList(gDisplayListHead++, &dl_power_meter_base); + gSPDisplayList(MASTERDL, &dl_power_meter_base); if (numHealthWedges != 0) { - gSPDisplayList(gDisplayListHead++, &dl_power_meter_health_segments_begin); + gSPDisplayList(MASTERDL, &dl_power_meter_health_segments_begin); render_power_meter_health_segment(numHealthWedges); - gSPDisplayList(gDisplayListHead++, &dl_power_meter_health_segments_end); + gSPDisplayList(MASTERDL, &dl_power_meter_health_segments_end); } - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } /** @@ -350,10 +350,10 @@ void render_hud_timer(void) { print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(71), 185, "%02d", timerSecs); print_text_fmt_int(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(37), 185, "%d", timerFracSecs); - gSPDisplayList(gDisplayListHead++, dl_hud_img_begin); + gSPDisplayList(MASTERDL, dl_hud_img_begin); render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(81), 32, (*hudLUT)[GLYPH_APOSTROPHE]); render_hud_tex_lut(GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(46), 32, (*hudLUT)[GLYPH_DOUBLE_QUOTE]); - gSPDisplayList(gDisplayListHead++, dl_hud_img_end); + gSPDisplayList(MASTERDL, dl_hud_img_end); } /** @@ -377,7 +377,7 @@ void render_hud_camera_status(void) { return; } - gSPDisplayList(gDisplayListHead++, dl_hud_img_begin); + gSPDisplayList(MASTERDL, dl_hud_img_begin); render_hud_tex_lut(x, y, (*cameraLUT)[GLYPH_CAM_CAMERA]); switch (sCameraHUDStatus & CAM_STATUS_MODE_GROUP) { @@ -401,7 +401,7 @@ void render_hud_camera_status(void) { break; } - gSPDisplayList(gDisplayListHead++, dl_hud_img_end); + gSPDisplayList(MASTERDL, dl_hud_img_end); } /** @@ -426,8 +426,8 @@ void render_hud(void) { create_dl_identity_matrix(); guOrtho(mtx, -16.0f, SCREEN_WIDTH + 16, 0, SCREEN_HEIGHT, -10.0f, 10.0f, 1.0f); - gSPPerspNormalize(gDisplayListHead++, 0xFFFF); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), + gSPPerspNormalize(MASTERDL, 0xFFFF); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); #else create_dl_ortho_matrix(); diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index d1f5741f..e3868664 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -146,8 +146,8 @@ void create_dl_identity_matrix(void) { guMtxIdent(matrix); #endif - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); } void create_dl_translation_matrix(s8 pushOp, f32 x, f32 y, f32 z) { @@ -160,11 +160,11 @@ void create_dl_translation_matrix(s8 pushOp, f32 x, f32 y, f32 z) { guTranslate(matrix, x, y, z); if (pushOp == MENU_MTX_PUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); } if (pushOp == MENU_MTX_NOPUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); } } @@ -178,11 +178,11 @@ void create_dl_rotation_matrix(s8 pushOp, f32 a, f32 x, f32 y, f32 z) { guRotate(matrix, a, x, y, z); if (pushOp == MENU_MTX_PUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); } if (pushOp == MENU_MTX_NOPUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); } } @@ -196,11 +196,11 @@ void create_dl_scale_matrix(s8 pushOp, f32 x, f32 y, f32 z) { guScale(matrix, x, y, z); if (pushOp == MENU_MTX_PUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); } if (pushOp == MENU_MTX_NOPUSH) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH); } } @@ -216,9 +216,9 @@ void create_dl_ortho_matrix(void) { guOrtho(matrix, 0.0f, SCREEN_WIDTH, 0.0f, SCREEN_HEIGHT, -10.0f, 10.0f, 1.0f); // Should produce G_RDPHALF_1 in Fast3D - gSPPerspNormalize(gDisplayListHead++, 0xFFFF); + gSPPerspNormalize(MASTERDL, 0xFFFF); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH) + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH) } #if defined(VERSION_US) || defined(VERSION_EU) @@ -295,16 +295,16 @@ void render_generic_char(u8 c) #endif #ifndef VERSION_EU - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); #endif #if defined(VERSION_JP) || defined(VERSION_SH) - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_8b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); #else - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(packedTexture)); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(packedTexture)); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); + gSPDisplayList(MASTERDL, dl_ia_text_tex_settings); #ifdef VERSION_EU - gSPTextureRectangleFlip(gDisplayListHead++, gDialogX << 2, (gDialogY - 16) << 2, + gSPTextureRectangleFlip(MASTERDL, gDialogX << 2, (gDialogY - 16) << 2, (gDialogX + 8) << 2, gDialogY << 2, G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); #endif } @@ -343,10 +343,10 @@ void render_generic_char_at_pos(s16 xPos, s16 yPos, u8 c) { void *packedTexture = segmented_to_virtual(fontLUT[c]); void *unpackedTexture = alloc_ia4_tex_from_i1(packedTexture, 8, 8); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); - gSPTextureRectangleFlip(gDisplayListHead++, xPos << 2, (yPos - 16) << 2, (xPos + 8) << 2, yPos << 2, + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); + gSPDisplayList(MASTERDL, dl_ia_text_tex_settings); + gSPTextureRectangleFlip(MASTERDL, xPos << 2, (yPos - 16) << 2, (xPos + 8) << 2, yPos << 2, G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); } @@ -369,9 +369,9 @@ void render_generic_char_cn(u16 c) { void *packedTexture = segmented_to_virtual(fontLUT[c]); void *unpackedTexture = alloc_ia8_text_from_i1(packedTexture); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); + gSPDisplayList(MASTERDL, dl_ia_text_tex_settings); } #endif @@ -462,7 +462,7 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { switch (CUR_CHAR) { #ifdef VERSION_CN case SPECIAL_CHAR(DIALOG_CHAR_NEWLINE): - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, x, y - (lineNum * MAX_STRING_WIDTH), 0.0f); lineNum++; break; @@ -527,7 +527,7 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { break; #ifndef VERSION_CN case SPECIAL_CHAR(DIALOG_CHAR_NEWLINE): - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, x, y - (lineNum * MAX_STRING_WIDTH), 0.0f); lineNum++; break; @@ -535,7 +535,7 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { case SPECIAL_CHAR(DIALOG_CHAR_PERIOD): create_dl_translation_matrix(MENU_MTX_PUSH, -2.0f, -5.0f, 0.0f); render_generic_char(DIALOG_CHAR_PERIOD_OR_HANDAKUTEN); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); break; #endif @@ -592,7 +592,7 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { if (mark != DIALOG_MARK_NONE) { create_dl_translation_matrix(MENU_MTX_PUSH, 5.0f, 5.0f, 0.0f); render_generic_char(DIALOG_CHAR_MARK_START + mark); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); mark = DIALOG_MARK_NONE; } @@ -611,7 +611,7 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { } #ifndef VERSION_EU - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); #endif } @@ -619,14 +619,14 @@ void print_generic_string(s16 x, s16 y, const u8 *str) { void print_hud_char_umlaut(s16 x, s16 y, u8 chr) { void **fontLUT = segmented_to_virtual(main_hud_lut); - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[chr]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 16) << 2, (y + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[chr]); + gSPDisplayList(MASTERDL, dl_rgba16_load_tex_block); + gSPTextureRectangle(MASTERDL, x << 2, y << 2, (x + 16) << 2, (y + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[GLYPH_UMLAUT]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, x << 2, (y - 4) << 2, (x + 16) << 2, (y + 12) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[GLYPH_UMLAUT]); + gSPDisplayList(MASTERDL, dl_rgba16_load_tex_block); + gSPTextureRectangle(MASTERDL, x << 2, (y - 4) << 2, (x + 16) << 2, (y + 12) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } #endif @@ -687,22 +687,22 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) { #endif default: #endif - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); #ifndef VERSION_CN if (hudLUT == HUD_LUT_JPMENU) { - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hudLUT1[str[strPos]]); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hudLUT1[str[strPos]]); } if (hudLUT == HUD_LUT_GLOBAL) { #endif - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hudLUT2[str[strPos]]); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hudLUT2[str[strPos]]); #ifndef VERSION_CN } #endif - gSPDisplayList(gDisplayListHead++, dl_rgba16_load_tex_block); - gSPTextureRectangle(gDisplayListHead++, curX << 2, curY << 2, (curX + 16) << 2, + gSPDisplayList(MASTERDL, dl_rgba16_load_tex_block); + gSPTextureRectangle(MASTERDL, curX << 2, curY << 2, (curX + 16) << 2, (curY + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); #ifdef VERSION_CN @@ -727,15 +727,15 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) { void print_menu_char_umlaut(s16 x, s16 y, u8 chr) { void **fontLUT = segmented_to_virtual(menu_font_lut); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[chr]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, x << 2, y << 2, (x + 8) << 2, (y + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[chr]); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); + gSPTextureRectangle(MASTERDL, x << 2, y << 2, (x + 8) << 2, (y + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[DIALOG_CHAR_UMLAUT]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, x << 2, (y - 4) << 2, (x + 8) << 2, (y + 4) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[DIALOG_CHAR_UMLAUT]); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); + gSPTextureRectangle(MASTERDL, x << 2, (y - 4) << 2, (x + 8) << 2, (y + 4) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } #endif @@ -773,18 +773,18 @@ void print_menu_generic_string(s16 x, s16 y, const u8 *str) { curX += 4; break; default: - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[str[strPos]]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, curX << 2, curY << 2, (curX + 8) << 2, + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[str[strPos]]); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); + gSPTextureRectangle(MASTERDL, curX << 2, curY << 2, (curX + 8) << 2, (curY + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); #ifndef VERSION_EU if (mark != DIALOG_MARK_NONE) { - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[DIALOG_CHAR_MARK_START + mark]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, (curX + 6) << 2, (curY - 7) << 2, + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_8b, 1, fontLUT[DIALOG_CHAR_MARK_START + mark]); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_8b_BYTES)); + gSPTextureRectangle(MASTERDL, (curX + 6) << 2, (curY - 7) << 2, (curX + 6 + 8) << 2, (curY - 7 + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); mark = DIALOG_MARK_NONE; @@ -806,12 +806,12 @@ void print_credits_string(s16 x, s16 y, const u8 *str) { u32 curX = x; u32 curY = y; - gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, + gDPSetTile(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD); - gDPTileSync(gDisplayListHead++); - gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0, G_TX_RENDERTILE, 0, + gDPTileSync(MASTERDL); + gDPSetTile(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 3, G_TX_NOLOD, G_TX_CLAMP, 3, G_TX_NOLOD); - gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC); + gDPSetTileSize(MASTERDL, G_TX_RENDERTILE, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC); while (str[strPos] != GLOBAL_CHAR_TERMINATOR) { switch (str[strPos]) { @@ -819,11 +819,11 @@ void print_credits_string(s16 x, s16 y, const u8 *str) { curX += 4; break; default: - gDPPipeSync(gDisplayListHead++); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[str[strPos]]); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)); - gSPTextureRectangle(gDisplayListHead++, curX << 2, curY << 2, (curX + 8) << 2, + gDPPipeSync(MASTERDL); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fontLUT[str[strPos]]); + gDPLoadSync(MASTERDL); + gDPLoadBlock(MASTERDL, G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)); + gSPTextureRectangle(MASTERDL, curX << 2, curY << 2, (curX + 8) << 2, (curY + 8) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); curX += 7; break; @@ -1147,7 +1147,7 @@ void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { // convert the speed into angle create_dl_rotation_matrix(MENU_MTX_NOPUSH, gDialogBoxAngle * 4.0f, 0, 0, 1.0f); } - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 150); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 150); break; case DIALOG_TYPE_ZOOM: // Renders a dialog white box with zoom if (gMenuState == MENU_STATE_DIALOG_OPENING || gMenuState == MENU_STATE_DIALOG_CLOSING) { @@ -1155,7 +1155,7 @@ void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { (40.0 / gDialogBoxScale) - 40, 0); create_dl_scale_matrix(MENU_MTX_NOPUSH, 1.0 / gDialogBoxScale, 1.0 / gDialogBoxScale, 1.0f); } - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 150); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 150); break; } @@ -1166,8 +1166,8 @@ void render_dialog_box_type(struct DialogEntry *dialog, s8 linesPerBox) { create_dl_scale_matrix(MENU_MTX_NOPUSH, 1.1f, ((f32) linesPerBox / Y_VAL2) + 0.1, 1.0f); #endif - gSPDisplayList(gDisplayListHead++, dl_draw_text_bg_box); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_text_bg_box); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void change_and_flash_dialog_text_color_lines(s8 colorMode, s8 lineNum) { @@ -1175,13 +1175,13 @@ void change_and_flash_dialog_text_color_lines(s8 colorMode, s8 lineNum) { if (colorMode == 1) { // unused if (lineNum == 1) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); } else { if (lineNum == gMenuLineNum) { color = sins(gMenuTextColorTransTimer) * 50.0f + 200.0f; - gDPSetEnvColor(gDisplayListHead++, color, color, color, 255); + gDPSetEnvColor(MASTERDL, color, color, color, 255); } else { - gDPSetEnvColor(gDisplayListHead++, 200, 200, 200, 255); + gDPSetEnvColor(MASTERDL, 200, 200, 200, 255); } } } else { @@ -1189,7 +1189,7 @@ void change_and_flash_dialog_text_color_lines(s8 colorMode, s8 lineNum) { case DIALOG_TYPE_ROTATE: break; case DIALOG_TYPE_ZOOM: - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); break; } } @@ -1208,9 +1208,9 @@ void render_generic_dialog_char_at_pos(struct DialogEntry *dialog, s16 x, s16 y, void *packedTexture = segmented_to_virtual(fontLUT[c]); void *unpackedTexture = alloc_ia4_tex_from_i1(packedTexture, 8, 8); - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_tex_settings); - gSPTextureRectangleFlip(gDisplayListHead++, xCoord << 2, (yCoord - height) << 2, + gDPSetTextureImage(MASTERDL, G_IM_FMT_IA, G_IM_SIZ_16b, 1, VIRTUAL_TO_PHYSICAL(unpackedTexture)); + gSPDisplayList(MASTERDL, dl_ia_text_tex_settings); + gSPTextureRectangleFlip(MASTERDL, xCoord << 2, (yCoord - height) << 2, (xCoord + width) << 2, yCoord << 2, G_TX_RENDERTILE, 8 << 6, 4 << 6, 1 << 10, 1 << 10); } #endif @@ -1233,7 +1233,7 @@ void handle_dialog_scroll_page_state(s8 lineNum, s8 totalLines, s8 *pageState, s #endif { #ifndef VERSION_EU - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); #endif if (lineNum == totalLines) { @@ -1259,7 +1259,7 @@ void adjust_pos_and_print_period_char(s8 *xMatrix, s16 *linePos) { create_dl_translation_matrix(MENU_MTX_PUSH, -2.0f, -5.0f, 0); render_generic_char(DIALOG_CHAR_PERIOD_OR_HANDAKUTEN); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); (*linePos)++; *xMatrix = 1; @@ -1428,7 +1428,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l #endif } - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); strIndex = gDialogPageStartStrIndex; @@ -1462,7 +1462,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l case SPECIAL_CHAR(DIALOG_CHAR_TERMINATOR): pageState = DIALOG_PAGE_STATE_END; #ifndef VERSION_EU - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); #endif break; case SPECIAL_CHAR(DIALOG_CHAR_NEWLINE): @@ -1651,7 +1651,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l if (mark != DIALOG_MARK_NONE) { create_dl_translation_matrix(MENU_MTX_PUSH, 5.0f, 7.0f, 0); render_generic_char(DIALOG_CHAR_MARK_START + mark); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); mark = DIALOG_MARK_NONE; } #ifdef VERSION_SH @@ -1696,7 +1696,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l if (str[strIndex + 1] == DIALOG_CHAR_TERMINATOR) { pageState = DIALOG_PAGE_STATE_END; - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); break; // exit loop } else { lineNum++; @@ -1712,7 +1712,7 @@ void handle_dialog_text_and_pages(s8 colorMode, struct DialogEntry *dialog, s8 l #endif } - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); if (gMenuState == MENU_STATE_DIALOG_OPEN) { if (pageState == DIALOG_PAGE_STATE_END) { @@ -1750,12 +1750,12 @@ void render_dialog_triangle_choice(void) { create_dl_translation_matrix(MENU_MTX_NOPUSH, ((gMenuLineNum - 1) * X_VAL4_1) + X_VAL4_2, Y_VAL4_1 - (gLastDialogLineNum * Y_VAL4_2), 0); if (gDialogBoxType == DIALOG_TYPE_ROTATE) { // White Text - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); } else { // Black Text - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); } - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); + gSPDisplayList(MASTERDL, dl_draw_triangle); } #if defined(VERSION_JP) || defined(VERSION_SH) @@ -1792,13 +1792,13 @@ void render_dialog_triangle_next(s8 linesPerBox) { create_dl_rotation_matrix(MENU_MTX_NOPUSH, -90.0f, 0, 0, 1.0f); if (gDialogBoxType == DIALOG_TYPE_ROTATE) { // White Text - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); } else { // Black Text - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); } - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void handle_special_dialog_text(s16 dialogID) { // dialog ID tables, in order @@ -2095,13 +2095,13 @@ void render_dialog_entries(void) { #define ulx ensure_nonnegative(dialog->leftOffset) #define lrx ensure_nonnegative(dialog->leftOffset + DIAG_VAL3) #endif - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, ulx, ensure_nonnegative(DIAG_VAL2 - dialog->width), + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, ulx, ensure_nonnegative(DIAG_VAL2 - dialog->width), lrx, ensure_nonnegative((256 - dialog->width) + (dialog->linesPerBox * 80 / DIAG_VAL4))); #undef ulx #undef lrx #else gDPSetScissor( - gDisplayListHead++, G_SC_NON_INTERLACE, + MASTERDL, G_SC_NON_INTERLACE, // Horizontal scissoring isn't really required and can potentially mess up widescreen enhancements. #ifdef WIDESCREEN 0, @@ -2141,7 +2141,7 @@ void render_dialog_entries(void) { #undef BORDER_HEIGHT #define BORDER_HEIGHT 8 #endif - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - BORDER_HEIGHT / 2, SCREEN_HEIGHT - BORDER_HEIGHT / 2); + gDPSetScissor(MASTERDL, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - BORDER_HEIGHT / 2, SCREEN_HEIGHT - BORDER_HEIGHT / 2); #ifdef VERSION_EU #undef BORDER_HEIGHT #define BORDER_HEIGHT 1 @@ -2164,12 +2164,12 @@ void reset_cutscene_msg_fade(void) { } void dl_rgba16_begin_cutscene_msg_fade(void) { - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gCutsceneMsgFade); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gCutsceneMsgFade); } void dl_rgba16_stop_cutscene_msg_fade(void) { - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); if (gCutsceneMsgFade < 250) { gCutsceneMsgFade += 25; @@ -2247,8 +2247,8 @@ void do_cutscene_handler(void) { create_dl_ortho_matrix(); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gCutsceneMsgFade); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gCutsceneMsgFade); #ifdef VERSION_EU switch (eu_get_language()) { @@ -2271,7 +2271,7 @@ void do_cutscene_handler(void) { print_generic_string(x, 240 - gCutsceneMsgYOffset, gEndCutsceneStringsEn[gCutsceneMsgIndex]); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); // if the timing variable is less than 5, increment // the fade until we are at full opacity. @@ -2342,21 +2342,21 @@ void print_peach_letter_message(void) { create_dl_translation_matrix(MENU_MTX_PUSH, 97.0f, 118.0f, 0); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gCutsceneMsgFade); - gSPDisplayList(gDisplayListHead++, castle_grounds_seg7_dl_0700EA58); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 20, 20, 20, gCutsceneMsgFade); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gCutsceneMsgFade); + gSPDisplayList(MASTERDL, castle_grounds_seg7_dl_0700EA58); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 20, 20, 20, gCutsceneMsgFade); print_generic_string(STR_X, STR_Y, str); #if defined(VERSION_JP) - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); #endif - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); #ifndef VERSION_JP - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); - gDPSetEnvColor(gDisplayListHead++, 200, 80, 120, gCutsceneMsgFade); - gSPDisplayList(gDisplayListHead++, castle_grounds_seg7_us_dl_0700F2E8); + gSPDisplayList(MASTERDL, dl_ia_text_end); + gDPSetEnvColor(MASTERDL, 200, 80, 120, gCutsceneMsgFade); + gSPDisplayList(MASTERDL, castle_grounds_seg7_us_dl_0700F2E8); #endif // at the start/end of message, reset the fade. @@ -2394,27 +2394,27 @@ void print_peach_letter_message(void) { void render_hud_cannon_reticle(void) { create_dl_translation_matrix(MENU_MTX_PUSH, 160.0f, 120.0f, 0); - gDPSetEnvColor(gDisplayListHead++, 50, 50, 50, 180); + gDPSetEnvColor(MASTERDL, 50, 50, 50, 180); create_dl_translation_matrix(MENU_MTX_PUSH, -20.0f, -8.0f, 0); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, 20.0f, 8.0f, 0); create_dl_rotation_matrix(MENU_MTX_NOPUSH, 180.0f, 0, 0, 1.0f); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, 8.0f, -20.0f, 0); create_dl_rotation_matrix(MENU_MTX_NOPUSH, 90.0f, 0, 0, 1.0f); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, -8.0f, 20.0f, 0); create_dl_rotation_matrix(MENU_MTX_NOPUSH, -90.0f, 0, 0, 1.0f); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void reset_red_coins_collected(void) { @@ -2441,9 +2441,9 @@ void shade_screen(void) { create_dl_scale_matrix(MENU_MTX_NOPUSH, 2.6f, 3.4f, 1.0f); #endif - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 110); - gSPDisplayList(gDisplayListHead++, dl_draw_text_bg_box); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 110); + gSPDisplayList(MASTERDL, dl_draw_text_bg_box); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void print_animated_red_coin(s16 x, s16 y) { @@ -2451,25 +2451,25 @@ void print_animated_red_coin(s16 x, s16 y) { create_dl_translation_matrix(MENU_MTX_PUSH, x, y, 0); create_dl_scale_matrix(MENU_MTX_NOPUSH, 0.2f, 0.2f, 1.0f); - gDPSetRenderMode(gDisplayListHead++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); + gDPSetRenderMode(MASTERDL, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); switch (globalTimer & 6) { case 0: - gSPDisplayList(gDisplayListHead++, coin_seg3_dl_03007940); + gSPDisplayList(MASTERDL, coin_seg3_dl_03007940); break; case 2: - gSPDisplayList(gDisplayListHead++, coin_seg3_dl_03007968); + gSPDisplayList(MASTERDL, coin_seg3_dl_03007968); break; case 4: - gSPDisplayList(gDisplayListHead++, coin_seg3_dl_03007990); + gSPDisplayList(MASTERDL, coin_seg3_dl_03007990); break; case 6: - gSPDisplayList(gDisplayListHead++, coin_seg3_dl_030079B8); + gSPDisplayList(MASTERDL, coin_seg3_dl_030079B8); break; } - gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetRenderMode(MASTERDL, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void render_pause_red_coins(void) { @@ -2570,18 +2570,18 @@ void render_pause_my_score_coins(void) { } #endif - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); if (courseIndex <= COURSE_NUM_TO_INDEX(COURSE_STAGES_MAX)) { print_hud_my_score_coins(1, gCurrSaveFileNum - 1, courseIndex, 178, 103); print_hud_my_score_stars(gCurrSaveFileNum - 1, courseIndex, 118, 103); } - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); if (courseIndex <= COURSE_NUM_TO_INDEX(COURSE_STAGES_MAX) && save_file_get_course_star_count(gCurrSaveFileNum - 1, courseIndex) != 0) { @@ -2615,7 +2615,7 @@ void render_pause_my_score_coins(void) { print_generic_string(CRS_NAME_X, 157, &courseName[CRS_NAME_START]); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } #if defined(VERSION_JP) || defined(VERSION_SH) @@ -2649,8 +2649,8 @@ void render_pause_camera_options(s16 x, s16 y, s8 *index, s16 xIndex) { handle_menu_scrolling(MENU_SCROLL_HORIZONTAL, index, 1, 2); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); #ifdef VERSION_CN print_generic_string(x + 14, y + 2, textNormalUpClose); @@ -2662,11 +2662,11 @@ void render_pause_camera_options(s16 x, s16 y, s8 *index, s16 xIndex) { print_generic_string(x + TXT2_X, y - 13, LANGUAGE_ARRAY(textNormalFixed)); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); create_dl_translation_matrix(MENU_MTX_PUSH, x + ((*index - 1) * xIndex), y + Y_VAL7, 0); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); switch (*index) { case CAM_SELECTION_MARIO: @@ -2720,21 +2720,21 @@ void render_pause_course_options(s16 x, s16 y, s8 *index, s16 yIndex) { handle_menu_scrolling(MENU_SCROLL_VERTICAL, index, 1, 3); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_generic_string(x + 10, y - 2, LANGUAGE_ARRAY(textContinue)); print_generic_string(x + 10, y - Y_OFFSET1, LANGUAGE_ARRAY(textExitCourse)); if (*index != MENU_OPT_CAMERA_ANGLE_R) { print_generic_string(x + 10, y - Y_OFFSET2, LANGUAGE_ARRAY(textCameraAngleR)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); create_dl_translation_matrix(MENU_MTX_PUSH, x - X_VAL8, (y - ((*index - 1) * yIndex)) - Y_VAL8, 0); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } if (*index == MENU_OPT_CAMERA_ANGLE_R) { @@ -2745,20 +2745,20 @@ void render_pause_course_options(s16 x, s16 y, s8 *index, s16 yIndex) { void render_pause_castle_menu_box(s16 x, s16 y) { create_dl_translation_matrix(MENU_MTX_PUSH, x - 78, y - 32, 0); create_dl_scale_matrix(MENU_MTX_NOPUSH, 1.2f, 0.8f, 1.0f); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 105); - gSPDisplayList(gDisplayListHead++, dl_draw_text_bg_box); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 105); + gSPDisplayList(MASTERDL, dl_draw_text_bg_box); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, x + 6, y - 28, 0); create_dl_rotation_matrix(MENU_MTX_NOPUSH, 90.0f, 0, 0, 1.0f); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); create_dl_translation_matrix(MENU_MTX_PUSH, x - 9, y - 101, 0); create_dl_rotation_matrix(MENU_MTX_NOPUSH, 270.0f, 0, 0, 1.0f); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_draw_triangle); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } void highlight_last_course_complete_stars(void) { @@ -2788,12 +2788,12 @@ void highlight_last_course_complete_stars(void) { void print_hud_pause_colorful_str(void) { u8 textPause[] = { TEXT_PAUSE }; - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_hud_lut_string(HUD_LUT_GLOBAL, PAUSE_X, 81, textPause); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); } void render_pause_castle_course_stars(s16 x, s16 y, s16 fileIndex, s16 courseIndex) { @@ -2929,8 +2929,8 @@ void render_pause_castle_main_strings(s16 x, s16 y) { } } - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); if (gMenuLineNum <= COURSE_NUM_TO_INDEX(COURSE_STAGES_MAX)) { // Main courses courseName = segmented_to_virtual(courseNameTbl[gMenuLineNum]); @@ -2959,7 +2959,7 @@ void render_pause_castle_main_strings(s16 x, s16 y) { print_generic_string(x - 9, y + 30, courseName); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } s8 gCourseCompleteCoinsEqual = FALSE; @@ -3100,8 +3100,8 @@ void print_hud_course_complete_string(s8 str) { u8 color = sins(gMenuTextColorTransTimer) * 50.0f + 200.0f; - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, color, color, color, 255); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, color, color, color, 255); if (str == HUD_PRINT_HISCORE) { print_hud_lut_string(HUD_LUT_GLOBAL, TXT_HISCORE_X, TXT_HISCORE_Y, LANGUAGE_ARRAY(textHiScore)); @@ -3109,7 +3109,7 @@ void print_hud_course_complete_string(s8 str) { print_hud_lut_string(HUD_LUT_GLOBAL, TXT_CONGRATS_X, TXT_CONGRATS_Y, LANGUAGE_ARRAY(textCongratulations)); } - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); } void print_hud_course_complete_coins(s16 x, s16 y) { @@ -3117,8 +3117,8 @@ void print_hud_course_complete_coins(s16 x, s16 y) { u8 hudTextSymCoin[] = { GLYPH_COIN, GLYPH_SPACE }; u8 hudTextSymX[] = { GLYPH_MULTIPLY, GLYPH_SPACE }; - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); print_hud_lut_string(HUD_LUT_GLOBAL, x, y, hudTextSymCoin); print_hud_lut_string(HUD_LUT_GLOBAL, x + 16, y, hudTextSymX); @@ -3126,7 +3126,7 @@ void print_hud_course_complete_coins(s16 x, s16 y) { int_to_str(gCourseCompleteCoins, courseCompleteCoinsStr); print_hud_lut_string(HUD_LUT_GLOBAL, x + 32, y, courseCompleteCoinsStr); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); if (gCourseCompleteCoins >= gHudDisplay.coins) { gCourseCompleteCoinsEqual = TRUE; @@ -3233,26 +3233,26 @@ void render_course_complete_lvl_info_and_hud_str(void) { } // Print course number - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); INT_TO_STR_DIFF(gLastCompletedCourseNum, strCourseNum); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, gMenuTextAlpha); print_generic_string(65, 165, LANGUAGE_ARRAY(textCourse)); print_generic_string(CRS_NUM_X2, 165, strCourseNum); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_generic_string(63, 167, LANGUAGE_ARRAY(textCourse)); print_generic_string(CRS_NUM_X3, 167, strCourseNum); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } else if (gLastCompletedCourseNum == COURSE_BITDW || gLastCompletedCourseNum == COURSE_BITFS) { // Bowser courses name = segmented_to_virtual(courseNameTbl[COURSE_NUM_TO_INDEX(gLastCompletedCourseNum)]); // Print course name and clear text - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, gMenuTextAlpha); #ifdef VERSION_EU centerX = get_str_x_pos_from_center(153, name, 12.0f); #endif @@ -3261,13 +3261,13 @@ void render_course_complete_lvl_info_and_hud_str(void) { print_generic_string(TXT_CLEAR_X1, 130, textClear); #endif - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_generic_string(TXT_NAME_X2, 132, name); #ifndef VERSION_EU print_generic_string(TXT_CLEAR_X2, 132, textClear); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); print_hud_course_complete_string(HUD_PRINT_CONGRATULATIONS); print_hud_course_complete_coins(118, 111); @@ -3282,29 +3282,29 @@ void render_course_complete_lvl_info_and_hud_str(void) { } // Print star glyph - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_hud_lut_string(HUD_LUT_GLOBAL, 55, 77, textSymStar); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); // Print act name and catch text - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, gMenuTextAlpha); print_generic_string(76, 145, name); #if defined(VERSION_JP) || defined(VERSION_SH) print_generic_string(220, 145, textCatch); #endif - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_generic_string(74, 147, name); #if defined(VERSION_JP) || defined(VERSION_SH) print_generic_string(218, 147, textCatch); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } #if defined(VERSION_JP) || defined(VERSION_SH) @@ -3357,21 +3357,21 @@ void render_save_confirmation(s16 x, s16 y, s8 *index, s16 yOffset) handle_menu_scrolling(MENU_SCROLL_VERTICAL, index, 1, 3); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); print_generic_string(TXT_SAVEOPTIONS_X, y + TXT_SAVECONT_Y, LANGUAGE_ARRAY(textSaveAndContinue)); print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_SAVEQUIT_Y, LANGUAGE_ARRAY(textSaveAndQuit)); print_generic_string(TXT_SAVEOPTIONS_X, y - TXT_CONTNOSAVE_Y, LANGUAGE_ARRAY(textContinueWithoutSave)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); create_dl_translation_matrix(MENU_MTX_PUSH, X_VAL9, y - ((*index - 1) * yOffset), 0); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gMenuTextAlpha); - gSPDisplayList(gDisplayListHead++, dl_draw_triangle); + gDPSetEnvColor(MASTERDL, 255, 255, 255, gMenuTextAlpha); + gSPDisplayList(MASTERDL, dl_draw_triangle); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); } s16 render_course_complete_screen(void) { diff --git a/src/game/print.c b/src/game/print.c index 11d49416..3a5a6c8e 100644 --- a/src/game/print.c +++ b/src/game/print.c @@ -366,13 +366,13 @@ s8 char_to_glyph_index(char c) { void add_glyph_texture(s8 glyphIndex) { const u8 *const *glyphs = segmented_to_virtual(main_hud_lut); - gDPPipeSync(gDisplayListHead++); + gDPPipeSync(MASTERDL); #ifdef VERSION_CN - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, glyphs[(u8) glyphIndex]); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, glyphs[(u8) glyphIndex]); #else - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, glyphs[glyphIndex]); + gDPSetTextureImage(MASTERDL, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, glyphs[glyphIndex]); #endif - gSPDisplayList(gDisplayListHead++, dl_hud_img_load_tex_block); + gSPDisplayList(MASTERDL, dl_hud_img_load_tex_block); } #ifndef WIDESCREEN @@ -418,7 +418,7 @@ void render_textrect(s32 x, s32 y, s32 pos) { #endif rectX = rectBaseX; rectY = rectBaseY; - gSPTextureRectangle(gDisplayListHead++, rectX << 2, rectY << 2, (rectX + 15) << 2, + gSPTextureRectangle(MASTERDL, rectX << 2, rectY << 2, (rectX + 15) << 2, (rectY + 15) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10); } @@ -444,9 +444,9 @@ void render_text_labels(void) { } guOrtho(mtx, 0.0f, SCREEN_WIDTH, 0.0f, SCREEN_HEIGHT, -10.0f, 10.0f, 1.0f); - gSPPerspNormalize((Gfx *) (gDisplayListHead++), 0xFFFF); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); - gSPDisplayList(gDisplayListHead++, dl_hud_img_begin); + gSPPerspNormalize((Gfx *) (MASTERDL), 0xFFFF); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); + gSPDisplayList(MASTERDL, dl_hud_img_begin); for (i = 0; i < sTextLabelsCount; i++) { for (j = 0; j < sTextLabels[i]->length; j++) { @@ -519,7 +519,7 @@ void render_text_labels(void) { mem_pool_free(gEffectsMemoryPool, sTextLabels[i]); } - gSPDisplayList(gDisplayListHead++, dl_hud_img_end); + gSPDisplayList(MASTERDL, dl_hud_img_end); sTextLabelsCount = 0; } diff --git a/src/game/profiler.c b/src/game/profiler.c index 9f968c6a..4907e8b3 100644 --- a/src/game/profiler.c +++ b/src/game/profiler.c @@ -88,9 +88,9 @@ void draw_profiler_bar(OSTime clockBase, OSTime clockStart, OSTime clockEnd, s16 // perform the render if start is less than end. in most cases, it should be. if (rectX1 < rectX2) { - gDPPipeSync(gDisplayListHead++); - gDPSetFillColor(gDisplayListHead++, color << 16 | color); - gDPFillRectangle(gDisplayListHead++, rectX1, posY, rectX2, posY + 2); + gDPPipeSync(MASTERDL); + gDPSetFillColor(MASTERDL, color << 16 | color); + gDPFillRectangle(MASTERDL, rectX1, posY, rectX2, posY + 2); } } @@ -98,28 +98,28 @@ void draw_reference_profiler_bars(void) { // Draws the reference "max" bars underneath the real thing. // Blue - gDPPipeSync(gDisplayListHead++); - gDPSetFillColor(gDisplayListHead++, + gDPPipeSync(MASTERDL); + gDPSetFillColor(MASTERDL, GPACK_RGBA5551(40, 80, 255, 1) << 16 | GPACK_RGBA5551(40, 80, 255, 1)); - gDPFillRectangle(gDisplayListHead++, 30, 220, 79, 222); + gDPFillRectangle(MASTERDL, 30, 220, 79, 222); // Yellow - gDPPipeSync(gDisplayListHead++); - gDPSetFillColor(gDisplayListHead++, + gDPPipeSync(MASTERDL); + gDPSetFillColor(MASTERDL, GPACK_RGBA5551(255, 255, 40, 1) << 16 | GPACK_RGBA5551(255, 255, 40, 1)); - gDPFillRectangle(gDisplayListHead++, 79, 220, 128, 222); + gDPFillRectangle(MASTERDL, 79, 220, 128, 222); // Orange - gDPPipeSync(gDisplayListHead++); - gDPSetFillColor(gDisplayListHead++, + gDPPipeSync(MASTERDL); + gDPSetFillColor(MASTERDL, GPACK_RGBA5551(255, 120, 40, 1) << 16 | GPACK_RGBA5551(255, 120, 40, 1)); - gDPFillRectangle(gDisplayListHead++, 128, 220, 177, 222); + gDPFillRectangle(MASTERDL, 128, 220, 177, 222); // Red - gDPPipeSync(gDisplayListHead++); - gDPSetFillColor(gDisplayListHead++, + gDPPipeSync(MASTERDL); + gDPSetFillColor(MASTERDL, GPACK_RGBA5551(255, 40, 40, 1) << 16 | GPACK_RGBA5551(255, 40, 40, 1)); - gDPFillRectangle(gDisplayListHead++, 177, 220, 226, 222); + gDPFillRectangle(MASTERDL, 177, 220, 226, 222); } /* diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 83bc35d9..2afe33e8 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -148,24 +148,24 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) { #endif if (enableZBuffer != 0) { - gDPPipeSync(gDisplayListHead++); - gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER); + gDPPipeSync(MASTERDL); + gSPSetGeometryMode(MASTERDL, G_ZBUFFER); } for (i = 0; i < GFX_NUM_MASTER_LISTS; i++) { if ((currList = node->listHeads[i]) != NULL) { - gDPSetRenderMode(gDisplayListHead++, modeList->modes[i], mode2List->modes[i]); + gDPSetRenderMode(MASTERDL, modeList->modes[i], mode2List->modes[i]); while (currList != NULL) { - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(currList->transform), + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(currList->transform), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); - gSPDisplayList(gDisplayListHead++, currList->displayList); + gSPDisplayList(MASTERDL, currList->displayList); currList = currList->next; } } } if (enableZBuffer != 0) { - gDPPipeSync(gDisplayListHead++); - gSPClearGeometryMode(gDisplayListHead++, G_ZBUFFER); + gDPPipeSync(MASTERDL); + gSPClearGeometryMode(MASTERDL, G_ZBUFFER); } } @@ -177,7 +177,7 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) { static void geo_append_display_list(void *displayList, s16 layer) { #ifdef F3DEX_GBI_2 - gSPLookAt(gDisplayListHead++, &lookAt); + gSPLookAt(MASTERDL, &lookAt); #endif if (gCurGraphNodeMasterList != 0) { struct DisplayListNode *listNode = @@ -225,8 +225,8 @@ static void geo_process_ortho_projection(struct GraphNodeOrthoProjection *node) f32 bottom = (gCurGraphNodeRoot->y + gCurGraphNodeRoot->height) / 2.0f * node->scale; guOrtho(mtx, left, right, bottom, top, -2.0f, 2.0f, 1.0f); - gSPPerspNormalize(gDisplayListHead++, 0xFFFF); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); + gSPPerspNormalize(MASTERDL, 0xFFFF); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); geo_process_node_and_siblings(node->node.children); } @@ -250,9 +250,9 @@ static void geo_process_perspective(struct GraphNodePerspective *node) { #endif guPerspective(mtx, &perspNorm, node->fov, aspect, node->near, node->far, 1.0f); - gSPPerspNormalize(gDisplayListHead++, perspNorm); + gSPPerspNormalize(MASTERDL, perspNorm); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); gCurGraphNodeCamFrustum = node; geo_process_node_and_siblings(node->fnNode.node.children); @@ -317,7 +317,7 @@ static void geo_process_camera(struct GraphNodeCamera *node) { } mtxf_rotate_xy(rollMtx, node->rollScreen); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(rollMtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(rollMtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); mtxf_lookat(cameraTransform, node->pos, node->focus, node->roll); mtxf_mul(gMatStack[gMatStackIndex + 1], cameraTransform, gMatStack[gMatStackIndex]); @@ -880,7 +880,7 @@ void geo_process_held_object(struct GraphNodeHeldObject *node) { Mtx *mtx = alloc_display_list(sizeof(*mtx)); #ifdef F3DEX_GBI_2 - gSPLookAt(gDisplayListHead++, &lookAt); + gSPLookAt(MASTERDL, &lookAt); #endif if (node->fnNode.func != NULL) { @@ -1071,8 +1071,8 @@ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor) mtxf_identity(gMatStack[gMatStackIndex]); mtxf_to_mtx(initialMatrix, gMatStack[gMatStackIndex]); gMatStackFixed[gMatStackIndex] = initialMatrix; - gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(viewport)); - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(gMatStackFixed[gMatStackIndex]), + gSPViewport(MASTERDL, VIRTUAL_TO_PHYSICAL(viewport)); + gSPMatrix(MASTERDL, VIRTUAL_TO_PHYSICAL(gMatStackFixed[gMatStackIndex]), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); gCurGraphNodeRoot = node; if (node->node.children != NULL) { diff --git a/src/game/screen_transition.c b/src/game/screen_transition.c index 9290a6f1..83c3f63b 100644 --- a/src/game/screen_transition.c +++ b/src/game/screen_transition.c @@ -63,12 +63,12 @@ s32 dl_transition_color(s8 fadeTimer, u8 transTime, struct WarpTransitionData *t Vtx *verts = vertex_transition_color(transData, alpha); if (verts != NULL) { - gSPDisplayList(gDisplayListHead++, dl_proj_mtx_fullscreen); - gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE); - gDPSetRenderMode(gDisplayListHead++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); - gSPVertex(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(verts), 4, 0); - gSPDisplayList(gDisplayListHead++, dl_draw_quad_verts_0123); - gSPDisplayList(gDisplayListHead++, dl_screen_transition_end); + gSPDisplayList(MASTERDL, dl_proj_mtx_fullscreen); + gDPSetCombineMode(MASTERDL, G_CC_SHADE, G_CC_SHADE); + gDPSetRenderMode(MASTERDL, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); + gSPVertex(MASTERDL, VIRTUAL_TO_PHYSICAL(verts), 4, 0); + gSPDisplayList(MASTERDL, dl_draw_quad_verts_0123); + gSPDisplayList(MASTERDL, dl_screen_transition_end); } return set_and_reset_transition_fade_timer(fadeTimer, transTime); } @@ -176,30 +176,30 @@ s32 render_textured_transition(s8 fadeTimer, s8 transTime, struct WarpTransition if (verts != NULL) { load_tex_transition_vertex(verts, fadeTimer, transData, centerTransX, centerTransY, texTransRadius, transTexType); - gSPDisplayList(gDisplayListHead++, dl_proj_mtx_fullscreen) - gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE); - gDPSetRenderMode(gDisplayListHead++, G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2); - gSPVertex(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(verts), 8, 0); - gSPDisplayList(gDisplayListHead++, dl_transition_draw_filled_region); - gDPPipeSync(gDisplayListHead++); - gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - gDPSetRenderMode(gDisplayListHead++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); - gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP); + gSPDisplayList(MASTERDL, dl_proj_mtx_fullscreen) + gDPSetCombineMode(MASTERDL, G_CC_SHADE, G_CC_SHADE); + gDPSetRenderMode(MASTERDL, G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2); + gSPVertex(MASTERDL, VIRTUAL_TO_PHYSICAL(verts), 8, 0); + gSPDisplayList(MASTERDL, dl_transition_draw_filled_region); + gDPPipeSync(MASTERDL); + gDPSetCombineMode(MASTERDL, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gDPSetRenderMode(MASTERDL, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); + gDPSetTextureFilter(MASTERDL, G_TF_BILERP); switch (transTexType) { case TRANS_TYPE_MIRROR: - gDPLoadTextureBlock(gDisplayListHead++, sTextureTransitionID[texID], G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, + gDPLoadTextureBlock(MASTERDL, sTextureTransitionID[texID], G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0, G_TX_WRAP | G_TX_MIRROR, G_TX_WRAP | G_TX_MIRROR, 5, 6, G_TX_NOLOD, G_TX_NOLOD); break; case TRANS_TYPE_CLAMP: - gDPLoadTextureBlock(gDisplayListHead++, sTextureTransitionID[texID], G_IM_FMT_IA, G_IM_SIZ_8b, 64, 64, 0, + gDPLoadTextureBlock(MASTERDL, sTextureTransitionID[texID], G_IM_FMT_IA, G_IM_SIZ_8b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); break; } - gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gSPVertex(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(verts), 4, 0); - gSPDisplayList(gDisplayListHead++, dl_draw_quad_verts_0123); - gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); - gSPDisplayList(gDisplayListHead++, dl_screen_transition_end); + gSPTexture(MASTERDL, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gSPVertex(MASTERDL, VIRTUAL_TO_PHYSICAL(verts), 4, 0); + gSPDisplayList(MASTERDL, dl_draw_quad_verts_0123); + gSPTexture(MASTERDL, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gSPDisplayList(MASTERDL, dl_screen_transition_end); sTransitionTextureFadeCount[fadeTimer] += transData->texTimer; } else { } diff --git a/src/init/memory.c b/src/init/memory.c index 0d457e37..9766141e 100644 --- a/src/init/memory.c +++ b/src/init/memory.c @@ -93,7 +93,7 @@ void move_segment_table_to_dmem(void) { s32 i; for (i = 0; i < 16; i++) { - gSPSegment(gDisplayListHead++, i, sSegmentTable[i]); + gSPSegment(MASTERDL, i, sSegmentTable[i]); } } #else diff --git a/src/menu/file_select.c b/src/menu/file_select.c index 13c7f78c..34204f4a 100644 --- a/src/menu/file_select.c +++ b/src/menu/file_select.c @@ -1722,13 +1722,13 @@ void print_menu_cursor(void) { // Get the right graphic to use for the cursor. if (sCursorClickingTimer == 0) { // Idle - gSPDisplayList(gDisplayListHead++, dl_menu_idle_hand); + gSPDisplayList(MASTERDL, dl_menu_idle_hand); } if (sCursorClickingTimer != 0) { // Grabbing - gSPDisplayList(gDisplayListHead++, dl_menu_grabbing_hand); + gSPDisplayList(MASTERDL, dl_menu_grabbing_hand); } - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); if (sCursorClickingTimer != 0) { sCursorClickingTimer++; // This is a very strange way to implement a timer? It counts up and // then resets to 0 instead of just counting down to 0. @@ -1742,20 +1742,20 @@ void print_menu_cursor(void) { * Prints a hud string depending of the hud table list defined with text fade properties. */ void print_hud_lut_string_fade(s8 hudLUT, s16 x, s16 y, const u8 *text) { - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha - sTextFadeAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha - sTextFadeAlpha); print_hud_lut_string(hudLUT, x, y, text); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); } /** * Prints a generic white string with text fade properties. */ void print_generic_string_fade(s16 x, s16 y, const u8 *text) { - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha - sTextFadeAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha - sTextFadeAlpha); print_generic_string(x, y, text); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } /** @@ -1873,8 +1873,8 @@ void print_main_menu_strings(void) { static s16 sSoundTextX; // TODO: There should be a way to make this match on both US and Shindou. #endif // Print "SELECT FILE" text - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); #ifndef VERSION_EU print_hud_lut_string(HUD_LUT_DIFF2, SELECT_FILE_X, SELECT_FILE_Y, textSelectFile); #endif @@ -1883,11 +1883,11 @@ void print_main_menu_strings(void) { print_save_file_star_count(SAVE_FILE_B, SAVEFILE_X2, 78); print_save_file_star_count(SAVE_FILE_C, SAVEFILE_X1, 118); print_save_file_star_count(SAVE_FILE_D, SAVEFILE_X2, 118); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); #ifndef VERSION_EU // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_generic_string(SCORE_X, 39, textScore); print_generic_string(COPY_X, 39, textCopy); print_generic_string(ERASE_X, 39, textErase); @@ -1895,17 +1895,17 @@ void print_main_menu_strings(void) { sSoundTextX = get_str_x_pos_from_center(254, textSoundModes[sSoundMode], 10.0f); #endif print_generic_string(SOUNDMODE_X1, 39, textSoundModes[sSoundMode]); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); #endif // Print file names - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_BEGIN); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_BEGIN); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); FILE_SELECT_PRINT_STRING(MARIOTEXT_X1, MARIOTEXT_Y1, textMarioA); FILE_SELECT_PRINT_STRING(MARIOTEXT_X2, MARIOTEXT_Y1, textMarioB); FILE_SELECT_PRINT_STRING(MARIOTEXT_X1, MARIOTEXT_Y2, textMarioC); FILE_SELECT_PRINT_STRING(MARIOTEXT_X2, MARIOTEXT_Y2, textMarioD); - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_END); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_END); } #ifdef VERSION_EU @@ -1918,15 +1918,15 @@ void print_main_lang_strings(void) { static s16 centeredX; // Print "SELECT FILE" text - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); centeredX = get_str_x_pos_from_center_scale(160, textSelectFile[sLanguageMode], 12.0f); print_hud_lut_string(HUD_LUT_GLOBAL, centeredX, 35, textSelectFile[sLanguageMode]); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); centeredX = get_str_x_pos_from_center(76, textScore[sLanguageMode], 10.0f); print_generic_string(centeredX, 39, textScore[sLanguageMode]); centeredX = get_str_x_pos_from_center(131, textCopy[sLanguageMode], 10.0f); @@ -1935,7 +1935,7 @@ void print_main_lang_strings(void) { print_generic_string(centeredX, 39, textErase[sLanguageMode]); centeredX = get_str_x_pos_from_center(245, textOption[sLanguageMode], 10.0f); print_generic_string(centeredX, 39, textOption[sLanguageMode]); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); print_main_menu_strings(); } @@ -2043,18 +2043,18 @@ void print_score_menu_strings(void) { #ifndef VERSION_EU // Print file star counts - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_save_file_star_count(SAVE_FILE_A, 90, 76); print_save_file_star_count(SAVE_FILE_B, 211, 76); print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); #endif // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); #ifdef VERSION_EU centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); #endif @@ -2067,19 +2067,19 @@ void print_score_menu_strings(void) { centeredX = get_str_x_pos_from_center(249, textEraseFileButton[sLanguageMode], 10.0f); #endif print_generic_string(ERASEFILE_X1, 35, LANGUAGE_ARRAY(textEraseFileButton)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); // Print file names #ifdef VERSION_EU print_main_menu_strings(); #else - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_BEGIN); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_BEGIN); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); FILE_SELECT_PRINT_STRING(89, SCORE_FILE_Y1, textMarioA); FILE_SELECT_PRINT_STRING(211, SCORE_FILE_Y1, textMarioB); FILE_SELECT_PRINT_STRING(89, SCORE_FILE_Y2, textMarioC); FILE_SELECT_PRINT_STRING(211, SCORE_FILE_Y2, textMarioD); - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_END); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_END); #endif } @@ -2252,17 +2252,17 @@ void print_copy_menu_strings(void) { copy_menu_display_message(sStatusMessageID); #ifndef VERSION_EU // Print file star counts - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_save_file_star_count(SAVE_FILE_A, 90, 76); print_save_file_star_count(SAVE_FILE_B, 211, 76); print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); #endif // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); #ifdef VERSION_EU centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); #endif @@ -2275,19 +2275,19 @@ void print_copy_menu_strings(void) { centeredX = get_str_x_pos_from_center(249, textEraseFileButton[sLanguageMode], 10.0f); #endif print_generic_string(ERASEFILE_X2, 35, LANGUAGE_ARRAY(textEraseFileButton)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); // Print file names #ifdef VERSION_EU print_main_menu_strings(); #else - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_BEGIN); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_BEGIN); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); FILE_SELECT_PRINT_STRING(89, COPY_FILE_Y1, textMarioA); FILE_SELECT_PRINT_STRING(211, COPY_FILE_Y1, textMarioB); FILE_SELECT_PRINT_STRING(89, COPY_FILE_Y2, textMarioC); FILE_SELECT_PRINT_STRING(211, COPY_FILE_Y2, textMarioD); - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_END); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_END); #endif } @@ -2400,12 +2400,12 @@ void print_erase_menu_prompt(s16 x, s16 y) { } // Print "YES NO" strings - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, sYesNoColor[0], sYesNoColor[0], sYesNoColor[0], sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, sYesNoColor[0], sYesNoColor[0], sYesNoColor[0], sTextBaseAlpha); print_generic_string(x + MENU_ERASE_YES_X_OFFSET, y, LANGUAGE_ARRAY(textYes)); - gDPSetEnvColor(gDisplayListHead++, sYesNoColor[1], sYesNoColor[1], sYesNoColor[1], sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, sYesNoColor[1], sYesNoColor[1], sYesNoColor[1], sTextBaseAlpha); print_generic_string(x + 98, y, LANGUAGE_ARRAY(textNo)); - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } // MARIO_ERASED_VAR is the value there the letter "A" is, it works like this: @@ -2570,18 +2570,18 @@ void print_erase_menu_strings(void) { #ifndef VERSION_EU // Print file star counts - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_save_file_star_count(SAVE_FILE_A, 90, 76); print_save_file_star_count(SAVE_FILE_B, 211, 76); print_save_file_star_count(SAVE_FILE_C, 90, 119); print_save_file_star_count(SAVE_FILE_D, 211, 119); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); #endif // Print menu names - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); #ifdef VERSION_EU centeredX = get_str_x_pos_from_center(69, textReturn[sLanguageMode], 10.0f); @@ -2595,19 +2595,19 @@ void print_erase_menu_strings(void) { print_generic_string(VIEWSCORE_X2, 35, textViewScore); print_generic_string(COPYFILE_X2, 35, textCopyFileButton); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); // Print file names #ifdef VERSION_EU print_main_menu_strings(); #else - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_BEGIN); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_BEGIN); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); FILE_SELECT_PRINT_STRING(89, ERASE_FILE_Y1, textMarioA); FILE_SELECT_PRINT_STRING(211, ERASE_FILE_Y1, textMarioB); FILE_SELECT_PRINT_STRING(89, ERASE_FILE_Y2, textMarioC); FILE_SELECT_PRINT_STRING(211, ERASE_FILE_Y2, textMarioD); - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_END); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_END); #endif } @@ -2641,8 +2641,8 @@ void print_sound_mode_menu_strings(void) { #endif // Print "SOUND SELECT" text - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); #ifdef VERSION_EU print_hud_lut_string(HUD_LUT_DIFF, 47, 32, textSoundSelect[sLanguageMode]); @@ -2651,17 +2651,17 @@ void print_sound_mode_menu_strings(void) { print_hud_lut_string(HUD_LUT_DIFF, SOUND_HUD_X, SOUND_HUD_Y, textSoundSelect); #endif - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); #ifdef VERSION_EU // In EU their X position get increased each string // Print sound mode names for (mode = 0, textX = 90; mode < 3; textX += 70, mode++) { if (mode == sSoundMode) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); } else { - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, sTextBaseAlpha); } print_generic_string( get_str_x_pos_from_center(textX, textSoundModes[sLanguageMode * 3 + mode], 10.0f), @@ -2671,9 +2671,9 @@ void print_sound_mode_menu_strings(void) { // In EU, print language mode names for (mode = 0, textX = 90; mode < 3; textX += 70, mode++) { if (mode == sLanguageMode) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); } else { - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, sTextBaseAlpha); } print_generic_string( get_str_x_pos_from_center(textX, textLanguage[mode], 10.0f), @@ -2683,9 +2683,9 @@ void print_sound_mode_menu_strings(void) { // Print sound mode names for (mode = 0; mode < 3; mode++) { if (sSoundMode == mode) { - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); } else { - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 0, 0, 0, sTextBaseAlpha); } #ifndef VERSION_JP // Mode names are centered correctly on US and Shindou @@ -2698,11 +2698,11 @@ void print_sound_mode_menu_strings(void) { #endif #ifdef VERSION_EU - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_generic_string(182, 29, textReturn[sLanguageMode]); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); } #ifndef VERSION_CN @@ -2946,18 +2946,18 @@ void print_save_file_scores(s8 fileIndex) { textFileLetter[0] = fileIndex + ASCII_TO_DIALOG('A'); // get letter of file selected // Print file name at top - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); print_hud_lut_string(HUD_LUT_DIFF, MARIO_X, MARIO_Y, textMario); print_hud_lut_string(HUD_LUT_GLOBAL, FILE_LETTER_X, 15, textFileLetter); // Print save file star count at top print_save_file_star_count(fileIndex, 124, 15); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); // Print course scores - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_BEGIN); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_BEGIN); + gDPSetEnvColor(MASTERDL, 255, 255, 255, sTextBaseAlpha); //! Huge print list, for loops exist for a reason! #ifdef VERSION_CN @@ -3041,7 +3041,7 @@ void print_save_file_scores(s8 fileIndex) { FILE_SELECT_PRINT_STRING(270, 17, textRArrow); #endif - gSPDisplayList(gDisplayListHead++, FILE_SELECT_TEXT_DL_END); + gSPDisplayList(MASTERDL, FILE_SELECT_TEXT_DL_END); } #undef PRINT_COURSE_NAME_CN diff --git a/src/menu/star_select.c b/src/menu/star_select.c index c9ee8715..a8513530 100644 --- a/src/menu/star_select.c +++ b/src/menu/star_select.c @@ -214,28 +214,28 @@ void print_course_number(void) { create_dl_translation_matrix(MENU_MTX_PUSH, 158.0f, 81.0f, 0.0f); // Full wood texture in JP & US, lower part of it on EU - gSPDisplayList(gDisplayListHead++, dl_menu_rgba16_wood_course); + gSPDisplayList(MASTERDL, dl_menu_rgba16_wood_course); #ifdef VERSION_EU // Change upper part of the wood texture depending of the language defined switch (language) { case LANGUAGE_ENGLISH: - gSPDisplayList(gDisplayListHead++, dl_menu_texture_course_upper); + gSPDisplayList(MASTERDL, dl_menu_texture_course_upper); break; case LANGUAGE_FRENCH: - gSPDisplayList(gDisplayListHead++, dl_menu_texture_niveau_upper); + gSPDisplayList(MASTERDL, dl_menu_texture_niveau_upper); break; case LANGUAGE_GERMAN: - gSPDisplayList(gDisplayListHead++, dl_menu_texture_kurs_upper); + gSPDisplayList(MASTERDL, dl_menu_texture_kurs_upper); break; } - gSPDisplayList(gDisplayListHead++, dl_menu_rgba16_wood_course_end); + gSPDisplayList(MASTERDL, dl_menu_rgba16_wood_course_end); #endif - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gSPPopMatrix(MASTERDL, G_MTX_MODELVIEW); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); int_to_str(gCurrCourseNum, courseNum); @@ -245,7 +245,7 @@ void print_course_number(void) { print_hud_lut_string(HUD_LUT_GLOBAL, 143, 158, courseNum); } - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); } #ifdef VERSION_JP @@ -304,13 +304,13 @@ void print_act_selector_strings(void) { #endif // Print the coin highscore. - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); - gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); + gSPDisplayList(MASTERDL, dl_rgba16_text_begin); + gDPSetEnvColor(MASTERDL, 255, 255, 255, 255); print_hud_my_score_coins(1, gCurrSaveFileNum - 1, COURSE_NUM_TO_INDEX(gCurrCourseNum), 155, 106); - gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); + gSPDisplayList(MASTERDL, dl_rgba16_text_end); - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gSPDisplayList(MASTERDL, dl_ia_text_begin); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); // Print the "MY SCORE" text if the coin score is more than 0 if (save_file_get_course_coin_score(gCurrSaveFileNum - 1, COURSE_NUM_TO_INDEX(gCurrCourseNum)) != 0) { // TODO: Macros for all these hardcoded positions would be nice @@ -331,7 +331,7 @@ void print_act_selector_strings(void) { print_generic_string(lvlNameX, 33, currLevelName + 3); #endif - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); #ifdef VERSION_EU print_course_number(language); @@ -340,11 +340,11 @@ void print_act_selector_strings(void) { #endif #ifdef VERSION_CN - gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); + gSPDisplayList(MASTERDL, dl_ia_text_begin); #else - gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); + gSPDisplayList(MASTERDL, dl_menu_ia8_text_begin); #endif - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); // Print the name of the selected act. if (sVisibleStars != 0) { @@ -360,10 +360,10 @@ void print_act_selector_strings(void) { } #ifdef VERSION_CN - gSPDisplayList(gDisplayListHead++, dl_ia_text_end); + gSPDisplayList(MASTERDL, dl_ia_text_end); - gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_begin); - gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, 255); + gSPDisplayList(MASTERDL, dl_menu_ia8_text_begin); + gDPSetEnvColor(MASTERDL, 0, 0, 0, 255); #endif // Print the numbers above each star. @@ -376,7 +376,7 @@ void print_act_selector_strings(void) { #endif } - gSPDisplayList(gDisplayListHead++, dl_menu_ia8_text_end); + gSPDisplayList(MASTERDL, dl_menu_ia8_text_end); } /**