Merge pull request #456 from Rangi42/master

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming

3 files changed, 685 insertions, 687 deletions

diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 24b058859..d768ec21a 100755
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -9,7 +9,7 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_PartyMonWithItemFast
 	dw .Frameset_GSTitleTrail
 	dw .Frameset_TextEntryCursor
-	dw .Frameset_09
+	dw .Frameset_TextEntryCursorBig
 	dw .Frameset_GameFreakLogo
 	dw .Frameset_GSIntroStar
 	dw .Frameset_GSIntroSparkle
@@ -20,7 +20,7 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_RedWalk
 	dw .Frameset_StillCursor
 	dw .Frameset_TradePokeBall
-	dw .Frameset_TradePokeBall0
+	dw .Frameset_TradePokeBallWobble
 	dw .Frameset_TradePoof
 	dw .Frameset_TradeTubeBulge
 	dw .Frameset_TrademonIcon
@@ -28,31 +28,31 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_EvolutionBallOfLight
 	dw .Frameset_RadioTuningKnob
 	dw .Frameset_MagnetTrainRed
-	dw .Frameset_1c
+	dw .Frameset_Unused1C
 	dw .Frameset_Leaf
 	dw .Frameset_CutTree
 	dw .Frameset_EggCrack
-	dw .Frameset_EggHatch
-	dw .Frameset_21
-	dw .Frameset_22
-	dw .Frameset_23
-	dw .Frameset_24
+	dw .Frameset_EggHatch1
+	dw .Frameset_EggHatch2
+	dw .Frameset_EggHatch3
+	dw .Frameset_EggHatch4
+	dw .Frameset_GSIntroHoOh
 	dw .Frameset_HeadbuttTree
-	dw .Frameset_26
-	dw .Frameset_27
-	dw .Frameset_28
-	dw .Frameset_29
-	dw .Frameset_2a
-	dw .Frameset_2b
-	dw .Frameset_2c
+	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
 	dw .Frameset_MobileTradeOTBall
-	dw .Frameset_ForMobile22
-	dw .Frameset_ForMobile23
-	dw .Frameset_ForMobile24
-	dw .Frameset_ForMobile25
+	dw .Frameset_MobileTradeCableBulge
+	dw .Frameset_MobileTradeSentPulse
+	dw .Frameset_MobileTradeOTPulse
+	dw .Frameset_MobileTradePing
 	dw .Frameset_IntroSuicune
 	dw .Frameset_IntroSuicune2
 	dw .Frameset_IntroPichu
@@ -133,8 +133,8 @@ SpriteAnimFrameData: ; 8d6e6
 	dorepeat  1
 	dorestart
 
-.Frameset_09:
-	frame SPRITE_ANIM_OAMSET_FOR_FRAMESET_09,  1
+.Frameset_TextEntryCursorBig:
+	frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG,  1
 	dorepeat  1
 	dorestart
 
@@ -202,7 +202,7 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32
 	endanim
 
-.Frameset_TradePokeBall0:
+.Frameset_TradePokeBallWobble:
 	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
@@ -216,8 +216,8 @@ SpriteAnimFrameData: ; 8d6e6
 	delanim
 
 .Frameset_TradeTubeBulge:
-	frame SPRITE_ANIM_OAMSET_35,  3
-	frame SPRITE_ANIM_OAMSET_36,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1,  3
+	frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2,  3
 	dorestart
 
 .Frameset_TrademonIcon:
@@ -246,50 +246,50 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2,  8, OAM_X_FLIP
 	dorestart
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_43,  8
-	frame SPRITE_ANIM_OAMSET_44,  8
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_43,  8
+	frame SPRITE_ANIM_OAMSET_UNUSED_44,  8
 	dorestart
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_45,  8
-	frame SPRITE_ANIM_OAMSET_46,  8
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_45,  8
+	frame SPRITE_ANIM_OAMSET_UNUSED_46,  8
 	dorestart
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_47,  8
-	frame SPRITE_ANIM_OAMSET_48,  8
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_47,  8
+	frame SPRITE_ANIM_OAMSET_UNUSED_48,  8
 	dorestart
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_49,  1
-	frame SPRITE_ANIM_OAMSET_49,  1, OAM_X_FLIP
-	frame SPRITE_ANIM_OAMSET_49,  1, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_OAMSET_49,  1, OAM_Y_FLIP
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1
+	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_X_FLIP
+	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_Y_FLIP
 	dorestart
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_4A, 32
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32
 	endanim
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_4B, 32
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32
 	endanim
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_4C, 32
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32
 	endanim
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_4D, 32
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32
 	endanim
 
-; XXX
-	frame SPRITE_ANIM_OAMSET_4E,  3
+; unused
+	frame SPRITE_ANIM_OAMSET_UNUSED_4E,  3
 	dorepeat  3
 	dorestart
 
-.Frameset_1c:
+.Frameset_Unused1C:
 	dorepeat 32
 	endanim
 
@@ -310,29 +310,29 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
 	endanim
 
-.Frameset_EggHatch:
-	frame SPRITE_ANIM_OAMSET_55, 32
+.Frameset_EggHatch1:
+	frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32
 	endanim
 
-.Frameset_21:
-	frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP
+.Frameset_EggHatch2:
+	frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP
 	endanim
 
-.Frameset_22:
-	frame SPRITE_ANIM_OAMSET_55, 32, OAM_Y_FLIP
+.Frameset_EggHatch3:
+	frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP
 	endanim
 
-.Frameset_23:
-	frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP, OAM_Y_FLIP
+.Frameset_EggHatch4:
+	frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
 	endanim
 
-.Frameset_24:
-	frame SPRITE_ANIM_OAMSET_56, 10
-	frame SPRITE_ANIM_OAMSET_57,  9
-	frame SPRITE_ANIM_OAMSET_58, 10
-	frame SPRITE_ANIM_OAMSET_59, 10
-	frame SPRITE_ANIM_OAMSET_58,  9
-	frame SPRITE_ANIM_OAMSET_5A, 10
+.Frameset_GSIntroHoOh:
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1, 10
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2,  9
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 10
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4, 10
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3,  9
+	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5, 10
 	dorestart
 
 .Frameset_HeadbuttTree:
@@ -342,32 +342,32 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2,  2, OAM_X_FLIP
 	dorestart
 
-.Frameset_26:
-	frame SPRITE_ANIM_OAMSET_5C,  2
+.Frameset_EZChatCursor1:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1,  2
 	endanim
 
-.Frameset_27:
-	frame SPRITE_ANIM_OAMSET_5D,  2
+.Frameset_EZChatCursor2:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2,  2
 	endanim
 
-.Frameset_28:
-	frame SPRITE_ANIM_OAMSET_5E,  2
+.Frameset_EZChatCursor3:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3,  2
 	endanim
 
-.Frameset_29:
-	frame SPRITE_ANIM_OAMSET_5F,  2
+.Frameset_EZChatCursor4:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4,  2
 	endanim
 
-.Frameset_2a:
-	frame SPRITE_ANIM_OAMSET_60,  2
+.Frameset_EZChatCursor5:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5,  2
 	endanim
 
-.Frameset_2b:
-	frame SPRITE_ANIM_OAMSET_61,  2
+.Frameset_EZChatCursor6:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6,  2
 	endanim
 
-.Frameset_2c:
-	frame SPRITE_ANIM_OAMSET_62,  2
+.Frameset_EZChatCursor7:
+	frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7,  2
 	endanim
 
 .Frameset_MobileTradeSentBall:
@@ -406,23 +406,23 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_TRADE_POOF_3,  3
 	delanim
 
-.Frameset_ForMobile22:
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1,  3
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2,  3
+.Frameset_MobileTradeCableBulge:
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1,  3
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2,  3
 	dorestart
 
-.Frameset_ForMobile23:
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_23,  3
+.Frameset_MobileTradeSentPulse:
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE,  3
 	endanim
 
-.Frameset_ForMobile24:
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_24,  3
+.Frameset_MobileTradeOTPulse:
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE,  3
 	endanim
 
