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/pikachu | |
| 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/pikachu')
| -rw-r--r-- | engine/pikachu/pikachu_pic_animation.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm index 4f56d542..a5d9087f 100644 --- a/engine/pikachu/pikachu_pic_animation.asm +++ b/engine/pikachu/pikachu_pic_animation.asm @@ -616,10 +616,10 @@ PikaPicAnimCommand_loadgfx: push af xor a ldh [hAutoBGTransferEnabled], a - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call GetPikaPicAnimByte ld [wPikaPicAnimCurGraphicID], a ld a, [wPikaPicAnimCurGraphicID] @@ -634,7 +634,7 @@ PikaPicAnimCommand_loadgfx: call DecompressRequestPikaPicAnimGFX .done pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ldh [hAutoBGTransferEnabled], a pop af |