ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

better matching approach than upstream

Browse Source
This commit is contained in:
jiangzhengwenjz 2020-04-02 20:30:31 +08:00
parent 61b7b45084
commit afdcb69bf4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pokedex.c
View File

@ -3869,14 +3869,17 @@ static void HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused)
for (i = 0; i < SCREEN_COUNT; i++) for (i = 0; i < SCREEN_COUNT; i++)
{ {
u8 row = (i * 7) + 1; u8 row = (i * 7) + 1;
u16 newPalette = 0x4000; u16 newPalette;
do
{
newPalette = 0x4000;
if (i == selectedScreen) if (i == selectedScreen)
do newPalette = 0x2000; while (0); newPalette = 0x2000;
} while (0);
for (j = 0; j < 7; j++) for (j = 0; j < 7; j++)
{ {
j++;j--;
ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette; ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette;
ptr[row + j + 0x20] = (ptr[row + j + 0x20] % 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++) for (j = 0; j < 7; j++)
{ {
j++;j--;
ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette; ptr[row + j] = (ptr[row + j] % 0x1000) | newPalette;
ptr[row + j + 0x20] = (ptr[row + j + 0x20] % 0x1000) | newPalette; ptr[row + j + 0x20] = (ptr[row + j + 0x20] % 0x1000) | newPalette;
} }