-.Frameset_ForMobile25:
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1,  2
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2,  2
-	frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3,  2
+.Frameset_MobileTradePing:
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1,  2
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2,  2
+	frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3,  2
 	delanim
 
 .Frameset_IntroSuicune:
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 99adc9df3..bfd5cbcd3 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -1,157 +1,157 @@
 SpriteAnimOAMData: ; 8d94d
 ; entries correspond to SPRITE_ANIM_OAMSET_* constants
 	; vtile offset, pointer
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1
-	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2
-	dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_02
-	dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_03
-	dbw $6c, .OAMData_04 ; SPRITE_ANIM_OAMSET_04
-	dbw $6e, .OAMData_04 ; SPRITE_ANIM_OAMSET_05
-	dbw $2d, .OAMData_06 ; SPRITE_ANIM_OAMSET_06
-	dbw $4d, .OAMData_06 ; SPRITE_ANIM_OAMSET_07
-	dbw $60, .OAMData_08 ; SPRITE_ANIM_OAMSET_08
-	dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_09
-	dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_0A
-	dbw $06, .OAMData_08 ; SPRITE_ANIM_OAMSET_0B
-	dbw $0c, .OAMData_0c ; SPRITE_ANIM_OAMSET_0C
-	dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_0D
-	dbw $00, .OAMData_0e ; SPRITE_ANIM_OAMSET_0E
-	dbw $04, .OAMData_0e ; SPRITE_ANIM_OAMSET_0F
-	dbw $08, .OAMData_0e ; SPRITE_ANIM_OAMSET_10
-	dbw $40, .OAMData_0e ; SPRITE_ANIM_OAMSET_11
-	dbw $44, .OAMData_0e ; SPRITE_ANIM_OAMSET_12
-	dbw $48, .OAMData_0e ; SPRITE_ANIM_OAMSET_13
-	dbw $4c, .OAMData_0e ; SPRITE_ANIM_OAMSET_14
-	dbw $80, .OAMData_15 ; SPRITE_ANIM_OAMSET_15
-	dbw $85, .OAMData_15 ; SPRITE_ANIM_OAMSET_16
-	dbw $8a, .OAMData_15 ; SPRITE_ANIM_OAMSET_17
-	dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_18
-	dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_19
-	dbw $09, .OAMData_1a ; SPRITE_ANIM_OAMSET_1A
-	dbw $10, .OAMData_1b ; SPRITE_ANIM_OAMSET_1B
-	dbw $29, .OAMData_1b ; SPRITE_ANIM_OAMSET_1C
-	dbw $42, .OAMData_1b ; SPRITE_ANIM_OAMSET_1D
-	dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
-	dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
-	dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
-	dbw $00, .OAMData_ForFrameset09 ; SPRITE_ANIM_OAMSET_FOR_FRAMESET_09
-	dbw $00, .OAMData_22 ; SPRITE_ANIM_OAMSET_22
-	dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
-	dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
-	dbw $12, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2
-	dbw $13, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3
-	dbw $00, .OAMData_SlotsGolem ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1
-	dbw $08, .OAMData_SlotsGolem ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2
-	dbw $10, .OAMData_SlotsChansey1 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1
-	dbw $10, .OAMData_SlotsChansey2 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2
-	dbw $10, .OAMData_SlotsChansey3 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3
-	dbw $10, .OAMData_SlotsChansey4 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4
-	dbw $10, .OAMData_SlotsChansey5 ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5
-	dbw $3a, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_SLOTS_EGG
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_STILL_CURSOR
-	dbw $00, .OAMData_TradePokeBall1 ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1
-	dbw $02, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2
-	dbw $06, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_1
-	dbw $0a, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_2
-	dbw $0e, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_3
-	dbw $12, .OAMData_35 ; SPRITE_ANIM_OAMSET_35
-	dbw $13, .OAMData_35 ; SPRITE_ANIM_OAMSET_36
-	dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_1
-	dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_2
-	dbw $10, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE
-	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1
-	dbw $04, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2
-	dbw $00, .OAMData_RadioTuningKnob ; SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB
-	dbw $00, .OAMData_PartyMonWithMail1 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1
-	dbw $00, .OAMData_PartyMonWithMail2 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2
-	dbw $00, .OAMData_PartyMonWithItem1 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1
-	dbw $00, .OAMData_PartyMonWithItem2 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2
-	dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1
-	dbw $04, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2
-	dbw $00, .OAMData_43 ; SPRITE_ANIM_OAMSET_43
-	dbw $30, .OAMData_43 ; SPRITE_ANIM_OAMSET_44
-	dbw $03, .OAMData_43 ; SPRITE_ANIM_OAMSET_45
-	dbw $33, .OAMData_43 ; SPRITE_ANIM_OAMSET_46
-	dbw $06, .OAMData_43 ; SPRITE_ANIM_OAMSET_47
-	dbw $36, .OAMData_43 ; SPRITE_ANIM_OAMSET_48
-	dbw $09, .OAMData_43 ; SPRITE_ANIM_OAMSET_49
-	dbw $39, .OAMData_43 ; SPRITE_ANIM_OAMSET_4A
-	dbw $0c, .OAMData_4b ; SPRITE_ANIM_OAMSET_4B
-	dbw $0c, .OAMData_4c ; SPRITE_ANIM_OAMSET_4C
-	dbw $3c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4D
-	dbw $3e, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4E
-	dbw $00, .OAMData_Leaf ; SPRITE_ANIM_OAMSET_LEAF
-	dbw $00, .OAMData_Tree ; SPRITE_ANIM_OAMSET_TREE_1
-	dbw $00, .OAMData_CutTree2 ; SPRITE_ANIM_OAMSET_CUT_TREE_2
-	dbw $00, .OAMData_CutTree3 ; SPRITE_ANIM_OAMSET_CUT_TREE_3
-	dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
-	dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK
-	dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_55
-	dbw $00, .OAMData_56 ; SPRITE_ANIM_OAMSET_56
-	dbw $00, .OAMData_57 ; SPRITE_ANIM_OAMSET_57
-	dbw $00, .OAMData_58 ; SPRITE_ANIM_OAMSET_58
-	dbw $00, .OAMData_59 ; SPRITE_ANIM_OAMSET_59
-	dbw $00, .OAMData_5a ; SPRITE_ANIM_OAMSET_5A
-	dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
-	dbw $00, .OAMData_5c ; SPRITE_ANIM_OAMSET_5C
-	dbw $00, .OAMData_5d ; SPRITE_ANIM_OAMSET_5D
-	dbw $00, .OAMData_5e ; SPRITE_ANIM_OAMSET_5E
-	dbw $00, .OAMData_5f ; SPRITE_ANIM_OAMSET_5F
-	dbw $00, .OAMData_60 ; SPRITE_ANIM_OAMSET_60
-	dbw $00, .OAMData_61 ; SPRITE_ANIM_OAMSET_61
-	dbw $00, .OAMData_62 ; SPRITE_ANIM_OAMSET_62
-	dbw $00, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_1
-	dbw $04, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_2
-	dbw $00, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1
-	dbw $04, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2
-	dbw $20, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1
-	dbw $21, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2
-	dbw $22, .OAMData_ForMobile25_1 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1
-	dbw $23, .OAMData_ForMobile25_2 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2
-	dbw $27, .OAMData_ForMobile25_3 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3
-	dbw $2a, .OAMData_ForMobile23 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_23
-	dbw $2a, .OAMData_ForMobile24 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_24
-	dbw $00, .OAMData_IntroSuicune1 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1
-	dbw $08, .OAMData_IntroSuicune2 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2
-	dbw $60, .OAMData_IntroSuicune3 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3
-	dbw $68, .OAMData_IntroSuicune4 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4
-	dbw $00, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_1
-	dbw $05, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_2
-	dbw $0a, .OAMData_IntroPichu ; SPRITE_ANIM_OAMSET_INTRO_PICHU_3
-	dbw $50, .OAMData_IntroWooper ; SPRITE_ANIM_OAMSET_INTRO_WOOPER
-	dbw $00, .OAMData_IntroUnown1 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_1
-	dbw $01, .OAMData_IntroUnown2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_2
-	dbw $04, .OAMData_IntroUnown3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_3
-	dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1
-	dbw $01, .OAMData_IntroUnownF2_2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2
-	dbw $03, .OAMData_IntroUnownF2_3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3
-	dbw $08, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4
-	dbw $1c, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5
-	dbw $80, .OAMData_IntroSuicuneAway ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY
-	dbw $00, .OAMData_Celebi ; SPRITE_ANIM_OAMSET_CELEBI_1
-	dbw $04, .OAMData_Celebi ; SPRITE_ANIM_OAMSET_CELEBI_2
-	dbw $d0, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1
-	dbw $d3, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2
-	dbw $d6, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3
-	dbw $6c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4
-	dbw $68, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5
-	dbw $64, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6
-	dbw $60, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7
-	dbw $0c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8
-	dbw $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
-	dbw $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
-	dbw $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
+	dbw $00, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_RED_WALK_1
+	dbw $04, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_RED_WALK_2
+	dbw $4c, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1
+	dbw $5c, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2
+	dbw $6c, .OAMData_GSIntroShellder          ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1
+	dbw $6e, .OAMData_GSIntroShellder          ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2
+	dbw $2d, .OAMData_GSIntroMagikarp          ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1
+	dbw $4d, .OAMData_GSIntroMagikarp          ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2
+	dbw $60, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
+	dbw $00, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2
+	dbw $00, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
+	dbw $06, .OAMData_GSIntroLapras            ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4
+	dbw $0c, .OAMData_GSIntroNote              ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE
+	dbw $0d, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE
+	dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1
+	dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2
+	dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3
+	dbw $40, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1
+	dbw $44, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2
+	dbw $48, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3
+	dbw $4c, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4
+	dbw $80, .OAMData_GSIntroPikachuTail       ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1
+	dbw $85, .OAMData_GSIntroPikachuTail       ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2
+	dbw $8a, .OAMData_GSIntroPikachuTail       ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3
+	dbw $00, .OAMData_IntroUnownF2_1           ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL
+	dbw $01, .OAMData_TradePoofBubble          ; SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL
+	dbw $09, .OAMData_GSIntroBigFireball       ; SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL
+	dbw $10, .OAMData_GSIntroStarter           ; SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA
+	dbw $29, .OAMData_GSIntroStarter           ; SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL
+	dbw $42, .OAMData_GSIntroStarter           ; SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE
+	dbw $f8, .OAMData_GSTitleTrail             ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
+	dbw $fa, .OAMData_GSTitleTrail             ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
+	dbw $00, .OAMData_TextEntryCursor          ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
+	dbw $00, .OAMData_TextEntryCursorBig       ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG
+	dbw $00, .OAMData_GSIntroGameFreakLogo     ; SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO
+	dbw $0f, .OAMData_GSIntroStar              ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
+	dbw $11, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
+	dbw $12, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2
+	dbw $13, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3
+	dbw $00, .OAMData_SlotsGolem               ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1
+	dbw $08, .OAMData_SlotsGolem               ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2
+	dbw $10, .OAMData_SlotsChansey1            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1
+	dbw $10, .OAMData_SlotsChansey2            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2
+	dbw $10, .OAMData_SlotsChansey3            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3
+	dbw $10, .OAMData_SlotsChansey4            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4
+	dbw $10, .OAMData_SlotsChansey5            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5
+	dbw $3a, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_SLOTS_EGG
+	dbw $00, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_STILL_CURSOR
+	dbw $00, .OAMData_TradePokeBall1           ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1
+	dbw $02, .OAMData_MagnetTrainRed           ; SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2
+	dbw $06, .OAMData_TradePoofBubble          ; SPRITE_ANIM_OAMSET_TRADE_POOF_1
+	dbw $0a, .OAMData_TradePoofBubble          ; SPRITE_ANIM_OAMSET_TRADE_POOF_2
+	dbw $0e, .OAMData_TradePoofBubble          ; SPRITE_ANIM_OAMSET_TRADE_POOF_3
+	dbw $12, .OAMData_TradeTubeBulge           ; SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1
+	dbw $13, .OAMData_TradeTubeBulge           ; SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2
+	dbw $00, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_1
+	dbw $04, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_2
+	dbw $10, .OAMData_TradePoofBubble          ; SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE
+	dbw $00, .OAMData_MagnetTrainRed           ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1
+	dbw $04, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2
+	dbw $00, .OAMData_RadioTuningKnob          ; SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB
+	dbw $00, .OAMData_PartyMonWithMail1        ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1
+	dbw $00, .OAMData_PartyMonWithMail2        ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2
+	dbw $00, .OAMData_PartyMonWithItem1        ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1
+	dbw $00, .OAMData_PartyMonWithItem2        ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2
+	dbw $00, .OAMData_MagnetTrainRed           ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1
+	dbw $04, .OAMData_MagnetTrainRed           ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2
+	dbw $00, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_43
+	dbw $30, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_44
+	dbw $03, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_45
+	dbw $33, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_46
+	dbw $06, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_47
+	dbw $36, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_48
+	dbw $09, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_49
+	dbw $39, .OAMData_Unused43_4A              ; SPRITE_ANIM_OAMSET_UNUSED_4A
+	dbw $0c, .OAMData_Unused4B                 ; SPRITE_ANIM_OAMSET_UNUSED_4B
+	dbw $0c, .OAMData_Unused4C                 ; SPRITE_ANIM_OAMSET_UNUSED_4C
+	dbw $3c, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_UNUSED_4D
+	dbw $3e, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_UNUSED_4E
+	dbw $00, .OAMData_Leaf                     ; SPRITE_ANIM_OAMSET_LEAF
+	dbw $00, .OAMData_Tree                     ; SPRITE_ANIM_OAMSET_TREE_1
+	dbw $00, .OAMData_CutTree2                 ; SPRITE_ANIM_OAMSET_CUT_TREE_2
+	dbw $00, .OAMData_CutTree3                 ; SPRITE_ANIM_OAMSET_CUT_TREE_3
+	dbw $00, .OAMData_CutTree4                 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
+	dbw $00, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_EGG_CRACK
+	dbw $01, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_EGG_HATCH
+	dbw $00, .OAMData_GSIntroHoOh1             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
+	dbw $00, .OAMData_GSIntroHoOh2             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
+	dbw $00, .OAMData_GSIntroHoOh3             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
+	dbw $00, .OAMData_GSIntroHoOh4             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
+	dbw $00, .OAMData_GSIntroHoOh5             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
+	dbw $04, .OAMData_Tree                     ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
+	dbw $00, .OAMData_EZChatCursor1            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1
+	dbw $00, .OAMData_EZChatCursor2            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2
+	dbw $00, .OAMData_EZChatCursor3            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3
+	dbw $00, .OAMData_EZChatCursor4            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4
+	dbw $00, .OAMData_EZChatCursor5            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5
+	dbw $00, .OAMData_EZChatCursor6            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6
+	dbw $00, .OAMData_EZChatCursor7            ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7
+	dbw $00, .OAMData_BlueWalk                 ; SPRITE_ANIM_OAMSET_BLUE_WALK_1
+	dbw $04, .OAMData_BlueWalk                 ; SPRITE_ANIM_OAMSET_BLUE_WALK_2
+	dbw $00, .OAMData_MagnetTrainBlue          ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1
+	dbw $04, .OAMData_MagnetTrainBlue          ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2
+	dbw $20, .OAMData_MobileTradeCableBulge    ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1
+	dbw $21, .OAMData_MobileTradeCableBulge    ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2
+	dbw $22, .OAMData_MobileTradePing1         ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1
+	dbw $23, .OAMData_MobileTradePing2         ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2
+	dbw $27, .OAMData_MobileTradePing3         ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3
+	dbw $2a, .OAMData_MobileTradeSentPulse     ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE
+	dbw $2a, .OAMData_MobileTradeOTPulse       ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE
+	dbw $00, .OAMData_IntroSuicune1            ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1
+	dbw $08, .OAMData_IntroSuicune2            ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2
+	dbw $60, .OAMData_IntroSuicune3            ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3
+	dbw $68, .OAMData_IntroSuicune4            ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4
+	dbw $00, .OAMData_IntroPichu               ; SPRITE_ANIM_OAMSET_INTRO_PICHU_1
+	dbw $05, .OAMData_IntroPichu               ; SPRITE_ANIM_OAMSET_INTRO_PICHU_2
+	dbw $0a, .OAMData_IntroPichu               ; SPRITE_ANIM_OAMSET_INTRO_PICHU_3
+	dbw $50, .OAMData_IntroWooper              ; SPRITE_ANIM_OAMSET_INTRO_WOOPER
+	dbw $00, .OAMData_IntroUnown1              ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_1
+	dbw $01, .OAMData_IntroUnown2              ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_2
+	dbw $04, .OAMData_IntroUnown3              ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_3
+	dbw $00, .OAMData_IntroUnownF2_1           ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1
+	dbw $01, .OAMData_IntroUnownF2_2           ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2
+	dbw $03, .OAMData_IntroUnownF2_3           ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3
+	dbw $08, .OAMData_IntroUnownF2_4_5         ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4
+	dbw $1c, .OAMData_IntroUnownF2_4_5         ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5
+	dbw $80, .OAMData_IntroSuicuneAway         ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY
+	dbw $00, .OAMData_Celebi                   ; SPRITE_ANIM_OAMSET_CELEBI_1
+	dbw $04, .OAMData_Celebi                   ; SPRITE_ANIM_OAMSET_CELEBI_2
+	dbw $d0, .OAMData_GameFreakLogo1_3         ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1
+	dbw $d3, .OAMData_GameFreakLogo1_3         ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2
+	dbw $d6, .OAMData_GameFreakLogo1_3         ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3
+	dbw $6c, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4
+	dbw $68, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5
+	dbw $64, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6
+	dbw $60, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7
+	dbw $0c, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8
+	dbw $08, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
+	dbw $04, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
+	dbw $00, .OAMData_GameFreakLogo4_11        ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
 
 .OAMData_1x1_Palette0:
 	db 1
-	dsprite -1,  4, -1,  4, $00, $00
+	dsprite -1,  4, -1,  4, $00, 0
 
-.OAMData_04:
+.OAMData_GSIntroShellder:
 	db 4
-	dsprite -1,  0, -1,  0, $00, $00
-	dsprite -1,  0,  0,  0, $01, $00
-	dsprite  0,  0, -1,  0, $10, $00
-	dsprite  0,  0,  0,  0, $11, $00
+	dsprite -1,  0, -1,  0, $00, 0
+	dsprite -1,  0,  0,  0, $01, 0
+	dsprite  0,  0, -1,  0, $10, 0
+	dsprite  0,  0,  0,  0, $11, 0
 
 .OAMData_GSIntroStar:
 	db 4
@@ -162,32 +162,31 @@ SpriteAnimOAMData: ; 8d94d
 
 .OAMData_TradePokeBall1:
 	db 4
-	dsprite -1,  0, -1,  0, $00, $80
-	dsprite -1,  0,  0,  0, $00, $a0
-	dsprite  0,  0, -1,  0, $01, $80
-	dsprite  0,  0,  0,  0, $01, $a0
+	dsprite -1,  0, -1,  0, $00, 0 | PRIORITY
+	dsprite -1,  0,  0,  0, $00, 0 | X_FLIP | PRIORITY
+	dsprite  0,  0, -1,  0, $01, 0 | PRIORITY
+	dsprite  0,  0,  0,  0, $01, 0 | X_FLIP | PRIORITY
 
-.OAMData_18:
+.OAMData_IntroUnownF2_1:
 	db 4
-	dsprite -1,  0, -1,  0, $00, $00
-	dsprite -1,  0,  0,  0, $00, $20
-	dsprite  0,  0, -1,  0, $00, $40
-	dsprite  0,  0,  0,  0, $00, $60
+	dsprite -1,  0, -1,  0, $00, 0
+	dsprite -1,  0,  0,  0, $00, 0 | X_FLIP
+	dsprite  0,  0, -1,  0, $00, 0 | Y_FLIP
+	dsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_35:
+.OAMData_TradeTubeBulge:
 	db 4
-	dsprite -1,  0, -1,  0, $00, $07
-	dsprite -1,  0,  0,  0, $00, $27
-	dsprite  0,  0, -1,  0, $00, $47
-	dsprite  0,  0,  0,  0, $00, $67
-; 8db4b
+	dsprite -1,  0, -1,  0, $00, 7
+	dsprite -1,  0,  0,  0, $00, 7 | X_FLIP
+	dsprite  0,  0, -1,  0, $00, 7 | Y_FLIP
+	dsprite  0,  0,  0,  0, $00, 7 | X_FLIP | Y_FLIP
 
-; 8db4b
+; unused
 	db 4
-	dsprite -1,  0, -1,  0, $00, $80
-	dsprite -1,  0,  0,  0, $00, $a0
-	dsprite  0,  0, -1,  0, $00, $c0
-	dsprite  0,  0,  0,  0, $00, $e0
+	dsprite -1,  0, -1,  0, $00, 0 | PRIORITY
+	dsprite -1,  0,  0,  0, $00, 0 | X_FLIP | PRIORITY
+	dsprite  0,  0, -1,  0, $00, 0 | Y_FLIP | PRIORITY
+	dsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
 
 .OAMData_TradePoofBubble:
 	db 16
@@ -208,143 +207,142 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  1,  0,  0,  0, $01, 0 | X_FLIP | Y_FLIP
 	dsprite  1,  0,  1,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_1a:
+.OAMData_GSIntroBigFireball:
 	db 36
-	dsprite -3,  0, -3,  0, $00, $00
-	dsprite -3,  0, -2,  0, $01, $00
-	dsprite -3,  0, -1,  0, $02, $00
-	dsprite -2,  0, -3,  0, $03, $00
-	dsprite -2,  0, -2,  0, $04, $00
-	dsprite -2,  0, -1,  0, $05, $00
-	dsprite -1,  0, -3,  0, $06, $00
-	dsprite -1,  0, -2,  0, $05, $00
-	dsprite -1,  0, -1,  0, $05, $00
-	dsprite -3,  0,  0,  0, $02, $20
-	dsprite -3,  0,  1,  0, $01, $20
-	dsprite -3,  0,  2,  0, $00, $20
-	dsprite -2,  0,  0,  0, $05, $20
-	dsprite -2,  0,  1,  0, $04, $20
-	dsprite -2,  0,  2,  0, $03, $20
-	dsprite -1,  0,  0,  0, $05, $20
-	dsprite -1,  0,  1,  0, $05, $20
-	dsprite -1,  0,  2,  0, $06, $20
-	dsprite  0,  0, -3,  0, $06, $40
-	dsprite  0,  0, -2,  0, $05, $40
-	dsprite  0,  0, -1,  0, $05, $40
-	dsprite  1,  0, -3,  0, $03, $40
-	dsprite  1,  0, -2,  0, $04, $40
-	dsprite  1,  0, -1,  0, $05, $40
-	dsprite  2,  0, -3,  0, $00, $40
-	dsprite  2,  0, -2,  0, $01, $40
-	dsprite  2,  0, -1,  0, $02, $40
-	dsprite  0,  0,  0,  0, $05, $60
-	dsprite  0,  0,  1,  0, $05, $60
-	dsprite  0,  0,  2,  0, $06, $60
-	dsprite  1,  0,  0,  0, $05, $60
-	dsprite  1,  0,  1,  0, $04, $60
-	dsprite  1,  0,  2,  0, $03, $60
-	dsprite  2,  0,  0,  0, $02, $60
-	dsprite  2,  0,  1,  0, $01, $60
-	dsprite  2,  0,  2,  0, $00, $60
-
-.OAMData_43:
+	dsprite -3,  0, -3,  0, $00, 0
+	dsprite -3,  0, -2,  0, $01, 0
+	dsprite -3,  0, -1,  0, $02, 0
+	dsprite -2,  0, -3,  0, $03, 0
+	dsprite -2,  0, -2,  0, $04, 0
+	dsprite -2,  0, -1,  0, $05, 0
+	dsprite -1,  0, -3,  0, $06, 0
+	dsprite -1,  0, -2,  0, $05, 0
+	dsprite -1,  0, -1,  0, $05, 0
+	dsprite -3,  0,  0,  0, $02, 0 | X_FLIP
+	dsprite -3,  0,  1,  0, $01, 0 | X_FLIP
+	dsprite -3,  0,  2,  0, $00, 0 | X_FLIP
+	dsprite -2,  0,  0,  0, $05, 0 | X_FLIP
+	dsprite -2,  0,  1,  0, $04, 0 | X_FLIP
+	dsprite -2,  0,  2,  0, $03, 0 | X_FLIP
+	dsprite -1,  0,  0,  0, $05, 0 | X_FLIP
+	dsprite -1,  0,  1,  0, $05, 0 | X_FLIP
+	dsprite -1,  0,  2,  0, $06, 0 | X_FLIP
+	dsprite  0,  0, -3,  0, $06, 0 | Y_FLIP
+	dsprite  0,  0, -2,  0, $05, 0 | Y_FLIP
+	dsprite  0,  0, -1,  0, $05, 0 | Y_FLIP
+	dsprite  1,  0, -3,  0, $03, 0 | Y_FLIP
+	dsprite  1,  0, -2,  0, $04, 0 | Y_FLIP
+	dsprite  1,  0, -1,  0, $05, 0 | Y_FLIP
+	dsprite  2,  0, -3,  0, $00, 0 | Y_FLIP
+	dsprite  2,  0, -2,  0, $01, 0 | Y_FLIP
+	dsprite  2,  0, -1,  0, $02, 0 | Y_FLIP
+	dsprite  0,  0,  0,  0, $05, 0 | X_FLIP | Y_FLIP
+	dsprite  0,  0,  1,  0, $05, 0 | X_FLIP | Y_FLIP
+	dsprite  0,  0,  2,  0, $06, 0 | X_FLIP | Y_FLIP
+	dsprite  1,  0,  0,  0, $05, 0 | X_FLIP | Y_FLIP
+	dsprite  1,  0,  1,  0, $04, 0 | X_FLIP | Y_FLIP
+	dsprite  1,  0,  2,  0, $03, 0 | X_FLIP | Y_FLIP
+	dsprite  2,  0,  0,  0, $02, 0 | X_FLIP | Y_FLIP
+	dsprite  2,  0,  1,  0, $01, 0 | X_FLIP | Y_FLIP
+	dsprite  2,  0,  2,  0, $00, 0 | X_FLIP | Y_FLIP
+
+.OAMData_Unused43_4A:
 	db 9
-	dsprite -2,  4, -2,  4, $00, $00
-	dsprite -2,  4, -1,  4, $01, $00
-	dsprite -2,  4,  0,  4, $02, $00
-	dsprite -1,  4, -2,  4, $10, $00
-	dsprite -1,  4, -1,  4, $11, $00
-	dsprite -1,  4,  0,  4, $12, $00
-	dsprite  0,  4, -2,  4, $20, $00
-	dsprite  0,  4, -1,  4, $21, $00
-	dsprite  0,  4,  0,  4, $22, $00
-
-.OAMData_0e:
+	dsprite -2,  4, -2,  4, $00, 0
+	dsprite -2,  4, -1,  4, $01, 0
+	dsprite -2,  4,  0,  4, $02, 0
+	dsprite -1,  4, -2,  4, $10, 0
+	dsprite -1,  4, -1,  4, $11, 0
+	dsprite -1,  4,  0,  4, $12, 0
+	dsprite  0,  4, -2,  4, $20, 0
+	dsprite  0,  4, -1,  4, $21, 0
+	dsprite  0,  4,  0,  4, $22, 0
+
+.OAMData_GSIntroJigglypuffPikachu:
 	db 16
-	dsprite -2,  0, -2,  0, $00, $00
-	dsprite -2,  0, -1,  0, $01, $00
-	dsprite -2,  0,  0,  0, $02, $00
-	dsprite -2,  0,  1,  0, $03, $00
-	dsprite -1,  0, -2,  0, $10, $00
-	dsprite -1,  0, -1,  0, $11, $00
-	dsprite -1,  0,  0,  0, $12, $00
-	dsprite -1,  0,  1,  0, $13, $00
-	dsprite  0,  0, -2,  0, $20, $00
-	dsprite  0,  0, -1,  0, $21, $00
-	dsprite  0,  0,  0,  0, $22, $00
-	dsprite  0,  0,  1,  0, $23, $00
-	dsprite  1,  0, -2,  0, $30, $00
-	dsprite  1,  0, -1,  0, $31, $00
-	dsprite  1,  0,  0,  0, $32, $00
-	dsprite  1,  0,  1,  0, $33, $00
-
-.OAMData_1b:
+	dsprite -2,  0, -2,  0, $00, 0
+	dsprite -2,  0, -1,  0, $01, 0
+	dsprite -2,  0,  0,  0, $02, 0
+	dsprite -2,  0,  1,  0, $03, 0
+	dsprite -1,  0, -2,  0, $10, 0
+	dsprite -1,  0, -1,  0, $11, 0
+	dsprite -1,  0,  0,  0, $12, 0
+	dsprite -1,  0,  1,  0, $13, 0
+	dsprite  0,  0, -2,  0, $20, 0
+	dsprite  0,  0, -1,  0, $21, 0
+	dsprite  0,  0,  0,  0, $22, 0
+	dsprite  0,  0,  1,  0, $23, 0
+	dsprite  1,  0, -2,  0, $30, 0
+	dsprite  1,  0, -1,  0, $31, 0
+	dsprite  1,  0,  0,  0, $32, 0
+	dsprite  1,  0,  1,  0, $33, 0
+
+.OAMData_GSIntroStarter:
 	db 25
-	dsprite -3,  4, -3,  4, $00, $00
-	dsprite -2,  4, -3,  4, $01, $00
-	dsprite -1,  4, -3,  4, $02, $00
-	dsprite  0,  4, -3,  4, $03, $00
-	dsprite  1,  4, -3,  4, $04, $00
-	dsprite -3,  4, -2,  4, $05, $00
-	dsprite -2,  4, -2,  4, $06, $00
-	dsprite -1,  4, -2,  4, $07, $00
-	dsprite  0,  4, -2,  4, $08, $00
-	dsprite  1,  4, -2,  4, $09, $00
-	dsprite -3,  4, -1,  4, $0a, $00
-	dsprite -2,  4, -1,  4, $0b, $00
-	dsprite -1,  4, -1,  4, $0c, $00
-	dsprite  0,  4, -1,  4, $0d, $00
-	dsprite  1,  4, -1,  4, $0e, $00
-	dsprite -3,  4,  0,  4, $0f, $00
-	dsprite -2,  4,  0,  4, $10, $00
-	dsprite -1,  4,  0,  4, $11, $00
-	dsprite  0,  4,  0,  4, $12, $00
-	dsprite  1,  4,  0,  4, $13, $00
-	dsprite -3,  4,  1,  4, $14, $00
-	dsprite -2,  4,  1,  4, $15, $00
-	dsprite -1,  4,  1,  4, $16, $00
-	dsprite  0,  4,  1,  4, $17, $00
-	dsprite  1,  4,  1,  4, $18, $00
-; 8dcf9
-
-; 8dcf9
+	dsprite -3,  4, -3,  4, $00, 0
+	dsprite -2,  4, -3,  4, $01, 0
+	dsprite -1,  4, -3,  4, $02, 0
+	dsprite  0,  4, -3,  4, $03, 0
+	dsprite  1,  4, -3,  4, $04, 0
+	dsprite -3,  4, -2,  4, $05, 0
+	dsprite -2,  4, -2,  4, $06, 0
+	dsprite -1,  4, -2,  4, $07, 0
+	dsprite  0,  4, -2,  4, $08, 0
+	dsprite  1,  4, -2,  4, $09, 0
+	dsprite -3,  4, -1,  4, $0a, 0
+	dsprite -2,  4, -1,  4, $0b, 0
+	dsprite -1,  4, -1,  4, $0c, 0
+	dsprite  0,  4, -1,  4, $0d, 0
+	dsprite  1,  4, -1,  4, $0e, 0
+	dsprite -3,  4,  0,  4, $0f, 0
+	dsprite -2,  4,  0,  4, $10, 0
+	dsprite -1,  4,  0,  4, $11, 0
+	dsprite  0,  4,  0,  4, $12, 0
+	dsprite  1,  4,  0,  4, $13, 0
+	dsprite -3,  4,  1,  4, $14, 0
+	dsprite -2,  4,  1,  4, $15, 0
+	dsprite -1,  4,  1,  4, $16, 0
+	dsprite  0,  4,  1,  4, $17, 0
+	dsprite  1,  4,  1,  4, $18, 0
+
+; unused
 	db 36
-	dsprite -3,  0, -3,  0, $00, $00
-	dsprite -3,  0, -2,  0, $01, $00
-	dsprite -3,  0, -1,  0, $02, $00
-	dsprite -3,  0,  0,  0, $03, $00
-	dsprite -3,  0,  1,  0, $04, $00
-	dsprite -3,  0,  2,  0, $05, $00
-	dsprite -2,  0, -3,  0, $06, $00
-	dsprite -2,  0, -2,  0, $07, $00
-	dsprite -2,  0, -1,  0, $08, $00
-	dsprite -2,  0,  0,  0, $09, $00
-	dsprite -2,  0,  1,  0, $0a, $00
-	dsprite -2,  0,  2,  0, $0b, $00
-	dsprite -1,  0, -3,  0, $0c, $00
-	dsprite -1,  0, -2,  0, $0d, $00
-	dsprite -1,  0, -1,  0, $0e, $00
-	dsprite -1,  0,  0,  0, $0f, $00
-	dsprite -1,  0,  1,  0, $10, $00
-	dsprite -1,  0,  2,  0, $11, $00
-	dsprite  0,  0, -3,  0, $12, $00
-	dsprite  0,  0, -2,  0, $13, $00
-	dsprite  0,  0, -1,  0, $14, $00
-	dsprite  0,  0,  0,  0, $15, $00
-	dsprite  0,  0,  1,  0, $16, $00
-	dsprite  0,  0,  2,  0, $17, $00
-	dsprite  1,  0, -3,  0, $18, $00
-	dsprite  1,  0, -2,  0, $19, $00
-	dsprite  1,  0, -1,  0, $1a, $00
-	dsprite  1,  0,  0,  0, $1b, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite  1,  0,  2,  0, $1d, $00
-	dsprite  2,  0, -3,  0, $1e, $00
-	dsprite  2,  0, -2,  0, $1f, $00
-	dsprite  2,  0, -1,  0, $20, $00
-	dsprite  2,  0,  0,  0, $21, $00
-	dsprite  2,  0,  1,  0, $22, $00
-	dsprite  2,  0,  2,  0, $23, $00
+	dsprite -3,  0, -3,  0, $00, 0
+	dsprite -3,  0, -2,  0, $01, 0
+	dsprite -3,  0, -1,  0, $02, 0
+	dsprite -3,  0,  0,  0, $03, 0
+	dsprite -3,  0,  1,  0, $04, 0
+	dsprite -3,  0,  2,  0, $05, 0
+	dsprite -2,  0, -3,  0, $06, 0
+	dsprite -2,  0, -2,  0, $07, 0
+	dsprite -2,  0, -1,  0, $08, 0
+	dsprite -2,  0,  0,  0, $09, 0
+	dsprite -2,  0,  1,  0, $0a, 0
+	dsprite -2,  0,  2,  0, $0b, 0
+	dsprite -1,  0, -3,  0, $0c, 0
+	dsprite -1,  0, -2,  0, $0d, 0
+	dsprite -1,  0, -1,  0, $0e, 0
+	dsprite -1,  0,  0,  0, $0f, 0
+	dsprite -1,  0,  1,  0, $10, 0
+	dsprite -1,  0,  2,  0, $11, 0
+	dsprite  0,  0, -3,  0, $12, 0
+	dsprite  0,  0, -2,  0, $13, 0
+	dsprite  0,  0, -1,  0, $14, 0
+	dsprite  0,  0,  0,  0, $15, 0
+	dsprite  0,  0,  1,  0, $16, 0
+	dsprite  0,  0,  2,  0, $17, 0
+	dsprite  1,  0, -3,  0, $18, 0
+	dsprite  1,  0, -2,  0, $19, 0
+	dsprite  1,  0, -1,  0, $1a, 0
+	dsprite  1,  0,  0,  0, $1b, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite  1,  0,  2,  0, $1d, 0
+	dsprite  2,  0, -3,  0, $1e, 0
+	dsprite  2,  0, -2,  0, $1f, 0
+	dsprite  2,  0, -1,  0, $20, 0
+	dsprite  2,  0,  0,  0, $21, 0
+	dsprite  2,  0,  1,  0, $22, 0
+	dsprite  2,  0,  2,  0, $23, 0
 
 .OAMData_RedWalk:
 	db 4
