atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review changes from https://github.com/pret/pokefirered/pull/525

Browse source
This commit is contained in:
Eduardo Quezada 2022-08-01 15:37:05 -04:00
parent cc288e3786
commit b49f8c10ad
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mon_markings.c
View file

@ -396,20 +396,16 @@ bool8 HandleMonMarkingsMenuInput(void)
if (JOY_NEW(DPAD_UP)) if (JOY_NEW(DPAD_UP))
{ {
s8 pos;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
pos = --sMenu->cursorPos; if (--sMenu->cursorPos < 0)
if (pos < 0)
sMenu->cursorPos = SELECTION_CANCEL; sMenu->cursorPos = SELECTION_CANCEL;
return TRUE; return TRUE;
} }
if (JOY_NEW(DPAD_DOWN)) if (JOY_NEW(DPAD_DOWN))
{ {
s8 pos;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
pos = ++sMenu->cursorPos; if (++sMenu->cursorPos > SELECTION_CANCEL)
if (pos > SELECTION_CANCEL)
sMenu->cursorPos = 0; sMenu->cursorPos = 0;
return TRUE; return TRUE;
} }

14
src/pokemon_storage_system.c
View file

@ -9241,16 +9241,16 @@ static bool8 UpdateItemInfoWindowSlideOut(void)
return TRUE; return TRUE;
} }
static void DrawItemInfoWindow(u32 pos) static void DrawItemInfoWindow(u32 x)
{ {
if (pos != 0) if (x != 0)
{ {
FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, pos, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xFu);
FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, pos, 1, 0xFu); FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xFu);
} }
FillBgTilemapBufferRect(0, 0x13B, pos, 0xD, 1, 7, 0xFu); FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xFu);
FillBgTilemapBufferRect(0, 0x13C, pos, 0xC, 1, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xFu);
FillBgTilemapBufferRect(0, 0x13D, pos, 0x14, 1, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xFu);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }