From af7009d63768600eeca2d698e886a03a72c22b57 Mon Sep 17 00:00:00 2001 From: Reonu Date: Mon, 12 Jul 2021 18:19:31 +0100 Subject: [PATCH 1/5] defines for emu and console borders --- include/config.h | 10 ++++++---- lib/libs2d_engine.a | Bin 0 -> 39620 bytes src/game/area.c | 12 ++++++------ src/game/game_init.c | 27 ++++++++++++++++++--------- src/game/game_init.h | 2 ++ src/game/ingame_menu.c | 10 +++++----- src/game/rendering_graph_node.c | 4 ++-- 7 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 lib/libs2d_engine.a diff --git a/include/config.h b/include/config.h index 45c0faa0..38eea8fb 100644 --- a/include/config.h +++ b/include/config.h @@ -36,13 +36,15 @@ // Border Height Define for NTSC Versions #ifdef TARGET_N64 #ifndef VERSION_EU -#define BORDER_HEIGHT 8 +#define BORDER_HEIGHT_CONSOLE 8 +#define BORDER_HEIGHT_EMULATOR 0 #else -#define BORDER_HEIGHT 1 +#define BORDER_HEIGHT_CONSOLE 8 +#define BORDER_HEIGHT_EMULATOR 0 #endif #else -// What's the point of having a border? -#define BORDER_HEIGHT 0 +#define BORDER_HEIGHT_CONSOLE 8 +#define BORDER_HEIGHT_EMULATOR 0 #endif #endif // CONFIG_H diff --git a/lib/libs2d_engine.a b/lib/libs2d_engine.a new file mode 100644 index 0000000000000000000000000000000000000000..ab363747589f74789db06a72d53ec9d5c0c3e0ee GIT binary patch literal 39620 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 Dnm`rN literal 0 HcmV?d00001 diff --git a/src/game/area.c b/src/game/area.c index af9d0156..976a1a50 100644 --- a/src/game/area.c +++ b/src/game/area.c @@ -365,16 +365,16 @@ void render_game(void) { gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_8032CF00)); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, - SCREEN_HEIGHT - BORDER_HEIGHT); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, gBorderHeight, SCREEN_WIDTH, + SCREEN_HEIGHT - gBorderHeight); render_hud(); gDPSetScissor(gDisplayListHead++, 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, - SCREEN_HEIGHT - BORDER_HEIGHT); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, gBorderHeight, SCREEN_WIDTH, + SCREEN_HEIGHT - gBorderHeight); gPauseScreenMode = render_menus_and_dialogs(); if (gPauseScreenMode != 0) { @@ -384,8 +384,8 @@ 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, - SCREEN_HEIGHT - BORDER_HEIGHT); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, gBorderHeight, SCREEN_WIDTH, + SCREEN_HEIGHT - gBorderHeight); if (gWarpTransition.isActive) { if (gWarpTransDelay == 0) { diff --git a/src/game/game_init.c b/src/game/game_init.c index 2097383d..bbcd496e 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -41,6 +41,8 @@ struct GfxPool *gGfxPool; OSContStatus gControllerStatuses[4]; OSContPad gControllerPads[4]; u8 gControllerBits; +u8 gIsConsole; +u8 gBorderHeight; #ifdef EEP s8 gEepromProbe; #endif @@ -140,8 +142,8 @@ void clear_z_buffer(void) { gDPSetFillColor(gDisplayListHead++, GPACK_ZDZ(G_MAXFBZ, 0) << 16 | GPACK_ZDZ(G_MAXFBZ, 0)); - gDPFillRectangle(gDisplayListHead++, 0, BORDER_HEIGHT, SCREEN_WIDTH - 1, - SCREEN_HEIGHT - 1 - BORDER_HEIGHT); + gDPFillRectangle(gDisplayListHead++, 0, gBorderHeight, SCREEN_WIDTH - 1, + SCREEN_HEIGHT - 1 - gBorderHeight); } /** Sets up the final framebuffer image. */ @@ -151,8 +153,8 @@ void display_frame_buffer(void) { gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gPhysicalFrameBuffers[frameBufferIndex]); - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, BORDER_HEIGHT, SCREEN_WIDTH, - SCREEN_HEIGHT - BORDER_HEIGHT); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, gBorderHeight, SCREEN_WIDTH, + SCREEN_HEIGHT - gBorderHeight); } /** Clears the framebuffer, allowing it to be overwritten. */ @@ -164,8 +166,8 @@ void clear_frame_buffer(s32 color) { gDPSetFillColor(gDisplayListHead++, color); gDPFillRectangle(gDisplayListHead++, - GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), BORDER_HEIGHT, - GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - BORDER_HEIGHT - 1); + GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), gBorderHeight, + GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - gBorderHeight - 1); gDPPipeSync(gDisplayListHead++); @@ -207,11 +209,11 @@ void draw_screen_borders(void) { gDPSetFillColor(gDisplayListHead++, GPACK_RGBA5551(0, 0, 0, 0) << 16 | GPACK_RGBA5551(0, 0, 0, 0)); -#if BORDER_HEIGHT != 0 +#if gBorderHeight != 0 gDPFillRectangle(gDisplayListHead++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), 0, - GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, BORDER_HEIGHT - 1); + GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, gBorderHeight - 1); gDPFillRectangle(gDisplayListHead++, - GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), SCREEN_HEIGHT - BORDER_HEIGHT, + GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), SCREEN_HEIGHT - gBorderHeight, GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - 1); #endif } @@ -322,6 +324,13 @@ void draw_reset_bars(void) { } void rendering_init(void) { + if (IO_READ(DPC_PIPEBUSY_REG) == 0) { + gIsConsole = 0; + gBorderHeight = BORDER_HEIGHT_EMULATOR; + } else { + gIsConsole = 1; + gBorderHeight = BORDER_HEIGHT_CONSOLE; + } gGfxPool = &gGfxPools[0]; set_segment_base_addr(1, gGfxPool->buffer); gGfxSPTask = &gGfxPool->spTask; diff --git a/src/game/game_init.h b/src/game/game_init.h index f1948718..ee5c13b2 100644 --- a/src/game/game_init.h +++ b/src/game/game_init.h @@ -41,6 +41,8 @@ extern Gfx *gDisplayListHead; extern u8 *gGfxPoolEnd; extern struct GfxPool *gGfxPool; extern u8 gControllerBits; +extern u8 gIsConsole; +extern u8 gBorderHeight; #ifdef EEP extern s8 gEepromProbe; #endif diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 9344738d..a7d2a226 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -1826,13 +1826,13 @@ void render_dialog_entries(void) { render_dialog_triangle_choice(); } #ifdef VERSION_EU - #undef BORDER_HEIGHT - #define BORDER_HEIGHT 8 + #undef gBorderHeight + #define gBorderHeight 8 #endif - gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - BORDER_HEIGHT/2, SCREEN_HEIGHT - BORDER_HEIGHT/2); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - gBorderHeight/2, SCREEN_HEIGHT - gBorderHeight/2); #ifdef VERSION_EU - #undef BORDER_HEIGHT - #define BORDER_HEIGHT 1 + #undef gBorderHeight + #define gBorderHeight 1 #endif if (gLastDialogPageStrPos != -1 && gDialogBoxState == DIALOG_STATE_VERTICAL) { render_dialog_string_color(dialog->linesPerBox); diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 58238e83..9cdab49b 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -521,8 +521,8 @@ static void geo_process_background(struct GraphNodeBackground *node) { gDPPipeSync(gfx++); gDPSetCycleType(gfx++, G_CYC_FILL); gDPSetFillColor(gfx++, node->background); - gDPFillRectangle(gfx++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), BORDER_HEIGHT, - GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - BORDER_HEIGHT - 1); + gDPFillRectangle(gfx++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), gBorderHeight, + GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - gBorderHeight - 1); gDPPipeSync(gfx++); gDPSetCycleType(gfx++, G_CYC_1CYCLE); gSPEndDisplayList(gfx++); From 73649f65eee121c8ab0a77e8ab96cd1d92f6dafd Mon Sep 17 00:00:00 2001 From: Reonu Date: Mon, 12 Jul 2021 18:21:18 +0100 Subject: [PATCH 2/5] mention border height & console detection --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8380de2c..87d26f2f 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ - It has been patched with someone2639's shiftable segments patch - Wiseguy's instant input patch has been added to allow for less input lag on emulation (Does not affect console) This does mean that any framebuffer effects will have to be done on buffer 0 if targeting emulators +- Automatic console and emulator detection: Use the `gIsConsole` variable to wrap your code in an emulator check. +- Separate defines for emulator and console black border height. - Getting HVQM FMV support to work with the game is WIP. Requirements are the same as regular SM64, however a GCC MIPS cross compiler is also required. If you're on Debian-like Linux, you can use the ``gcc-mips-linux-gnu`` package. The toolchain that comes with my SDK is also supported. From 98a7266529c93617f02e276f5184d98202ecb757 Mon Sep 17 00:00:00 2001 From: Reonu Date: Mon, 12 Jul 2021 18:33:11 +0100 Subject: [PATCH 3/5] fixed default console defines for EU and non-N64 --- include/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config.h b/include/config.h index 38eea8fb..5e477ede 100644 --- a/include/config.h +++ b/include/config.h @@ -39,11 +39,11 @@ #define BORDER_HEIGHT_CONSOLE 8 #define BORDER_HEIGHT_EMULATOR 0 #else -#define BORDER_HEIGHT_CONSOLE 8 +#define BORDER_HEIGHT_CONSOLE 1 #define BORDER_HEIGHT_EMULATOR 0 #endif #else -#define BORDER_HEIGHT_CONSOLE 8 +#define BORDER_HEIGHT_CONSOLE 0 #define BORDER_HEIGHT_EMULATOR 0 #endif From b61837525d5ff87e2467ac4313a9e03a2e72e73a Mon Sep 17 00:00:00 2001 From: Reonu Date: Mon, 12 Jul 2021 23:05:56 +0100 Subject: [PATCH 4/5] deleted file that slipped in --- lib/libs2d_engine.a | Bin 39620 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/libs2d_engine.a diff --git a/lib/libs2d_engine.a b/lib/libs2d_engine.a deleted file mode 100644 index ab363747589f74789db06a72d53ec9d5c0c3e0ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39620 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 Dnm`rN From f8cd491f6d2dd10fbe0847ab0c13148b6531980e Mon Sep 17 00:00:00 2001 From: Reonu Date: Tue, 13 Jul 2021 01:03:44 +0100 Subject: [PATCH 5/5] HUD fix --- bin/segment2.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bin/segment2.c b/bin/segment2.c index eb2bdb3a..bcdb36c9 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -2097,14 +2097,8 @@ const Gfx dl_hud_img_begin[] = { gsDPSetTexturePersp(G_TP_NONE), gsDPSetAlphaCompare(G_AC_THRESHOLD), gsDPSetBlendColor(255, 255, 255, 255), -#if defined(VERSION_EU) || defined(VERSION_SH) gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), -#endif -#ifdef VERSION_EU gsDPSetTextureFilter(G_TF_POINT), -#elif defined(VERSION_JP) || defined(VERSION_US) - gsDPSetRenderMode(G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2), -#endif gsSPEndDisplayList(), }; @@ -2124,13 +2118,8 @@ const Gfx dl_hud_img_end[] = { gsDPSetTexturePersp(G_TP_PERSP), gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), gsDPSetAlphaCompare(G_AC_NONE), -#ifdef VERSION_EU gsDPSetTextureFilter(G_TF_BILERP), -#endif gsDPSetCycleType(G_CYC_1CYCLE), -#if defined(VERSION_JP) || defined(VERSION_US) - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), -#endif gsSPEndDisplayList(), };