Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 21:25:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve natdex load times

Browse Source
This commit is contained in:
cawtds 2025-03-21 21:23:48 +01:00
parent e0d828bb48
commit 21fda56141
2 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/global.h
View File

@ -171,6 +171,31 @@ extern u8 gStringVar4[1000];
#define FEATURE_FLAG_ASSERT(flag, id) STATIC_ASSERT(flag > TEMP_FLAGS_END || flag == 0, id)
#ifndef NDEBUG
static inline void CycleCountStart()
{
REG_TM2CNT_H = 0;
REG_TM3CNT_H = 0;
REG_TM2CNT_L = 0;
REG_TM3CNT_L = 0;
// init timers (tim3 count up mode, tim2 every clock cycle)
REG_TM3CNT_H = TIMER_ENABLE | TIMER_COUNTUP;
REG_TM2CNT_H = TIMER_1CLK | TIMER_ENABLE;
}
static inline u32 CycleCountEnd()
{
// stop timers
REG_TM2CNT_H = 0;
REG_TM3CNT_H = 0;
// return result
return REG_TM2CNT_L | (REG_TM3CNT_L << 16u);
}
#endif
struct Coords8
{
s8 x;

66
src/pokedex_screen.c
View File

@ -1392,10 +1392,13 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
{
bool32 isNationalDex = IsNationalPokedexEnabled();
u16 natDexNum;
u16 ret = 0;
u16 seenCount = 0;
s32 i;
bool8 caught;
bool8 seen;
FREE_IF_NOT_NULL(sPokedexScreenData->listItems);
sPokedexScreenData->listItems = AllocZeroed(NATIONAL_DEX_COUNT * sizeof(struct ListMenuItem));
switch (orderIdx)
{
@ -1409,7 +1412,7 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
if (seen)
{
sPokedexScreenData->listItems[i].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
ret = i + 1;
seenCount = i + 1;
}
else
{
@ -1428,9 +1431,9 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
caught = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE);
if (seen)
{
sPokedexScreenData->listItems[ret].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[ret].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
ret++;
sPokedexScreenData->listItems[seenCount].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[seenCount].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
seenCount++;
}
}
}
@ -1445,9 +1448,9 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
caught = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE);
if (caught)
{
sPokedexScreenData->listItems[ret].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[ret].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
ret++;
sPokedexScreenData->listItems[seenCount].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[seenCount].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
seenCount++;
}
}
}
@ -1462,9 +1465,9 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
caught = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE);
if (caught)
{
sPokedexScreenData->listItems[ret].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[ret].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
ret++;
sPokedexScreenData->listItems[seenCount].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[seenCount].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
seenCount++;
}
}
}
@ -1479,33 +1482,48 @@ static u16 DexScreen_CountMonsInOrderedList(u8 orderIdx)
caught = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE);
if (caught)
{
sPokedexScreenData->listItems[ret].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[ret].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
ret++;
sPokedexScreenData->listItems[seenCount].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
sPokedexScreenData->listItems[seenCount].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
seenCount++;
}
}
}
break;
case DEX_ORDER_NUMERICAL_NATIONAL:
for (i = 0; i < NATIONAL_DEX_COUNT; i++)
u32 species;
for (i = SPECIES_BULBASAUR; i < NUM_SPECIES; i++)
{
natDexNum = i + 1;
species = SanitizeSpeciesId(i);
natDexNum = gSpeciesInfo[species].natDexNum;
if (!natDexNum)
continue;
seen = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_SEEN, FALSE);
caught = DexScreen_GetSetPokedexFlag(natDexNum, FLAG_GET_CAUGHT, FALSE);
if (seen)
if (!sPokedexScreenData->listItems[natDexNum - 1].index)
{
sPokedexScreenData->listItems[i].label = gSpeciesInfo[NationalPokedexNumToSpecies(natDexNum)].speciesName;
ret = natDexNum;
if (seen)
{
sPokedexScreenData->listItems[natDexNum - 1].label = gSpeciesInfo[species].speciesName;
seenCount = natDexNum > seenCount ? natDexNum : seenCount;
}
else
{
sPokedexScreenData->listItems[natDexNum - 1].label = gText_5Dashes;
}
sPokedexScreenData->listItems[natDexNum - 1].index = (caught << 17) + (seen << 16) + species;
}
else
{
}
// in case national dex nums are missing
for (i = 0; i < NATIONAL_DEX_COUNT; i++)
{
if (!sPokedexScreenData->listItems[i].index)
sPokedexScreenData->listItems[i].label = gText_5Dashes;
}
sPokedexScreenData->listItems[i].index = (caught << 17) + (seen << 16) + NationalPokedexNumToSpecies(natDexNum);
}
break;
}
return ret;
return seenCount;
}
static void DexScreen_InitListMenuForOrderedList(const struct ListMenuTemplate * template, u8 order)