diff options
| -rw-r--r-- | constants/sprite_anim_constants.asm | 2 | ||||
| -rwxr-xr-x | data/sprite_anims/framesets.asm | 20 | ||||
| -rwxr-xr-x | engine/sprite_anims.asm | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 4e88afdf8..6d6b1a474 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -127,7 +127,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_FRAMESET_RED_WALK ; 11 const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12 const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13 - const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14 + const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE ; 14 const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15 const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16 const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17 diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 1182ef4c6..5216a4d88 100755 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -20,7 +20,7 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_RedWalk dw .Frameset_StillCursor dw .Frameset_TradePokeBall - dw .Frameset_TradePokeBall0 + dw .Frameset_TradePokeBallWiggle dw .Frameset_TradePoof dw .Frameset_TradeTubeBulge dw .Frameset_TrademonIcon @@ -38,13 +38,13 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_EggHatch4 dw .Frameset_GSIntroHoOh dw .Frameset_HeadbuttTree - dw .Frameset_EZChatCursor0 dw .Frameset_EZChatCursor1 dw .Frameset_EZChatCursor2 dw .Frameset_EZChatCursor3 dw .Frameset_EZChatCursor4 dw .Frameset_EZChatCursor5 dw .Frameset_EZChatCursor6 + dw .Frameset_EZChatCursor7 dw .Frameset_BlueWalk dw .Frameset_MagnetTrainBlue dw .Frameset_MobileTradeSentBall @@ -202,7 +202,7 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32 endanim -.Frameset_TradePokeBall0: +.Frameset_TradePokeBallWiggle: frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 @@ -342,31 +342,31 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP dorestart -.Frameset_EZChatCursor0: +.Frameset_EZChatCursor1: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2 endanim -.Frameset_EZChatCursor1: +.Frameset_EZChatCursor2: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2 endanim -.Frameset_EZChatCursor2: +.Frameset_EZChatCursor3: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2 endanim -.Frameset_EZChatCursor3: +.Frameset_EZChatCursor4: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2 endanim -.Frameset_EZChatCursor4: +.Frameset_EZChatCursor5: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2 endanim -.Frameset_EZChatCursor5: +.Frameset_EZChatCursor6: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2 endanim -.Frameset_EZChatCursor6: +.Frameset_EZChatCursor7: frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2 endanim diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index f51b26e61..29af03d89 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -430,7 +430,7 @@ DoAnimFrame: ; 8d24b ; 8d493 .TradePokeBall_zero ; 8d493 - ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 + ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE call _ReinitSpriteAnimFrame ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX |