Split battle/ into data/ and engine/ components

2025-01-23 09:16:20 -08:00 · 2017-12-26 17:47:05 -05:00 · 2017-12-26 17:47:05 -05:00 · b5417fafec
commit b5417fafec
parent 2f98c2032f
170 changed files with 1790 additions and 1799 deletions
--- a/34
+++ b/34
@ -169,23 +169,23 @@ gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates -

 gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace

-gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
-gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace
-gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
-gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
-gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
-gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
-gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/angels.2bpp: tools/gfx += --trim-whitespace
+gfx/anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
+gfx/anims/bubble.2bpp: tools/gfx += --trim-whitespace
+gfx/anims/charge.2bpp: tools/gfx += --trim-whitespace
+gfx/anims/egg.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/explosion.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/hit.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/horn.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/lightning.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/anims/noise.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
+gfx/anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
+gfx/anims/reflect.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/rocks.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/skyattack.2bpp: tools/gfx += --remove-whitespace
+gfx/anims/status.2bpp: tools/gfx += --remove-whitespace

 gfx/player/chris.2bpp: rgbgfx += -h
 gfx/player/chris_back.2bpp: rgbgfx += -h
--- a/battle/anim_gfx.asm
+++ b/battle/anim_gfx.asm
@ -1,41 +0,0 @@
-AnimObj00GFX: ; 84a2e
-AnimObjHitGFX:       INCBIN "gfx/fx/hit.2bpp.lz"
-AnimObjCutGFX:       INCBIN "gfx/fx/cut.2bpp.lz"
-AnimObjFireGFX:      INCBIN "gfx/fx/fire.2bpp.lz"
-AnimObjWaterGFX:     INCBIN "gfx/fx/water.2bpp.lz"
-AnimObjLightningGFX: INCBIN "gfx/fx/lightning.2bpp.lz"
-AnimObjSmokeGFX:     INCBIN "gfx/fx/smoke.2bpp.lz"
-AnimObjExplosionGFX: INCBIN "gfx/fx/explosion.2bpp.lz"
-AnimObjIceGFX:       INCBIN "gfx/fx/ice.2bpp.lz"
-AnimObjRocksGFX:     INCBIN "gfx/fx/rocks.2bpp.lz"
-AnimObjPoisonGFX:    INCBIN "gfx/fx/poison.2bpp.lz"
-AnimObjPlantGFX:     INCBIN "gfx/fx/plant.2bpp.lz"
-AnimObjPokeBallGFX:  INCBIN "gfx/fx/pokeball.2bpp.lz"
-AnimObjBubbleGFX:    INCBIN "gfx/fx/bubble.2bpp.lz"
-AnimObjNoiseGFX:     INCBIN "gfx/fx/noise.2bpp.lz"
-AnimObjReflectGFX:   INCBIN "gfx/fx/reflect.2bpp.lz"
-AnimObjPowderGFX:    INCBIN "gfx/fx/powder.2bpp.lz"
-AnimObjBeamGFX:      INCBIN "gfx/fx/beam.2bpp.lz"
-AnimObjSpeedGFX:     INCBIN "gfx/fx/speed.2bpp.lz"
-AnimObjChargeGFX:    INCBIN "gfx/fx/charge.2bpp.lz"
-AnimObjWindGFX:      INCBIN "gfx/fx/wind.2bpp.lz"
-AnimObjWhipGFX:      INCBIN "gfx/fx/whip.2bpp.lz"
-AnimObjRopeGFX:      INCBIN "gfx/fx/rope.2bpp.lz"
-AnimObjEggGFX:       INCBIN "gfx/fx/egg.2bpp.lz"
-AnimObjPsychicGFX:   INCBIN "gfx/fx/psychic.2bpp.lz"
-AnimObjSandGFX:      INCBIN "gfx/fx/sand.2bpp.lz"
-AnimObjWebGFX:       INCBIN "gfx/fx/web.2bpp.lz"
-AnimObjHazeGFX:      INCBIN "gfx/fx/haze.2bpp.lz"
-AnimObjHornGFX:      INCBIN "gfx/fx/horn.2bpp.lz"
-AnimObjFlowerGFX:    INCBIN "gfx/fx/flower.2bpp.lz"
-AnimObjMiscGFX:      INCBIN "gfx/fx/misc.2bpp.lz"
-AnimObjSkyAttackGFX: INCBIN "gfx/fx/skyattack.2bpp.lz"
-AnimObjGlobeGFX:     INCBIN "gfx/fx/globe.2bpp.lz"
-AnimObjShapesGFX:    INCBIN "gfx/fx/shapes.2bpp.lz"
-AnimObjStatusGFX:    INCBIN "gfx/fx/status.2bpp.lz"
-AnimObjObjectsGFX:   INCBIN "gfx/fx/objects.2bpp.lz"
-AnimObjShineGFX:     INCBIN "gfx/fx/shine.2bpp.lz"
-AnimObjAngelsGFX:    INCBIN "gfx/fx/angels.2bpp.lz"
-AnimObjWaveGFX:      INCBIN "gfx/fx/wave.2bpp.lz"
-AnimObjAeroblastGFX: INCBIN "gfx/fx/aeroblast.2bpp.lz"
-; 8640e
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@ -1,9 +0,0 @@
-; Objects used in battle animations.
-
-INCLUDE "battle/objects/engine.asm"
-INCLUDE "battle/objects/data.asm"
-INCLUDE "battle/objects/functions.asm"
-INCLUDE "battle/objects/helpers.asm"
-INCLUDE "battle/objects/framesets.asm"
-INCLUDE "battle/objects/oam.asm"
-INCLUDE "battle/objects/object_gfx.asm"
--- a/constants.asm
+++ b/constants.asm
@ -35,6 +35,7 @@ INCLUDE "constants/radio_constants.asm"
 INCLUDE "constants/npctrade_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/sprite_data_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
 INCLUDE "constants/tileset_constants.asm"
 INCLUDE "constants/collision_constants.asm"
 INCLUDE "constants/cgb_constants.asm"
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@ -26,7 +26,7 @@
 	const BATTLEANIMSTRUCT_17
 BATTLEANIMSTRUCT_LENGTH EQU const_value

-; BattleAnimObjects indexes (see battle/objects/data.asm)
+; BattleAnimObjects indexes (see data/anims/objects.asm)
 	const_def
 	const ANIM_OBJ_00
 	const ANIM_OBJ_01
@ -217,7 +217,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const ANIM_OBJ_BA
 	const ANIM_OBJ_BB

-; DoBattleAnimFrame arguments (see battle/objects/functions.asm)
+; DoBattleAnimFrame arguments (see engine/anims/functions.asm)
 	const_def
 	const BATTLEANIMFUNC_00
 	const BATTLEANIMFUNC_01
@ -300,7 +300,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMFUNC_4E
 	const BATTLEANIMFUNC_4F

-; BattleAnimFrameData indexes (see battle/objects/framesets.asm)
+; BattleAnimFrameData indexes (see data/anims/framesets.asm)
 	const_def
 	const BATTLEANIMFRAMESET_00
 	const BATTLEANIMFRAMESET_01
@ -488,7 +488,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMFRAMESET_B7
 	const BATTLEANIMFRAMESET_B8

-; BattleAnimOAMData indexes (see battle/objects/oam.asm)
+; BattleAnimOAMData indexes (see data/anims/oam.asm)
 	const_def
 	const BATTLEANIMOAMSET_00
 	const BATTLEANIMOAMSET_01
@ -707,7 +707,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMOAMSET_D6
 	const BATTLEANIMOAMSET_D7

-; BattleBGEffects indexes (see battle/bg_effects.asm)
+; BattleBGEffects indexes (see engine/anims/bg_effects.asm)
 const_value SET 1
 	const ANIM_BG_FLASH_INVERTED
 	const ANIM_BG_FLASH_WHITE
@ -763,19 +763,7 @@ const_value SET 1
 	const ANIM_BG_WOBBLE_MON
 	const ANIM_BG_35

-; PokeAnims indexes (see gfx/pokemon/animation.asm)
-	const_def
-	const ANIM_MON_SLOW
-	const ANIM_MON_NORMAL
-	const ANIM_MON_MENU
-	const ANIM_MON_TRADE
-	const ANIM_MON_EVOLVE
-	const ANIM_MON_HATCH
-	const ANIM_MON_UNUSED
-	const ANIM_MON_EGG1
-	const ANIM_MON_EGG2
-
-; AnimObjGFX indexes (see battle/objects/object_gfx.asm)
+; AnimObjGFX indexes (see data/anims/object_gfx.asm)
 const_value SET 1
 	const ANIM_GFX_HIT
 	const ANIM_GFX_CUT
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@ -30,7 +30,7 @@ TREEMON_SLEEP_TURNS EQU 7
 	const ABILITY ; used for BattleCommand_Curse
 NUM_LEVEL_STATS EQU const_value

-; move struct members (see battle/moves/moves.asm)
+; move struct members (see data/moves/moves.asm)
 	const_def
 	const MOVE_ANIM   ; 0
 	const MOVE_EFFECT ; 1
@ -213,7 +213,7 @@ SUBSTATUS_CURLED EQU 0
 	const WEATHER_SUN_END
 	const WEATHER_SANDSTORM_END

-; MoveEffectsPointers indexes (see battle/moves/move_effects_pointers.asm)
+; MoveEffectsPointers indexes (see data/moves/move_effects_pointers.asm)
 	const_def
 	const EFFECT_NORMAL_HIT
 	const EFFECT_SLEEP
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@ -197,7 +197,7 @@
 	const MIRAGE_MAIL  ; $BD
 	const ITEM_BE      ; $BE

-; see data/tmhm_moves.asm for moves
+; see data/moves/tmhm_moves.asm for moves
 	add_tm DYNAMICPUNCH ; $BF
 	add_tm HEADBUTT     ; $C0
 	add_tm CURSE        ; $C1
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@ -1,26 +1,18 @@
 ; hMapEntryMethod values
-; MapSetupScripts indexes (see engine/map_setup.asm)
+; MapSetupScripts indexes (see data/maps/map_setup_scripts.asm)
 const_value SET $f1
-	const MAPSETUP_WARP
-	const MAPSETUP_CONTINUE
-	const MAPSETUP_RELOADMAP
-	const MAPSETUP_TELEPORT
-	const MAPSETUP_DOOR
-	const MAPSETUP_FALL
-	const MAPSETUP_CONNECTION
-	const MAPSETUP_LINKRETURN
-	const MAPSETUP_TRAIN
-	const MAPSETUP_SUBMENU
-	const MAPSETUP_BADWARP
-	const MAPSETUP_FLY
-
-; callback types
-const_value SET 1
-	const MAPCALLBACK_TILES
-	const MAPCALLBACK_OBJECTS
-	const MAPCALLBACK_CMDQUEUE
-	const MAPCALLBACK_SPRITES
-	const MAPCALLBACK_NEWMAP
+	const MAPSETUP_WARP       ; f1
+	const MAPSETUP_CONTINUE   ; f2
+	const MAPSETUP_RELOADMAP  ; f3
+	const MAPSETUP_TELEPORT   ; f4
+	const MAPSETUP_DOOR       ; f5
+	const MAPSETUP_FALL       ; f6
+	const MAPSETUP_CONNECTION ; f7
+	const MAPSETUP_LINKRETURN ; f8
+	const MAPSETUP_TRAIN      ; f9
+	const MAPSETUP_SUBMENU    ; fa
+	const MAPSETUP_BADWARP    ; fb
+	const MAPSETUP_FLY        ; fc

 ; MapSetupCommands indexes (see engine/map_setup.asm)
 ; Names taken from Condensation water's scripting compendium
@ -73,3 +65,11 @@ const_value SET 1
 	const map_text_scroll_off     ; 2c
 	const map_stop_script         ; 2d
 map_end EQU -1
+
+; callback types
+const_value SET 1
+	const MAPCALLBACK_TILES
+	const MAPCALLBACK_OBJECTS
+	const MAPCALLBACK_CMDQUEUE
+	const MAPCALLBACK_SPRITES
+	const MAPCALLBACK_NEWMAP
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@ -1,9 +1,9 @@
 ; move ids
 ; indexes for:
-; - MoveDescriptions (see battle/moves/move_descriptions.asm)
-; - Moves (see battle/moves/moves.asm)
-; - MoveNames (see battle/move_names.asm)
-; - BattleAnimations (see battle/anims.asm)
+; - Moves (see data/moves/moves.asm)
+; - MoveNames (see data/moves/move_names.asm)
+; - MoveDescriptions (see data/moves/move_descriptions.asm)
+; - BattleAnimations (see data/moves/move_anims.asm)
 	const_def
 	const NO_MOVE      ; 00
 	const POUND        ; 01
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@ -192,6 +192,18 @@ FISHSWARM_QWILFISH EQU 1
 FISHSWARM_REMORAID EQU 2


+; PokeAnims indexes (see gfx/pokemon/animation.asm)
+	const_def
+	const ANIM_MON_SLOW
+	const ANIM_MON_NORMAL
+	const ANIM_MON_MENU
+	const ANIM_MON_TRADE
+	const ANIM_MON_EVOLVE
+	const ANIM_MON_HATCH
+	const ANIM_MON_UNUSED
+	const ANIM_MON_EGG1
+	const ANIM_MON_EGG2
+
 ; MonMenuOptions indexes (see engine/mon_menu.asm)
 const_value SET 1
 ; moves
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@ -0,0 +1,316 @@
+; sprite_anim_struct members (see macros/wram.asm)
+	const_def
+	const SPRITEANIMSTRUCT_INDEX           ; 0
+	const SPRITEANIMSTRUCT_FRAMESET_ID     ; 1
+	const SPRITEANIMSTRUCT_ANIM_SEQ_ID     ; 2
+	const SPRITEANIMSTRUCT_TILE_ID         ; 3
+	const SPRITEANIMSTRUCT_XCOORD          ; 4
+	const SPRITEANIMSTRUCT_YCOORD          ; 5
+	const SPRITEANIMSTRUCT_XOFFSET         ; 6
+	const SPRITEANIMSTRUCT_YOFFSET         ; 7
+	const SPRITEANIMSTRUCT_DURATION        ; 8
+	const SPRITEANIMSTRUCT_DURATIONOFFSET  ; 9
+	const SPRITEANIMSTRUCT_FRAME           ; a
+	const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
+	const SPRITEANIMSTRUCT_0C              ; c
+	const SPRITEANIMSTRUCT_0D              ; d
+	const SPRITEANIMSTRUCT_0E              ; e
+	const SPRITEANIMSTRUCT_0F              ; f
+
+; SpriteAnimSeqData indexes (see data/sprites/sequences.asm)
+	const_def
+	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
+	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 01
+	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 02
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 03
+	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 04
+	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 05
+	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 06
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 07
+	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 08
+	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 09
+	const SPRITE_ANIM_INDEX_RED_WALK                ; 0a
+	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 0b
+	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 0c
+	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 0d
+	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 0e
+	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 0f
+	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 10
+	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 11
+	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 12
+	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13
+	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 14
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 15
+	const SPRITE_ANIM_INDEX_LEAF                    ; 16
+	const SPRITE_ANIM_INDEX_CUT_TREE                ; 17
+	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 18
+	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 19
+	const SPRITE_ANIM_INDEX_1A                      ; 1a
+	const SPRITE_ANIM_INDEX_HEADBUTT                ; 1b
+	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 1c
+	const SPRITE_ANIM_INDEX_1D                      ; 1d
+	const SPRITE_ANIM_INDEX_BLUE_WALK               ; 1e
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE       ; 1f
+	const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL  ; 20
+	const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL    ; 21
+	const SPRITE_ANIM_INDEX_MOBILE_22               ; 22
+	const SPRITE_ANIM_INDEX_MOBILE_23               ; 23
+	const SPRITE_ANIM_INDEX_MOBILE_24               ; 24
+	const SPRITE_ANIM_INDEX_MOBILE_25               ; 25
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE           ; 26
+	const SPRITE_ANIM_INDEX_INTRO_PICHU             ; 27
+	const SPRITE_ANIM_INDEX_INTRO_WOOPER            ; 28
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN             ; 29
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F           ; 2a
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY      ; 2b
+	const SPRITE_ANIM_INDEX_CELEBI                  ; 2c
+
+; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
+	const_def
+	const SPRITE_ANIM_SEQ_NULL                 ; 00
+	const SPRITE_ANIM_SEQ_PARTY_MON            ; 01
+	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH     ; 02
+	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED   ; 03
+	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL       ; 04
+	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05
+	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO       ; 06
+	const SPRITE_ANIM_SEQ_GS_INTRO_STAR        ; 07
+	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE     ; 08
+	const SPRITE_ANIM_SEQ_SLOTS_GOLEM          ; 09
+	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY        ; 0a
+	const SPRITE_ANIM_SEQ_SLOTS_EGG            ; 0b
+	const SPRITE_ANIM_SEQ_MAIL_CURSOR          ; 0c
+	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR    ; 0d
+	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR    ; 0e
+	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW       ; 0f
+	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL      ; 10
+	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE     ; 11
+	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE     ; 12
+	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON       ; 13
+	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB    ; 14
+	const SPRITE_ANIM_SEQ_CUT_LEAVES           ; 15
+	const SPRITE_ANIM_SEQ_FLY_FROM             ; 16
+	const SPRITE_ANIM_SEQ_FLY_LEAF             ; 17
+	const SPRITE_ANIM_SEQ_FLY_TO               ; 18
+	const SPRITE_ANIM_SEQ_19                   ; 19
+	const SPRITE_ANIM_SEQ_1A                   ; 1a
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_23        ; 1b
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_24        ; 1c
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE        ; 1d
+	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER   ; 1e
+	const SPRITE_ANIM_SEQ_CELEBI               ; 1f
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN          ; 20
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F        ; 21
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY   ; 22
+
+; SpriteAnimFrameData indexes (see data/sprites/framesets.asm)
+	const_def
+	const SPRITE_ANIM_FRAMESET_00
+	const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL ; 02
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM ; 03
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST ; 04
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST ; 05
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
+	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08
+	const SPRITE_ANIM_FRAMESET_09
+	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c
+	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM ; 0d
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY ; 0e
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 ; 0f
+	const SPRITE_ANIM_FRAMESET_SLOTS_EGG ; 10
+	const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
+	const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14
+	const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
+	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
+	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17
+	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE ; 18
+	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19
+	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b
+	const SPRITE_ANIM_FRAMESET_1C
+	const SPRITE_ANIM_FRAMESET_LEAF ; 1d
+	const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
+	const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
+	const SPRITE_ANIM_FRAMESET_21
+	const SPRITE_ANIM_FRAMESET_22
+	const SPRITE_ANIM_FRAMESET_23
+	const SPRITE_ANIM_FRAMESET_24
+	const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
+	const SPRITE_ANIM_FRAMESET_26
+	const SPRITE_ANIM_FRAMESET_27
+	const SPRITE_ANIM_FRAMESET_28
+	const SPRITE_ANIM_FRAMESET_29
+	const SPRITE_ANIM_FRAMESET_2A
+	const SPRITE_ANIM_FRAMESET_2B
+	const SPRITE_ANIM_FRAMESET_2C
+	const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36
+	const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37
+	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER ; 38
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 ; 39
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 ; 3a
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 ; 3b
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 ; 3c
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 ; 3d
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY ; 3e
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
+	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
+	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
+
+; SpriteAnimOAMData indexes (see data/sprites/oam.asm)
+	const_def
+	const SPRITE_ANIM_OAMSET_RED_WALK_1 ; 00
+	const SPRITE_ANIM_OAMSET_RED_WALK_2 ; 01
+	const SPRITE_ANIM_OAMSET_02
+	const SPRITE_ANIM_OAMSET_03
+	const SPRITE_ANIM_OAMSET_04
+	const SPRITE_ANIM_OAMSET_05
+	const SPRITE_ANIM_OAMSET_06
+	const SPRITE_ANIM_OAMSET_07
+	const SPRITE_ANIM_OAMSET_08
+	const SPRITE_ANIM_OAMSET_09
+	const SPRITE_ANIM_OAMSET_0A
+	const SPRITE_ANIM_OAMSET_0B
+	const SPRITE_ANIM_OAMSET_0C
+	const SPRITE_ANIM_OAMSET_0D
+	const SPRITE_ANIM_OAMSET_0E
+	const SPRITE_ANIM_OAMSET_0F
+	const SPRITE_ANIM_OAMSET_10
+	const SPRITE_ANIM_OAMSET_11
+	const SPRITE_ANIM_OAMSET_12
+	const SPRITE_ANIM_OAMSET_13
+	const SPRITE_ANIM_OAMSET_14
+	const SPRITE_ANIM_OAMSET_15
+	const SPRITE_ANIM_OAMSET_16
+	const SPRITE_ANIM_OAMSET_17
+	const SPRITE_ANIM_OAMSET_18
+	const SPRITE_ANIM_OAMSET_19
+	const SPRITE_ANIM_OAMSET_1A
+	const SPRITE_ANIM_OAMSET_1B
+	const SPRITE_ANIM_OAMSET_1C
+	const SPRITE_ANIM_OAMSET_1D
+	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1 ; 1e
+	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f
+	const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR ; 20
+	const SPRITE_ANIM_OAMSET_FOR_FRAMESET_09 ; 21
+	const SPRITE_ANIM_OAMSET_22
+	const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2 ; 25
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3 ; 26
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1 ; 27
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2 ; 28
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1 ; 29
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2 ; 2a
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3 ; 2b
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4 ; 2c
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5 ; 2d
+	const SPRITE_ANIM_OAMSET_SLOTS_EGG ; 2e
+	const SPRITE_ANIM_OAMSET_STILL_CURSOR ; 2f
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1 ; 30
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2 ; 31
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_1 ; 32
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_2 ; 33
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_3 ; 34
+	const SPRITE_ANIM_OAMSET_35
+	const SPRITE_ANIM_OAMSET_36
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_1 ; 37
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_2 ; 38
+	const SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE ; 39
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1 ; 3a
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2 ; 3b
+	const SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB ; 3c
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1 ; 3d
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2 ; 3e
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1 ; 3f
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2 ; 40
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1 ; 41
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2 ; 42
+	const SPRITE_ANIM_OAMSET_43
+	const SPRITE_ANIM_OAMSET_44
+	const SPRITE_ANIM_OAMSET_45
+	const SPRITE_ANIM_OAMSET_46
+	const SPRITE_ANIM_OAMSET_47
+	const SPRITE_ANIM_OAMSET_48
+	const SPRITE_ANIM_OAMSET_49
+	const SPRITE_ANIM_OAMSET_4A
+	const SPRITE_ANIM_OAMSET_4B
+	const SPRITE_ANIM_OAMSET_4C
+	const SPRITE_ANIM_OAMSET_4D
+	const SPRITE_ANIM_OAMSET_4E
+	const SPRITE_ANIM_OAMSET_LEAF ; 4f
+	const SPRITE_ANIM_OAMSET_TREE_1 ; 50
+	const SPRITE_ANIM_OAMSET_CUT_TREE_2 ; 51
+	const SPRITE_ANIM_OAMSET_CUT_TREE_3 ; 52
+	const SPRITE_ANIM_OAMSET_CUT_TREE_4 ; 53
+	const SPRITE_ANIM_OAMSET_EGG_CRACK ; 54
+	const SPRITE_ANIM_OAMSET_55
+	const SPRITE_ANIM_OAMSET_56
+	const SPRITE_ANIM_OAMSET_57
+	const SPRITE_ANIM_OAMSET_58
+	const SPRITE_ANIM_OAMSET_59
+	const SPRITE_ANIM_OAMSET_5A
+	const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 ; 5b
+	const SPRITE_ANIM_OAMSET_5C
+	const SPRITE_ANIM_OAMSET_5D
+	const SPRITE_ANIM_OAMSET_5E
+	const SPRITE_ANIM_OAMSET_5F
+	const SPRITE_ANIM_OAMSET_60
+	const SPRITE_ANIM_OAMSET_61
+	const SPRITE_ANIM_OAMSET_62
+	const SPRITE_ANIM_OAMSET_BLUE_WALK_1 ; 63
+	const SPRITE_ANIM_OAMSET_BLUE_WALK_2 ; 64
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1 ; 65
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2 ; 66
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1 ; 67
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2 ; 68
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1 ; 69
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2 ; 6a
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3 ; 6b
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_23 ; 6c
+	const SPRITE_ANIM_OAMSET_FOR_MOBILE_24 ; 6d
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1 ; 6e
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2 ; 6f
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3 ; 70
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_4 ; 71
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_1 ; 72
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_2 ; 73
+	const SPRITE_ANIM_OAMSET_INTRO_PICHU_3 ; 74
+	const SPRITE_ANIM_OAMSET_INTRO_WOOPER ; 75
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_1 ; 76
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_2 ; 77
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_3 ; 78
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1 ; 79
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2 ; 7a
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3 ; 7b
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4 ; 7c
+	const SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_5 ; 7d
+	const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_AWAY ; 7e
+	const SPRITE_ANIM_OAMSET_CELEBI_1 ; 7f
+	const SPRITE_ANIM_OAMSET_CELEBI_2 ; 80
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_1 ; 81
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_2 ; 82
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_3 ; 83
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_4 ; 84
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_5 ; 85
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_6 ; 86
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_7 ; 87
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_8 ; 88
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9 ; 89
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10 ; 8A
+	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11 ; 8B
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@ -192,320 +192,3 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const FACING_BOULDER_DUST_2 ; 1d
 	const FACING_GRASS_1        ; 1e
 	const FACING_GRASS_2        ; 1f
