Keep table labels in the same files as their contents.

30 files changed, 560 insertions, 532 deletions

diff --git a/data/ball_colors.asm b/data/ball_colors.asm
index 9b6cdc50a..c3ba9d2b4 100644
--- a/data/ball_colors.asm
+++ b/data/ball_colors.asm
@@ -1,4 +1,6 @@
 ; colors of balls thrown in battle
+
+BallColors: ; cd26c (33:526c)
 	db MASTER_BALL, PAL_BATTLE_OB_GREEN
 	db ULTRA_BALL,  PAL_BATTLE_OB_YELLOW
 	db GREAT_BALL,  PAL_BATTLE_OB_BLUE
@@ -11,3 +13,4 @@
 	db MOON_BALL,   PAL_BATTLE_OB_GRAY
 	db LOVE_BALL,   PAL_BATTLE_OB_RED
 	db -1,          PAL_BATTLE_OB_GRAY
+; cd284
diff --git a/data/base_stats.asm b/data/base_stats.asm
index 6ce415691..808a996a6 100644
--- a/data/base_stats.asm
+++ b/data/base_stats.asm
@@ -1,3 +1,4 @@
+BaseData::
 INCLUDE "data/base_stats/bulbasaur.asm"
 INCLUDE "data/base_stats/ivysaur.asm"
 INCLUDE "data/base_stats/venusaur.asm"
diff --git a/data/decoration_attributes.asm b/data/decoration_attributes.asm
index 07d4abb37..209662a6f 100644
--- a/data/decoration_attributes.asm
+++ b/data/decoration_attributes.asm
@@ -5,6 +5,8 @@ decoration: MACRO
 	db \5
 ENDM
 
+DecorationAttributes: ; 26a4f
+; entries correspond to deco constants
 	decoration DECO_PLANT,   $00,            $0,                EVENT_GAVE_KURT_APRICORNS,       $00
 	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_BED,      EVENT_GAVE_KURT_APRICORNS,       $00
 	decoration DECO_BED,     FEATHERY_BED,   SET_UP_BED,        EVENT_DECO_BED_1,                $1b
@@ -58,3 +60,4 @@ ENDM
 	decoration DECO_DOLL,    TENTACOOL,      SET_UP_DOLL,       EVENT_DECO_TENTACOOL_DOLL,       SPRITE_TENTACOOL
 	decoration DECO_PLANT,   GOLD_TROPHY,    SET_UP_DOLL,       EVENT_DECO_GOLD_TROPHY,          SPRITE_GOLD_TROPHY
 	decoration DECO_PLANT,   SILVER_TROPHY,  SET_UP_DOLL,       EVENT_DECO_SILVER_TROPHY,        SPRITE_SILVER_TROPHY
+; 26b8d
diff --git a/data/default_options.asm b/data/default_options.asm
index 7ecbe3163..b1916b88c 100644
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -1,3 +1,4 @@
+DefaultOptions: ; 14f7c
 ; Options: med text speed
 	db TEXT_DELAY_MED
 ; wSaveFileExists: no
@@ -14,3 +15,4 @@
 	db $00
 ; $cfd3: ??
 	db $00
+; 14f84
diff --git a/data/egg_move_pointers.asm b/data/egg_move_pointers.asm
index 27558ddef..caa9ed7c0 100644
--- a/data/egg_move_pointers.asm
+++ b/data/egg_move_pointers.asm
@@ -1,3 +1,4 @@
+EggMovePointers:: ; 0x23b11
 	dw BulbasaurEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
@@ -253,3 +254,4 @@ endc
 	dw NoEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
+; 0x23d07
diff --git a/data/egg_moves.asm b/data/egg_moves.asm
index d27c2f52b..2fcf47232 100644
--- a/data/egg_moves.asm
+++ b/data/egg_moves.asm
@@ -10,7 +10,6 @@ SECTION "Egg Moves", ROMX
 ; and can only breed with Ditto.
 
 
-EggMovePointers:: ; 0x23b11
 INCLUDE "data/egg_move_pointers.asm"
 
 
diff --git a/data/emote_headers.asm b/data/emote_headers.asm
index 8605471f9..2618d3b0a 100644
--- a/data/emote_headers.asm
+++ b/data/emote_headers.asm
@@ -5,6 +5,7 @@ emote_header: MACRO
 	dw VTiles1 tile \3
 ENDM
 
+EmotesPointers: ; 144d
 ; entries correspond to EMOTE_* constants
 	emote_header ShockEmote,     4, $78
 	emote_header QuestionEmote,  4, $78
@@ -18,3 +19,4 @@ ENDM
 	emote_header FishingRodGFX,  2, $7c
 	emote_header BoulderDustGFX, 2, $7e
 	emote_header GrassRustleGFX, 1, $7e
+; 14495
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index facc30bac..6eb5f6065 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -2,6 +2,7 @@ engine_flag: MACRO
 	dwb \1, 1 << \2
 ENDM
 
+EngineFlags: ; 80462
 	; location, bit
 	; (all locations are in WRAM bank 1)
 
@@ -201,3 +202,5 @@ ENDM
 
 	engine_flag SwarmFlags, 2 ; dunsparce swarm   ; $a0
 	engine_flag SwarmFlags, 3 ; yanma swarm
+
+; 80648
diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm
index c8e5da236..749731812 100644
--- a/data/evos_attacks.asm
+++ b/data/evos_attacks.asm
@@ -4,7 +4,6 @@ INCLUDE "includes.asm"
 SECTION "Evolutions and Attacks", ROMX
 
 
-EvosAttacksPointers:: ; 0x425b1
 INCLUDE "data/evos_attacks_pointers.asm"
 
 
diff --git a/data/evos_attacks_pointers.asm b/data/evos_attacks_pointers.asm
index 863e17824..f6582e786 100644
--- a/data/evos_attacks_pointers.asm
+++ b/data/evos_attacks_pointers.asm
@@ -1,5 +1,6 @@
 ; Evolutions and attacks are grouped together since they're both checked at level-up.
 
+EvosAttacksPointers:: ; 0x425b1
 	dw BulbasaurEvosAttacks
 	dw IvysaurEvosAttacks
 	dw VenusaurEvosAttacks
@@ -251,3 +252,4 @@
 	dw LugiaEvosAttacks
 	dw HoOhEvosAttacks
 	dw CelebiEvosAttacks
+; 0x427a7
diff --git a/data/fruit_tree_items.asm b/data/fruit_tree_items.asm
index 91fcb3a58..67b8f51ad 100644
--- a/data/fruit_tree_items.asm
+++ b/data/fruit_tree_items.asm
@@ -1,5 +1,5 @@
+FruitTreeItems: ; 44097
 ; entries correspond to FRUITTREE_* constants
-
 	db BERRY        ; ROUTE_29
 	db BERRY        ; ROUTE_30_1
 	db BERRY        ; ROUTE_38
@@ -30,3 +30,4 @@
 	db ICE_BERRY    ; PEWTER_CITY_1
 	db MINT_BERRY   ; PEWTER_CITY_2
 	db BURNT_BERRY  ; FUCHSIA_CITY
+; 440b5
diff --git a/data/happiness_changes.asm b/data/happiness_changes.asm
index ba854bfc6..de60ea32d 100644
--- a/data/happiness_changes.asm
+++ b/data/happiness_changes.asm
@@ -1,5 +1,5 @@
+HappinessChanges:
 ; entries correspond to HAPPINESS_* constants
-
 ; change if happiness < 100, change if happiness < 200, change otherwise
 	db  +5,  +3,  +2 ; Gained a level
 	db  +5,  +3,  +2 ; Vitamin
diff --git a/data/hm_moves.asm b/data/hm_moves.asm
index 49d40d1d7..ac9f1f542 100644
--- a/data/hm_moves.asm
+++ b/data/hm_moves.asm
@@ -1,4 +1,6 @@
 ;  HM moves can't be forgotten
+
+HMMoves: ; 34f0
 	db CUT
 	db FLY
 	db SURF
@@ -7,3 +9,4 @@
 	db WATERFALL
 	db WHIRLPOOL
 	db -1 ; end
+; 34f8
diff --git a/data/landmarks.asm b/data/landmarks.asm
index 1de292ef8..0b927aaf6 100644
--- a/data/landmarks.asm
+++ b/data/landmarks.asm
@@ -4,6 +4,7 @@ landmark: MACRO
 	dw \3
 ENDM
 
+Landmarks: ; 0x1ca8c3
 ; entries correspond to constants/landmark_constants.asm
 	landmark   0,   0, SpecialMapName
 	landmark 148, 116, NewBarkTownName
@@ -101,7 +102,7 @@ ENDM
 	landmark  20, 116, TohjoFallsName
 	landmark  28,  84, Route28Name
 	landmark 148, 132, FastShipName
-
+; 0x1caa43
 
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"
diff --git a/data/mail_input_chars.asm b/data/mail_input_chars.asm
index 4466464b2..befdc0cf7 100644
--- a/data/mail_input_chars.asm
+++ b/data/mail_input_chars.asm
@@ -7,7 +7,6 @@ MailEntry_Uppercase: ; 122dd
 	db "1 2 3 4 5 6 7 8 9 0"
 	db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×"
 	db "lower  DEL   END   "
-
 ; 1224f
 
 MailEntry_Lowercase: ; 1224f
@@ -17,3 +16,4 @@ MailEntry_Lowercase: ; 1224f
 	db "'d 'l 'm 'r 's 't 'v & ( )"
 	db "<``> <''> [ ] ' : ;      "
 	db "UPPER  DEL   END   "
+; 122c1
diff --git a/data/map_objects.asm b/data/map_objects.asm
index 9cc495b7f..6bf9aeaa1 100755
--- a/data/map_objects.asm
+++ b/data/map_objects.asm
@@ -1,10 +1,10 @@
-; entries correspond to SPRITEMOVEDATA_* constants
-
 sprite_movement_data: macro
 	db \1, \2, \3, \4, \5
 	dn \6, 0
 endm
 
+SpriteMovementData:: ; 4273
+; entries correspond to SPRITEMOVEDATA_* constants
 	; function,                                              facing, action,                  flags1, flags2, palette flags
 	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 00
 	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $0c,    $00,    %0000 ; 01
@@ -44,3 +44,4 @@ endm
 	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   PERSON_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; 23
 	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0010 ; 24
 	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 25
+; 4357
diff --git a/data/map_triggers.asm b/data/map_triggers.asm
index 567165392..b2ba1222a 100644
--- a/data/map_triggers.asm
+++ b/data/map_triggers.asm
@@ -5,6 +5,7 @@ trigger_def: MACRO
 	dw \2
 ENDM
 
+MapTriggers:: ; 4d01e
 	trigger_def POKECENTER_2F,                          wPokecenter2FTrigger
 	trigger_def TRADE_CENTER,                           wTradeCenterTrigger
 	trigger_def COLOSSEUM,                              wColosseumTrigger
@@ -85,3 +86,4 @@ ENDM
 	trigger_def MOBILE_TRADE_ROOM_MOBILE,               wMobileTradeRoomMobileTrigger
 	trigger_def MOBILE_BATTLE_ROOM,                     wMobileBattleRoomTrigger
 	db -1
+; 4d15b
diff --git a/data/mapgroup_roofs.asm b/data/mapgroup_roofs.asm
index 076a0e8e1..0cad8a0e3 100644
--- a/data/mapgroup_roofs.asm
+++ b/data/mapgroup_roofs.asm
@@ -1,4 +1,6 @@
-; valid roofs: 0, 1, 2, 3, 4; -1 for none
+; valid roofs: 0, 1, 2, 3, 4, or -1 for none
+
+MapGroupRoofs: ; 1c021i
 	db -1 ; group 0 (unused)
 	db  3 ; group 1 (Olivine)
 	db  2 ; group 2 (Mahogany)
@@ -26,3 +28,4 @@
 	db  0 ; group 24 (New Bark)
 	db -1 ; group 25
 	db  0 ; group 26 (Cherrygrove)
+; 1c03c
diff --git a/data/mon_menu_icons.asm b/data/mon_menu_icons.asm
index f5c4386ad..360b206a2 100644
--- a/data/mon_menu_icons.asm
+++ b/data/mon_menu_icons.asm
@@ -1,4 +1,6 @@
 ; party menu icons
+
+MonMenuIcons: ; 8eac4
 	db ICON_BULBASAUR   ; BULBASAUR
 	db ICON_BULBASAUR   ; IVYSAUR
 	db ICON_BULBASAUR   ; VENUSAUR
@@ -250,3 +252,4 @@
 	db ICON_LUGIA       ; LUGIA
 	db ICON_HO_OH       ; HO_OH
 	db ICON_HUMANSHAPE  ; CELEBI
+; 8ebbf
diff --git a/data/npc_trades.asm b/data/npc_trades.asm
index 1957d5c3f..57b2411d3 100644
--- a/data/npc_trades.asm
+++ b/data/npc_trades.asm
@@ -1,3 +1,7 @@
+TRADE_EITHER_GENDER EQU 0
+TRADE_MALE_ONLY     EQU 1
+TRADE_FEMALE_ONLY   EQU 2
+
 npctrade: MACRO
 ; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
 	db \1, \2, \3, \4, \5, \6, \7
@@ -6,10 +10,7 @@ npctrade: MACRO
 	db \8, \9, 0
 ENDM
 
-TRADE_EITHER_GENDER EQU 0
-TRADE_MALE_ONLY     EQU 1
-TRADE_FEMALE_ONLY   EQU 2
-
+NPCTrades: ; fce58
 ; entries correspond to NPCTRADE_* constants
 	npctrade 0, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
 	npctrade 0, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
@@ -18,3 +19,4 @@ TRADE_FEMALE_ONLY   EQU 2
 	npctrade 2, HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
 	npctrade 3, CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
 	npctrade 0, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_EITHER_GENDER
+; fcf38
diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm
index f3a3036f9..a46d84bdc 100644
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -1,10 +1,9 @@
-OddEggProbabilities:
-
-prob: MACRO
+prob: macro
 prob_total = prob_total + (\1)
 	dw prob_total * $ffff / 100
-ENDM
+endm
 
+OddEggProbabilities:
 prob_total = 0
 ; Pichu
 	prob 8
diff --git a/data/phone_contacts.asm b/data/phone_contacts.asm
index c5614a64c..0c21049bb 100644
--- a/data/phone_contacts.asm
+++ b/data/phone_contacts.asm
@@ -8,6 +8,7 @@ phone: macro
 	dba \7
 endm
 
+PhoneContacts: ; 9045f
 ; entries correspond to PHONE_* constants
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
 	phone TRAINER_NONE, PHONECONTACT_MOM,      KRISS_HOUSE_1F,            7, MomPhoneScript,      0, UnusedPhoneScript
@@ -47,3 +48,4 @@ endm
 	phone HIKER,        PARRY1,                ROUTE_45,                  7, ParryPhoneScript1,   7, ParryPhoneScript2
 	phone PICNICKER,    ERIN1,                 ROUTE_46,                  7, ErinPhoneScript1,    7, ErinPhoneScript2
 	phone TRAINER_NONE, PHONECONTACT_BUENA,    GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1,   7, BuenaPhoneScript2
+; 90627
diff --git a/data/phone_special.asm b/data/phone_special.asm
index 5446e95c9..c66c9ff77 100644
--- a/data/phone_special.asm
+++ b/data/phone_special.asm
@@ -5,6 +5,7 @@ specialcall: macro
 	dba \3
 endm
 
+SpecialPhoneCallList: ; 90627
 ; entries correspond to SPECIALCALL_* constants
 	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
 	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
@@ -14,3 +15,4 @@ endm
 	specialcall SpecialCallWhereverYouAre,  PHONE_OAK, BikeShopPhoneScript
 	specialcall SpecialCallWhereverYouAre,  PHONE_MOM, MomPhoneLectureScript
 	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+; 90657
diff --git a/data/pokemon_names.asm b/data/pokemon_names.asm
index 06b1a6e55..266b0c020 100644
--- a/data/pokemon_names.asm
+++ b/data/pokemon_names.asm
@@ -1,3 +1,4 @@
+PokemonNames::
 	db "BULBASAUR@"
 	db "IVYSAUR@@@"
 	db "VENUSAUR@@"
diff --git a/data/spawn_points.asm b/data/spawn_points.asm
index 39b71c620..49ba362d7 100644
--- a/data/spawn_points.asm
+++ b/data/spawn_points.asm
@@ -4,6 +4,7 @@ spawn: MACRO
 	db \2, \3
 ENDM
 
+SpawnPoints: ; 0x152ab
 ; entries correspond to SPAWN_* constants
 
 	spawn KRISS_HOUSE_2F,              3,  3
@@ -37,3 +38,4 @@ ENDM
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
 	spawn N_A,                        -1, -1
+; 1531f
diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm
new file mode 100755
index 000000000..0111a5bc2
--- /dev/null
+++ b/data/sprite_anim_frames.asm
@@ -0,0 +1,499 @@
+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_TextEntryCursor
+	dw .Frameset_09
+	dw .Frameset_GameFreakLogo
+	dw .Frameset_GSIntroStar
+	dw .Frameset_GSIntroSparkle
+	dw .Frameset_SlotsGolem
+	dw .Frameset_SlotsChansey
+	dw .Frameset_SlotsChansey2
+	dw .Frameset_SlotsEgg
+	dw .Frameset_RedWalk
+	dw .Frameset_StillCursor
+	dw .Frameset_TradePokeBall
+	dw .Frameset_TradePokeBall0
+	dw .Frameset_TradePoof
+	dw .Frameset_TradeTubeBulge
+	dw .Frameset_TrademonIcon
+	dw .Frameset_TrademonBubble
+	dw .Frameset_EvolutionBallOfLight
+	dw .Frameset_RadioTuningKnob
+	dw .Frameset_MagnetTrainRed
+	dw .Frameset_1c
+	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_HeadbuttTree
+	dw .Frameset_26
+	dw .Frameset_27
+	dw .Frameset_28
+	dw .Frameset_29
+	dw .Frameset_2a
+	dw .Frameset_2b
+	dw .Frameset_2c
+	dw .Frameset_BlueWalk
+	dw .Frameset_MagnetTrainBlue
+	dw .Frameset_2f
+	dw .Frameset_30
+	dw .Frameset_31
+	dw .Frameset_32
+	dw .Frameset_33
+	dw .Frameset_34
+	dw .Frameset_IntroSuicune
+	dw .Frameset_IntroSuicune2
+	dw .Frameset_IntroPichu
+	dw .Frameset_IntroWooper
+	dw .Frameset_IntroUnown1
+	dw .Frameset_IntroUnown2
+	dw .Frameset_IntroUnown3
+	dw .Frameset_IntroUnown4
+	dw .Frameset_IntroUnownF2
+	dw .Frameset_IntroSuicuneAway
+	dw .Frameset_IntroUnownF
+	dw .Frameset_CelebiLeft
+	dw .Frameset_CelebiRight
+; 8d76a
+
+.Frameset_00:
+	frame SPRITE_ANIM_FRAME_IDX_00, 32
+	endanim
+
+.Frameset_PartyMon:
+	frame SPRITE_ANIM_FRAME_IDX_00,  8
+	frame SPRITE_ANIM_FRAME_IDX_01,  8
+	dorestart
+
+.Frameset_02:
+	frame SPRITE_ANIM_FRAME_IDX_3D,  8
+	frame SPRITE_ANIM_FRAME_IDX_3E,  8
+	dorestart
+
+.Frameset_03:
+	frame SPRITE_ANIM_FRAME_IDX_3F,  8
+	frame SPRITE_ANIM_FRAME_IDX_40,  8
+	dorestart
+
+.Frameset_04:
+	frame SPRITE_ANIM_FRAME_IDX_00,  4
+	frame SPRITE_ANIM_FRAME_IDX_01,  4
+	dorestart
+
+.Frameset_05:
+	frame SPRITE_ANIM_FRAME_IDX_3D,  4
+	frame SPRITE_ANIM_FRAME_IDX_3E,  4
+	dorestart
+
+.Frameset_06:
+	frame SPRITE_ANIM_FRAME_IDX_3F,  4
+	frame SPRITE_ANIM_FRAME_IDX_40,  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
+	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
+	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
+	dorestart
+
+.Frameset_07:
+	frame SPRITE_ANIM_FRAME_IDX_1E,  1
+	frame SPRITE_ANIM_FRAME_IDX_1F,  1
+	dorestart
+
+.Frameset_TextEntryCursor:
+	frame SPRITE_ANIM_FRAME_IDX_20,  1
+	dorepeat  1
+	dorestart
+
+.Frameset_09:
+	frame SPRITE_ANIM_FRAME_IDX_21,  1
+	dorepeat  1
+	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
+	endanim
+
+.Frameset_GSIntroStar:
+	frame SPRITE_ANIM_FRAME_IDX_23,  3
+	frame SPRITE_ANIM_FRAME_IDX_23,  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
+	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
+	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
+	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
+	endanim
+
+.Frameset_SlotsEgg:
+	frame SPRITE_ANIM_FRAME_IDX_2E, 20
+	endanim
+
+.Frameset_StillCursor:
+	frame SPRITE_ANIM_FRAME_IDX_2F, 32
+	endanim
+
+.Frameset_TradePokeBall:
+	frame SPRITE_ANIM_FRAME_IDX_30, 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
+	dorestart
+
+.Frameset_TradePoof:
+	frame SPRITE_ANIM_FRAME_IDX_32,  4
+	frame SPRITE_ANIM_FRAME_IDX_33,  4
+	frame SPRITE_ANIM_FRAME_IDX_34,  4
+	delanim
+
+.Frameset_TradeTubeBulge:
+	frame SPRITE_ANIM_FRAME_IDX_35,  3
+	frame SPRITE_ANIM_FRAME_IDX_36,  3
+	dorestart
+
+.Frameset_TrademonIcon:
+	frame SPRITE_ANIM_FRAME_IDX_37,  7
+	frame SPRITE_ANIM_FRAME_IDX_38,  7
+	dorestart
+
+.Frameset_TrademonBubble:
+	frame SPRITE_ANIM_FRAME_IDX_39, 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
+	endanim
+
+.Frameset_RadioTuningKnob:
+	frame SPRITE_ANIM_FRAME_IDX_3C, 32
+	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
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_43,  8
+	frame SPRITE_ANIM_FRAME_IDX_44,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_45,  8
+	frame SPRITE_ANIM_FRAME_IDX_46,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_47,  8
+	frame SPRITE_ANIM_FRAME_IDX_48,  8
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_49,  1
+	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_Y_FLIP
+	dorestart
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_4A, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_4B, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_4C, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_4D, 32
+	endanim
+
+; XXX
+	frame SPRITE_ANIM_FRAME_IDX_4E,  3
+	dorepeat  3
+	dorestart
+
+.Frameset_1c:
+	dorepeat 32
+	endanim
+
+.Frameset_Leaf:
+	frame SPRITE_ANIM_FRAME_IDX_4F, 32
+	endanim
+
+.Frameset_CutTree:
+	frame SPRITE_ANIM_FRAME_IDX_50,  2
+	frame SPRITE_ANIM_FRAME_IDX_51, 16
+	dorepeat  1
+	frame SPRITE_ANIM_FRAME_IDX_52,  1
+	dorepeat  1
+	frame SPRITE_ANIM_FRAME_IDX_53,  1
+	delanim
+
+.Frameset_EggCrack:
+	frame SPRITE_ANIM_FRAME_IDX_54, 32
+	endanim
+
+.Frameset_EggHatch:
+	frame SPRITE_ANIM_FRAME_IDX_55, 32
+	endanim
+
+.Frameset_21:
+	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP
+	endanim
+
+.Frameset_22:
+	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_Y_FLIP
+	endanim
+
+.Frameset_23:
+	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP, OAM_Y_FLIP
+	endanim
+
+.Frameset_24:
+	frame SPRITE_ANIM_FRAME_IDX_56, 10
+	frame SPRITE_ANIM_FRAME_IDX_57,  9
+	frame SPRITE_ANIM_FRAME_IDX_58, 10
+	frame SPRITE_ANIM_FRAME_IDX_59, 10
+	frame SPRITE_ANIM_FRAME_IDX_58,  9
+	frame SPRITE_ANIM_FRAME_IDX_5A, 10
+	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
+	dorestart
+
+.Frameset_26:
+	frame SPRITE_ANIM_FRAME_IDX_5C,  2
+	endanim
+
+.Frameset_27:
+	frame SPRITE_ANIM_FRAME_IDX_5D,  2
+	endanim
+
+.Frameset_28:
+	frame SPRITE_ANIM_FRAME_IDX_5E,  2
+	endanim
+
+.Frameset_29:
+	frame SPRITE_ANIM_FRAME_IDX_5F,  2
+	endanim
+
+.Frameset_2a:
+	frame SPRITE_ANIM_FRAME_IDX_60,  2
+	endanim
+
+.Frameset_2b:
+	frame SPRITE_ANIM_FRAME_IDX_61,  2
+	endanim
+
+.Frameset_2c:
+	frame SPRITE_ANIM_FRAME_IDX_62,  2
+	endanim
+
+.Frameset_2f:
+	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_32,  3
+	frame SPRITE_ANIM_FRAME_IDX_33,  3
+	frame SPRITE_ANIM_FRAME_IDX_34,  3
+	delanim
+
+.Frameset_31:
+	frame SPRITE_ANIM_FRAME_IDX_67,  3
+	frame SPRITE_ANIM_FRAME_IDX_68,  3
+	dorestart
+
+.Frameset_32:
+	frame SPRITE_ANIM_FRAME_IDX_6C,  3
+	endanim
+
+.Frameset_33:
+	frame SPRITE_ANIM_FRAME_IDX_6D,  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
+	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
+	dorestart
+
+.Frameset_IntroSuicune2:
+	frame SPRITE_ANIM_FRAME_IDX_71,  3
+	frame SPRITE_ANIM_FRAME_IDX_6E,  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
+	endanim
+
+.Frameset_IntroWooper:
+	frame SPRITE_ANIM_FRAME_IDX_75,  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
+	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
+	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
+	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
+	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
+	endanim
+
+.Frameset_IntroSuicuneAway:
+	frame SPRITE_ANIM_FRAME_IDX_7E,  3
+	endanim
+
+.Frameset_IntroUnownF:
+	dorepeat 0
+	endanim
+
+.Frameset_CelebiLeft:
+	frame SPRITE_ANIM_FRAME_IDX_7F,  8
+	frame SPRITE_ANIM_FRAME_IDX_80,  8
+	endanim
+
+.Frameset_CelebiRight:
+	frame SPRITE_ANIM_FRAME_IDX_7F,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_80,  8, OAM_X_FLIP
+	endanim
+; 8d94d
diff --git a/data/sprite_engine.asm b/data/sprite_anim_oam.asm
index e3662fdaf..304151e8c 100755..100644
--- a/data/sprite_engine.asm
+++ b/data/sprite_anim_oam.asm
@@ -1,503 +1,3 @@
-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_TextEntryCursor
-	dw .Frameset_09
-	dw .Frameset_GameFreakLogo
-	dw .Frameset_GSIntroStar
-	dw .Frameset_GSIntroSparkle
-	dw .Frameset_SlotsGolem
-	dw .Frameset_SlotsChansey
-	dw .Frameset_SlotsChansey2
-	dw .Frameset_SlotsEgg
-	dw .Frameset_RedWalk
-	dw .Frameset_StillCursor
-	dw .Frameset_TradePokeBall
-	dw .Frameset_TradePokeBall0
-	dw .Frameset_TradePoof
-	dw .Frameset_TradeTubeBulge
-	dw .Frameset_TrademonIcon
-	dw .Frameset_TrademonBubble
-	dw .Frameset_EvolutionBallOfLight
-	dw .Frameset_RadioTuningKnob
-	dw .Frameset_MagnetTrainRed
-	dw .Frameset_1c
-	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_HeadbuttTree
-	dw .Frameset_26
-	dw .Frameset_27
-	dw .Frameset_28
-	dw .Frameset_29
-	dw .Frameset_2a
-	dw .Frameset_2b
-	dw .Frameset_2c
-	dw .Frameset_BlueWalk
-	dw .Frameset_MagnetTrainBlue
-	dw .Frameset_2f
-	dw .Frameset_30
-	dw .Frameset_31
-	dw .Frameset_32
-	dw .Frameset_33
-	dw .Frameset_34
-	dw .Frameset_IntroSuicune
-	dw .Frameset_IntroSuicune2
-	dw .Frameset_IntroPichu
-	dw .Frameset_IntroWooper
-	dw .Frameset_IntroUnown1
-	dw .Frameset_IntroUnown2
-	dw .Frameset_IntroUnown3
-	dw .Frameset_IntroUnown4
-	dw .Frameset_IntroUnownF2
-	dw .Frameset_IntroSuicuneAway
-	dw .Frameset_IntroUnownF
-	dw .Frameset_CelebiLeft
-	dw .Frameset_CelebiRight
-; 8d76a
-
-.Frameset_00:
-	frame SPRITE_ANIM_FRAME_IDX_00, 32
-	endanim
-
-.Frameset_PartyMon:
-	frame SPRITE_ANIM_FRAME_IDX_00,  8
-	frame SPRITE_ANIM_FRAME_IDX_01,  8
-	dorestart
-
-.Frameset_02:
-	frame SPRITE_ANIM_FRAME_IDX_3D,  8
-	frame SPRITE_ANIM_FRAME_IDX_3E,  8
-	dorestart
-
-.Frameset_03:
-	frame SPRITE_ANIM_FRAME_IDX_3F,  8
-	frame SPRITE_ANIM_FRAME_IDX_40,  8
-	dorestart
-
-.Frameset_04:
-	frame SPRITE_ANIM_FRAME_IDX_00,  4
-	frame SPRITE_ANIM_FRAME_IDX_01,  4
-	dorestart
-
-.Frameset_05:
-	frame SPRITE_ANIM_FRAME_IDX_3D,  4
-	frame SPRITE_ANIM_FRAME_IDX_3E,  4
-	dorestart
-
-.Frameset_06:
-	frame SPRITE_ANIM_FRAME_IDX_3F,  4
-	frame SPRITE_ANIM_FRAME_IDX_40,  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
-	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
-	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
-	dorestart
-
-.Frameset_07:
-	frame SPRITE_ANIM_FRAME_IDX_1E,  1
-	frame SPRITE_ANIM_FRAME_IDX_1F,  1
-	dorestart
-
-.Frameset_TextEntryCursor:
-	frame SPRITE_ANIM_FRAME_IDX_20,  1
-	dorepeat  1
-	dorestart
-
-.Frameset_09:
-	frame SPRITE_ANIM_FRAME_IDX_21,  1
-	dorepeat  1
-	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
-	endanim
-
-.Frameset_GSIntroStar:
-	frame SPRITE_ANIM_FRAME_IDX_23,  3
-	frame SPRITE_ANIM_FRAME_IDX_23,  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
-	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
-	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
-	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
-	endanim
-
-.Frameset_SlotsEgg:
-	frame SPRITE_ANIM_FRAME_IDX_2E, 20
-	endanim
-
-.Frameset_StillCursor:
-	frame SPRITE_ANIM_FRAME_IDX_2F, 32
-	endanim
-
-.Frameset_TradePokeBall:
-	frame SPRITE_ANIM_FRAME_IDX_30, 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
-	dorestart
-
-.Frameset_TradePoof:
-	frame SPRITE_ANIM_FRAME_IDX_32,  4
-	frame SPRITE_ANIM_FRAME_IDX_33,  4
-	frame SPRITE_ANIM_FRAME_IDX_34,  4
-	delanim
-
-.Frameset_TradeTubeBulge:
-	frame SPRITE_ANIM_FRAME_IDX_35,  3
-	frame SPRITE_ANIM_FRAME_IDX_36,  3
-	dorestart
-
-.Frameset_TrademonIcon:
-	frame SPRITE_ANIM_FRAME_IDX_37,  7
-	frame SPRITE_ANIM_FRAME_IDX_38,  7
-	dorestart
-
-.Frameset_TrademonBubble:
-	frame SPRITE_ANIM_FRAME_IDX_39, 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
-	endanim
-
-.Frameset_RadioTuningKnob:
-	frame SPRITE_ANIM_FRAME_IDX_3C, 32
-	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
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_43,  8
-	frame SPRITE_ANIM_FRAME_IDX_44,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_45,  8
-	frame SPRITE_ANIM_FRAME_IDX_46,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_47,  8
-	frame SPRITE_ANIM_FRAME_IDX_48,  8
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_49,  1
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_49,  1, OAM_Y_FLIP
-	dorestart
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4A, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4B, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4C, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4D, 32
-	endanim
-
-; XXX
-	frame SPRITE_ANIM_FRAME_IDX_4E,  3
-	dorepeat  3
-	dorestart
-
-.Frameset_1c:
-	dorepeat 32
-	endanim
-
-.Frameset_Leaf:
-	frame SPRITE_ANIM_FRAME_IDX_4F, 32
-	endanim
-
-.Frameset_CutTree:
-	frame SPRITE_ANIM_FRAME_IDX_50,  2
-	frame SPRITE_ANIM_FRAME_IDX_51, 16
-	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_52,  1
-	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_53,  1
-	delanim
-
-.Frameset_EggCrack:
-	frame SPRITE_ANIM_FRAME_IDX_54, 32
-	endanim
-
-.Frameset_EggHatch:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32
-	endanim
-
-.Frameset_21:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP
-	endanim
-
-.Frameset_22:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_Y_FLIP
-	endanim
-
-.Frameset_23:
-	frame SPRITE_ANIM_FRAME_IDX_55, 32, OAM_X_FLIP, OAM_Y_FLIP
-	endanim
-
-.Frameset_24:
-	frame SPRITE_ANIM_FRAME_IDX_56, 10
-	frame SPRITE_ANIM_FRAME_IDX_57,  9
-	frame SPRITE_ANIM_FRAME_IDX_58, 10
-	frame SPRITE_ANIM_FRAME_IDX_59, 10
-	frame SPRITE_ANIM_FRAME_IDX_58,  9
-	frame SPRITE_ANIM_FRAME_IDX_5A, 10
-	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
-	dorestart
-
-.Frameset_26:
-	frame SPRITE_ANIM_FRAME_IDX_5C,  2
-	endanim
-
-.Frameset_27:
-	frame SPRITE_ANIM_FRAME_IDX_5D,  2
-	endanim
-
-.Frameset_28:
-	frame SPRITE_ANIM_FRAME_IDX_5E,  2
-	endanim
-
-.Frameset_29:
-	frame SPRITE_ANIM_FRAME_IDX_5F,  2
-	endanim
-
-.Frameset_2a:
-	frame SPRITE_ANIM_FRAME_IDX_60,  2
-	endanim
-
-.Frameset_2b:
-	frame SPRITE_ANIM_FRAME_IDX_61,  2
-	endanim
-
-.Frameset_2c:
-	frame SPRITE_ANIM_FRAME_IDX_62,  2
-	endanim
-
-.Frameset_2f:
-	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_32,  3
-	frame SPRITE_ANIM_FRAME_IDX_33,  3
-	frame SPRITE_ANIM_FRAME_IDX_34,  3
-	delanim
-
-.Frameset_31:
-	frame SPRITE_ANIM_FRAME_IDX_67,  3
-	frame SPRITE_ANIM_FRAME_IDX_68,  3
-	dorestart
-
-.Frameset_32:
-	frame SPRITE_ANIM_FRAME_IDX_6C,  3
-	endanim
-
-.Frameset_33:
-	frame SPRITE_ANIM_FRAME_IDX_6D,  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
-	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
-	dorestart
-
-.Frameset_IntroSuicune2:
-	frame SPRITE_ANIM_FRAME_IDX_71,  3
-	frame SPRITE_ANIM_FRAME_IDX_6E,  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
-	endanim
-
-.Frameset_IntroWooper:
-	frame SPRITE_ANIM_FRAME_IDX_75,  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
-	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
-	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
-	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
-	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
-	endanim
-
-.Frameset_IntroSuicuneAway:
-	frame SPRITE_ANIM_FRAME_IDX_7E,  3
-	endanim
-
-.Frameset_IntroUnownF:
-	dorepeat 0
-	endanim
-
-.Frameset_CelebiLeft:
-	frame SPRITE_ANIM_FRAME_IDX_7F,  8
-	frame SPRITE_ANIM_FRAME_IDX_80,  8
-	endanim
-
-.Frameset_CelebiRight:
-	frame SPRITE_ANIM_FRAME_IDX_7F,  8, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_80,  8, OAM_X_FLIP
-	endanim
-; 8d94d
-
 SpriteAnimOAMData: ; 8d94d
 ; entries correspond to SPRITE_ANIM_FRAME_IDX_* constants
 	; vtile offset, pointer
@@ -1634,17 +1134,3 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0,  0,  4, $52, $01
 	dsprite  0,  0,  1,  4, $53, $01
 ; 8e706
-
-BrokenStdGFXPointers: ; Broken 2bpp pointers
-	dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply)
-	dbbw $80, $01, .deleted
-	dbbw $80, $01, .deleted
-	dbbw $80, $01, .deleted
-	dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX)
-	dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
-	dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
-	dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
-	dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
-
-.deleted
-; 8e72a (23:672a)
diff --git a/data/sprite_anim_seqs.asm b/data/sprite_anim_seqs.asm
index 8c70f96b3..8f8d89aaf 100644
--- a/data/sprite_anim_seqs.asm
+++ b/data/sprite_anim_seqs.asm
@@ -1,3 +1,4 @@
+SpriteAnimSeqData: ; 8d1c4
 ; entries correspond to SPRITE_ANIM_INDEX_* constants
 	; frameset sequence, tile
 ; SPRITE_ANIM_INDEX_PARTY_MON
@@ -90,3 +91,4 @@
 	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00
 ; SPRITE_ANIM_INDEX_CELEBI
 	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c
+; 8d24b
diff --git a/data/sprite_mons.asm b/data/sprite_mons.asm
index 62f7fc15d..d3000e2b7 100644
--- a/data/sprite_mons.asm
+++ b/data/sprite_mons.asm
@@ -1,5 +1,5 @@
+SpriteMons: ; 14495
 ; entries correspond to SPRITE_* constants past SPRITE_POKEMON
-
 	db UNOWN
 	db GEODUDE
 	db GROWLITHE
@@ -35,3 +35,4 @@
 	db GYARADOS
 	db LUGIA
 	db HO_OH
+; 144b8
diff --git a/data/tmhm_moves.asm b/data/tmhm_moves.asm
index be9d4916b..c1af85ec5 100644
--- a/data/tmhm_moves.asm
+++ b/data/tmhm_moves.asm
@@ -1,3 +1,4 @@
+TMHMMoves: ; 1167a
 ; TMs
 	db DYNAMICPUNCH
 	db HEADBUTT
@@ -65,3 +66,4 @@
 	db ICE_BEAM
 
 	db 0 ; end
+; 116b7