@@ -355,10 +353,10 @@ SpriteAnimOAMData: ; 8d94d
 
 .OAMData_MagnetTrainRed:
 	db 4
-	dsprite -1,  0, -1,  0, $00, PAL_OW_RED | BEHIND_BG
-	dsprite -1,  0,  0,  0, $01, PAL_OW_RED | BEHIND_BG
-	dsprite  0,  0, -1,  0, $02, PAL_OW_RED | BEHIND_BG
-	dsprite  0,  0,  0,  0, $03, PAL_OW_RED | BEHIND_BG
+	dsprite -1,  0, -1,  0, $00, PAL_OW_RED | PRIORITY
+	dsprite -1,  0,  0,  0, $01, PAL_OW_RED | PRIORITY
+	dsprite  0,  0, -1,  0, $02, PAL_OW_RED | PRIORITY
+	dsprite  0,  0,  0,  0, $03, PAL_OW_RED | PRIORITY
 
 .OAMData_PartyMonWithMail1:
 	db 4
@@ -388,59 +386,59 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0, -1,  0, $09, PAL_OW_RED
 	dsprite  0,  0,  0,  0, $07, PAL_OW_RED
 
-.OAMData_06:
+.OAMData_GSIntroMagikarp:
 	db 6
-	dsprite -1,  0, -2,  4, $00, $01
-	dsprite -1,  0, -1,  4, $01, $01
-	dsprite -1,  0,  0,  4, $02, $01
-	dsprite  0,  0, -2,  4, $10, $01
-	dsprite  0,  0, -1,  4, $11, $01
-	dsprite  0,  0,  0,  4, $12, $01
-
-.OAMData_08:
+	dsprite -1,  0, -2,  4, $00, 1
+	dsprite -1,  0, -1,  4, $01, 1
+	dsprite -1,  0,  0,  4, $02, 1
+	dsprite  0,  0, -2,  4, $10, 1
+	dsprite  0,  0, -1,  4, $11, 1
+	dsprite  0,  0,  0,  4, $12, 1
+
+.OAMData_GSIntroLapras:
 	db 29
-	dsprite -3,  0, -3,  0, $00, $00
-	dsprite -3,  0, -2,  0, $01, $00
-	dsprite -3,  0, -1,  0, $02, $00
-	dsprite -3,  0,  0,  0, $03, $00
-	dsprite -2,  0, -3,  0, $10, $00
-	dsprite -2,  0, -2,  0, $11, $00
-	dsprite -2,  0, -1,  0, $12, $00
-	dsprite -2,  0,  0,  0, $13, $00
-	dsprite -1,  0, -3,  0, $20, $00
-	dsprite -1,  0, -2,  0, $21, $00
-	dsprite -1,  0, -1,  0, $22, $00
-	dsprite -1,  0,  0,  0, $23, $00
-	dsprite -1,  0,  1,  0, $24, $00
-	dsprite  0,  0, -3,  0, $30, $80
-	dsprite  0,  0, -2,  0, $31, $80
-	dsprite  0,  0, -1,  0, $32, $80
-	dsprite  0,  0,  0,  0, $33, $80
-	dsprite  0,  0,  1,  0, $34, $80
-	dsprite  1,  0, -3,  0, $40, $80
-	dsprite  1,  0, -2,  0, $41, $80
-	dsprite  1,  0, -1,  0, $42, $80
-	dsprite  1,  0,  0,  0, $43, $80
-	dsprite  1,  0,  1,  0, $44, $80
-	dsprite  1,  0,  2,  0, $45, $80
-	dsprite  2,  0, -2,  0, $51, $80
-	dsprite  2,  0, -1,  0, $52, $80
-	dsprite  2,  0,  0,  0, $53, $80
-	dsprite  2,  0,  1,  0, $54, $80
-	dsprite  2,  0,  2,  0, $55, $80
-
-.OAMData_0c:
+	dsprite -3,  0, -3,  0, $00, 0
+	dsprite -3,  0, -2,  0, $01, 0
+	dsprite -3,  0, -1,  0, $02, 0
+	dsprite -3,  0,  0,  0, $03, 0
+	dsprite -2,  0, -3,  0, $10, 0
+	dsprite -2,  0, -2,  0, $11, 0
+	dsprite -2,  0, -1,  0, $12, 0
+	dsprite -2,  0,  0,  0, $13, 0
+	dsprite -1,  0, -3,  0, $20, 0
+	dsprite -1,  0, -2,  0, $21, 0
+	dsprite -1,  0, -1,  0, $22, 0
+	dsprite -1,  0,  0,  0, $23, 0
+	dsprite -1,  0,  1,  0, $24, 0
+	dsprite  0,  0, -3,  0, $30, 0 | PRIORITY
+	dsprite  0,  0, -2,  0, $31, 0 | PRIORITY
+	dsprite  0,  0, -1,  0, $32, 0 | PRIORITY
+	dsprite  0,  0,  0,  0, $33, 0 | PRIORITY
+	dsprite  0,  0,  1,  0, $34, 0 | PRIORITY
+	dsprite  1,  0, -3,  0, $40, 0 | PRIORITY
+	dsprite  1,  0, -2,  0, $41, 0 | PRIORITY
+	dsprite  1,  0, -1,  0, $42, 0 | PRIORITY
+	dsprite  1,  0,  0,  0, $43, 0 | PRIORITY
+	dsprite  1,  0,  1,  0, $44, 0 | PRIORITY
+	dsprite  1,  0,  2,  0, $45, 0 | PRIORITY
+	dsprite  2,  0, -2,  0, $51, 0 | PRIORITY
+	dsprite  2,  0, -1,  0, $52, 0 | PRIORITY
+	dsprite  2,  0,  0,  0, $53, 0 | PRIORITY
+	dsprite  2,  0,  1,  0, $54, 0 | PRIORITY
+	dsprite  2,  0,  2,  0, $55, 0 | PRIORITY
+
+.OAMData_GSIntroNote:
 	db 2
-	dsprite -1,  0, -1,  4, $00, $00
-	dsprite  0,  0, -1,  4, $10, $00
+	dsprite -1,  0, -1,  4, $00, 0
+	dsprite  0,  0, -1,  4, $10, 0
 
-.OAMData_15:
+.OAMData_GSIntroPikachuTail:
 	db 5
-	dsprite -2,  0,  3,  0, $00, $00
-	dsprite -2,  0,  4,  0, $01, $00
-	dsprite -1,  0,  2,  0, $02, $00
-	dsprite -1,  0,  3,  0, $03, $00
-	dsprite  0,  0,  2,  0, $04, $00
+	dsprite -2,  0,  3,  0, $00, 0
+	dsprite -2,  0,  4,  0, $01, 0
+	dsprite -1,  0,  2,  0, $02, 0
+	dsprite -1,  0,  3,  0, $03, 0
+	dsprite  0,  0,  2,  0, $04, 0
 
 .OAMData_Leaf:
 	db 1
@@ -460,7 +458,7 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0, -1,  7, $00, 0 | Y_FLIP
 	dsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_ForFrameset09:
+.OAMData_TextEntryCursorBig:
 	db 10
 	dsprite -1,  7,  0,  0, $00, 0
 	dsprite -1,  7,  1,  0, $01, 0
@@ -473,23 +471,23 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0,  3,  0, $01, 0 | Y_FLIP
 	dsprite  0,  0,  4,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_22:
+.OAMData_GSIntroGameFreakLogo:
 	db 15
-	dsprite -3,  4, -2,  4, $00, $11
-	dsprite -3,  4, -1,  4, $01, $11
-	dsprite -3,  4,  0,  4, $02, $11
-	dsprite -2,  4, -2,  4, $03, $11
-	dsprite -2,  4, -1,  4, $04, $11
-	dsprite -2,  4,  0,  4, $05, $11
-	dsprite -1,  4, -2,  4, $06, $11
-	dsprite -1,  4, -1,  4, $07, $11
-	dsprite -1,  4,  0,  4, $08, $11
-	dsprite  0,  4, -2,  4, $09, $11
-	dsprite  0,  4, -1,  4, $0a, $11
-	dsprite  0,  4,  0,  4, $0b, $11
-	dsprite  1,  4, -2,  4, $0c, $11
-	dsprite  1,  4, -1,  4, $0d, $11
-	dsprite  1,  4,  0,  4, $0e, $11
+	dsprite -3,  4, -2,  4, $00, 1 | OBP_NUM
+	dsprite -3,  4, -1,  4, $01, 1 | OBP_NUM
+	dsprite -3,  4,  0,  4, $02, 1 | OBP_NUM
+	dsprite -2,  4, -2,  4, $03, 1 | OBP_NUM
+	dsprite -2,  4, -1,  4, $04, 1 | OBP_NUM
+	dsprite -2,  4,  0,  4, $05, 1 | OBP_NUM
+	dsprite -1,  4, -2,  4, $06, 1 | OBP_NUM
+	dsprite -1,  4, -1,  4, $07, 1 | OBP_NUM
+	dsprite -1,  4,  0,  4, $08, 1 | OBP_NUM
+	dsprite  0,  4, -2,  4, $09, 1 | OBP_NUM
+	dsprite  0,  4, -1,  4, $0a, 1 | OBP_NUM
+	dsprite  0,  4,  0,  4, $0b, 1 | OBP_NUM
+	dsprite  1,  4, -2,  4, $0c, 1 | OBP_NUM
+	dsprite  1,  4, -1,  4, $0d, 1 | OBP_NUM
+	dsprite  1,  4,  0,  4, $0e, 1 | OBP_NUM
 
 .OAMData_SlotsGolem:
 	db 6
@@ -551,21 +549,21 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite -1,  4, -1,  4, $00, 0 | OBP_NUM
 	dsprite  0,  4, -1,  4, $00, 0 | OBP_NUM
 
-.OAMData_4b:
+.OAMData_Unused4B:
 	db 6
-	dsprite  0,  0,  0,  0, $00, $00
-	dsprite  0,  0,  1,  0, $01, $00
-	dsprite  0,  0,  2,  0, $01, $00
-	dsprite  0,  0,  3,  0, $01, $00
-	dsprite  0,  0,  4,  0, $02, $00
-	dsprite  0,  0,  5,  0, $03, $00
-
-.OAMData_4c:
+	dsprite  0,  0,  0,  0, $00, 0
+	dsprite  0,  0,  1,  0, $01, 0
+	dsprite  0,  0,  2,  0, $01, 0
+	dsprite  0,  0,  3,  0, $01, 0
+	dsprite  0,  0,  4,  0, $02, 0
+	dsprite  0,  0,  5,  0, $03, 0
+
+.OAMData_Unused4C:
 	db 4
-	dsprite  0,  0,  0,  0, $00, $00
-	dsprite  0,  0,  1,  0, $01, $00
-	dsprite  0,  0,  2,  0, $02, $00
-	dsprite  0,  0,  3,  0, $03, $00
+	dsprite  0,  0,  0,  0, $00, 0
+	dsprite  0,  0,  1,  0, $01, 0
+	dsprite  0,  0,  2,  0, $02, 0
+	dsprite  0,  0,  3,  0, $03, 0
 
 .OAMData_CutTree2:
 	db 4
@@ -588,159 +586,159 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0, -2,  0, $02, PAL_OW_TREE
 	dsprite  0,  0,  1,  0, $03, PAL_OW_TREE
 
-.OAMData_56:
+.OAMData_GSIntroHoOh1:
 	db 19
-	dsprite -1,  0, -4,  0, $00, $00
-	dsprite -2,  0, -3,  0, $02, $00
-	dsprite  0,  0, -3,  0, $04, $00
-	dsprite -3,  0, -2,  0, $06, $00
-	dsprite -1,  0, -2,  0, $08, $00
-	dsprite  1,  0, -2,  0, $0a, $00
-	dsprite -3,  0, -1,  0, $0c, $00
-	dsprite -1,  0, -1,  0, $0e, $00
-	dsprite  1,  0, -1,  0, $10, $00
-	dsprite -3,  0,  0,  0, $12, $00
-	dsprite -1,  0,  0,  0, $14, $00
-	dsprite  1,  0,  0,  0, $16, $00
-	dsprite -3,  0,  1,  0, $18, $00
-	dsprite -1,  0,  1,  0, $1a, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite -1,  0,  2,  0, $1e, $00
-	dsprite  1,  0,  2,  0, $20, $00
-	dsprite -2,  0,  3,  0, $22, $00
-	dsprite  0,  0,  3,  0, $24, $00
-
-.OAMData_57:
+	dsprite -1,  0, -4,  0, $00, 0
+	dsprite -2,  0, -3,  0, $02, 0
+	dsprite  0,  0, -3,  0, $04, 0
+	dsprite -3,  0, -2,  0, $06, 0
+	dsprite -1,  0, -2,  0, $08, 0
+	dsprite  1,  0, -2,  0, $0a, 0
+	dsprite -3,  0, -1,  0, $0c, 0
+	dsprite -1,  0, -1,  0, $0e, 0
+	dsprite  1,  0, -1,  0, $10, 0
+	dsprite -3,  0,  0,  0, $12, 0
+	dsprite -1,  0,  0,  0, $14, 0
+	dsprite  1,  0,  0,  0, $16, 0
+	dsprite -3,  0,  1,  0, $18, 0
+	dsprite -1,  0,  1,  0, $1a, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite -1,  0,  2,  0, $1e, 0
+	dsprite  1,  0,  2,  0, $20, 0
+	dsprite -2,  0,  3,  0, $22, 0
+	dsprite  0,  0,  3,  0, $24, 0
+
+.OAMData_GSIntroHoOh2:
 	db 16
-	dsprite -1,  0, -4,  0, $00, $00
-	dsprite -2,  0, -3,  0, $02, $00
-	dsprite  0,  0, -3,  0, $04, $00
-	dsprite -1,  0, -2,  0, $26, $00
-	dsprite  1,  0, -2,  0, $0a, $00
-	dsprite -3,  0, -1,  0, $28, $00
-	dsprite -1,  0, -1,  0, $2a, $00
-	dsprite  1,  0, -1,  0, $10, $00
-	dsprite -1,  0,  0,  0, $2c, $00
-	dsprite  1,  0,  0,  0, $16, $00
-	dsprite -1,  0,  1,  0, $30, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite -1,  0,  2,  0, $1e, $00
-	dsprite  1,  0,  2,  0, $20, $00
-	dsprite -2,  0,  3,  0, $22, $00
-	dsprite  0,  0,  3,  0, $24, $00
-
-.OAMData_58:
+	dsprite -1,  0, -4,  0, $00, 0
+	dsprite -2,  0, -3,  0, $02, 0
+	dsprite  0,  0, -3,  0, $04, 0
+	dsprite -1,  0, -2,  0, $26, 0
+	dsprite  1,  0, -2,  0, $0a, 0
+	dsprite -3,  0, -1,  0, $28, 0
+	dsprite -1,  0, -1,  0, $2a, 0
+	dsprite  1,  0, -1,  0, $10, 0
+	dsprite -1,  0,  0,  0, $2c, 0
+	dsprite  1,  0,  0,  0, $16, 0
+	dsprite -1,  0,  1,  0, $30, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite -1,  0,  2,  0, $1e, 0
+	dsprite  1,  0,  2,  0, $20, 0
+	dsprite -2,  0,  3,  0, $22, 0
+	dsprite  0,  0,  3,  0, $24, 0
+
+.OAMData_GSIntroHoOh3:
 	db 15
-	dsprite -1,  0, -4,  0, $00, $00
-	dsprite -2,  0, -3,  0, $02, $00
-	dsprite  0,  0, -3,  0, $32, $00
-	dsprite -1,  0, -2,  0, $34, $00
-	dsprite  1,  0, -2,  0, $36, $00
-	dsprite -1,  0, -1,  0, $38, $00
-	dsprite  1,  0, -1,  0, $3a, $00
-	dsprite -1,  0,  0,  0, $3c, $00
-	dsprite  1,  0,  0,  0, $3e, $00
-	dsprite -1,  0,  1,  0, $30, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite -1,  0,  2,  0, $1e, $00
-	dsprite  1,  0,  2,  0, $20, $00
-	dsprite -2,  0,  3,  0, $22, $00
-	dsprite  0,  0,  3,  0, $24, $00
-
-.OAMData_59:
+	dsprite -1,  0, -4,  0, $00, 0
+	dsprite -2,  0, -3,  0, $02, 0
+	dsprite  0,  0, -3,  0, $32, 0
+	dsprite -1,  0, -2,  0, $34, 0
+	dsprite  1,  0, -2,  0, $36, 0
+	dsprite -1,  0, -1,  0, $38, 0
+	dsprite  1,  0, -1,  0, $3a, 0
+	dsprite -1,  0,  0,  0, $3c, 0
+	dsprite  1,  0,  0,  0, $3e, 0
+	dsprite -1,  0,  1,  0, $30, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite -1,  0,  2,  0, $1e, 0
+	dsprite  1,  0,  2,  0, $20, 0
+	dsprite -2,  0,  3,  0, $22, 0
+	dsprite  0,  0,  3,  0, $24, 0
+
+.OAMData_GSIntroHoOh4:
 	db 17
-	dsprite -1,  0, -4,  0, $00, $00
-	dsprite -2,  0, -3,  0, $02, $00
-	dsprite  0,  0, -3,  0, $04, $00
-	dsprite -1,  0, -2,  0, $40, $00
-	dsprite  1,  0, -2,  0, $42, $00
-	dsprite  3,  0, -2,  0, $44, $00
-	dsprite -1,  0, -1,  0, $46, $00
-	dsprite  1,  0, -1,  0, $48, $00
-	dsprite  3,  0, -1,  0, $4a, $00
-	dsprite -1,  0,  0,  0, $4c, $00
-	dsprite  1,  0,  0,  0, $4e, $00
-	dsprite -1,  0,  1,  0, $30, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite -1,  0,  2,  0, $1e, $00
-	dsprite  1,  0,  2,  0, $20, $00
-	dsprite -2,  0,  3,  0, $22, $00
-	dsprite  0,  0,  3,  0, $24, $00
-
-.OAMData_5a:
+	dsprite -1,  0, -4,  0, $00, 0
+	dsprite -2,  0, -3,  0, $02, 0
+	dsprite  0,  0, -3,  0, $04, 0
+	dsprite -1,  0, -2,  0, $40, 0
+	dsprite  1,  0, -2,  0, $42, 0
+	dsprite  3,  0, -2,  0, $44, 0
+	dsprite -1,  0, -1,  0, $46, 0
+	dsprite  1,  0, -1,  0, $48, 0
+	dsprite  3,  0, -1,  0, $4a, 0
+	dsprite -1,  0,  0,  0, $4c, 0
+	dsprite  1,  0,  0,  0, $4e, 0
+	dsprite -1,  0,  1,  0, $30, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite -1,  0,  2,  0, $1e, 0
+	dsprite  1,  0,  2,  0, $20, 0
+	dsprite -2,  0,  3,  0, $22, 0
+	dsprite  0,  0,  3,  0, $24, 0
+
+.OAMData_GSIntroHoOh5:
 	db 17
-	dsprite -1,  0, -4,  0, $00, $00
-	dsprite -2,  0, -3,  0, $02, $00
-	dsprite  0,  0, -3,  0, $04, $00
-	dsprite -1,  0, -2,  0, $50, $00
-	dsprite  1,  0, -2,  0, $0a, $00
-	dsprite -3,  0, -1,  0, $52, $00
-	dsprite -1,  0, -1,  0, $54, $00
-	dsprite  1,  0, -1,  0, $10, $00
-	dsprite -3,  0,  0,  0, $56, $00
-	dsprite -1,  0,  0,  0, $2e, $00
-	dsprite  1,  0,  0,  0, $16, $00
-	dsprite -1,  0,  1,  0, $30, $00
-	dsprite  1,  0,  1,  0, $1c, $00
-	dsprite -1,  0,  2,  0, $1e, $00
-	dsprite  1,  0,  2,  0, $20, $00
-	dsprite -2,  0,  3,  0, $22, $00
-	dsprite  0,  0,  3,  0, $24, $00
+	dsprite -1,  0, -4,  0, $00, 0
+	dsprite -2,  0, -3,  0, $02, 0
+	dsprite  0,  0, -3,  0, $04, 0
+	dsprite -1,  0, -2,  0, $50, 0
+	dsprite  1,  0, -2,  0, $0a, 0
+	dsprite -3,  0, -1,  0, $52, 0
+	dsprite -1,  0, -1,  0, $54, 0
+	dsprite  1,  0, -1,  0, $10, 0
+	dsprite -3,  0,  0,  0, $56, 0
+	dsprite -1,  0,  0,  0, $2e, 0
+	dsprite  1,  0,  0,  0, $16, 0
+	dsprite -1,  0,  1,  0, $30, 0
+	dsprite  1,  0,  1,  0, $1c, 0
+	dsprite -1,  0,  2,  0, $1e, 0
+	dsprite  1,  0,  2,  0, $20, 0
+	dsprite -2,  0,  3,  0, $22, 0
+	dsprite  0,  0,  3,  0, $24, 0
 
 .OAMData_GSTitleTrail:
 	db 1
 	dsprite -1,  4, -1,  4, $00, 1 | OBP_NUM
 
-.OAMData_5c:
+.OAMData_EZChatCursor1:
 	db 12
-	dsprite  0,  0,  0,  0, $30, $00
-	dsprite  0,  0,  1,  0, $31, $00
-	dsprite  0,  0,  2,  0, $31, $00
-	dsprite  0,  0,  3,  0, $31, $00
-	dsprite  0,  0,  4,  0, $31, $00
-	dsprite  0,  0,  5,  0, $32, $00
-	dsprite  1,  0,  0,  0, $33, $00
-	dsprite  1,  0,  1,  0, $34, $00
-	dsprite  1,  0,  2,  0, $34, $00
-	dsprite  1,  0,  3,  0, $34, $00
-	dsprite  1,  0,  4,  0, $34, $00
-	dsprite  1,  0,  5,  0, $35, $00
-
-.OAMData_5d:
+	dsprite  0,  0,  0,  0, $30, 0
+	dsprite  0,  0,  1,  0, $31, 0
+	dsprite  0,  0,  2,  0, $31, 0
+	dsprite  0,  0,  3,  0, $31, 0
+	dsprite  0,  0,  4,  0, $31, 0
+	dsprite  0,  0,  5,  0, $32, 0
+	dsprite  1,  0,  0,  0, $33, 0
+	dsprite  1,  0,  1,  0, $34, 0
+	dsprite  1,  0,  2,  0, $34, 0
+	dsprite  1,  0,  3,  0, $34, 0
+	dsprite  1,  0,  4,  0, $34, 0
+	dsprite  1,  0,  5,  0, $35, 0
+
+.OAMData_EZChatCursor2:
 	db 1
-	dsprite  0,  0,  0,  0, $ed, $00
+	dsprite  0,  0,  0,  0, $ed, 0
 
-.OAMData_5e:
+.OAMData_EZChatCursor3:
 	db 4
-	dsprite -1,  7, -1,  7, $30, $00
-	dsprite -1,  7,  0,  1, $32, $00
-	dsprite  0,  1, -1,  7, $33, $00
-	dsprite  0,  1,  0,  1, $35, $00
+	dsprite -1,  7, -1,  7, $30, 0
+	dsprite -1,  7,  0,  1, $32, 0
+	dsprite  0,  1, -1,  7, $33, 0
+	dsprite  0,  1,  0,  1, $35, 0
 
-.OAMData_5f:
+.OAMData_EZChatCursor4:
 	db 8
-	dsprite -1,  7, -1,  7, $30, $00
-	dsprite -1,  7,  0,  4, $31, $00
-	dsprite -1,  7,  1,  4, $31, $00
-	dsprite -1,  7,  2,  1, $32, $00
-	dsprite  0,  1, -1,  7, $33, $00
-	dsprite  0,  1,  0,  4, $34, $00
-	dsprite  0,  1,  1,  4, $34, $00
-	dsprite  0,  1,  2,  1, $35, $00
-
-.OAMData_60:
+	dsprite -1,  7, -1,  7, $30, 0
+	dsprite -1,  7,  0,  4, $31, 0
+	dsprite -1,  7,  1,  4, $31, 0
+	dsprite -1,  7,  2,  1, $32, 0
+	dsprite  0,  1, -1,  7, $33, 0
+	dsprite  0,  1,  0,  4, $34, 0
+	dsprite  0,  1,  1,  4, $34, 0
+	dsprite  0,  1,  2,  1, $35, 0
+
+.OAMData_EZChatCursor5:
 	db 1
-	dsprite  0,  0,  0,  0, $34, $00
+	dsprite  0,  0,  0,  0, $34, 0
 
-.OAMData_61:
+.OAMData_EZChatCursor6:
 	db 2
-	dsprite  0,  0,  0,  0, $30, $00
-	dsprite  1,  0,  0,  0, $33, $00
+	dsprite  0,  0,  0,  0, $30, 0
+	dsprite  1,  0,  0,  0, $33, 0
 
-.OAMData_62:
+.OAMData_EZChatCursor7:
 	db 2
-	dsprite  0,  0,  0,  0, $32, $00
-	dsprite  1,  0,  0,  0, $35, $00
+	dsprite  0,  0,  0,  0, $32, 0
+	dsprite  1,  0,  0,  0, $35, 0
 
 .OAMData_BlueWalk:
 	db 4
@@ -751,37 +749,37 @@ SpriteAnimOAMData: ; 8d94d
 
 .OAMData_MagnetTrainBlue:
 	db 4
-	dsprite -1,  0, -1,  0, $00, PAL_OW_BLUE | BEHIND_BG
-	dsprite -1,  0,  0,  0, $01, PAL_OW_BLUE | BEHIND_BG
-	dsprite  0,  0, -1,  0, $02, PAL_OW_BLUE | BEHIND_BG
-	dsprite  0,  0,  0,  0, $03, PAL_OW_BLUE | BEHIND_BG
+	dsprite -1,  0, -1,  0, $00, PAL_OW_BLUE | PRIORITY
+	dsprite -1,  0,  0,  0, $01, PAL_OW_BLUE | PRIORITY
+	dsprite  0,  0, -1,  0, $02, PAL_OW_BLUE | PRIORITY
+	dsprite  0,  0,  0,  0, $03, PAL_OW_BLUE | PRIORITY
 
-.OAMData_ForMobile22:
+.OAMData_MobileTradeCableBulge:
 	db 1
 	dsprite -1,  4, -1,  4, $00, 2
 
-.OAMData_ForMobile23:
+.OAMData_MobileTradeSentPulse:
 	db 4
 	dsprite -2,  0, -1,  4, $00, 3
 	dsprite -1,  0, -1,  4, $01, 3
 	dsprite  0,  0, -1,  4, $02, 3
 	dsprite  1,  0, -1,  4, $03, 3
 
-.OAMData_ForMobile24:
+.OAMData_MobileTradeOTPulse:
 	db 4
 	dsprite -2,  0, -1,  4, $03, 4 | Y_FLIP
 	dsprite -1,  0, -1,  4, $02, 4 | Y_FLIP
 	dsprite  0,  0, -1,  4, $01, 4 | Y_FLIP
 	dsprite  1,  0, -1,  4, $00, 4 | Y_FLIP
 
-.OAMData_ForMobile25_1:
+.OAMData_MobileTradePing1:
 	db 4
 	dsprite -1,  0, -1,  0, $00, 1
 	dsprite -1,  0,  0,  0, $00, 1 | X_FLIP
 	dsprite  0,  0, -1,  0, $00, 1 | Y_FLIP
 	dsprite  0,  0,  0,  0, $00, 1 | X_FLIP | Y_FLIP
 
-.OAMData_ForMobile25_2:
+.OAMData_MobileTradePing2:
 	db 8
 	dsprite -2,  4, -2,  4, $00, 1
 	dsprite -2,  4, -1,  4, $01, 1
@@ -792,7 +790,7 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  4, -1,  4, $01, 1 | Y_FLIP
 	dsprite  0,  4,  0,  4, $00, 1 | X_FLIP | Y_FLIP
 
-.OAMData_ForMobile25_3:
+.OAMData_MobileTradePing3:
 	db 12
 	dsprite -2,  0, -2,  0, $00, 1
 	dsprite -2,  0, -1,  0, $01, 1
@@ -993,23 +991,23 @@ SpriteAnimOAMData: ; 8d94d
 
 .OAMData_IntroUnown1:
 	db 1
-	dsprite -1,  4, -1,  4, $00, $00
+	dsprite -1,  4, -1,  4, $00, 0
 
 .OAMData_IntroUnown2:
 	db 3
-	dsprite  0,  0, -1,  0, $00, $00
-	dsprite -1,  0, -1,  0, $01, $00
-	dsprite -1,  0,  0,  0, $02, $00
+	dsprite  0,  0, -1,  0, $00, 0
+	dsprite -1,  0, -1,  0, $01, 0
+	dsprite -1,  0,  0,  0, $02, 0
 
 .OAMData_IntroUnown3:
 	db 7
-	dsprite  1,  0, -2,  0, $00, $00
-	dsprite  0,  0, -2,  0, $01, $00
-	dsprite -1,  0, -2,  0, $02, $00
-	dsprite -1,  0, -1,  0, $03, $00
-	dsprite -2,  0, -1,  0, $04, $00
-	dsprite -2,  0,  0,  0, $05, $00
-	dsprite -2,  0,  1,  0, $06, $00
+	dsprite  1,  0, -2,  0, $00, 0
+	dsprite  0,  0, -2,  0, $01, 0
+	dsprite -1,  0, -2,  0, $02, 0
+	dsprite -1,  0, -1,  0, $03, 0
+	dsprite -2,  0, -1,  0, $04, 0
+	dsprite -2,  0,  0,  0, $05, 0
+	dsprite -2,  0,  1,  0, $06, 0
 
 .OAMData_IntroUnownF2_2:
 	db 8
@@ -1062,26 +1060,26 @@ SpriteAnimOAMData: ; 8d94d
 
 .OAMData_IntroSuicuneAway:
 	db 20
