From afdcb69bf4cd6f3f7f0bad66801108384ab596c1 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 2 Apr 2020 20:30:31 +0800 Subject: [PATCH] better matching approach than upstream --- src/pokedex.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index 5b28563012..0805485537 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3869,14 +3869,17 @@ static void HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused) for (i = 0; i < SCREEN_COUNT; i++) { u8 row = (i * 7) + 1; - u16 newPalette = 0x4000; + u16 newPalette; - if (i == selectedScreen) - do newPalette = 0x2000; while (0); + do + { + newPalette = 0x4000; + if (i == selectedScreen) + newPalette = 0x2000; + } while (0); for (j = 0; j < 7; j++) { - j++;j--; ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette; ptr[row + j + 0x20] = (ptr[row + j + 0x20] % 0x1000) | newPalette; } @@ -3905,7 +3908,6 @@ static void HighlightSubmenuScreenSelectBarItem(u8 a, u16 b) for (j = 0; j < 7; j++) { - j++;j--; ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette; ptr[row + j + 0x20] = (ptr[row + j + 0x20] % 0x1000) | newPalette; }