diff options
| author | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
| commit | 2654da5d157540d482790308f1c2948e1431fa46 (patch) | |
| tree | 265d64b9fb8f6e8bd580cb6a5ec3c59224e9fdeb /engine/menus/pokedex.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Update rgbdscheck.asm (diff) | |
| download | pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.tar.gz pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.tar.xz pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus/pokedex.asm')
| -rw-r--r-- | engine/menus/pokedex.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 315e4805..8e4fef19 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -162,10 +162,10 @@ HandlePokedexSideMenu: jr .exitSideMenu .chosePrint - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wd11e] ld [wcf91], a callfar PrintPokedexEntry @@ -173,7 +173,7 @@ HandlePokedexSideMenu: ldh [hAutoBGTransferEnabled], a call ClearScreen pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld b, $3 jr .exitSideMenu @@ -442,10 +442,10 @@ ShowPokedexDataInternal: set 1, [hl] ld a, $33 ; 3/7 volume ldh [rNR50], a - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOut ; zero all palettes ld a, [wd11e] ; pokemon ID ld [wcf91], a @@ -462,7 +462,7 @@ ShowPokedexDataInternal: and A_BUTTON | B_BUTTON jr z, .waitForButtonPress pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOut call ClearScreen call RunDefaultPaletteCommand |