From 48e40a7f09fb026bdf2f49b7f8ffc812268b2695 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 12 Dec 2017 01:34:46 -0500 Subject: Identify some SPRITE_ANIM_FRAME_IDX_* constants --- data/sprite_anim_frames.asm | 110 ++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'data/sprite_anim_frames.asm') diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm index 0111a5bc2..e61c528dd 100755 --- a/data/sprite_anim_frames.asm +++ b/data/sprite_anim_frames.asm @@ -2,12 +2,12 @@ SpriteAnimFrameData: ; 8d6e6 ; entries correspond to SPRITE_ANIM_FRAMESET_* constants dw .Frameset_00 dw .Frameset_PartyMon - dw .Frameset_02 - dw .Frameset_03 - dw .Frameset_04 - dw .Frameset_05 - dw .Frameset_06 - dw .Frameset_07 + dw .Frameset_PartyMonWithMail + dw .Frameset_PartyMonWithItem + dw .Frameset_PartyMonFast + dw .Frameset_PartyMonWithMailFast + dw .Frameset_PartyMonWithItemFast + dw .Frameset_GSTitleTrail dw .Frameset_TextEntryCursor dw .Frameset_09 dw .Frameset_GameFreakLogo @@ -69,51 +69,51 @@ SpriteAnimFrameData: ; 8d6e6 ; 8d76a .Frameset_00: - frame SPRITE_ANIM_FRAME_IDX_00, 32 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 32 endanim .Frameset_PartyMon: - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8 dorestart -.Frameset_02: - frame SPRITE_ANIM_FRAME_IDX_3D, 8 - frame SPRITE_ANIM_FRAME_IDX_3E, 8 +.Frameset_PartyMonWithMail: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1, 8 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2, 8 dorestart -.Frameset_03: - frame SPRITE_ANIM_FRAME_IDX_3F, 8 - frame SPRITE_ANIM_FRAME_IDX_40, 8 +.Frameset_PartyMonWithItem: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1, 8 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2, 8 dorestart -.Frameset_04: - frame SPRITE_ANIM_FRAME_IDX_00, 4 - frame SPRITE_ANIM_FRAME_IDX_01, 4 +.Frameset_PartyMonFast: + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 4 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 4 dorestart -.Frameset_05: - frame SPRITE_ANIM_FRAME_IDX_3D, 4 - frame SPRITE_ANIM_FRAME_IDX_3E, 4 +.Frameset_PartyMonWithMailFast: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1, 4 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2, 4 dorestart -.Frameset_06: - frame SPRITE_ANIM_FRAME_IDX_3F, 4 - frame SPRITE_ANIM_FRAME_IDX_40, 4 +.Frameset_PartyMonWithItemFast: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1, 4 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2, 4 dorestart .Frameset_RedWalk: - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8 - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8, OAM_X_FLIP dorestart .Frameset_BlueWalk: - frame SPRITE_ANIM_FRAME_IDX_63, 8 - frame SPRITE_ANIM_FRAME_IDX_64, 8 - frame SPRITE_ANIM_FRAME_IDX_63, 8 - frame SPRITE_ANIM_FRAME_IDX_64, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2, 8, OAM_X_FLIP dorestart .Frameset_MagnetTrainBlue: @@ -123,9 +123,9 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_FRAME_IDX_66, 8, OAM_X_FLIP dorestart -.Frameset_07: - frame SPRITE_ANIM_FRAME_IDX_1E, 1 - frame SPRITE_ANIM_FRAME_IDX_1F, 1 +.Frameset_GSTitleTrail: + frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1, 1 + frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2, 1 dorestart .Frameset_TextEntryCursor: @@ -134,7 +134,7 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_09: - frame SPRITE_ANIM_FRAME_IDX_21, 1 + frame SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09, 1 dorepeat 1 dorestart @@ -195,7 +195,7 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_StillCursor: - frame SPRITE_ANIM_FRAME_IDX_2F, 32 + frame SPRITE_ANIM_FRAME_IDX_STILL_CURSOR, 32 endanim .Frameset_TradePokeBall: @@ -221,8 +221,8 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_TrademonIcon: - frame SPRITE_ANIM_FRAME_IDX_37, 7 - frame SPRITE_ANIM_FRAME_IDX_38, 7 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1, 7 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2, 7 dorestart .Frameset_TrademonBubble: @@ -236,7 +236,7 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_RadioTuningKnob: - frame SPRITE_ANIM_FRAME_IDX_3C, 32 + frame SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB, 32 endanim .Frameset_MagnetTrainRed: @@ -294,20 +294,20 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_Leaf: - frame SPRITE_ANIM_FRAME_IDX_4F, 32 + frame SPRITE_ANIM_FRAME_IDX_LEAF, 32 endanim .Frameset_CutTree: - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_51, 16 + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_2, 16 dorepeat 1 - frame SPRITE_ANIM_FRAME_IDX_52, 1 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_3, 1 dorepeat 1 - frame SPRITE_ANIM_FRAME_IDX_53, 1 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_4, 1 delanim .Frameset_EggCrack: - frame SPRITE_ANIM_FRAME_IDX_54, 32 + frame SPRITE_ANIM_FRAME_IDX_EGG_CRACK, 32 endanim .Frameset_EggHatch: @@ -336,10 +336,10 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_HeadbuttTree: - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_5B, 2 - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_5B, 2, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2, 2 + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2, 2, OAM_X_FLIP dorestart .Frameset_26: @@ -480,7 +480,7 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_IntroSuicuneAway: - frame SPRITE_ANIM_FRAME_IDX_7E, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY, 3 endanim .Frameset_IntroUnownF: @@ -488,12 +488,12 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_CelebiLeft: - frame SPRITE_ANIM_FRAME_IDX_7F, 8 - frame SPRITE_ANIM_FRAME_IDX_80, 8 + frame SPRITE_ANIM_FRAME_IDX_CELEBI_1, 8 + frame SPRITE_ANIM_FRAME_IDX_CELEBI_2, 8 endanim .Frameset_CelebiRight: - frame SPRITE_ANIM_FRAME_IDX_7F, 8, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_80, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_CELEBI_1, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_CELEBI_2, 8, OAM_X_FLIP endanim ; 8d94d -- cgit v1.2.3 From c5675927feefc60a286de1725515d1475a30ca2c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 12 Dec 2017 12:18:11 -0500 Subject: Identify more sprite-related constants --- data/sprite_anim_frames.asm | 150 ++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'data/sprite_anim_frames.asm') diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm index e61c528dd..10f9244f3 100755 --- a/data/sprite_anim_frames.asm +++ b/data/sprite_anim_frames.asm @@ -47,8 +47,8 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_2c dw .Frameset_BlueWalk dw .Frameset_MagnetTrainBlue - dw .Frameset_2f - dw .Frameset_30 + dw .Frameset_MobileTradeSentBall + dw .Frameset_MobileTradeOTBall dw .Frameset_31 dw .Frameset_32 dw .Frameset_33 @@ -117,10 +117,10 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_MagnetTrainBlue: - frame SPRITE_ANIM_FRAME_IDX_65, 8 - frame SPRITE_ANIM_FRAME_IDX_66, 8 - frame SPRITE_ANIM_FRAME_IDX_65, 8 - frame SPRITE_ANIM_FRAME_IDX_66, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2, 8, OAM_X_FLIP dorestart .Frameset_GSTitleTrail: @@ -129,7 +129,7 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_TextEntryCursor: - frame SPRITE_ANIM_FRAME_IDX_20, 1 + frame SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR, 1 dorepeat 1 dorestart @@ -139,59 +139,59 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_GameFreakLogo: - frame SPRITE_ANIM_FRAME_IDX_81, 12 - frame SPRITE_ANIM_FRAME_IDX_82, 1 - frame SPRITE_ANIM_FRAME_IDX_83, 1 - frame SPRITE_ANIM_FRAME_IDX_82, 4 - frame SPRITE_ANIM_FRAME_IDX_81, 12 - frame SPRITE_ANIM_FRAME_IDX_82, 12 - frame SPRITE_ANIM_FRAME_IDX_83, 4 - frame SPRITE_ANIM_FRAME_IDX_84, 32 - frame SPRITE_ANIM_FRAME_IDX_85, 3 - frame SPRITE_ANIM_FRAME_IDX_86, 3 - frame SPRITE_ANIM_FRAME_IDX_87, 4 - frame SPRITE_ANIM_FRAME_IDX_88, 4 - frame SPRITE_ANIM_FRAME_IDX_89, 4 - frame SPRITE_ANIM_FRAME_IDX_8A, 10 - frame SPRITE_ANIM_FRAME_IDX_8B, 7 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 1 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3, 1 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4, 32 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5, 3 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6, 3 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10, 10 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11, 7 endanim .Frameset_GSIntroStar: - frame SPRITE_ANIM_FRAME_IDX_23, 3 - frame SPRITE_ANIM_FRAME_IDX_23, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR, 3 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR, 3, OAM_Y_FLIP dorestart .Frameset_GSIntroSparkle: - frame SPRITE_ANIM_FRAME_IDX_24, 2 - frame SPRITE_ANIM_FRAME_IDX_25, 2 - frame SPRITE_ANIM_FRAME_IDX_26, 2 - frame SPRITE_ANIM_FRAME_IDX_25, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2, 2 dorestart .Frameset_SlotsGolem: - frame SPRITE_ANIM_FRAME_IDX_27, 7 - frame SPRITE_ANIM_FRAME_IDX_28, 7 - frame SPRITE_ANIM_FRAME_IDX_27, 7, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_28, 7, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1, 7, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2, 7, OAM_X_FLIP dorestart .Frameset_SlotsChansey: - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2A, 7 - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2B, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3, 7 dorestart .Frameset_SlotsChansey2: - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2C, 7 - frame SPRITE_ANIM_FRAME_IDX_2D, 7 - frame SPRITE_ANIM_FRAME_IDX_2C, 7 - frame SPRITE_ANIM_FRAME_IDX_29, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 endanim .Frameset_SlotsEgg: - frame SPRITE_ANIM_FRAME_IDX_2E, 20 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_EGG, 20 endanim .Frameset_StillCursor: @@ -199,14 +199,14 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_TradePokeBall: - frame SPRITE_ANIM_FRAME_IDX_30, 32 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 32 endanim .Frameset_TradePokeBall0: - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP dorestart .Frameset_TradePoof: @@ -370,37 +370,37 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_FRAME_IDX_62, 2 endanim -.Frameset_2f: +.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_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - endanim - -.Frameset_30: - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + endanim + +.Frameset_MobileTradeOTBall: + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + 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 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + 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 + 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 -- cgit v1.2.3 From 5b13a7a13b9ebbb26a75b9ef19221e8e140c221b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 12 Dec 2017 13:22:19 -0500 Subject: Identify more sprite-related constants Start more documentation --- data/sprite_anim_frames.asm | 118 ++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'data/sprite_anim_frames.asm') 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: -- cgit v1.2.3