Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1089 from PokeCodec/patch-1 

Match CreatePokeDexList
This commit is contained in:
PikalaxALT 2020-07-07 21:15:49 -04:00 committed by GitHub
parent 46f4a4bbf7 938aec45d3
commit b7532903d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pokedex.c
View File

@ -2218,18 +2218,14 @@ static void CreatePokedexList(u8 dexMode, u8 order)
}
else
{
bool32 r10;
s16 r5;
r10 = r5 = i = 0;
for (i = 0; i < temp_dexCount; i++)
s16 r5, r10;
for (i = 0, r5 = 0, r10 = 0; i < temp_dexCount; i++)
{
temp_dexNum = i + 1;
if (GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
r10 = 1;
if (r10)
{
asm(""); //Needed to match for some reason
sPokedexView->pokedexList[r5].dexNum = temp_dexNum;
sPokedexView->pokedexList[r5].seen = GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN);
sPokedexView->pokedexList[r5].owned = GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT);