ref: 8d095cd5b8c8aa120ec4ccb215cd0ee6345a197b
parent: b0d2409c831855da38833a912efa8117a84d8140
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Tue Jan 2 20:27:12 EST 2018
Better names
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -127,7 +127,7 @@
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
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -20,7 +20,7 @@
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,7 +38,6 @@
dw .Frameset_EggHatch4
dw .Frameset_GSIntroHoOh
dw .Frameset_HeadbuttTree
- dw .Frameset_EZChatCursor0
dw .Frameset_EZChatCursor1
dw .Frameset_EZChatCursor2
dw .Frameset_EZChatCursor3
@@ -45,6 +44,7 @@
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 @@
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 @@
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
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -430,7 +430,7 @@
; 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