diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-11-30 16:35:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 16:35:33 -0600 |
| commit | bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c (patch) | |
| tree | 7629f516fd4c09dbfb907c5d4154e0a58666a5a6 /engine/menus/pokedex.asm | |
| parent | Keep wGrassMons and wWaterMons together with a UNION (diff) | |
| parent | Fix reference to unused_fanfare.asm (diff) | |
| download | pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.gz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.xz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.zip | |
Merge pull request #304 from SatoMew/master
Rename *TilesetType to *TileAnimations
Diffstat (limited to 'engine/menus/pokedex.asm')
| -rw-r--r-- | engine/menus/pokedex.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 5660ecfb..2af8d714 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -410,10 +410,10 @@ ShowPokedexDataInternal: call RunPaletteCommand pop af ld [wd11e], a - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a hlcoord 0, 0 ld de, 1 @@ -577,7 +577,7 @@ ShowPokedexDataInternal: and A_BUTTON | B_BUTTON jr z, .waitForButtonPress pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOut call ClearScreen call RunDefaultPaletteCommand |