From b6cc4a4a1fc32ee9e3b1807127f434720a004315 Mon Sep 17 00:00:00 2001 From: Reonu Date: Tue, 13 Jul 2021 04:23:26 +0100 Subject: [PATCH] fix search and replace memes --- src/game/game_init.c | 14 +++++++------- src/game/ingame_menu.c | 8 -------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/game/game_init.c b/src/game/game_init.c index bbcd496ec..684c81e5f 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -209,13 +209,13 @@ void draw_screen_borders(void) { gDPSetFillColor(gDisplayListHead++, GPACK_RGBA5551(0, 0, 0, 0) << 16 | GPACK_RGBA5551(0, 0, 0, 0)); -#if gBorderHeight != 0 - gDPFillRectangle(gDisplayListHead++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), 0, - GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, gBorderHeight - 1); - gDPFillRectangle(gDisplayListHead++, - GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), SCREEN_HEIGHT - gBorderHeight, - GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - 1); -#endif + if (gBorderHeight) { + gDPFillRectangle(gDisplayListHead++, GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), 0, + GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, gBorderHeight - 1); + gDPFillRectangle(gDisplayListHead++, + GFX_DIMENSIONS_RECT_FROM_LEFT_EDGE(0), SCREEN_HEIGHT - gBorderHeight, + GFX_DIMENSIONS_RECT_FROM_RIGHT_EDGE(0) - 1, SCREEN_HEIGHT - 1); + } } void make_viewport_clip_rect(Vp *viewport) { diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index a7d2a226a..0abc047db 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -1825,15 +1825,7 @@ void render_dialog_entries(void) { if (gLastDialogPageStrPos == -1 && gLastDialogResponse == 1) { render_dialog_triangle_choice(); } - #ifdef VERSION_EU - #undef gBorderHeight - #define gBorderHeight 8 - #endif gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 2, 2, SCREEN_WIDTH - gBorderHeight/2, SCREEN_HEIGHT - gBorderHeight/2); - #ifdef VERSION_EU - #undef gBorderHeight - #define gBorderHeight 1 - #endif if (gLastDialogPageStrPos != -1 && gDialogBoxState == DIALOG_STATE_VERTICAL) { render_dialog_string_color(dialog->linesPerBox); }