-
-; sprite_anim_struct members (see macros/wram.asm)
-	const_def
-	const SPRITEANIMSTRUCT_INDEX           ; 0
-	const SPRITEANIMSTRUCT_FRAMESET_ID     ; 1
-	const SPRITEANIMSTRUCT_ANIM_SEQ_ID     ; 2
-	const SPRITEANIMSTRUCT_TILE_ID         ; 3
-	const SPRITEANIMSTRUCT_XCOORD          ; 4
-	const SPRITEANIMSTRUCT_YCOORD          ; 5
-	const SPRITEANIMSTRUCT_XOFFSET         ; 6
-	const SPRITEANIMSTRUCT_YOFFSET         ; 7
-	const SPRITEANIMSTRUCT_DURATION        ; 8
-	const SPRITEANIMSTRUCT_DURATIONOFFSET  ; 9
-	const SPRITEANIMSTRUCT_FRAME           ; a
-	const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
-	const SPRITEANIMSTRUCT_0C              ; c
-	const SPRITEANIMSTRUCT_0D              ; d
-	const SPRITEANIMSTRUCT_0E              ; e
-	const SPRITEANIMSTRUCT_0F              ; f
-
-; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm)
-	const_def
-	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
-	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 01
-	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 02
-	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 03
-	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 04
-	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 05
-	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 06
-	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 07
-	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 08
-	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 09
-	const SPRITE_ANIM_INDEX_RED_WALK                ; 0a
-	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 0b
-	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 0c
-	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 0d
-	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 0e
-	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 0f
-	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 10
-	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 11
-	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 12
-	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13
-	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 14
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 15
-	const SPRITE_ANIM_INDEX_LEAF                    ; 16
-	const SPRITE_ANIM_INDEX_CUT_TREE                ; 17
-	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 18
-	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 19
-	const SPRITE_ANIM_INDEX_1A                      ; 1a
-	const SPRITE_ANIM_INDEX_HEADBUTT                ; 1b
-	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 1c
-	const SPRITE_ANIM_INDEX_1D                      ; 1d
-	const SPRITE_ANIM_INDEX_BLUE_WALK               ; 1e
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE       ; 1f
-	const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL  ; 20
-	const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL    ; 21
-	const SPRITE_ANIM_INDEX_MOBILE_22               ; 22
-	const SPRITE_ANIM_INDEX_MOBILE_23               ; 23
-	const SPRITE_ANIM_INDEX_MOBILE_24               ; 24
-	const SPRITE_ANIM_INDEX_MOBILE_25               ; 25
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE           ; 26
-	const SPRITE_ANIM_INDEX_INTRO_PICHU             ; 27
-	const SPRITE_ANIM_INDEX_INTRO_WOOPER            ; 28
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN             ; 29
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F           ; 2a
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY      ; 2b
-	const SPRITE_ANIM_INDEX_CELEBI                  ; 2c
-
-; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
-	const_def
-	const SPRITE_ANIM_SEQ_NULL                 ; 00
-	const SPRITE_ANIM_SEQ_PARTY_MON            ; 01
-	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH     ; 02
-	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED   ; 03
-	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL       ; 04
-	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05
-	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO       ; 06
-	const SPRITE_ANIM_SEQ_GS_INTRO_STAR        ; 07
-	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE     ; 08
-	const SPRITE_ANIM_SEQ_SLOTS_GOLEM          ; 09
-	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY        ; 0a
-	const SPRITE_ANIM_SEQ_SLOTS_EGG            ; 0b
-	const SPRITE_ANIM_SEQ_MAIL_CURSOR          ; 0c
-	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR    ; 0d
-	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR    ; 0e
-	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW       ; 0f
-	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL      ; 10
-	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE     ; 11
-	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE     ; 12
-	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON       ; 13
-	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB    ; 14
-	const SPRITE_ANIM_SEQ_CUT_LEAVES           ; 15
-	const SPRITE_ANIM_SEQ_FLY_FROM             ; 16
-	const SPRITE_ANIM_SEQ_FLY_LEAF             ; 17
-	const SPRITE_ANIM_SEQ_FLY_TO               ; 18
-	const SPRITE_ANIM_SEQ_19                   ; 19
-	const SPRITE_ANIM_SEQ_1A                   ; 1a
-	const SPRITE_ANIM_SEQ_FOR_MOBILE_23        ; 1b
-	const SPRITE_ANIM_SEQ_FOR_MOBILE_24        ; 1c
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE        ; 1d
-	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER   ; 1e
-	const SPRITE_ANIM_SEQ_CELEBI               ; 1f
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN          ; 20
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F        ; 21
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY   ; 22
-
-; SpriteAnimFrameData indexes (see data/sprite_anim_frames.asm)
-	const_def
-	const SPRITE_ANIM_FRAMESET_00
-	const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL ; 02
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM ; 03
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST ; 04
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST ; 05
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
-	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
-	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08
-	const SPRITE_ANIM_FRAMESET_09
-	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c
-	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM ; 0d
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY ; 0e
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 ; 0f
-	const SPRITE_ANIM_FRAMESET_SLOTS_EGG ; 10
-	const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
-	const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14
-	const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
-	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
-	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17
-	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE ; 18
-	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19
-	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b
-	const SPRITE_ANIM_FRAMESET_1C
-	const SPRITE_ANIM_FRAMESET_LEAF ; 1d
-	const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
-	const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
-	const SPRITE_ANIM_FRAMESET_21
-	const SPRITE_ANIM_FRAMESET_22
-	const SPRITE_ANIM_FRAMESET_23
-	const SPRITE_ANIM_FRAMESET_24
-	const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
-	const SPRITE_ANIM_FRAMESET_26
-	const SPRITE_ANIM_FRAMESET_27
-	const SPRITE_ANIM_FRAMESET_28
-	const SPRITE_ANIM_FRAMESET_29
-	const SPRITE_ANIM_FRAMESET_2A
-	const SPRITE_ANIM_FRAMESET_2B
-	const SPRITE_ANIM_FRAMESET_2C
-	const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33
-	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36
-	const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37
-	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER ; 38
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 ; 39
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 ; 3a
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 ; 3b
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 ; 3c
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 ; 3d
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY ; 3e
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
-	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
-	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
-
-; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm)
-	const_def
-	const SPRITE_ANIM_FRAME_IDX_RED_WALK_1 ; 00
-	const SPRITE_ANIM_FRAME_IDX_RED_WALK_2 ; 01
-	const SPRITE_ANIM_FRAME_IDX_02
-	const SPRITE_ANIM_FRAME_IDX_03
-	const SPRITE_ANIM_FRAME_IDX_04
-	const SPRITE_ANIM_FRAME_IDX_05
-	const SPRITE_ANIM_FRAME_IDX_06
-	const SPRITE_ANIM_FRAME_IDX_07
-	const SPRITE_ANIM_FRAME_IDX_08
-	const SPRITE_ANIM_FRAME_IDX_09
-	const SPRITE_ANIM_FRAME_IDX_0A
-	const SPRITE_ANIM_FRAME_IDX_0B
-	const SPRITE_ANIM_FRAME_IDX_0C
-	const SPRITE_ANIM_FRAME_IDX_0D
-	const SPRITE_ANIM_FRAME_IDX_0E
-	const SPRITE_ANIM_FRAME_IDX_0F
-	const SPRITE_ANIM_FRAME_IDX_10
-	const SPRITE_ANIM_FRAME_IDX_11
-	const SPRITE_ANIM_FRAME_IDX_12
-	const SPRITE_ANIM_FRAME_IDX_13
-	const SPRITE_ANIM_FRAME_IDX_14
-	const SPRITE_ANIM_FRAME_IDX_15
-	const SPRITE_ANIM_FRAME_IDX_16
-	const SPRITE_ANIM_FRAME_IDX_17
-	const SPRITE_ANIM_FRAME_IDX_18
-	const SPRITE_ANIM_FRAME_IDX_19
-	const SPRITE_ANIM_FRAME_IDX_1A
-	const SPRITE_ANIM_FRAME_IDX_1B
-	const SPRITE_ANIM_FRAME_IDX_1C
-	const SPRITE_ANIM_FRAME_IDX_1D
-	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1 ; 1e
-	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2 ; 1f
-	const SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR ; 20
-	const SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09 ; 21
-	const SPRITE_ANIM_FRAME_IDX_22
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR ; 23
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1 ; 24
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2 ; 25
-	const SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3 ; 26
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1 ; 27
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2 ; 28
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1 ; 29
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2 ; 2a
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3 ; 2b
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4 ; 2c
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5 ; 2d
-	const SPRITE_ANIM_FRAME_IDX_SLOTS_EGG ; 2e
-	const SPRITE_ANIM_FRAME_IDX_STILL_CURSOR ; 2f
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1 ; 30
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2 ; 31
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1 ; 32
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2 ; 33
-	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3 ; 34
-	const SPRITE_ANIM_FRAME_IDX_35
-	const SPRITE_ANIM_FRAME_IDX_36
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1 ; 37
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2 ; 38
-	const SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE ; 39
-	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1 ; 3a
-	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2 ; 3b
-	const SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB ; 3c
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1 ; 3d
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2 ; 3e
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1 ; 3f
-	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2 ; 40
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1 ; 41
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2 ; 42
-	const SPRITE_ANIM_FRAME_IDX_43
-	const SPRITE_ANIM_FRAME_IDX_44
-	const SPRITE_ANIM_FRAME_IDX_45
-	const SPRITE_ANIM_FRAME_IDX_46
-	const SPRITE_ANIM_FRAME_IDX_47
-	const SPRITE_ANIM_FRAME_IDX_48
-	const SPRITE_ANIM_FRAME_IDX_49
-	const SPRITE_ANIM_FRAME_IDX_4A
-	const SPRITE_ANIM_FRAME_IDX_4B
-	const SPRITE_ANIM_FRAME_IDX_4C
-	const SPRITE_ANIM_FRAME_IDX_4D
-	const SPRITE_ANIM_FRAME_IDX_4E
-	const SPRITE_ANIM_FRAME_IDX_LEAF ; 4f
-	const SPRITE_ANIM_FRAME_IDX_TREE_1 ; 50
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_2 ; 51
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_3 ; 52
-	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_4 ; 53
-	const SPRITE_ANIM_FRAME_IDX_EGG_CRACK ; 54
-	const SPRITE_ANIM_FRAME_IDX_55
-	const SPRITE_ANIM_FRAME_IDX_56
-	const SPRITE_ANIM_FRAME_IDX_57
-	const SPRITE_ANIM_FRAME_IDX_58
-	const SPRITE_ANIM_FRAME_IDX_59
-	const SPRITE_ANIM_FRAME_IDX_5A
-	const SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2 ; 5b
-	const SPRITE_ANIM_FRAME_IDX_5C
-	const SPRITE_ANIM_FRAME_IDX_5D
-	const SPRITE_ANIM_FRAME_IDX_5E
-	const SPRITE_ANIM_FRAME_IDX_5F
-	const SPRITE_ANIM_FRAME_IDX_60
-	const SPRITE_ANIM_FRAME_IDX_61
-	const SPRITE_ANIM_FRAME_IDX_62
-	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1 ; 63
-	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2 ; 64
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1 ; 65
-	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2 ; 66
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1 ; 67
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2 ; 68
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1 ; 69
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2 ; 6a
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3 ; 6b
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23 ; 6c
-	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24 ; 6d
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1 ; 6e
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2 ; 6f
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3 ; 70
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4 ; 71
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1 ; 72
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2 ; 73
-	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3 ; 74
-	const SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER ; 75
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1 ; 76
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2 ; 77
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3 ; 78
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1 ; 79
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2 ; 7a
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3 ; 7b
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4 ; 7c
-	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5 ; 7d
-	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY ; 7e
-	const SPRITE_ANIM_FRAME_IDX_CELEBI_1 ; 7f
-	const SPRITE_ANIM_FRAME_IDX_CELEBI_2 ; 80
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1 ; 81
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2 ; 82
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3 ; 83
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4 ; 84
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5 ; 85
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6 ; 86
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7 ; 87
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8 ; 88
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9 ; 89
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10 ; 8A
-	const SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11 ; 8B
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@ -1,6 +1,6 @@
-; TypeNames indexes (see text/types.asm)
+; TypeNames indexes (see data/type_names.asm)
 ; also used in:
-; - TypeMatchup (see battle.type_matchup.asm)
+; - TypeMatchups (see data/type_matchups.asm)
 ; - Pokedex_SearchForMons.TypeConversionTable and Pokedex_PlaceSearchScreenTypeStrings.TypeStrings (see engine/pokedex.asm)
 	const_def

--- a/data/battle/ball_colors.asm
+++ b/data/battle/ball_colors.asm
--- a/battle/objects/framesets.asm
+++ b/battle/objects/framesets.asm
@ -1,191 +1,192 @@
 BattleAnimFrameData: ; ce85e
-	dw .Frameset_00 ; 00
-	dw .Frameset_01 ; 01
-	dw .Frameset_02 ; 02
-	dw .Frameset_03 ; 03
-	dw .Frameset_04 ; 04
-	dw .Frameset_05 ; 05
-	dw .Frameset_06 ; 06
-	dw .Frameset_07 ; 07
-	dw .Frameset_08 ; 08
-	dw .Frameset_09 ; 09
-	dw .Frameset_0a ; 0a
-	dw .Frameset_0b ; 0b
-	dw .Frameset_0c ; 0c
-	dw .Frameset_0d ; 0d
-	dw .Frameset_0e ; 0e
-	dw .Frameset_0f ; 0f
-	dw .Frameset_10 ; 10
-	dw .Frameset_11 ; 11
-	dw .Frameset_12 ; 12
-	dw .Frameset_13 ; 13
-	dw .Frameset_14 ; 14
-	dw .Frameset_15 ; 15
-	dw .Frameset_16 ; 16
-	dw .Frameset_17 ; 17
-	dw .Frameset_18 ; 18
-	dw .Frameset_19 ; 19
-	dw .Frameset_1a ; 1a
-	dw .Frameset_1b ; 1b
-	dw .Frameset_1c ; 1c
-	dw .Frameset_1d ; 1d
-	dw .Frameset_1e ; 1e
-	dw .Frameset_1f ; 1f
-	dw .Frameset_20 ; 20
-	dw .Frameset_21 ; 21
-	dw .Frameset_22 ; 22
-	dw .Frameset_23 ; 23
-	dw .Frameset_24 ; 24
-	dw .Frameset_25 ; 25
-	dw .Frameset_26 ; 26
-	dw .Frameset_27 ; 27
-	dw .Frameset_28 ; 28
-	dw .Frameset_29 ; 29
-	dw .Frameset_2a ; 2a
-	dw .Frameset_2b ; 2b
-	dw .Frameset_2c ; 2c
-	dw .Frameset_2d ; 2d
-	dw .Frameset_2e ; 2e
-	dw .Frameset_2f ; 2f
-	dw .Frameset_30 ; 30
-	dw .Frameset_31 ; 31
-	dw .Frameset_32 ; 32
-	dw .Frameset_33 ; 33
-	dw .Frameset_34 ; 34
-	dw .Frameset_35 ; 35
-	dw .Frameset_36 ; 36
-	dw .Frameset_37 ; 37
-	dw .Frameset_38 ; 38
-	dw .Frameset_39 ; 39
-	dw .Frameset_3a ; 3a
-	dw .Frameset_3b ; 3b
-	dw .Frameset_3c ; 3c
-	dw .Frameset_3d ; 3d
-	dw .Frameset_3e ; 3e
-	dw .Frameset_3f ; 3f
-	dw .Frameset_40 ; 40
-	dw .Frameset_41 ; 41
-	dw .Frameset_42 ; 42
-	dw .Frameset_43 ; 43
-	dw .Frameset_44 ; 44
-	dw .Frameset_45 ; 45
-	dw .Frameset_46 ; 46
-	dw .Frameset_47 ; 47
-	dw .Frameset_48 ; 48
-	dw .Frameset_49 ; 49
-	dw .Frameset_4a ; 4a
-	dw .Frameset_4b ; 4b
-	dw .Frameset_4c ; 4c
-	dw .Frameset_4d ; 4d
-	dw .Frameset_4e ; 4e
-	dw .Frameset_4f ; 4f
-	dw .Frameset_50 ; 50
-	dw .Frameset_51 ; 51
-	dw .Frameset_52 ; 52
-	dw .Frameset_53 ; 53
-	dw .Frameset_54 ; 54
-	dw .Frameset_55 ; 55
-	dw .Frameset_56 ; 56
-	dw .Frameset_57 ; 57
-	dw .Frameset_58 ; 58
-	dw .Frameset_59 ; 59
-	dw .Frameset_5a ; 5a
-	dw .Frameset_5b ; 5b
-	dw .Frameset_5c ; 5c
-	dw .Frameset_5d ; 5d
-	dw .Frameset_5e ; 5e
-	dw .Frameset_5f ; 5f
-	dw .Frameset_60 ; 60
-	dw .Frameset_61 ; 61
-	dw .Frameset_62 ; 62
-	dw .Frameset_63 ; 63
-	dw .Frameset_64 ; 64
-	dw .Frameset_65 ; 65
-	dw .Frameset_66 ; 66
-	dw .Frameset_67 ; 67
-	dw .Frameset_68 ; 68
-	dw .Frameset_69 ; 69
-	dw .Frameset_6a ; 6a
-	dw .Frameset_6b ; 6b
-	dw .Frameset_6c ; 6c
-	dw .Frameset_6d ; 6d
-	dw .Frameset_6e ; 6e
-	dw .Frameset_6f ; 6f
-	dw .Frameset_70 ; 70
-	dw .Frameset_71 ; 71
-	dw .Frameset_72 ; 72
-	dw .Frameset_73 ; 73
-	dw .Frameset_74 ; 74
-	dw .Frameset_75 ; 75
-	dw .Frameset_76 ; 76
-	dw .Frameset_77 ; 77
-	dw .Frameset_78 ; 78
-	dw .Frameset_79 ; 79
-	dw .Frameset_7a ; 7a
-	dw .Frameset_7b ; 7b
-	dw .Frameset_7c ; 7c
-	dw .Frameset_7d ; 7d
-	dw .Frameset_7e ; 7e
-	dw .Frameset_7f ; 7f
-	dw .Frameset_80 ; 80
-	dw .Frameset_81 ; 81
-	dw .Frameset_82 ; 82
-	dw .Frameset_83 ; 83
-	dw .Frameset_84 ; 84
-	dw .Frameset_85 ; 85
-	dw .Frameset_86 ; 86
-	dw .Frameset_87 ; 87
-	dw .Frameset_88 ; 88
-	dw .Frameset_89 ; 89
-	dw .Frameset_8a ; 8a
-	dw .Frameset_8b ; 8b
-	dw .Frameset_8c ; 8c
-	dw .Frameset_8d ; 8d
-	dw .Frameset_8e ; 8e
-	dw .Frameset_8f ; 8f
-	dw .Frameset_90 ; 90
-	dw .Frameset_91 ; 91
-	dw .Frameset_92 ; 92
-	dw .Frameset_93 ; 93
-	dw .Frameset_94 ; 94
-	dw .Frameset_95 ; 95
-	dw .Frameset_96 ; 96
-	dw .Frameset_97 ; 97
-	dw .Frameset_98 ; 98
-	dw .Frameset_99 ; 99
-	dw .Frameset_9a ; 9a
-	dw .Frameset_9b ; 9b
-	dw .Frameset_9c ; 9c
-	dw .Frameset_9d ; 9d
-	dw .Frameset_9e ; 9e
-	dw .Frameset_9f ; 9f
-	dw .Frameset_a0 ; a0
-	dw .Frameset_a1 ; a1
-	dw .Frameset_a2 ; a2
-	dw .Frameset_a3 ; a3
-	dw .Frameset_a4 ; a4
-	dw .Frameset_a5 ; a5
-	dw .Frameset_a6 ; a6
-	dw .Frameset_a7 ; a7
-	dw .Frameset_a8 ; a8
-	dw .Frameset_a9 ; a9
-	dw .Frameset_aa ; aa
-	dw .Frameset_ab ; ab
-	dw .Frameset_ac ; ac
-	dw .Frameset_ad ; ad
-	dw .Frameset_ae ; ae
-	dw .Frameset_af ; af
-	dw .Frameset_b0 ; b0
-	dw .Frameset_b1 ; b1
-	dw .Frameset_b2 ; b2
-	dw .Frameset_b3 ; b3
-	dw .Frameset_b4 ; b4
-	dw .Frameset_b5 ; b5
-	dw .Frameset_b6 ; b6
-	dw .Frameset_b7 ; b7
-	dw .Frameset_b8 ; b8
+; entries correspond to BATTLEANIMFRAMESET_* constants
+	dw .Frameset_00 ; BATTLEANIMFRAMESET_00
+	dw .Frameset_01 ; BATTLEANIMFRAMESET_01
+	dw .Frameset_02 ; BATTLEANIMFRAMESET_02
+	dw .Frameset_03 ; BATTLEANIMFRAMESET_03
+	dw .Frameset_04 ; BATTLEANIMFRAMESET_04
+	dw .Frameset_05 ; BATTLEANIMFRAMESET_05
+	dw .Frameset_06 ; BATTLEANIMFRAMESET_06
+	dw .Frameset_07 ; BATTLEANIMFRAMESET_07
+	dw .Frameset_08 ; BATTLEANIMFRAMESET_08
+	dw .Frameset_09 ; BATTLEANIMFRAMESET_09
+	dw .Frameset_0a ; BATTLEANIMFRAMESET_0A
+	dw .Frameset_0b ; BATTLEANIMFRAMESET_0B
+	dw .Frameset_0c ; BATTLEANIMFRAMESET_0C
+	dw .Frameset_0d ; BATTLEANIMFRAMESET_0D
+	dw .Frameset_0e ; BATTLEANIMFRAMESET_0E
+	dw .Frameset_0f ; BATTLEANIMFRAMESET_0F
+	dw .Frameset_10 ; BATTLEANIMFRAMESET_10
+	dw .Frameset_11 ; BATTLEANIMFRAMESET_11
+	dw .Frameset_12 ; BATTLEANIMFRAMESET_12
+	dw .Frameset_13 ; BATTLEANIMFRAMESET_13
+	dw .Frameset_14 ; BATTLEANIMFRAMESET_14
+	dw .Frameset_15 ; BATTLEANIMFRAMESET_15
+	dw .Frameset_16 ; BATTLEANIMFRAMESET_16
+	dw .Frameset_17 ; BATTLEANIMFRAMESET_17
+	dw .Frameset_18 ; BATTLEANIMFRAMESET_18
+	dw .Frameset_19 ; BATTLEANIMFRAMESET_19
+	dw .Frameset_1a ; BATTLEANIMFRAMESET_1A
+	dw .Frameset_1b ; BATTLEANIMFRAMESET_1B
+	dw .Frameset_1c ; BATTLEANIMFRAMESET_1C
+	dw .Frameset_1d ; BATTLEANIMFRAMESET_1D
+	dw .Frameset_1e ; BATTLEANIMFRAMESET_1E
+	dw .Frameset_1f ; BATTLEANIMFRAMESET_1F
+	dw .Frameset_20 ; BATTLEANIMFRAMESET_20
+	dw .Frameset_21 ; BATTLEANIMFRAMESET_21
+	dw .Frameset_22 ; BATTLEANIMFRAMESET_22
+	dw .Frameset_23 ; BATTLEANIMFRAMESET_23
+	dw .Frameset_24 ; BATTLEANIMFRAMESET_24
+	dw .Frameset_25 ; BATTLEANIMFRAMESET_25
+	dw .Frameset_26 ; BATTLEANIMFRAMESET_26
+	dw .Frameset_27 ; BATTLEANIMFRAMESET_27
+	dw .Frameset_28 ; BATTLEANIMFRAMESET_28
+	dw .Frameset_29 ; BATTLEANIMFRAMESET_29
+	dw .Frameset_2a ; BATTLEANIMFRAMESET_2A
+	dw .Frameset_2b ; BATTLEANIMFRAMESET_2B
+	dw .Frameset_2c ; BATTLEANIMFRAMESET_2C
+	dw .Frameset_2d ; BATTLEANIMFRAMESET_2D
+	dw .Frameset_2e ; BATTLEANIMFRAMESET_2E
+	dw .Frameset_2f ; BATTLEANIMFRAMESET_2F
+	dw .Frameset_30 ; BATTLEANIMFRAMESET_30
+	dw .Frameset_31 ; BATTLEANIMFRAMESET_31
+	dw .Frameset_32 ; BATTLEANIMFRAMESET_32
+	dw .Frameset_33 ; BATTLEANIMFRAMESET_33
+	dw .Frameset_34 ; BATTLEANIMFRAMESET_34
+	dw .Frameset_35 ; BATTLEANIMFRAMESET_35
+	dw .Frameset_36 ; BATTLEANIMFRAMESET_36
+	dw .Frameset_37 ; BATTLEANIMFRAMESET_37
+	dw .Frameset_38 ; BATTLEANIMFRAMESET_38
+	dw .Frameset_39 ; BATTLEANIMFRAMESET_39
+	dw .Frameset_3a ; BATTLEANIMFRAMESET_3A
+	dw .Frameset_3b ; BATTLEANIMFRAMESET_3B
+	dw .Frameset_3c ; BATTLEANIMFRAMESET_3C
+	dw .Frameset_3d ; BATTLEANIMFRAMESET_3D
+	dw .Frameset_3e ; BATTLEANIMFRAMESET_3E
+	dw .Frameset_3f ; BATTLEANIMFRAMESET_3F
+	dw .Frameset_40 ; BATTLEANIMFRAMESET_40
+	dw .Frameset_41 ; BATTLEANIMFRAMESET_41
+	dw .Frameset_42 ; BATTLEANIMFRAMESET_42
+	dw .Frameset_43 ; BATTLEANIMFRAMESET_43
+	dw .Frameset_44 ; BATTLEANIMFRAMESET_44
+	dw .Frameset_45 ; BATTLEANIMFRAMESET_45
+	dw .Frameset_46 ; BATTLEANIMFRAMESET_46
+	dw .Frameset_47 ; BATTLEANIMFRAMESET_47
+	dw .Frameset_48 ; BATTLEANIMFRAMESET_48
+	dw .Frameset_49 ; BATTLEANIMFRAMESET_49
+	dw .Frameset_4a ; BATTLEANIMFRAMESET_4A
+	dw .Frameset_4b ; BATTLEANIMFRAMESET_4B
+	dw .Frameset_4c ; BATTLEANIMFRAMESET_4C
+	dw .Frameset_4d ; BATTLEANIMFRAMESET_4D
+	dw .Frameset_4e ; BATTLEANIMFRAMESET_4E
+	dw .Frameset_4f ; BATTLEANIMFRAMESET_4F
+	dw .Frameset_50 ; BATTLEANIMFRAMESET_50
+	dw .Frameset_51 ; BATTLEANIMFRAMESET_51
+	dw .Frameset_52 ; BATTLEANIMFRAMESET_52
+	dw .Frameset_53 ; BATTLEANIMFRAMESET_53
+	dw .Frameset_54 ; BATTLEANIMFRAMESET_54
+	dw .Frameset_55 ; BATTLEANIMFRAMESET_55
+	dw .Frameset_56 ; BATTLEANIMFRAMESET_56
+	dw .Frameset_57 ; BATTLEANIMFRAMESET_57
+	dw .Frameset_58 ; BATTLEANIMFRAMESET_58
+	dw .Frameset_59 ; BATTLEANIMFRAMESET_59
+	dw .Frameset_5a ; BATTLEANIMFRAMESET_5A
+	dw .Frameset_5b ; BATTLEANIMFRAMESET_5B
+	dw .Frameset_5c ; BATTLEANIMFRAMESET_5C
+	dw .Frameset_5d ; BATTLEANIMFRAMESET_5D
+	dw .Frameset_5e ; BATTLEANIMFRAMESET_5E
+	dw .Frameset_5f ; BATTLEANIMFRAMESET_5F
+	dw .Frameset_60 ; BATTLEANIMFRAMESET_60
+	dw .Frameset_61 ; BATTLEANIMFRAMESET_61
+	dw .Frameset_62 ; BATTLEANIMFRAMESET_62
+	dw .Frameset_63 ; BATTLEANIMFRAMESET_63
+	dw .Frameset_64 ; BATTLEANIMFRAMESET_64
+	dw .Frameset_65 ; BATTLEANIMFRAMESET_65
+	dw .Frameset_66 ; BATTLEANIMFRAMESET_66
+	dw .Frameset_67 ; BATTLEANIMFRAMESET_67
+	dw .Frameset_68 ; BATTLEANIMFRAMESET_68
+	dw .Frameset_69 ; BATTLEANIMFRAMESET_69
+	dw .Frameset_6a ; BATTLEANIMFRAMESET_6A
+	dw .Frameset_6b ; BATTLEANIMFRAMESET_6B
+	dw .Frameset_6c ; BATTLEANIMFRAMESET_6C
+	dw .Frameset_6d ; BATTLEANIMFRAMESET_6D
+	dw .Frameset_6e ; BATTLEANIMFRAMESET_6E
+	dw .Frameset_6f ; BATTLEANIMFRAMESET_6F
+	dw .Frameset_70 ; BATTLEANIMFRAMESET_70
+	dw .Frameset_71 ; BATTLEANIMFRAMESET_71
+	dw .Frameset_72 ; BATTLEANIMFRAMESET_72
+	dw .Frameset_73 ; BATTLEANIMFRAMESET_73
+	dw .Frameset_74 ; BATTLEANIMFRAMESET_74
+	dw .Frameset_75 ; BATTLEANIMFRAMESET_75
+	dw .Frameset_76 ; BATTLEANIMFRAMESET_76
+	dw .Frameset_77 ; BATTLEANIMFRAMESET_77
+	dw .Frameset_78 ; BATTLEANIMFRAMESET_78
+	dw .Frameset_79 ; BATTLEANIMFRAMESET_79
+	dw .Frameset_7a ; BATTLEANIMFRAMESET_7A
+	dw .Frameset_7b ; BATTLEANIMFRAMESET_7B
+	dw .Frameset_7c ; BATTLEANIMFRAMESET_7C
+	dw .Frameset_7d ; BATTLEANIMFRAMESET_7D
+	dw .Frameset_7e ; BATTLEANIMFRAMESET_7E
+	dw .Frameset_7f ; BATTLEANIMFRAMESET_7F
+	dw .Frameset_80 ; BATTLEANIMFRAMESET_80
+	dw .Frameset_81 ; BATTLEANIMFRAMESET_81
+	dw .Frameset_82 ; BATTLEANIMFRAMESET_82
+	dw .Frameset_83 ; BATTLEANIMFRAMESET_83
+	dw .Frameset_84 ; BATTLEANIMFRAMESET_84
+	dw .Frameset_85 ; BATTLEANIMFRAMESET_85
+	dw .Frameset_86 ; BATTLEANIMFRAMESET_86
+	dw .Frameset_87 ; BATTLEANIMFRAMESET_87
+	dw .Frameset_88 ; BATTLEANIMFRAMESET_88
+	dw .Frameset_89 ; BATTLEANIMFRAMESET_89
+	dw .Frameset_8a ; BATTLEANIMFRAMESET_8A
+	dw .Frameset_8b ; BATTLEANIMFRAMESET_8B
+	dw .Frameset_8c ; BATTLEANIMFRAMESET_8C
+	dw .Frameset_8d ; BATTLEANIMFRAMESET_8D
+	dw .Frameset_8e ; BATTLEANIMFRAMESET_8E
+	dw .Frameset_8f ; BATTLEANIMFRAMESET_8F
+	dw .Frameset_90 ; BATTLEANIMFRAMESET_90
+	dw .Frameset_91 ; BATTLEANIMFRAMESET_91
+	dw .Frameset_92 ; BATTLEANIMFRAMESET_92
+	dw .Frameset_93 ; BATTLEANIMFRAMESET_93
+	dw .Frameset_94 ; BATTLEANIMFRAMESET_94
+	dw .Frameset_95 ; BATTLEANIMFRAMESET_95
+	dw .Frameset_96 ; BATTLEANIMFRAMESET_96
+	dw .Frameset_97 ; BATTLEANIMFRAMESET_97
+	dw .Frameset_98 ; BATTLEANIMFRAMESET_98
+	dw .Frameset_99 ; BATTLEANIMFRAMESET_99
+	dw .Frameset_9a ; BATTLEANIMFRAMESET_9A
+	dw .Frameset_9b ; BATTLEANIMFRAMESET_9B
+	dw .Frameset_9c ; BATTLEANIMFRAMESET_9C
+	dw .Frameset_9d ; BATTLEANIMFRAMESET_9D
+	dw .Frameset_9e ; BATTLEANIMFRAMESET_9E
+	dw .Frameset_9f ; BATTLEANIMFRAMESET_9F
+	dw .Frameset_a0 ; BATTLEANIMFRAMESET_A0
+	dw .Frameset_a1 ; BATTLEANIMFRAMESET_A1
+	dw .Frameset_a2 ; BATTLEANIMFRAMESET_A2
+	dw .Frameset_a3 ; BATTLEANIMFRAMESET_A3
+	dw .Frameset_a4 ; BATTLEANIMFRAMESET_A4
+	dw .Frameset_a5 ; BATTLEANIMFRAMESET_A5
+	dw .Frameset_a6 ; BATTLEANIMFRAMESET_A6
+	dw .Frameset_a7 ; BATTLEANIMFRAMESET_A7
+	dw .Frameset_a8 ; BATTLEANIMFRAMESET_A8
+	dw .Frameset_a9 ; BATTLEANIMFRAMESET_A9
+	dw .Frameset_aa ; BATTLEANIMFRAMESET_AA
+	dw .Frameset_ab ; BATTLEANIMFRAMESET_AB
+	dw .Frameset_ac ; BATTLEANIMFRAMESET_AC
+	dw .Frameset_ad ; BATTLEANIMFRAMESET_AD
+	dw .Frameset_ae ; BATTLEANIMFRAMESET_AE
+	dw .Frameset_af ; BATTLEANIMFRAMESET_AF
+	dw .Frameset_b0 ; BATTLEANIMFRAMESET_B0
+	dw .Frameset_b1 ; BATTLEANIMFRAMESET_B1
+	dw .Frameset_b2 ; BATTLEANIMFRAMESET_B2
+	dw .Frameset_b3 ; BATTLEANIMFRAMESET_B3
+	dw .Frameset_b4 ; BATTLEANIMFRAMESET_B4
+	dw .Frameset_b5 ; BATTLEANIMFRAMESET_B5
+	dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6
+	dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7
+	dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8

-     ; OAM index (see battle/objects/oam.asm), flip flags / duration
+     ; OAM index (see data/anims/oam.asm), flip flags / duration
 .Frameset_00:
 	db BATTLEANIMOAMSET_00, $06
 	db -4
--- a/battle/objects/oam.asm
+++ b/battle/objects/oam.asm
@ -1,221 +1,222 @@
 BattleAnimOAMData: ; ceeae
-; vtile offset (?), length, address
-	dbbw $00, 16, .OAMData_00 ; 00
-	dbbw $04,  9, .OAMData_01 ; 01
-	dbbw $08,  4, .OAMData_02 ; 02
-	dbbw $09,  4, .OAMData_03 ; 03
-	dbbw $0d,  4, .OAMData_04 ; 04
-	dbbw $0f,  4, .OAMData_03 ; 05
-	dbbw $13,  4, .OAMData_04 ; 06
-	dbbw $04, 16, .OAMData_00 ; 07
-	dbbw $08, 16, .OAMData_00 ; 08
-	dbbw $08, 16, .OAMData_09 ; 09
-	dbbw $00,  4, .OAMData_04 ; 0a
-	dbbw $02,  4, .OAMData_03 ; 0b
-	dbbw $06,  2, .OAMData_0c ; 0c
-	dbbw $07,  2, .OAMData_0c ; 0d
-	dbbw $02,  4, .OAMData_04 ; 0e
-	dbbw $04,  1, .OAMData_0f ; 0f
-	dbbw $05,  1, .OAMData_0f ; 10
-	dbbw $00,  2, .OAMData_11 ; 11
-	dbbw $02,  2, .OAMData_11 ; 12
-	dbbw $00,  4, .OAMData_13 ; 13
-	dbbw $00,  1, .OAMData_0f ; 14
-	dbbw $01,  1, .OAMData_0f ; 15
-	dbbw $02,  1, .OAMData_0f ; 16
-	dbbw $03,  1, .OAMData_0f ; 17
-	dbbw $00,  4, .OAMData_02 ; 18
-	dbbw $01, 16, .OAMData_00 ; 19
-	dbbw $05, 16, .OAMData_00 ; 1a
-	dbbw $00,  4, .OAMData_03 ; 1b
-	dbbw $05, 12, .OAMData_1c ; 1c
-	dbbw $02,  4, .OAMData_02 ; 1d
-	dbbw $06,  1, .OAMData_0f ; 1e
-	dbbw $07,  1, .OAMData_0f ; 1f
-	dbbw $08,  1, .OAMData_0f ; 20
-	dbbw $04,  4, .OAMData_03 ; 21
-	dbbw $09, 22, .OAMData_22 ; 22
-	dbbw $04,  2, .OAMData_11 ; 23
-	dbbw $06,  2, .OAMData_11 ; 24
-	dbbw $0c,  1, .OAMData_0f ; 25
-	dbbw $0a,  1, .OAMData_0f ; 26
-	dbbw $0b,  4, .OAMData_02 ; 27
-	dbbw $08,  4, .OAMData_04 ; 28
-	dbbw $06,  4, .OAMData_04 ; 29
-	dbbw $00,  5, .OAMData_2a ; 2a
-	dbbw $03,  6, .OAMData_2b ; 2b
-	dbbw $00,  7, .OAMData_2c ; 2c
-	dbbw $03,  8, .OAMData_2d ; 2d
-	dbbw $00,  9, .OAMData_2e ; 2e
-	dbbw $00,  4, .OAMData_2f ; 2f
-	dbbw $02,  4, .OAMData_30 ; 30
-	dbbw $04,  6, .OAMData_31 ; 31
-	dbbw $00,  2, .OAMData_32 ; 32
-	dbbw $00,  7, .OAMData_33 ; 33
-	dbbw $00, 14, .OAMData_32 ; 34
-	dbbw $00, 21, .OAMData_33 ; 35
-	dbbw $00,  2, .OAMData_36 ; 36
-	dbbw $00,  6, .OAMData_36 ; 37
-	dbbw $00, 10, .OAMData_36 ; 38
-	dbbw $00, 14, .OAMData_36 ; 39
-	dbbw $00,  2, .OAMData_3a ; 3a
-	dbbw $00,  6, .OAMData_3a ; 3b
-	dbbw $00, 10, .OAMData_3a ; 3c
-	dbbw $00, 14, .OAMData_3a ; 3d
-	dbbw $00,  4, .OAMData_3e ; 3e
-	dbbw $00, 16, .OAMData_3e ; 3f
-	dbbw $00, 26, .OAMData_3e ; 40
-	dbbw $00, 26, .OAMData_41 ; 41
-	dbbw $0e,  4, .OAMData_42 ; 42
-	dbbw $0e,  8, .OAMData_42 ; 43
-	dbbw $0e,  4, .OAMData_44 ; 44
-	dbbw $0e,  8, .OAMData_44 ; 45
-	dbbw $0e,  4, .OAMData_46 ; 46
-	dbbw $0e,  4, .OAMData_47 ; 47
-	dbbw $00,  6, .OAMData_48 ; 48
-	dbbw $03,  4, .OAMData_49 ; 49
-	dbbw $03,  2, .OAMData_4a ; 4a
-	dbbw $01,  5, .OAMData_0f ; 4b
-	dbbw $01,  6, .OAMData_4c ; 4c
-	dbbw $01,  7, .OAMData_4d ; 4d
-	dbbw $01,  3, .OAMData_4d ; 4e
-	dbbw $01,  8, .OAMData_4f ; 4f
-	dbbw $01,  9, .OAMData_50 ; 50
-	dbbw $01, 10, .OAMData_51 ; 51
-	dbbw $01,  6, .OAMData_51 ; 52
-	dbbw $00,  9, .OAMData_01 ; 53
-	dbbw $04,  4, .OAMData_02 ; 54
-	dbbw $05,  4, .OAMData_02 ; 55
-	dbbw $00,  2, .OAMData_56 ; 56
-	dbbw $02,  2, .OAMData_56 ; 57
-	dbbw $04,  2, .OAMData_56 ; 58
-	dbbw $02,  4, .OAMData_59 ; 59
-	dbbw $02,  4, .OAMData_5a ; 5a
-	dbbw $02,  2, .OAMData_0c ; 5b
-	dbbw $04,  2, .OAMData_0c ; 5c
-	dbbw $06,  4, .OAMData_5d ; 5d
-	dbbw $08,  2, .OAMData_0c ; 5e
-	dbbw $09,  2, .OAMData_0c ; 5f
-	dbbw $05,  2, .OAMData_60 ; 60
-	dbbw $00,  2, .OAMData_61 ; 61
-	dbbw $00,  5, .OAMData_61 ; 62
-	dbbw $00,  9, .OAMData_61 ; 63
-	dbbw $09,  9, .OAMData_61 ; 64
-	dbbw $00,  4, .OAMData_65 ; 65
-	dbbw $00,  7, .OAMData_65 ; 66
-	dbbw $00,  9, .OAMData_65 ; 67
-	dbbw $09,  9, .OAMData_65 ; 68
-	dbbw $04,  1, .OAMData_69 ; 69
-	dbbw $05,  2, .OAMData_6a ; 6a
-	dbbw $06,  4, .OAMData_03 ; 6b
-	dbbw $0a,  4, .OAMData_03 ; 6c
-	dbbw $0e,  4, .OAMData_03 ; 6d
-	dbbw $08,  5, .OAMData_6e ; 6e
-	dbbw $0d,  3, .OAMData_6f ; 6f
-	dbbw $01,  8, .OAMData_70 ; 70
-	dbbw $03,  8, .OAMData_70 ; 71
-	dbbw $05,  8, .OAMData_70 ; 72
-	dbbw $07,  8, .OAMData_70 ; 73
-	dbbw $06,  4, .OAMData_02 ; 74
-	dbbw $07,  4, .OAMData_02 ; 75
-	dbbw $0a,  2, .OAMData_76 ; 76
-	dbbw $00,  1, .OAMData_77 ; 77
-	dbbw $00,  3, .OAMData_78 ; 78
-	dbbw $00,  6, .OAMData_79 ; 79
-	dbbw $00,  9, .OAMData_7a ; 7a
-	dbbw $00, 12, .OAMData_7b ; 7b
-	dbbw $00, 14, .OAMData_7c ; 7c
-	dbbw $00, 15, .OAMData_7d ; 7d
-	dbbw $04,  4, .OAMData_03 ; 7e
-	dbbw $08,  4, .OAMData_03 ; 7f
-	dbbw $0d,  1, .OAMData_0f ; 80
-	dbbw $0e,  4, .OAMData_81 ; 81
-	dbbw $10,  1, .OAMData_0f ; 82
-	dbbw $11,  1, .OAMData_0f ; 83
-	dbbw $04,  2, .OAMData_6a ; 84
-	dbbw $05,  2, .OAMData_6a ; 85
-	dbbw $0a,  4, .OAMData_04 ; 86
-	dbbw $00,  8, .OAMData_87 ; 87
-	dbbw $00, 12, .OAMData_88 ; 88
-	dbbw $00, 16, .OAMData_87 ; 89
-	dbbw $09,  2, .OAMData_8a ; 8a
-	dbbw $09,  4, .OAMData_8a ; 8b
-	dbbw $09,  6, .OAMData_8a ; 8c
-	dbbw $09,  8, .OAMData_8a ; 8d
-	dbbw $12,  5, .OAMData_8e ; 8e
-	dbbw $00,  4, .OAMData_8f ; 8f
-	dbbw $04,  4, .OAMData_8f ; 90
-	dbbw $08,  4, .OAMData_8f ; 91
-	dbbw $0c,  4, .OAMData_8f ; 92
-	dbbw $00,  6, .OAMData_93 ; 93
-	dbbw $04,  4, .OAMData_03 ; 94
-	dbbw $0a,  4, .OAMData_04 ; 95
-	dbbw $15,  4, .OAMData_30 ; 96
-	dbbw $04,  4, .OAMData_30 ; 97
-	dbbw $0c,  4, .OAMData_04 ; 98
-	dbbw $0a,  4, .OAMData_99 ; 99
-	dbbw $0c,  4, .OAMData_03 ; 9a
-	dbbw $00, 36, .OAMData_9b ; 9b
-	dbbw $0d,  2, .OAMData_9c ; 9c
-	dbbw $0d,  4, .OAMData_9c ; 9d
-	dbbw $0d,  6, .OAMData_9c ; 9e
-	dbbw $02,  8, .OAMData_9f ; 9f
-	dbbw $08,  7, .OAMData_a0 ; a0
-	dbbw $08,  5, .OAMData_a0 ; a1
-	dbbw $08,  3, .OAMData_a0 ; a2
-	dbbw $00, 16, .OAMData_1c ; a3
-	dbbw $00,  9, .OAMData_a4 ; a4
-	dbbw $06,  9, .OAMData_a4 ; a5
-	dbbw $0c,  9, .OAMData_a4 ; a6
-	dbbw $12,  9, .OAMData_a4 ; a7
-	dbbw $18,  9, .OAMData_a4 ; a8
-	dbbw $1e,  9, .OAMData_a4 ; a9
-	dbbw $24,  9, .OAMData_a4 ; aa
-	dbbw $2a,  9, .OAMData_a4 ; ab
-	dbbw $03,  4, .OAMData_ac ; ac
-	dbbw $12,  4, .OAMData_03 ; ad
-	dbbw $10,  4, .OAMData_04 ; ae
-	dbbw $16,  1, .OAMData_0f ; af
-	dbbw $17,  4, .OAMData_02 ; b0
-	dbbw $18,  4, .OAMData_03 ; b1
-	dbbw $1c,  4, .OAMData_03 ; b2
-	dbbw $20,  3, .OAMData_03 ; b3
-	dbbw $23,  4, .OAMData_04 ; b4
-	dbbw $25,  3, .OAMData_03 ; b5
-	dbbw $17,  4, .OAMData_03 ; b6
-	dbbw $0a, 16, .OAMData_00 ; b7
-	dbbw $10, 16, .OAMData_1c ; b8
-	dbbw $00, 16, .OAMData_1c ; b9
-	dbbw $04,  4, .OAMData_03 ; ba
-	dbbw $08,  2, .OAMData_11 ; bb
-	dbbw $20,  6, .OAMData_bc ; bc
-	dbbw $08,  1, .OAMData_0f ; bd
-	dbbw $04,  4, .OAMData_03 ; be
-	dbbw $1a,  4, .OAMData_30 ; bf
-	dbbw $16,  9, .OAMData_01 ; c0
-	dbbw $10, 16, .OAMData_c1 ; c1
-	dbbw $09,  6, .OAMData_c2 ; c2
-	dbbw $11,  9, .OAMData_c3 ; c3
-	dbbw $0e,  4, .OAMData_03 ; c4
-	dbbw $0b,  4, .OAMData_30 ; c5
-	dbbw $1c,  6, .OAMData_02 ; c6
-	dbbw $20, 16, .OAMData_c1 ; c7
-	dbbw $05,  6, .OAMData_c8 ; c8
-	dbbw $0b,  4, .OAMData_03 ; c9
-	dbbw $09,  4, .OAMData_ca ; ca
-	dbbw $0b,  4, .OAMData_04 ; cb
-	dbbw $11, 13, .OAMData_cc ; cc
-	dbbw $00,  9, .OAMData_c3 ; cd
-	dbbw $09,  9, .OAMData_c3 ; ce
-	dbbw $00, 12, .OAMData_cf ; cf
-	dbbw $06, 12, .OAMData_cf ; d0
-	dbbw $0c, 12, .OAMData_cf ; d1
-	dbbw $12, 12, .OAMData_cf ; d2
-	dbbw $00, 13, .OAMData_cc ; d3
-	dbbw $00,  7, .OAMData_d4 ; d4
-	dbbw $00,  6, .OAMData_d5 ; d5
-	dbbw $00, 14, .OAMData_d6 ; d6
-	dbbw $00, 12, .OAMData_d7 ; d7
+; entries correspond to BATTLEANIMOAMSET_* constants
+	; vtile offset, length, pointer
+	dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00
+	dbbw $04,  9, .OAMData_01 ; BATTLEANIMOAMSET_01
+	dbbw $08,  4, .OAMData_02 ; BATTLEANIMOAMSET_02
+	dbbw $09,  4, .OAMData_03 ; BATTLEANIMOAMSET_03
+	dbbw $0d,  4, .OAMData_04 ; BATTLEANIMOAMSET_04
+	dbbw $0f,  4, .OAMData_03 ; BATTLEANIMOAMSET_05
+	dbbw $13,  4, .OAMData_04 ; BATTLEANIMOAMSET_06
+	dbbw $04, 16, .OAMData_00 ; BATTLEANIMOAMSET_07
+	dbbw $08, 16, .OAMData_00 ; BATTLEANIMOAMSET_08
+	dbbw $08, 16, .OAMData_09 ; BATTLEANIMOAMSET_09
+	dbbw $00,  4, .OAMData_04 ; BATTLEANIMOAMSET_0A
+	dbbw $02,  4, .OAMData_03 ; BATTLEANIMOAMSET_0B
+	dbbw $06,  2, .OAMData_0c ; BATTLEANIMOAMSET_0C
+	dbbw $07,  2, .OAMData_0c ; BATTLEANIMOAMSET_0D
+	dbbw $02,  4, .OAMData_04 ; BATTLEANIMOAMSET_0E
+	dbbw $04,  1, .OAMData_0f ; BATTLEANIMOAMSET_0F
+	dbbw $05,  1, .OAMData_0f ; BATTLEANIMOAMSET_10
+	dbbw $00,  2, .OAMData_11 ; BATTLEANIMOAMSET_11
+	dbbw $02,  2, .OAMData_11 ; BATTLEANIMOAMSET_12
+	dbbw $00,  4, .OAMData_13 ; BATTLEANIMOAMSET_13
+	dbbw $00,  1, .OAMData_0f ; BATTLEANIMOAMSET_14
+	dbbw $01,  1, .OAMData_0f ; BATTLEANIMOAMSET_15
+	dbbw $02,  1, .OAMData_0f ; BATTLEANIMOAMSET_16
+	dbbw $03,  1, .OAMData_0f ; BATTLEANIMOAMSET_17
+	dbbw $00,  4, .OAMData_02 ; BATTLEANIMOAMSET_18
+	dbbw $01, 16, .OAMData_00 ; BATTLEANIMOAMSET_19
+	dbbw $05, 16, .OAMData_00 ; BATTLEANIMOAMSET_1A
+	dbbw $00,  4, .OAMData_03 ; BATTLEANIMOAMSET_1B
+	dbbw $05, 12, .OAMData_1c ; BATTLEANIMOAMSET_1C
+	dbbw $02,  4, .OAMData_02 ; BATTLEANIMOAMSET_1D
+	dbbw $06,  1, .OAMData_0f ; BATTLEANIMOAMSET_1E
+	dbbw $07,  1, .OAMData_0f ; BATTLEANIMOAMSET_1F
+	dbbw $08,  1, .OAMData_0f ; BATTLEANIMOAMSET_20
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_21
+	dbbw $09, 22, .OAMData_22 ; BATTLEANIMOAMSET_22
+	dbbw $04,  2, .OAMData_11 ; BATTLEANIMOAMSET_23
+	dbbw $06,  2, .OAMData_11 ; BATTLEANIMOAMSET_24
+	dbbw $0c,  1, .OAMData_0f ; BATTLEANIMOAMSET_25
+	dbbw $0a,  1, .OAMData_0f ; BATTLEANIMOAMSET_26
+	dbbw $0b,  4, .OAMData_02 ; BATTLEANIMOAMSET_27
+	dbbw $08,  4, .OAMData_04 ; BATTLEANIMOAMSET_28
+	dbbw $06,  4, .OAMData_04 ; BATTLEANIMOAMSET_29
+	dbbw $00,  5, .OAMData_2a ; BATTLEANIMOAMSET_2A
+	dbbw $03,  6, .OAMData_2b ; BATTLEANIMOAMSET_2B
+	dbbw $00,  7, .OAMData_2c ; BATTLEANIMOAMSET_2C
+	dbbw $03,  8, .OAMData_2d ; BATTLEANIMOAMSET_2D
+	dbbw $00,  9, .OAMData_2e ; BATTLEANIMOAMSET_2E
+	dbbw $00,  4, .OAMData_2f ; BATTLEANIMOAMSET_2F
+	dbbw $02,  4, .OAMData_30 ; BATTLEANIMOAMSET_30
+	dbbw $04,  6, .OAMData_31 ; BATTLEANIMOAMSET_31
+	dbbw $00,  2, .OAMData_32 ; BATTLEANIMOAMSET_32
+	dbbw $00,  7, .OAMData_33 ; BATTLEANIMOAMSET_33
+	dbbw $00, 14, .OAMData_32 ; BATTLEANIMOAMSET_34
+	dbbw $00, 21, .OAMData_33 ; BATTLEANIMOAMSET_35
+	dbbw $00,  2, .OAMData_36 ; BATTLEANIMOAMSET_36
+	dbbw $00,  6, .OAMData_36 ; BATTLEANIMOAMSET_37
+	dbbw $00, 10, .OAMData_36 ; BATTLEANIMOAMSET_38
+	dbbw $00, 14, .OAMData_36 ; BATTLEANIMOAMSET_39
+	dbbw $00,  2, .OAMData_3a ; BATTLEANIMOAMSET_3A
+	dbbw $00,  6, .OAMData_3a ; BATTLEANIMOAMSET_3B
+	dbbw $00, 10, .OAMData_3a ; BATTLEANIMOAMSET_3C
+	dbbw $00, 14, .OAMData_3a ; BATTLEANIMOAMSET_3D
+	dbbw $00,  4, .OAMData_3e ; BATTLEANIMOAMSET_3E
+	dbbw $00, 16, .OAMData_3e ; BATTLEANIMOAMSET_3F
+	dbbw $00, 26, .OAMData_3e ; BATTLEANIMOAMSET_40
+	dbbw $00, 26, .OAMData_41 ; BATTLEANIMOAMSET_41
+	dbbw $0e,  4, .OAMData_42 ; BATTLEANIMOAMSET_42
+	dbbw $0e,  8, .OAMData_42 ; BATTLEANIMOAMSET_43
+	dbbw $0e,  4, .OAMData_44 ; BATTLEANIMOAMSET_44
+	dbbw $0e,  8, .OAMData_44 ; BATTLEANIMOAMSET_45
+	dbbw $0e,  4, .OAMData_46 ; BATTLEANIMOAMSET_46
+	dbbw $0e,  4, .OAMData_47 ; BATTLEANIMOAMSET_47
+	dbbw $00,  6, .OAMData_48 ; BATTLEANIMOAMSET_48
+	dbbw $03,  4, .OAMData_49 ; BATTLEANIMOAMSET_49
+	dbbw $03,  2, .OAMData_4a ; BATTLEANIMOAMSET_4A
+	dbbw $01,  5, .OAMData_0f ; BATTLEANIMOAMSET_4B
+	dbbw $01,  6, .OAMData_4c ; BATTLEANIMOAMSET_4C
+	dbbw $01,  7, .OAMData_4d ; BATTLEANIMOAMSET_4D
+	dbbw $01,  3, .OAMData_4d ; BATTLEANIMOAMSET_4E
+	dbbw $01,  8, .OAMData_4f ; BATTLEANIMOAMSET_4F
+	dbbw $01,  9, .OAMData_50 ; BATTLEANIMOAMSET_50
+	dbbw $01, 10, .OAMData_51 ; BATTLEANIMOAMSET_51
+	dbbw $01,  6, .OAMData_51 ; BATTLEANIMOAMSET_52
+	dbbw $00,  9, .OAMData_01 ; BATTLEANIMOAMSET_53
+	dbbw $04,  4, .OAMData_02 ; BATTLEANIMOAMSET_54
+	dbbw $05,  4, .OAMData_02 ; BATTLEANIMOAMSET_55
+	dbbw $00,  2, .OAMData_56 ; BATTLEANIMOAMSET_56
+	dbbw $02,  2, .OAMData_56 ; BATTLEANIMOAMSET_57
+	dbbw $04,  2, .OAMData_56 ; BATTLEANIMOAMSET_58
+	dbbw $02,  4, .OAMData_59 ; BATTLEANIMOAMSET_59
+	dbbw $02,  4, .OAMData_5a ; BATTLEANIMOAMSET_5A
+	dbbw $02,  2, .OAMData_0c ; BATTLEANIMOAMSET_5B
+	dbbw $04,  2, .OAMData_0c ; BATTLEANIMOAMSET_5C
+	dbbw $06,  4, .OAMData_5d ; BATTLEANIMOAMSET_5D
+	dbbw $08,  2, .OAMData_0c ; BATTLEANIMOAMSET_5E
+	dbbw $09,  2, .OAMData_0c ; BATTLEANIMOAMSET_5F
+	dbbw $05,  2, .OAMData_60 ; BATTLEANIMOAMSET_60
+	dbbw $00,  2, .OAMData_61 ; BATTLEANIMOAMSET_61
+	dbbw $00,  5, .OAMData_61 ; BATTLEANIMOAMSET_62
+	dbbw $00,  9, .OAMData_61 ; BATTLEANIMOAMSET_63
+	dbbw $09,  9, .OAMData_61 ; BATTLEANIMOAMSET_64
+	dbbw $00,  4, .OAMData_65 ; BATTLEANIMOAMSET_65
+	dbbw $00,  7, .OAMData_65 ; BATTLEANIMOAMSET_66
+	dbbw $00,  9, .OAMData_65 ; BATTLEANIMOAMSET_67
+	dbbw $09,  9, .OAMData_65 ; BATTLEANIMOAMSET_68
+	dbbw $04,  1, .OAMData_69 ; BATTLEANIMOAMSET_69
+	dbbw $05,  2, .OAMData_6a ; BATTLEANIMOAMSET_6A
+	dbbw $06,  4, .OAMData_03 ; BATTLEANIMOAMSET_6B
+	dbbw $0a,  4, .OAMData_03 ; BATTLEANIMOAMSET_6C
+	dbbw $0e,  4, .OAMData_03 ; BATTLEANIMOAMSET_6D
+	dbbw $08,  5, .OAMData_6e ; BATTLEANIMOAMSET_6E
+	dbbw $0d,  3, .OAMData_6f ; BATTLEANIMOAMSET_6F
+	dbbw $01,  8, .OAMData_70 ; BATTLEANIMOAMSET_70
+	dbbw $03,  8, .OAMData_70 ; BATTLEANIMOAMSET_71
+	dbbw $05,  8, .OAMData_70 ; BATTLEANIMOAMSET_72
+	dbbw $07,  8, .OAMData_70 ; BATTLEANIMOAMSET_73
+	dbbw $06,  4, .OAMData_02 ; BATTLEANIMOAMSET_74
+	dbbw $07,  4, .OAMData_02 ; BATTLEANIMOAMSET_75
+	dbbw $0a,  2, .OAMData_76 ; BATTLEANIMOAMSET_76
+	dbbw $00,  1, .OAMData_77 ; BATTLEANIMOAMSET_77
+	dbbw $00,  3, .OAMData_78 ; BATTLEANIMOAMSET_78
+	dbbw $00,  6, .OAMData_79 ; BATTLEANIMOAMSET_79
+	dbbw $00,  9, .OAMData_7a ; BATTLEANIMOAMSET_7A
+	dbbw $00, 12, .OAMData_7b ; BATTLEANIMOAMSET_7B
+	dbbw $00, 14, .OAMData_7c ; BATTLEANIMOAMSET_7C
+	dbbw $00, 15, .OAMData_7d ; BATTLEANIMOAMSET_7D
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_7E
+	dbbw $08,  4, .OAMData_03 ; BATTLEANIMOAMSET_7F
+	dbbw $0d,  1, .OAMData_0f ; BATTLEANIMOAMSET_80
+	dbbw $0e,  4, .OAMData_81 ; BATTLEANIMOAMSET_81
+	dbbw $10,  1, .OAMData_0f ; BATTLEANIMOAMSET_82
+	dbbw $11,  1, .OAMData_0f ; BATTLEANIMOAMSET_83
+	dbbw $04,  2, .OAMData_6a ; BATTLEANIMOAMSET_84
+	dbbw $05,  2, .OAMData_6a ; BATTLEANIMOAMSET_85
+	dbbw $0a,  4, .OAMData_04 ; BATTLEANIMOAMSET_86
+	dbbw $00,  8, .OAMData_87 ; BATTLEANIMOAMSET_87
+	dbbw $00, 12, .OAMData_88 ; BATTLEANIMOAMSET_88
+	dbbw $00, 16, .OAMData_87 ; BATTLEANIMOAMSET_89
+	dbbw $09,  2, .OAMData_8a ; BATTLEANIMOAMSET_8A
+	dbbw $09,  4, .OAMData_8a ; BATTLEANIMOAMSET_8B
+	dbbw $09,  6, .OAMData_8a ; BATTLEANIMOAMSET_8C
+	dbbw $09,  8, .OAMData_8a ; BATTLEANIMOAMSET_8D
+	dbbw $12,  5, .OAMData_8e ; BATTLEANIMOAMSET_8E
+	dbbw $00,  4, .OAMData_8f ; BATTLEANIMOAMSET_8F
+	dbbw $04,  4, .OAMData_8f ; BATTLEANIMOAMSET_90
+	dbbw $08,  4, .OAMData_8f ; BATTLEANIMOAMSET_91
+	dbbw $0c,  4, .OAMData_8f ; BATTLEANIMOAMSET_92
+	dbbw $00,  6, .OAMData_93 ; BATTLEANIMOAMSET_93
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_94
+	dbbw $0a,  4, .OAMData_04 ; BATTLEANIMOAMSET_95
+	dbbw $15,  4, .OAMData_30 ; BATTLEANIMOAMSET_96
+	dbbw $04,  4, .OAMData_30 ; BATTLEANIMOAMSET_97
+	dbbw $0c,  4, .OAMData_04 ; BATTLEANIMOAMSET_98
+	dbbw $0a,  4, .OAMData_99 ; BATTLEANIMOAMSET_99
+	dbbw $0c,  4, .OAMData_03 ; BATTLEANIMOAMSET_9A
+	dbbw $00, 36, .OAMData_9b ; BATTLEANIMOAMSET_9B
+	dbbw $0d,  2, .OAMData_9c ; BATTLEANIMOAMSET_9C
+	dbbw $0d,  4, .OAMData_9c ; BATTLEANIMOAMSET_9D
+	dbbw $0d,  6, .OAMData_9c ; BATTLEANIMOAMSET_9E
+	dbbw $02,  8, .OAMData_9f ; BATTLEANIMOAMSET_9F
+	dbbw $08,  7, .OAMData_a0 ; BATTLEANIMOAMSET_A0
+	dbbw $08,  5, .OAMData_a0 ; BATTLEANIMOAMSET_A1
+	dbbw $08,  3, .OAMData_a0 ; BATTLEANIMOAMSET_A2
+	dbbw $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_A3
+	dbbw $00,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A4
+	dbbw $06,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A5
+	dbbw $0c,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A6
+	dbbw $12,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A7
+	dbbw $18,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A8
+	dbbw $1e,  9, .OAMData_a4 ; BATTLEANIMOAMSET_A9
+	dbbw $24,  9, .OAMData_a4 ; BATTLEANIMOAMSET_AA
+	dbbw $2a,  9, .OAMData_a4 ; BATTLEANIMOAMSET_AB
+	dbbw $03,  4, .OAMData_ac ; BATTLEANIMOAMSET_AC
+	dbbw $12,  4, .OAMData_03 ; BATTLEANIMOAMSET_AD
+	dbbw $10,  4, .OAMData_04 ; BATTLEANIMOAMSET_AE
+	dbbw $16,  1, .OAMData_0f ; BATTLEANIMOAMSET_AF
+	dbbw $17,  4, .OAMData_02 ; BATTLEANIMOAMSET_B0
+	dbbw $18,  4, .OAMData_03 ; BATTLEANIMOAMSET_B1
+	dbbw $1c,  4, .OAMData_03 ; BATTLEANIMOAMSET_B2
+	dbbw $20,  3, .OAMData_03 ; BATTLEANIMOAMSET_B3
+	dbbw $23,  4, .OAMData_04 ; BATTLEANIMOAMSET_B4
+	dbbw $25,  3, .OAMData_03 ; BATTLEANIMOAMSET_B5
+	dbbw $17,  4, .OAMData_03 ; BATTLEANIMOAMSET_B6
+	dbbw $0a, 16, .OAMData_00 ; BATTLEANIMOAMSET_B7
+	dbbw $10, 16, .OAMData_1c ; BATTLEANIMOAMSET_B8
+	dbbw $00, 16, .OAMData_1c ; BATTLEANIMOAMSET_B9
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_BA
+	dbbw $08,  2, .OAMData_11 ; BATTLEANIMOAMSET_BB
+	dbbw $20,  6, .OAMData_bc ; BATTLEANIMOAMSET_BC
+	dbbw $08,  1, .OAMData_0f ; BATTLEANIMOAMSET_BD
+	dbbw $04,  4, .OAMData_03 ; BATTLEANIMOAMSET_BE
+	dbbw $1a,  4, .OAMData_30 ; BATTLEANIMOAMSET_BF
+	dbbw $16,  9, .OAMData_01 ; BATTLEANIMOAMSET_C0
+	dbbw $10, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C1
+	dbbw $09,  6, .OAMData_c2 ; BATTLEANIMOAMSET_C2
+	dbbw $11,  9, .OAMData_c3 ; BATTLEANIMOAMSET_C3
+	dbbw $0e,  4, .OAMData_03 ; BATTLEANIMOAMSET_C4
+	dbbw $0b,  4, .OAMData_30 ; BATTLEANIMOAMSET_C5
+	dbbw $1c,  6, .OAMData_02 ; BATTLEANIMOAMSET_C6
+	dbbw $20, 16, .OAMData_c1 ; BATTLEANIMOAMSET_C7
+	dbbw $05,  6, .OAMData_c8 ; BATTLEANIMOAMSET_C8
+	dbbw $0b,  4, .OAMData_03 ; BATTLEANIMOAMSET_C9
+	dbbw $09,  4, .OAMData_ca ; BATTLEANIMOAMSET_CA
+	dbbw $0b,  4, .OAMData_04 ; BATTLEANIMOAMSET_CB
+	dbbw $11, 13, .OAMData_cc ; BATTLEANIMOAMSET_CC
+	dbbw $00,  9, .OAMData_c3 ; BATTLEANIMOAMSET_CD
+	dbbw $09,  9, .OAMData_c3 ; BATTLEANIMOAMSET_CE
+	dbbw $00, 12, .OAMData_cf ; BATTLEANIMOAMSET_CF
+	dbbw $06, 12, .OAMData_cf ; BATTLEANIMOAMSET_D0
+	dbbw $0c, 12, .OAMData_cf ; BATTLEANIMOAMSET_D1
+	dbbw $12, 12, .OAMData_cf ; BATTLEANIMOAMSET_D2
+	dbbw $00, 13, .OAMData_cc ; BATTLEANIMOAMSET_D3
+	dbbw $00,  7, .OAMData_d4 ; BATTLEANIMOAMSET_D4
+	dbbw $00,  6, .OAMData_d5 ; BATTLEANIMOAMSET_D5
+	dbbw $00, 14, .OAMData_d6 ; BATTLEANIMOAMSET_D6
+	dbbw $00, 12, .OAMData_d7 ; BATTLEANIMOAMSET_D7

 .OAMData_11:
 	dsprite  -1, 0,  -1, 4, $00, $00
--- a/battle/objects/object_gfx.asm
+++ b/battle/objects/object_gfx.asm
--- a/battle/objects/data.asm
+++ b/battle/objects/data.asm
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
--- a/data/maps/map_setup_scripts.asm
+++ b/data/maps/map_setup_scripts.asm
@ -0,0 +1,177 @@
+MapSetupScripts: ; 15377
+; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
+	dw MapSetupScript_Warp
+	dw MapSetupScript_Continue
+	dw MapSetupScript_ReloadMap
+	dw MapSetupScript_Teleport
+	dw MapSetupScript_Door
+	dw MapSetupScript_Fall
+	dw MapSetupScript_Connection
+	dw MapSetupScript_LinkReturn
+	dw MapSetupScript_Train
+	dw MapSetupScript_Submenu
+	dw MapSetupScript_BadWarp
+	dw MapSetupScript_Fly
+; 1538f
+
+MapSetupScript_Teleport: ; 1538f
+	db map_prolong_sprites
+MapSetupScript_Fly: ; 15390
+	db map_fade_out_palettes
+	db map_keep_roam
+MapSetupScript_Warp: ; 15392
+	db map_lcd_off
+	db map_sound_off
+	db map_load_spawn
+	db map_attributes
+	db map_change_callback
+	db map_spawn_coord
+	db map_player_coord
+	db map_anchor_screen
+	db map_load_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_load_objects
+	db map_lcd_on
+	db map_palettes
+	db map_face_down
+	db map_sprites
+	db map_bike_music
+	db map_max_volume
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_BadWarp: ; 153a9
+	db map_load_spawn
+	db map_attributes
+	db map_change_callback
+	db map_spawn_coord
+	db map_player_coord
+	db map_anchor_screen
+	db map_load_blocks
+	db map_buffer_screen
+	db map_lcd_off
+	db map_load_graphics
+	db map_time_of_day
+	db map_fade_out_music
+	db map_lcd_on
+	db map_load_objects
+	db map_palettes
+	db map_face_down
+	db map_sprites
+	db map_fade_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_Connection: ; 153bf
+	db map_animations_off
+	db map_load_connection
+	db map_attributes
+	db map_change_callback
+	db map_player_coord
+	db map_load_blocks
+	db map_load_tileset
+	db map_save_screen
+	db map_load_objects
+	db map_fade_music
+	db map_palettes
+	db map_stop_script
+	db map_keep_palettes
+	db map_wildmons
+	db map_update_roam
+	db map_animations_on
+	db map_end
+
+MapSetupScript_Fall: ; 153d0
+	db map_prolong_sprites
+MapSetupScript_Door: ; 153d1
+	db map_fade_out_palettes
+MapSetupScript_Train: ; 153d2
+	db map_load_warp
+	db map_attributes
+	db map_warp_face
+	db map_change_callback
+	db map_player_coord
+	db map_load_blocks
+	db map_buffer_screen
+	db map_lcd_off
+	db map_load_graphics
+	db map_time_of_day
+	db map_fade_out_music
+	db map_lcd_on
+	db map_load_objects
+	db map_palettes
+	db map_sprites
+	db map_fade_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_update_roam
+	db map_end
+
+MapSetupScript_ReloadMap: ; 153e7
+	db map_fade
+	db map_clear_bg_palettes
+	db map_lcd_off
+	db map_sound_off
+	db map_load_blocks
+	db map_connection_blocks
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_music_force
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_LinkReturn: ; 153f7
+	db map_fade
+	db map_lcd_off
+	db map_sound_off
+	db map_change_callback
+	db map_load_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_bike_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_text_scroll_off
+	db map_end
+
+MapSetupScript_Continue: ; 15408
+	db map_lcd_off
+	db map_sound_off
+	db map_attributes_2
+	db map_anchor_screen
+	db map_start_callback
+	db map_load_blocks
+	db map_connection_blocks
+	db map_buffer_screen
+	db map_load_graphics
+	db map_time_of_day
+	db map_lcd_on
+	db map_palettes
+	db map_sprites
+	db map_bike_music
+	db map_fade_in_palettes
+	db map_animations_on
+	db map_wildmons
+	db map_end
+
+MapSetupScript_Submenu: ; 1541a
+	db map_load_blocks
+	db map_connection_blocks
+	db map_end
--- a/Show More
+++ b/Show More