diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-14 14:18:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 14:18:29 -0600 |
| commit | b4b4fb951a588dd50b4589efea11d1a17fd88342 (patch) | |
| tree | 8bce21f083717e8b39df833136fdab956673001b /src/pokedex.c | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
| parent | 87763d133fadac8270dab0cba3d964a47b5b0dd2 (diff) | |
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 755a46821..8c6ed3159 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1264,7 +1264,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) for (i = 0; i < NATIONAL_DEX_COUNT; i++) { - pokedexView->pokedexList[i].dexNum |= 0xFFFF; + pokedexView->pokedexList[i].dexNum = 0xFFFF; pokedexView->pokedexList[i].seen = 0; pokedexView->pokedexList[i].owned = 0; } @@ -1281,7 +1281,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->seenCount = 0; pokedexView->ownCount = 0; for (i = 0; i < 4; i++) - pokedexView->unk61E[i] |= 0xFFFF; + pokedexView->unk61E[i] = 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; @@ -2030,7 +2030,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) { - sPokedexView->pokedexList[i].dexNum |= 0xFFFF; + sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].seen = FALSE; sPokedexView->pokedexList[i].owned = FALSE; } @@ -2437,7 +2437,7 @@ u8 sub_80BDA40(void) if (sPokedexView->unk61E[i] != 0xFFFF) { FreeAndDestroyMonPicSprite(sPokedexView->unk61E[i]); - sPokedexView->unk61E[i] |= 0xFFFF; + sPokedexView->unk61E[i] = 0xFFFF; } } return FALSE; |