diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:47:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:47:45 -0400 |
| commit | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (patch) | |
| tree | aa2b318b4763fe39fd4ffc19ac7356dabba7034f /src/pokedex.c | |
| parent | a88676094b37951bd83b81cf610ddf92d7be0736 (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into add-localids
Diffstat (limited to 'src/pokedex.c')
| -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); |