summaryrefslogtreecommitdiff
path: root/engine/sprite_anims.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-29 17:13:47 -0800
committerGitHub <noreply@github.com>2017-11-29 17:13:47 -0800
commit7a2a20528136b9a2452a313cd50c46a45f9a5cb0 (patch)
tree4e7a32f2b809f5458cbfa6b068fbaa8e3e49e5c6 /engine/sprite_anims.asm
parentc28be02a193a088354131f260781a9081825eeee (diff)
parent2cc2f057e8a4429cc328d9f1fe578142e82cfc49 (diff)
Merge pull request #400 from mid-kid/master
mid-kid's amazing patches act 2
Diffstat (limited to 'engine/sprite_anims.asm')
-rwxr-xr-xengine/sprite_anims.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index 132c0fb5a..ed7fe20ad 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -367,7 +367,7 @@ DoAnimFrame: ; 8d24b
cp $2
ret nz
ld [hl], $3
- ld a, $f
+ ld a, SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2
call _ReinitSpriteAnimFrame
ret
@@ -431,7 +431,7 @@ DoAnimFrame: ; 8d24b
; 8d493
.sixteen_zero ; 8d493
- ld a, $14
+ ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0
call _ReinitSpriteAnimFrame
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -780,7 +780,7 @@ DoAnimFrame: ; 8d24b
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- ld a, $36
+ ld a, SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2
call _ReinitSpriteAnimFrame
ret
@@ -834,7 +834,7 @@ DoAnimFrame: ; 8d24b
ld a, [wcf64]
cp $40
ret nz
- ld a, $3d
+ ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2
call _ReinitSpriteAnimFrame
ret