ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added X/Y-style wrapping summary screen

Browse Source
This commit is contained in:
Ninjdai 2023-11-11 00:24:25 +01:00
parent ee34b4f09d
commit 304447ee2d
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pokemon_summary_screen.c
View File

@ -1778,29 +1778,23 @@ static void Task_ChangeSummaryMon(u8 taskId)
static s8 AdvanceMonIndex(s8 delta) static s8 AdvanceMonIndex(s8 delta)
{ {
struct Pokemon *mon = sMonSummaryScreen->monList.mons; struct Pokemon *mon = sMonSummaryScreen->monList.mons;
u8 index = sMonSummaryScreen->curMonIndex;
u8 numMons = sMonSummaryScreen->maxMonIndex + 1;
delta += numMons;
if (sMonSummaryScreen->currPageIndex == PSS_PAGE_INFO) index = (index + delta) % numMons;
{
if (delta == -1 && sMonSummaryScreen->curMonIndex == 0) // skip over any Eggs unless on the Info Page
return -1; if (sMonSummaryScreen->currPageIndex != PSS_PAGE_INFO)
else if (delta == 1 && sMonSummaryScreen->curMonIndex >= sMonSummaryScreen->maxMonIndex) while (GetMonData(&mon[index], MON_DATA_IS_EGG))
index = (index + delta) % numMons;
// to avoid "scrolling" to the same Pokemon
if (index == sMonSummaryScreen->curMonIndex)
return -1; return -1;
else else
return sMonSummaryScreen->curMonIndex + delta;
}
else
{
s8 index = sMonSummaryScreen->curMonIndex;
do
{
index += delta;
if (index < 0 || index > sMonSummaryScreen->maxMonIndex)
return -1;
} while (GetMonData(&mon[index], MON_DATA_IS_EGG));
return index; return index;
} }
}
static s8 AdvanceMultiBattleMonIndex(s8 delta) static s8 AdvanceMultiBattleMonIndex(s8 delta)
{ {