diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-07 21:15:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 21:15:49 -0400 |
| commit | b7532903d7969cc80174ca2538351df2f2aff6d7 (patch) | |
| tree | 4bd2a9cd9a00d5ead8e1749f61e6baef4a7e5a71 /src | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
| parent | 938aec45d32eef8f4a6894e1c4cc19ffccc85543 (diff) | |
Merge pull request #1089 from PokeCodec/patch-1
Match CreatePokeDexList
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokedex.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index c3d38681c..d2e1a0666 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -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); |