diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-23 00:37:48 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-23 00:37:48 -0400 |
commit | d5b98f520692160cadcbf3470b02d5510d5fdf91 (patch) | |
tree | 47377949df94ed4ad7f82b8fe555a8144c7a0281 | |
parent | 4f0c9cecf9a4c9dec50e2a5fce8392c2217068e0 (diff) |
wPokeAnimStruct matches wPokeAnimStructEnd
-rw-r--r-- | engine/gfx/pic_animation.asm | 8 | ||||
-rw-r--r-- | wram.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index d8e3de0b2..af0227a2a 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -109,7 +109,7 @@ LoadMonAnimation: SetUpPokeAnim: ld a, [rSVBK] push af - ld a, BANK(wPokeAnimSceneIndex) + ld a, BANK(wPokeAnimStruct) ld [rSVBK], a ld a, [wPokeAnimSceneIndex] ld c, a @@ -284,14 +284,14 @@ AnimateMon_CheckIfPokemon: PokeAnim_InitPicAttributes: ld a, [rSVBK] push af - ld a, BANK(wPokeAnimSceneIndex) + ld a, BANK(wPokeAnimStruct) ld [rSVBK], a push bc push de push hl - ld hl, wPokeAnimSceneIndex - ld bc, wPokeAnimStructEnd - wPokeAnimSceneIndex + ld hl, wPokeAnimStruct + ld bc, wPokeAnimStructEnd - wPokeAnimStruct xor a call ByteFill pop hl @@ -2893,6 +2893,7 @@ wTempTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360 ; PokeAnim data +wPokeAnimStruct:: wPokeAnimSceneIndex:: db wPokeAnimPointer:: dw wPokeAnimSpecies:: db @@ -2901,7 +2902,6 @@ wPokeAnimSpeciesOrUnown:: db wPokeAnimGraphicStartTile:: db wPokeAnimCoord:: dw wPokeAnimFrontpicHeight:: db -; PokeAnim Data wPokeAnimIdleFlag:: db wPokeAnimSpeed:: db wPokeAnimPointerBank:: db |