-	dsprite  0,  0,   1,  0, $00, 1 | BEHIND_BG
-	dsprite  1,  0,   2,  0, $00, 1 | BEHIND_BG
-	dsprite  2,  0,   3,  0, $00, 1 | BEHIND_BG
-	dsprite  3,  0,   4,  0, $00, 1 | BEHIND_BG
-	dsprite  4,  0,   5,  0, $00, 1 | BEHIND_BG
-	dsprite  3,  0,   6,  0, $00, 1 | BEHIND_BG
-	dsprite  2,  0,   7,  0, $00, 1 | BEHIND_BG
-	dsprite  1,  0,   8,  0, $00, 1 | BEHIND_BG
-	dsprite  0,  0,   9,  0, $00, 1 | BEHIND_BG
-	dsprite  1,  0,  10,  0, $00, 1 | BEHIND_BG
-	dsprite  2,  0,  11,  0, $00, 1 | BEHIND_BG
-	dsprite  3,  0,  12,  0, $00, 1 | BEHIND_BG
-	dsprite  4,  0,  13,  0, $00, 1 | BEHIND_BG
-	dsprite  3,  0,  14,  0, $00, 1 | BEHIND_BG
-	dsprite  2,  0,  15,  0, $00, 1 | BEHIND_BG
-	dsprite  1,  0,  16,  0, $00, 1 | BEHIND_BG
-	dsprite  0,  0, -15,  0, $00, 1 | BEHIND_BG
-	dsprite  1,  0, -14,  0, $00, 1 | BEHIND_BG
-	dsprite  2,  0, -13,  0, $00, 1 | BEHIND_BG
-	dsprite  3,  0, -12,  0, $00, 1 | BEHIND_BG
+	dsprite  0,  0,   1,  0, $00, 1 | PRIORITY
+	dsprite  1,  0,   2,  0, $00, 1 | PRIORITY
+	dsprite  2,  0,   3,  0, $00, 1 | PRIORITY
+	dsprite  3,  0,   4,  0, $00, 1 | PRIORITY
+	dsprite  4,  0,   5,  0, $00, 1 | PRIORITY
+	dsprite  3,  0,   6,  0, $00, 1 | PRIORITY
+	dsprite  2,  0,   7,  0, $00, 1 | PRIORITY
+	dsprite  1,  0,   8,  0, $00, 1 | PRIORITY
+	dsprite  0,  0,   9,  0, $00, 1 | PRIORITY
+	dsprite  1,  0,  10,  0, $00, 1 | PRIORITY
+	dsprite  2,  0,  11,  0, $00, 1 | PRIORITY
+	dsprite  3,  0,  12,  0, $00, 1 | PRIORITY
+	dsprite  4,  0,  13,  0, $00, 1 | PRIORITY
+	dsprite  3,  0,  14,  0, $00, 1 | PRIORITY
+	dsprite  2,  0,  15,  0, $00, 1 | PRIORITY
+	dsprite  1,  0,  16,  0, $00, 1 | PRIORITY
+	dsprite  0,  0, -15,  0, $00, 1 | PRIORITY
+	dsprite  1,  0, -14,  0, $00, 1 | PRIORITY
+	dsprite  2,  0, -13,  0, $00, 1 | PRIORITY
+	dsprite  3,  0, -12,  0, $00, 1 | PRIORITY
 
 .OAMData_Celebi:
 	db 4
diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm
index 70544a60a..36a0f4afc 100644
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -1,49 +1,49 @@
 SpriteAnimSeqData: ; 8d1c4
 ; entries correspond to SPRITE_ANIM_INDEX_* constants
 	; frameset sequence, tile
-	db SPRITE_ANIM_FRAMESET_PARTY_MON,               SPRITE_ANIM_SEQ_PARTY_MON,            $00 ; SPRITE_ANIM_INDEX_PARTY_MON
-	db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL,          SPRITE_ANIM_SEQ_GS_TITLE_TRAIL,       $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,       SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
-	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO,          SPRITE_ANIM_SEQ_GAMEFREAK_LOGO,       $00 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR,           SPRITE_ANIM_SEQ_GS_INTRO_STAR,        $06 ; SPRITE_ANIM_INDEX_GS_INTRO_STAR
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE,        SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE,     $06 ; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
-	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM,             SPRITE_ANIM_SEQ_SLOTS_GOLEM,          $07 ; SPRITE_ANIM_INDEX_SLOTS_GOLEM
-	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY,           SPRITE_ANIM_SEQ_SLOTS_CHANSEY,        $07 ; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
-	db SPRITE_ANIM_FRAMESET_SLOTS_EGG,               SPRITE_ANIM_SEQ_SLOTS_EGG,            $07 ; SPRITE_ANIM_INDEX_SLOTS_EGG
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,       SPRITE_ANIM_SEQ_MAIL_CURSOR,          $05 ; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
-	db SPRITE_ANIM_FRAMESET_RED_WALK,                SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_RED_WALK
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,            SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR,    $08 ; SPRITE_ANIM_INDEX_UNUSED_CURSOR
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,            SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR,    $08 ; SPRITE_ANIM_INDEX_DUMMY_GAME
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,            SPRITE_ANIM_SEQ_POKEGEAR_ARROW,       $08 ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
-	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL,         SPRITE_ANIM_SEQ_TRADE_POKE_BALL,      $00 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
-	db SPRITE_ANIM_FRAMESET_TRADE_POOF,              SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_TRADE_POOF
-	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE,        SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE,     $00 ; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
-	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON,           SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,     $00 ; SPRITE_ANIM_INDEX_TRADEMON_ICON
-	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE,         SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,     $00 ; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
-	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON,       $00 ; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
-	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB,       SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB,    $00 ; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
-	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED,        SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
-	db SPRITE_ANIM_FRAMESET_LEAF,                    SPRITE_ANIM_SEQ_CUT_LEAVES,           $00 ; SPRITE_ANIM_INDEX_LEAF
-	db SPRITE_ANIM_FRAMESET_CUT_TREE,                SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_CUT_TREE
-	db SPRITE_ANIM_FRAMESET_LEAF,                    SPRITE_ANIM_SEQ_FLY_LEAF,             $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
-	db SPRITE_ANIM_FRAMESET_EGG_CRACK,               SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
-	db SPRITE_ANIM_FRAMESET_24,                      SPRITE_ANIM_SEQ_19,                   $00 ; SPRITE_ANIM_INDEX_1A
-	db SPRITE_ANIM_FRAMESET_HEADBUTT,                SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_HEADBUTT
-	db SPRITE_ANIM_FRAMESET_EGG_HATCH,               SPRITE_ANIM_SEQ_REVEAL_NEW_MON,       $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
-	db SPRITE_ANIM_FRAMESET_26,                      SPRITE_ANIM_SEQ_1A,                   $00 ; SPRITE_ANIM_INDEX_1D
-	db SPRITE_ANIM_FRAMESET_BLUE_WALK,               SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_BLUE_WALK
-	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE,       SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
-	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL,  SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
-	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL,    SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
-	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_22,           SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MOBILE_22
-	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_23,           SPRITE_ANIM_SEQ_FOR_MOBILE_23,        $00 ; SPRITE_ANIM_INDEX_MOBILE_23
-	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_24,           SPRITE_ANIM_SEQ_FOR_MOBILE_24,        $00 ; SPRITE_ANIM_INDEX_MOBILE_24
-	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_25,           SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_MOBILE_25
-	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE,           SPRITE_ANIM_SEQ_INTRO_SUICUNE,        $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE
-	db SPRITE_ANIM_FRAMESET_INTRO_PICHU,             SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER,   $00 ; SPRITE_ANIM_INDEX_INTRO_PICHU
-	db SPRITE_ANIM_FRAMESET_INTRO_WOOPER,            SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER,   $00 ; SPRITE_ANIM_INDEX_INTRO_WOOPER
-	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1,           SPRITE_ANIM_SEQ_INTRO_UNOWN,          $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN
-	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F,           SPRITE_ANIM_SEQ_INTRO_UNOWN_F,        $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F
-	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY,      SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY,   $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
-	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT,             SPRITE_ANIM_SEQ_NULL,                 $00 ; SPRITE_ANIM_INDEX_CELEBI
+	db SPRITE_ANIM_FRAMESET_PARTY_MON,                SPRITE_ANIM_SEQ_PARTY_MON,               $00 ; SPRITE_ANIM_INDEX_PARTY_MON
+	db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL,           SPRITE_ANIM_SEQ_GS_TITLE_TRAIL,          $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,        SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR,    $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
+	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO,           SPRITE_ANIM_SEQ_GAMEFREAK_LOGO,          $00 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR,            SPRITE_ANIM_SEQ_GS_INTRO_STAR,           $06 ; SPRITE_ANIM_INDEX_GS_INTRO_STAR
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE,         SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE,        $06 ; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
+	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM,              SPRITE_ANIM_SEQ_SLOTS_GOLEM,             $07 ; SPRITE_ANIM_INDEX_SLOTS_GOLEM
+	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY,            SPRITE_ANIM_SEQ_SLOTS_CHANSEY,           $07 ; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	db SPRITE_ANIM_FRAMESET_SLOTS_EGG,                SPRITE_ANIM_SEQ_SLOTS_EGG,               $07 ; SPRITE_ANIM_INDEX_SLOTS_EGG
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,        SPRITE_ANIM_SEQ_MAIL_CURSOR,             $05 ; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	db SPRITE_ANIM_FRAMESET_RED_WALK,                 SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_RED_WALK
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_UNUSED_CURSOR,           $08 ; SPRITE_ANIM_INDEX_UNUSED_CURSOR
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR,       $08 ; SPRITE_ANIM_INDEX_DUMMY_GAME
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_POKEGEAR_ARROW,          $08 ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
+	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL,          SPRITE_ANIM_SEQ_TRADE_POKE_BALL,         $00 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	db SPRITE_ANIM_FRAMESET_TRADE_POOF,               SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_TRADE_POOF
+	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE,         SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE,        $00 ; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
+	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON,            SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,        $00 ; SPRITE_ANIM_INDEX_TRADEMON_ICON
+	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE,          SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,        $00 ; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
+	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT,  SPRITE_ANIM_SEQ_REVEAL_NEW_MON,          $00 ; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
+	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB,        SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB,       $00 ; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED,         SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
+	db SPRITE_ANIM_FRAMESET_LEAF,                     SPRITE_ANIM_SEQ_CUT_LEAVES,              $00 ; SPRITE_ANIM_INDEX_LEAF
+	db SPRITE_ANIM_FRAMESET_CUT_TREE,                 SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_CUT_TREE
+	db SPRITE_ANIM_FRAMESET_LEAF,                     SPRITE_ANIM_SEQ_FLY_LEAF,                $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
+	db SPRITE_ANIM_FRAMESET_EGG_CRACK,                SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH,           SPRITE_ANIM_SEQ_GS_INTRO_HO_OH,          $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
+	db SPRITE_ANIM_FRAMESET_HEADBUTT,                 SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_HEADBUTT
+	db SPRITE_ANIM_FRAMESET_EGG_HATCH_1,              SPRITE_ANIM_SEQ_REVEAL_NEW_MON,          $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
+	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1,          SPRITE_ANIM_SEQ_EZCHAT_CURSOR,           $00 ; SPRITE_ANIM_INDEX_EZCHAT_CURSOR
+	db SPRITE_ANIM_FRAMESET_BLUE_WALK,                SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_BLUE_WALK
+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE,        SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL,   SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL,     SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_CABLE_BULGE, SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_PULSE,  SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_PULSE,    SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE,   $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
+	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_PING,        SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
+	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE,            SPRITE_ANIM_SEQ_INTRO_SUICUNE,           $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE
+	db SPRITE_ANIM_FRAMESET_INTRO_PICHU,              SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER,      $00 ; SPRITE_ANIM_INDEX_INTRO_PICHU
+	db SPRITE_ANIM_FRAMESET_INTRO_WOOPER,             SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER,      $00 ; SPRITE_ANIM_INDEX_INTRO_WOOPER
+	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1,            SPRITE_ANIM_SEQ_INTRO_UNOWN,             $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN
+	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F,            SPRITE_ANIM_SEQ_INTRO_UNOWN_F,           $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F
+	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY,       SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY,      $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
+	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT,              SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_CELEBI
 ; 8d24b