fix search and replace memes

This commit is contained in:
Reonu
2021-07-13 04:23:26 +01:00
parent 225c1eef55
commit b6cc4a4a1f
2 changed files with 7 additions and 15 deletions

View File

@@ -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) {

View File

@@ -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);
}