diff options
Diffstat (limited to 'data/sprite_anim_frames.asm')
| -rwxr-xr-x | data/sprite_anim_frames.asm | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm index 10f9244f3..e69792ec1 100755 --- a/data/sprite_anim_frames.asm +++ b/data/sprite_anim_frames.asm @@ -49,10 +49,10 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_MagnetTrainBlue dw .Frameset_MobileTradeSentBall dw .Frameset_MobileTradeOTBall - dw .Frameset_31 - dw .Frameset_32 - dw .Frameset_33 - dw .Frameset_34 + dw .Frameset_ForMobile22 + dw .Frameset_ForMobile23 + dw .Frameset_ForMobile24 + dw .Frameset_ForMobile25 dw .Frameset_IntroSuicune dw .Frameset_IntroSuicune2 dw .Frameset_IntroPichu @@ -210,9 +210,9 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_TradePoof: - frame SPRITE_ANIM_FRAME_IDX_32, 4 - frame SPRITE_ANIM_FRAME_IDX_33, 4 - frame SPRITE_ANIM_FRAME_IDX_34, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 4 delanim .Frameset_TradeTubeBulge: @@ -226,13 +226,13 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_TrademonBubble: - frame SPRITE_ANIM_FRAME_IDX_39, 32 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE, 32 endanim .Frameset_EvolutionBallOfLight: - frame SPRITE_ANIM_FRAME_IDX_3B, 2 - frame SPRITE_ANIM_FRAME_IDX_3A, 2 - frame SPRITE_ANIM_FRAME_IDX_3B, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2, 2 endanim .Frameset_RadioTuningKnob: @@ -240,10 +240,10 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_MagnetTrainRed: - frame SPRITE_ANIM_FRAME_IDX_41, 8 - frame SPRITE_ANIM_FRAME_IDX_42, 8 - frame SPRITE_ANIM_FRAME_IDX_41, 8 - frame SPRITE_ANIM_FRAME_IDX_42, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP dorestart ; XXX @@ -371,9 +371,9 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_MobileTradeSentBall: - frame SPRITE_ANIM_FRAME_IDX_32, 3 - frame SPRITE_ANIM_FRAME_IDX_33, 3 - frame SPRITE_ANIM_FRAME_IDX_34, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 3 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 @@ -401,82 +401,82 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_32, 3 - frame SPRITE_ANIM_FRAME_IDX_33, 3 - frame SPRITE_ANIM_FRAME_IDX_34, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 3 delanim -.Frameset_31: - frame SPRITE_ANIM_FRAME_IDX_67, 3 - frame SPRITE_ANIM_FRAME_IDX_68, 3 +.Frameset_ForMobile22: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1, 3 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2, 3 dorestart -.Frameset_32: - frame SPRITE_ANIM_FRAME_IDX_6C, 3 +.Frameset_ForMobile23: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23, 3 endanim -.Frameset_33: - frame SPRITE_ANIM_FRAME_IDX_6D, 3 +.Frameset_ForMobile24: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24, 3 endanim -.Frameset_34: - frame SPRITE_ANIM_FRAME_IDX_69, 2 - frame SPRITE_ANIM_FRAME_IDX_6A, 2 - frame SPRITE_ANIM_FRAME_IDX_6B, 2 +.Frameset_ForMobile25: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1, 2 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2, 2 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3, 2 delanim .Frameset_IntroSuicune: - frame SPRITE_ANIM_FRAME_IDX_6E, 3 - frame SPRITE_ANIM_FRAME_IDX_6F, 3 - frame SPRITE_ANIM_FRAME_IDX_70, 3 - frame SPRITE_ANIM_FRAME_IDX_71, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4, 3 dorestart .Frameset_IntroSuicune2: - frame SPRITE_ANIM_FRAME_IDX_71, 3 - frame SPRITE_ANIM_FRAME_IDX_6E, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1, 7 endanim .Frameset_IntroPichu: - frame SPRITE_ANIM_FRAME_IDX_72, 32 - frame SPRITE_ANIM_FRAME_IDX_73, 7 - frame SPRITE_ANIM_FRAME_IDX_74, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1, 32 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3, 7 endanim .Frameset_IntroWooper: - frame SPRITE_ANIM_FRAME_IDX_75, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER, 3 endanim .Frameset_IntroUnown1: - frame SPRITE_ANIM_FRAME_IDX_76, 3 - frame SPRITE_ANIM_FRAME_IDX_77, 3 - frame SPRITE_ANIM_FRAME_IDX_78, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7 delanim .Frameset_IntroUnown2: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_X_FLIP delanim .Frameset_IntroUnown3: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_Y_FLIP delanim .Frameset_IntroUnown4: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_IntroUnownF2: - frame SPRITE_ANIM_FRAME_IDX_79, 3 - frame SPRITE_ANIM_FRAME_IDX_7A, 3 - frame SPRITE_ANIM_FRAME_IDX_7B, 3 - frame SPRITE_ANIM_FRAME_IDX_7C, 7 - frame SPRITE_ANIM_FRAME_IDX_7D, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5, 7 endanim .Frameset_IntroSuicuneAway: |