570 files changed, 863 insertions, 863 deletions

diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 91ff79f2b..d52086b08 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -13,7 +13,7 @@
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
 ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
 ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
-; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm)
+; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
 ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - Footprints (see gfx/footprints.asm)
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm
index 2b93ef749..1a56bad94 100644
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -77,13 +77,13 @@ PokeAnims: ; d0042
 
 .Slow:   pokeanim StereoCry, Setup2, Play
 .Normal: pokeanim StereoCry, Setup, Play
-.Menu:   pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
-.Trade:  pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
-.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
-.Hatch:  pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
-.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
+.Menu:   pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
+.Trade:  pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play
+.Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play
+.Hatch:  pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
+.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
 .Egg1:   pokeanim Setup, Play
-.Egg2:   pokeanim Extra, Play
+.Egg2:   pokeanim Idle, Play
 
 
 AnimateFrontpic: ; d008e
@@ -151,7 +151,7 @@ endm
 	setup_command PokeAnim_Wait
 	setup_command PokeAnim_Setup
 	setup_command PokeAnim_Setup2
-	setup_command PokeAnim_Extra
+	setup_command PokeAnim_Idle
 	setup_command PokeAnim_Play
 	setup_command PokeAnim_Play2
 	setup_command PokeAnim_Cry
@@ -198,7 +198,7 @@ PokeAnim_Setup2: ; d011d
 	ret
 ; d012f
 
-PokeAnim_Extra: ; d012f
+PokeAnim_Idle: ; d012f
 	ld c, TRUE
 	ld b, 0
 	call PokeAnim_InitAnim
@@ -360,18 +360,18 @@ PokeAnim_InitPicAttributes: ; d01d6
 PokeAnim_InitAnim: ; d0228
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(wPokeAnimExtraFlag)
+	ld a, BANK(wPokeAnimIdleFlag)
 	ld [rSVBK], a
 	push bc
-	ld hl, wPokeAnimExtraFlag
-	ld bc, wPokeAnimStructEnd - wPokeAnimExtraFlag
+	ld hl, wPokeAnimIdleFlag
+	ld bc, wPokeAnimStructEnd - wPokeAnimIdleFlag
 	xor a
 	call ByteFill
 	pop bc
 	ld a, b
 	ld [wPokeAnimSpeed], a
 	ld a, c
-	ld [wPokeAnimExtraFlag], a
+	ld [wPokeAnimIdleFlag], a
 	call GetMonAnimPointer
 	call GetMonFramesPointer
 	call GetMonBitmaskPointer
@@ -949,20 +949,20 @@ GetMonAnimPointer: ; d055c
 
 	ld c, BANK(UnownAnimations)
 	ld hl, UnownAnimationPointers
-	ld de, UnownAnimationExtraPointers
+	ld de, UnownAnimationIdlePointers
 	call PokeAnim_IsUnown
 	jr z, .unown
 	ld c, BANK(PicAnimations)
 	ld hl, AnimationPointers
-	ld de, AnimationExtraPointers
+	ld de, AnimationIdlePointers
 .unown
 
-	ld a, [wPokeAnimExtraFlag]
+	ld a, [wPokeAnimIdleFlag]
 	and a
-	jr z, .extras
+	jr z, .idles
 	ld h, d
 	ld l, e
-.extras
+.idles
 
 	ld a, [wPokeAnimSpeciesOrUnown]
 	dec a
@@ -982,12 +982,12 @@ GetMonAnimPointer: ; d055c
 .egg
 	ld hl, EggAnimation
 	ld c, BANK(EggAnimation)
-	ld a, [wPokeAnimExtraFlag]
+	ld a, [wPokeAnimIdleFlag]
 	and a
-	jr z, .extras_egg
-	ld hl, EggAnimationExtra
-	ld c, BANK(EggAnimationExtra)
-.extras_egg
+	jr z, .idles_egg
+	ld hl, EggAnimationIdle
+	ld c, BANK(EggAnimationIdle)
+.idles_egg
 
 	ld a, c
 	ld [wPokeAnimPointerBank], a
diff --git a/gfx/pokemon/abra/anim0.asm b/gfx/pokemon/abra/anim.asm
index 9d37567ac..9d37567ac 100644
--- a/gfx/pokemon/abra/anim0.asm
+++ b/gfx/pokemon/abra/anim.asm
diff --git a/gfx/pokemon/abra/anim1.asm b/gfx/pokemon/abra/anim_idle.asm
index 796e57f88..796e57f88 100644
--- a/gfx/pokemon/abra/anim1.asm
+++ b/gfx/pokemon/abra/anim_idle.asm
diff --git a/gfx/pokemon/aerodactyl/anim0.asm b/gfx/pokemon/aerodactyl/anim.asm
index 515cba043..515cba043 100644
--- a/gfx/pokemon/aerodactyl/anim0.asm
+++ b/gfx/pokemon/aerodactyl/anim.asm
diff --git a/gfx/pokemon/aerodactyl/anim1.asm b/gfx/pokemon/aerodactyl/anim_idle.asm
index 4394a8e0c..4394a8e0c 100644
--- a/gfx/pokemon/aerodactyl/anim1.asm
+++ b/gfx/pokemon/aerodactyl/anim_idle.asm
diff --git a/gfx/pokemon/aipom/anim0.asm b/gfx/pokemon/aipom/anim.asm
index 99556d958..99556d958 100644
--- a/gfx/pokemon/aipom/anim0.asm
+++ b/gfx/pokemon/aipom/anim.asm
diff --git a/gfx/pokemon/aipom/anim1.asm b/gfx/pokemon/aipom/anim_idle.asm
index 9685b665d..9685b665d 100644
--- a/gfx/pokemon/aipom/anim1.asm
+++ b/gfx/pokemon/aipom/anim_idle.asm
diff --git a/gfx/pokemon/alakazam/anim0.asm b/gfx/pokemon/alakazam/anim.asm
index fb87afbfe..fb87afbfe 100644
--- a/gfx/pokemon/alakazam/anim0.asm
+++ b/gfx/pokemon/alakazam/anim.asm
diff --git a/gfx/pokemon/alakazam/anim1.asm b/gfx/pokemon/alakazam/anim_idle.asm
index 52cf585fb..52cf585fb 100644
--- a/gfx/pokemon/alakazam/anim1.asm
+++ b/gfx/pokemon/alakazam/anim_idle.asm
diff --git a/gfx/pokemon/ampharos/anim0.asm b/gfx/pokemon/ampharos/anim.asm
index 5e3d6538e..5e3d6538e 100644
--- a/gfx/pokemon/ampharos/anim0.asm
+++ b/gfx/pokemon/ampharos/anim.asm
diff --git a/gfx/pokemon/ampharos/anim1.asm b/gfx/pokemon/ampharos/anim_idle.asm
index 6dcb40d61..6dcb40d61 100644
--- a/gfx/pokemon/ampharos/anim1.asm
+++ b/gfx/pokemon/ampharos/anim_idle.asm
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
index 04d0be9ce..8efba2c30 100644
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@@ -1,253 +1,253 @@
 PicAnimations:
-BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim0.asm"
-IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim0.asm"
-VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim0.asm"
-CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim0.asm"
-CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim0.asm"
-CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim0.asm"
-SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim0.asm"
-WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim0.asm"
-BlastoiseAnimation:  INCLUDE "gfx/pokemon/blastoise/anim0.asm"
-CaterpieAnimation:   INCLUDE "gfx/pokemon/caterpie/anim0.asm"
-MetapodAnimation:    INCLUDE "gfx/pokemon/metapod/anim0.asm"
-ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim0.asm"
-WeedleAnimation:     INCLUDE "gfx/pokemon/weedle/anim0.asm"
-KakunaAnimation:     INCLUDE "gfx/pokemon/kakuna/anim0.asm"
-BeedrillAnimation:   INCLUDE "gfx/pokemon/beedrill/anim0.asm"
-PidgeyAnimation:     INCLUDE "gfx/pokemon/pidgey/anim0.asm"
-PidgeottoAnimation:  INCLUDE "gfx/pokemon/pidgeotto/anim0.asm"
-PidgeotAnimation:    INCLUDE "gfx/pokemon/pidgeot/anim0.asm"
-RattataAnimation:    INCLUDE "gfx/pokemon/rattata/anim0.asm"
-RaticateAnimation:   INCLUDE "gfx/pokemon/raticate/anim0.asm"
-SpearowAnimation:    INCLUDE "gfx/pokemon/spearow/anim0.asm"
-FearowAnimation:     INCLUDE "gfx/pokemon/fearow/anim0.asm"
-EkansAnimation:      INCLUDE "gfx/pokemon/ekans/anim0.asm"
-ArbokAnimation:      INCLUDE "gfx/pokemon/arbok/anim0.asm"
-PikachuAnimation:    INCLUDE "gfx/pokemon/pikachu/anim0.asm"
-RaichuAnimation:     INCLUDE "gfx/pokemon/raichu/anim0.asm"
-SandshrewAnimation:  INCLUDE "gfx/pokemon/sandshrew/anim0.asm"
-SandslashAnimation:  INCLUDE "gfx/pokemon/sandslash/anim0.asm"
-NidoranFAnimation:   INCLUDE "gfx/pokemon/nidoran_f/anim0.asm"
-NidorinaAnimation:   INCLUDE "gfx/pokemon/nidorina/anim0.asm"
-NidoqueenAnimation:  INCLUDE "gfx/pokemon/nidoqueen/anim0.asm"
-NidoranMAnimation:   INCLUDE "gfx/pokemon/nidoran_m/anim0.asm"
-NidorinoAnimation:   INCLUDE "gfx/pokemon/nidorino/anim0.asm"
-NidokingAnimation:   INCLUDE "gfx/pokemon/nidoking/anim0.asm"
-ClefairyAnimation:   INCLUDE "gfx/pokemon/clefairy/anim0.asm"
-ClefableAnimation:   INCLUDE "gfx/pokemon/clefable/anim0.asm"
-VulpixAnimation:     INCLUDE "gfx/pokemon/vulpix/anim0.asm"
-NinetalesAnimation:  INCLUDE "gfx/pokemon/ninetales/anim0.asm"
-JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim0.asm"
-WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim0.asm"
-ZubatAnimation:      INCLUDE "gfx/pokemon/zubat/anim0.asm"
-GolbatAnimation:     INCLUDE "gfx/pokemon/golbat/anim0.asm"
-OddishAnimation:     INCLUDE "gfx/pokemon/oddish/anim0.asm"
-GloomAnimation:      INCLUDE "gfx/pokemon/gloom/anim0.asm"
-VileplumeAnimation:  INCLUDE "gfx/pokemon/vileplume/anim0.asm"
-ParasAnimation:      INCLUDE "gfx/pokemon/paras/anim0.asm"
-ParasectAnimation:   INCLUDE "gfx/pokemon/parasect/anim0.asm"
-VenonatAnimation:    INCLUDE "gfx/pokemon/venonat/anim0.asm"
-VenomothAnimation:   INCLUDE "gfx/pokemon/venomoth/anim0.asm"
-DiglettAnimation:    INCLUDE "gfx/pokemon/diglett/anim0.asm"
-DugtrioAnimation:    INCLUDE "gfx/pokemon/dugtrio/anim0.asm"
-MeowthAnimation:     INCLUDE "gfx/pokemon/meowth/anim0.asm"
-PersianAnimation:    INCLUDE "gfx/pokemon/persian/anim0.asm"
-PsyduckAnimation:    INCLUDE "gfx/pokemon/psyduck/anim0.asm"
-GolduckAnimation:    INCLUDE "gfx/pokemon/golduck/anim0.asm"
-MankeyAnimation:     INCLUDE "gfx/pokemon/mankey/anim0.asm"
-PrimeapeAnimation:   INCLUDE "gfx/pokemon/primeape/anim0.asm"
-GrowlitheAnimation:  INCLUDE "gfx/pokemon/growlithe/anim0.asm"
-ArcanineAnimation:   INCLUDE "gfx/pokemon/arcanine/anim0.asm"
-PoliwagAnimation:    INCLUDE "gfx/pokemon/poliwag/anim0.asm"
-PoliwhirlAnimation:  INCLUDE "gfx/pokemon/poliwhirl/anim0.asm"
-PoliwrathAnimation:  INCLUDE "gfx/pokemon/poliwrath/anim0.asm"
-AbraAnimation:       INCLUDE "gfx/pokemon/abra/anim0.asm"
-KadabraAnimation:    INCLUDE "gfx/pokemon/kadabra/anim0.asm"
-AlakazamAnimation:   INCLUDE "gfx/pokemon/alakazam/anim0.asm"
-MachopAnimation:     INCLUDE "gfx/pokemon/machop/anim0.asm"
-MachokeAnimation:    INCLUDE "gfx/pokemon/machoke/anim0.asm"
-MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim0.asm"
-BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim0.asm"
-WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim0.asm"
-VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim0.asm"
-TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim0.asm"
-TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim0.asm"
-GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim0.asm"
-GravelerAnimation:   INCLUDE "gfx/pokemon/graveler/anim0.asm"
-GolemAnimation:      INCLUDE "gfx/pokemon/golem/anim0.asm"
-PonytaAnimation:     INCLUDE "gfx/pokemon/ponyta/anim0.asm"
-RapidashAnimation:   INCLUDE "gfx/pokemon/rapidash/anim0.asm"
-SlowpokeAnimation:   INCLUDE "gfx/pokemon/slowpoke/anim0.asm"
-SlowbroAnimation:    INCLUDE "gfx/pokemon/slowbro/anim0.asm"
-MagnemiteAnimation:  INCLUDE "gfx/pokemon/magnemite/anim0.asm"
-MagnetonAnimation:   INCLUDE "gfx/pokemon/magneton/anim0.asm"
-FarfetchDAnimation:  INCLUDE "gfx/pokemon/farfetch_d/anim0.asm"
-DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim0.asm"
-DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim0.asm"
-SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim0.asm"
-DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim0.asm"
-GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim0.asm"
-MukAnimation:        INCLUDE "gfx/pokemon/muk/anim0.asm"
-ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim0.asm"
-CloysterAnimation:   INCLUDE "gfx/pokemon/cloyster/anim0.asm"
-GastlyAnimation:     INCLUDE "gfx/pokemon/gastly/anim0.asm"
-HaunterAnimation:    INCLUDE "gfx/pokemon/haunter/anim0.asm"
-GengarAnimation:     INCLUDE "gfx/pokemon/gengar/anim0.asm"
-OnixAnimation:       INCLUDE "gfx/pokemon/onix/anim0.asm"
-DrowzeeAnimation:    INCLUDE "gfx/pokemon/drowzee/anim0.asm"
-HypnoAnimation:      INCLUDE "gfx/pokemon/hypno/anim0.asm"
-KrabbyAnimation:     INCLUDE "gfx/pokemon/krabby/anim0.asm"
-KinglerAnimation:    INCLUDE "gfx/pokemon/kingler/anim0.asm"
-VoltorbAnimation:    INCLUDE "gfx/pokemon/voltorb/anim0.asm"
-ElectrodeAnimation:  INCLUDE "gfx/pokemon/electrode/anim0.asm"
-ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim0.asm"
-ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim0.asm"
-CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim0.asm"
-MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim0.asm"
-HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim0.asm"
-HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim0.asm"
-LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim0.asm"
-KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim0.asm"
-WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim0.asm"
-RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim0.asm"
-RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim0.asm"
-ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim0.asm"
-TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim0.asm"
-KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim0.asm"
-HorseaAnimation:     INCLUDE "gfx/pokemon/horsea/anim0.asm"
-SeadraAnimation:     INCLUDE "gfx/pokemon/seadra/anim0.asm"
-GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim0.asm"
-SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim0.asm"
-StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim0.asm"
-StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim0.asm"
-MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim0.asm"
-ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim0.asm"
-JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim0.asm"
-ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim0.asm"
-MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim0.asm"
-PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim0.asm"
-TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim0.asm"
-MagikarpAnimation:   INCLUDE "gfx/pokemon/magikarp/anim0.asm"
-GyaradosAnimation:   INCLUDE "gfx/pokemon/gyarados/anim0.asm"
-LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim0.asm"
-DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim0.asm"
-EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim0.asm"
-VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim0.asm"
-JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim0.asm"
-FlareonAnimation:    INCLUDE "gfx/pokemon/flareon/anim0.asm"
-PorygonAnimation:    INCLUDE "gfx/pokemon/porygon/anim0.asm"
-OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim0.asm"
-OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim0.asm"
-KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim0.asm"
-KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim0.asm"
-AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim0.asm"
-SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim0.asm"
-ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim0.asm"
-ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim0.asm"
-MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim0.asm"
-DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim0.asm"
-DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim0.asm"
-DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim0.asm"
-MewtwoAnimation:     INCLUDE "gfx/pokemon/mewtwo/anim0.asm"
-MewAnimation:        INCLUDE "gfx/pokemon/mew/anim0.asm"
-ChikoritaAnimation:  INCLUDE "gfx/pokemon/chikorita/anim0.asm"
-BayleefAnimation:    INCLUDE "gfx/pokemon/bayleef/anim0.asm"
-MeganiumAnimation:   INCLUDE "gfx/pokemon/meganium/anim0.asm"
-CyndaquilAnimation:  INCLUDE "gfx/pokemon/cyndaquil/anim0.asm"
-QuilavaAnimation:    INCLUDE "gfx/pokemon/quilava/anim0.asm"
-TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim0.asm"
-TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim0.asm"
-CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim0.asm"
-FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim0.asm"
-SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim0.asm"
-FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim0.asm"
-HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim0.asm"
-NoctowlAnimation:    INCLUDE "gfx/pokemon/noctowl/anim0.asm"
-LedybaAnimation:     INCLUDE "gfx/pokemon/ledyba/anim0.asm"
-LedianAnimation:     INCLUDE "gfx/pokemon/ledian/anim0.asm"
-SpinarakAnimation:   INCLUDE "gfx/pokemon/spinarak/anim0.asm"
-AriadosAnimation:    INCLUDE "gfx/pokemon/ariados/anim0.asm"
-CrobatAnimation:     INCLUDE "gfx/pokemon/crobat/anim0.asm"
-ChinchouAnimation:   INCLUDE "gfx/pokemon/chinchou/anim0.asm"
-LanturnAnimation:    INCLUDE "gfx/pokemon/lanturn/anim0.asm"
-PichuAnimation:      INCLUDE "gfx/pokemon/pichu/anim0.asm"
-CleffaAnimation:     INCLUDE "gfx/pokemon/cleffa/anim0.asm"
-IgglybuffAnimation:  INCLUDE "gfx/pokemon/igglybuff/anim0.asm"
-TogepiAnimation:     INCLUDE "gfx/pokemon/togepi/anim0.asm"
-TogeticAnimation:    INCLUDE "gfx/pokemon/togetic/anim0.asm"
-NatuAnimation:       INCLUDE "gfx/pokemon/natu/anim0.asm"
-XatuAnimation:       INCLUDE "gfx/pokemon/xatu/anim0.asm"
-MareepAnimation:     INCLUDE "gfx/pokemon/mareep/anim0.asm"
-FlaaffyAnimation:    INCLUDE "gfx/pokemon/flaaffy/anim0.asm"
-AmpharosAnimation:   INCLUDE "gfx/pokemon/ampharos/anim0.asm"
-BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim0.asm"
-MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim0.asm"
-AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim0.asm"
-SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim0.asm"
-PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim0.asm"
-HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim0.asm"
-SkiploomAnimation:   INCLUDE "gfx/pokemon/skiploom/anim0.asm"
-JumpluffAnimation:   INCLUDE "gfx/pokemon/jumpluff/anim0.asm"
-AipomAnimation:      INCLUDE "gfx/pokemon/aipom/anim0.asm"
-SunkernAnimation:    INCLUDE "gfx/pokemon/sunkern/anim0.asm"
-SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim0.asm"
-YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim0.asm"
-WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim0.asm"
-QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim0.asm"
-EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim0.asm"
-UmbreonAnimation:    INCLUDE "gfx/pokemon/umbreon/anim0.asm"
-MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim0.asm"
-SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim0.asm"
-MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim0.asm"
-UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim0.asm"
-WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim0.asm"
-GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim0.asm"
-PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim0.asm"
-ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim0.asm"
-DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim0.asm"
-GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim0.asm"
-SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim0.asm"
-SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim0.asm"
-GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim0.asm"
-QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim0.asm"
-ScizorAnimation:     INCLUDE "gfx/pokemon/scizor/anim0.asm"
-ShuckleAnimation:    INCLUDE "gfx/pokemon/shuckle/anim0.asm"
-HeracrossAnimation:  INCLUDE "gfx/pokemon/heracross/anim0.asm"
-SneaselAnimation:    INCLUDE "gfx/pokemon/sneasel/anim0.asm"
-TeddiursaAnimation:  INCLUDE "gfx/pokemon/teddiursa/anim0.asm"
-UrsaringAnimation:   INCLUDE "gfx/pokemon/ursaring/anim0.asm"
-SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim0.asm"
-MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim0.asm"
-SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim0.asm"
-PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim0.asm"
-CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim0.asm"
-RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim0.asm"
-OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim0.asm"
-DelibirdAnimation:   INCLUDE "gfx/pokemon/delibird/anim0.asm"
-MantineAnimation:    INCLUDE "gfx/pokemon/mantine/anim0.asm"
-SkarmoryAnimation:   INCLUDE "gfx/pokemon/skarmory/anim0.asm"
-HoundourAnimation:   INCLUDE "gfx/pokemon/houndour/anim0.asm"
-HoundoomAnimation:   INCLUDE "gfx/pokemon/houndoom/anim0.asm"
-KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim0.asm"
-PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim0.asm"
-DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim0.asm"
-Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim0.asm"
-StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim0.asm"
-SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim0.asm"
-TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim0.asm"
-HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim0.asm"
-SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim0.asm"
-ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim0.asm"
-MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim0.asm"
-MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim0.asm"
-BlisseyAnimation:    INCLUDE "gfx/pokemon/blissey/anim0.asm"
-RaikouAnimation:     INCLUDE "gfx/pokemon/raikou/anim0.asm"
-EnteiAnimation:      INCLUDE "gfx/pokemon/entei/anim0.asm"
-SuicuneAnimation:    INCLUDE "gfx/pokemon/suicune/anim0.asm"
-LarvitarAnimation:   INCLUDE "gfx/pokemon/larvitar/anim0.asm"
-PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim0.asm"
-TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim0.asm"
-LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim0.asm"
-HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim0.asm"
-CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim0.asm"
-EggAnimation:        INCLUDE "gfx/pokemon/egg/anim0.asm"
+BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
+IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim.asm"
+VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim.asm"
+CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim.asm"
+CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm"
+CharizardAnimation:  INCLUDE "gfx/pokemon/charizard/anim.asm"
+SquirtleAnimation:   INCLUDE "gfx/pokemon/squirtle/anim.asm"
+WartortleAnimation:  INCLUDE "gfx/pokemon/wartortle/anim.asm"
+BlastoiseAnimation:  INCLUDE "gfx/pokemon/blastoise/anim.asm"
+CaterpieAnimation:   INCLUDE "gfx/pokemon/caterpie/anim.asm"
+MetapodAnimation:    INCLUDE "gfx/pokemon/metapod/anim.asm"
+ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm"
+WeedleAnimation:     INCLUDE "gfx/pokemon/weedle/anim.asm"
+KakunaAnimation:     INCLUDE "gfx/pokemon/kakuna/anim.asm"
+BeedrillAnimation:   INCLUDE "gfx/pokemon/beedrill/anim.asm"
+PidgeyAnimation:     INCLUDE "gfx/pokemon/pidgey/anim.asm"
+PidgeottoAnimation:  INCLUDE "gfx/pokemon/pidgeotto/anim.asm"
+PidgeotAnimation:    INCLUDE "gfx/pokemon/pidgeot/anim.asm"
+RattataAnimation:    INCLUDE "gfx/pokemon/rattata/anim.asm"
+RaticateAnimation:   INCLUDE "gfx/pokemon/raticate/anim.asm"
+SpearowAnimation:    INCLUDE "gfx/pokemon/spearow/anim.asm"
+FearowAnimation:     INCLUDE "gfx/pokemon/fearow/anim.asm"
+EkansAnimation:      INCLUDE "gfx/pokemon/ekans/anim.asm"
+ArbokAnimation:      INCLUDE "gfx/pokemon/arbok/anim.asm"
+PikachuAnimation:    INCLUDE "gfx/pokemon/pikachu/anim.asm"
+RaichuAnimation:     INCLUDE "gfx/pokemon/raichu/anim.asm"
+SandshrewAnimation:  INCLUDE "gfx/pokemon/sandshrew/anim.asm"
+SandslashAnimation:  INCLUDE "gfx/pokemon/sandslash/anim.asm"
+NidoranFAnimation:   INCLUDE "gfx/pokemon/nidoran_f/anim.asm"
+NidorinaAnimation:   INCLUDE "gfx/pokemon/nidorina/anim.asm"
+NidoqueenAnimation:  INCLUDE "gfx/pokemon/nidoqueen/anim.asm"
+NidoranMAnimation:   INCLUDE "gfx/pokemon/nidoran_m/anim.asm"
+NidorinoAnimation:   INCLUDE "gfx/pokemon/nidorino/anim.asm"
+NidokingAnimation:   INCLUDE "gfx/pokemon/nidoking/anim.asm"
+ClefairyAnimation:   INCLUDE "gfx/pokemon/clefairy/anim.asm"
+ClefableAnimation:   INCLUDE "gfx/pokemon/clefable/anim.asm"
+VulpixAnimation:     INCLUDE "gfx/pokemon/vulpix/anim.asm"
+NinetalesAnimation:  INCLUDE "gfx/pokemon/ninetales/anim.asm"
+JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim.asm"
+WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim.asm"
+ZubatAnimation:      INCLUDE "gfx/pokemon/zubat/anim.asm"
+GolbatAnimation:     INCLUDE "gfx/pokemon/golbat/anim.asm"
+OddishAnimation:     INCLUDE "gfx/pokemon/oddish/anim.asm"
+GloomAnimation:      INCLUDE "gfx/pokemon/gloom/anim.asm"
+VileplumeAnimation:  INCLUDE "gfx/pokemon/vileplume/anim.asm"
+ParasAnimation:      INCLUDE "gfx/pokemon/paras/anim.asm"
+ParasectAnimation:   INCLUDE "gfx/pokemon/parasect/anim.asm"
+VenonatAnimation:    INCLUDE "gfx/pokemon/venonat/anim.asm"
+VenomothAnimation:   INCLUDE "gfx/pokemon/venomoth/anim.asm"
+DiglettAnimation:    INCLUDE "gfx/pokemon/diglett/anim.asm"
+DugtrioAnimation:    INCLUDE "gfx/pokemon/dugtrio/anim.asm"
+MeowthAnimation:     INCLUDE "gfx/pokemon/meowth/anim.asm"
+PersianAnimation:    INCLUDE "gfx/pokemon/persian/anim.asm"
+PsyduckAnimation:    INCLUDE "gfx/pokemon/psyduck/anim.asm"
+GolduckAnimation:    INCLUDE "gfx/pokemon/golduck/anim.asm"
+MankeyAnimation:     INCLUDE "gfx/pokemon/mankey/anim.asm"
+PrimeapeAnimation:   INCLUDE "gfx/pokemon/primeape/anim.asm"
+GrowlitheAnimation:  INCLUDE "gfx/pokemon/growlithe/anim.asm"
+ArcanineAnimation:   INCLUDE "gfx/pokemon/arcanine/anim.asm"
+PoliwagAnimation:    INCLUDE "gfx/pokemon/poliwag/anim.asm"
+PoliwhirlAnimation:  INCLUDE "gfx/pokemon/poliwhirl/anim.asm"
+PoliwrathAnimation:  INCLUDE "gfx/pokemon/poliwrath/anim.asm"
+AbraAnimation:       INCLUDE "gfx/pokemon/abra/anim.asm"
+KadabraAnimation:    INCLUDE "gfx/pokemon/kadabra/anim.asm"
+AlakazamAnimation:   INCLUDE "gfx/pokemon/alakazam/anim.asm"
+MachopAnimation:     INCLUDE "gfx/pokemon/machop/anim.asm"
+MachokeAnimation:    INCLUDE "gfx/pokemon/machoke/anim.asm"
+MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim.asm"
+BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm"
+WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm"
+VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm"
+TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim.asm"
+TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm"
+GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim.asm"
+GravelerAnimation:   INCLUDE "gfx/pokemon/graveler/anim.asm"
+GolemAnimation:      INCLUDE "gfx/pokemon/golem/anim.asm"
+PonytaAnimation:     INCLUDE "gfx/pokemon/ponyta/anim.asm"
+RapidashAnimation:   INCLUDE "gfx/pokemon/rapidash/anim.asm"
+SlowpokeAnimation:   INCLUDE "gfx/pokemon/slowpoke/anim.asm"
+SlowbroAnimation:    INCLUDE "gfx/pokemon/slowbro/anim.asm"
+MagnemiteAnimation:  INCLUDE "gfx/pokemon/magnemite/anim.asm"
+MagnetonAnimation:   INCLUDE "gfx/pokemon/magneton/anim.asm"
+FarfetchDAnimation:  INCLUDE "gfx/pokemon/farfetch_d/anim.asm"
+DoduoAnimation:      INCLUDE "gfx/pokemon/doduo/anim.asm"
+DodrioAnimation:     INCLUDE "gfx/pokemon/dodrio/anim.asm"
+SeelAnimation:       INCLUDE "gfx/pokemon/seel/anim.asm"
+DewgongAnimation:    INCLUDE "gfx/pokemon/dewgong/anim.asm"
+GrimerAnimation:     INCLUDE "gfx/pokemon/grimer/anim.asm"
+MukAnimation:        INCLUDE "gfx/pokemon/muk/anim.asm"
+ShellderAnimation:   INCLUDE "gfx/pokemon/shellder/anim.asm"
+CloysterAnimation:   INCLUDE "gfx/pokemon/cloyster/anim.asm"
+GastlyAnimation:     INCLUDE "gfx/pokemon/gastly/anim.asm"
+HaunterAnimation:    INCLUDE "gfx/pokemon/haunter/anim.asm"
+GengarAnimation:     INCLUDE "gfx/pokemon/gengar/anim.asm"
+OnixAnimation:       INCLUDE "gfx/pokemon/onix/anim.asm"
+DrowzeeAnimation:    INCLUDE "gfx/pokemon/drowzee/anim.asm"
+HypnoAnimation:      INCLUDE "gfx/pokemon/hypno/anim.asm"
+KrabbyAnimation:     INCLUDE "gfx/pokemon/krabby/anim.asm"
+KinglerAnimation:    INCLUDE "gfx/pokemon/kingler/anim.asm"
+VoltorbAnimation:    INCLUDE "gfx/pokemon/voltorb/anim.asm"
+ElectrodeAnimation:  INCLUDE "gfx/pokemon/electrode/anim.asm"
+ExeggcuteAnimation:  INCLUDE "gfx/pokemon/exeggcute/anim.asm"
+ExeggutorAnimation:  INCLUDE "gfx/pokemon/exeggutor/anim.asm"
+CuboneAnimation:     INCLUDE "gfx/pokemon/cubone/anim.asm"
+MarowakAnimation:    INCLUDE "gfx/pokemon/marowak/anim.asm"
+HitmonleeAnimation:  INCLUDE "gfx/pokemon/hitmonlee/anim.asm"
+HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim.asm"
+LickitungAnimation:  INCLUDE "gfx/pokemon/lickitung/anim.asm"
+KoffingAnimation:    INCLUDE "gfx/pokemon/koffing/anim.asm"
+WeezingAnimation:    INCLUDE "gfx/pokemon/weezing/anim.asm"
+RhyhornAnimation:    INCLUDE "gfx/pokemon/rhyhorn/anim.asm"
+RhydonAnimation:     INCLUDE "gfx/pokemon/rhydon/anim.asm"
+ChanseyAnimation:    INCLUDE "gfx/pokemon/chansey/anim.asm"
+TangelaAnimation:    INCLUDE "gfx/pokemon/tangela/anim.asm"
+KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm"
+HorseaAnimation:     INCLUDE "gfx/pokemon/horsea/anim.asm"
+SeadraAnimation:     INCLUDE "gfx/pokemon/seadra/anim.asm"
+GoldeenAnimation:    INCLUDE "gfx/pokemon/goldeen/anim.asm"
+SeakingAnimation:    INCLUDE "gfx/pokemon/seaking/anim.asm"
+StaryuAnimation:     INCLUDE "gfx/pokemon/staryu/anim.asm"
+StarmieAnimation:    INCLUDE "gfx/pokemon/starmie/anim.asm"
+MrMimeAnimation:     INCLUDE "gfx/pokemon/mr__mime/anim.asm"
+ScytherAnimation:    INCLUDE "gfx/pokemon/scyther/anim.asm"
+JynxAnimation:       INCLUDE "gfx/pokemon/jynx/anim.asm"
+ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm"
+MagmarAnimation:     INCLUDE "gfx/pokemon/magmar/anim.asm"
+PinsirAnimation:     INCLUDE "gfx/pokemon/pinsir/anim.asm"
+TaurosAnimation:     INCLUDE "gfx/pokemon/tauros/anim.asm"
+MagikarpAnimation:   INCLUDE "gfx/pokemon/magikarp/anim.asm"
+GyaradosAnimation:   INCLUDE "gfx/pokemon/gyarados/anim.asm"
+LaprasAnimation:     INCLUDE "gfx/pokemon/lapras/anim.asm"
+DittoAnimation:      INCLUDE "gfx/pokemon/ditto/anim.asm"
+EeveeAnimation:      INCLUDE "gfx/pokemon/eevee/anim.asm"
+VaporeonAnimation:   INCLUDE "gfx/pokemon/vaporeon/anim.asm"
+JolteonAnimation:    INCLUDE "gfx/pokemon/jolteon/anim.asm"
+FlareonAnimation:    INCLUDE "gfx/pokemon/flareon/anim.asm"
+PorygonAnimation:    INCLUDE "gfx/pokemon/porygon/anim.asm"
+OmanyteAnimation:    INCLUDE "gfx/pokemon/omanyte/anim.asm"
+OmastarAnimation:    INCLUDE "gfx/pokemon/omastar/anim.asm"
+KabutoAnimation:     INCLUDE "gfx/pokemon/kabuto/anim.asm"
+KabutopsAnimation:   INCLUDE "gfx/pokemon/kabutops/anim.asm"
+AerodactylAnimation: INCLUDE "gfx/pokemon/aerodactyl/anim.asm"
+SnorlaxAnimation:    INCLUDE "gfx/pokemon/snorlax/anim.asm"
+ArticunoAnimation:   INCLUDE "gfx/pokemon/articuno/anim.asm"
+ZapdosAnimation:     INCLUDE "gfx/pokemon/zapdos/anim.asm"
+MoltresAnimation:    INCLUDE "gfx/pokemon/moltres/anim.asm"
+DratiniAnimation:    INCLUDE "gfx/pokemon/dratini/anim.asm"
+DragonairAnimation:  INCLUDE "gfx/pokemon/dragonair/anim.asm"
+DragoniteAnimation:  INCLUDE "gfx/pokemon/dragonite/anim.asm"
+MewtwoAnimation:     INCLUDE "gfx/pokemon/mewtwo/anim.asm"
+MewAnimation:        INCLUDE "gfx/pokemon/mew/anim.asm"
+ChikoritaAnimation:  INCLUDE "gfx/pokemon/chikorita/anim.asm"
+BayleefAnimation:    INCLUDE "gfx/pokemon/bayleef/anim.asm"
+MeganiumAnimation:   INCLUDE "gfx/pokemon/meganium/anim.asm"
+CyndaquilAnimation:  INCLUDE "gfx/pokemon/cyndaquil/anim.asm"
+QuilavaAnimation:    INCLUDE "gfx/pokemon/quilava/anim.asm"
+TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim.asm"
+TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim.asm"
+CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim.asm"
+FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim.asm"
+SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim.asm"
+FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim.asm"
+HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim.asm"
+NoctowlAnimation:    INCLUDE "gfx/pokemon/noctowl/anim.asm"
+LedybaAnimation:     INCLUDE "gfx/pokemon/ledyba/anim.asm"
+LedianAnimation:     INCLUDE "gfx/pokemon/ledian/anim.asm"
+SpinarakAnimation:   INCLUDE "gfx/pokemon/spinarak/anim.asm"
+AriadosAnimation:    INCLUDE "gfx/pokemon/ariados/anim.asm"
+CrobatAnimation:     INCLUDE "gfx/pokemon/crobat/anim.asm"
+ChinchouAnimation:   INCLUDE "gfx/pokemon/chinchou/anim.asm"
+LanturnAnimation:    INCLUDE "gfx/pokemon/lanturn/anim.asm"
+PichuAnimation:      INCLUDE "gfx/pokemon/pichu/anim.asm"
+CleffaAnimation:     INCLUDE "gfx/pokemon/cleffa/anim.asm"
+IgglybuffAnimation:  INCLUDE "gfx/pokemon/igglybuff/anim.asm"
+TogepiAnimation:     INCLUDE "gfx/pokemon/togepi/anim.asm"
+TogeticAnimation:    INCLUDE "gfx/pokemon/togetic/anim.asm"
+NatuAnimation:       INCLUDE "gfx/pokemon/natu/anim.asm"
+XatuAnimation:       INCLUDE "gfx/pokemon/xatu/anim.asm"
+MareepAnimation:     INCLUDE "gfx/pokemon/mareep/anim.asm"
+FlaaffyAnimation:    INCLUDE "gfx/pokemon/flaaffy/anim.asm"
+AmpharosAnimation:   INCLUDE "gfx/pokemon/ampharos/anim.asm"
+BellossomAnimation:  INCLUDE "gfx/pokemon/bellossom/anim.asm"
+MarillAnimation:     INCLUDE "gfx/pokemon/marill/anim.asm"
+AzumarillAnimation:  INCLUDE "gfx/pokemon/azumarill/anim.asm"
+SudowoodoAnimation:  INCLUDE "gfx/pokemon/sudowoodo/anim.asm"
+PolitoedAnimation:   INCLUDE "gfx/pokemon/politoed/anim.asm"
+HoppipAnimation:     INCLUDE "gfx/pokemon/hoppip/anim.asm"
+SkiploomAnimation:   INCLUDE "gfx/pokemon/skiploom/anim.asm"
+JumpluffAnimation:   INCLUDE "gfx/pokemon/jumpluff/anim.asm"
+AipomAnimation:      INCLUDE "gfx/pokemon/aipom/anim.asm"
+SunkernAnimation:    INCLUDE "gfx/pokemon/sunkern/anim.asm"
+SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim.asm"
+YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
+WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim.asm"
+QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim.asm"
+EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim.asm"
+UmbreonAnimation:    INCLUDE "gfx/pokemon/umbreon/anim.asm"
+MurkrowAnimation:    INCLUDE "gfx/pokemon/murkrow/anim.asm"
+SlowkingAnimation:   INCLUDE "gfx/pokemon/slowking/anim.asm"
+MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm"
+UnownAnimation:      INCLUDE "gfx/pokemon/unown/anim.asm"
+WobbuffetAnimation:  INCLUDE "gfx/pokemon/wobbuffet/anim.asm"
+GirafarigAnimation:  INCLUDE "gfx/pokemon/girafarig/anim.asm"
+PinecoAnimation:     INCLUDE "gfx/pokemon/pineco/anim.asm"
+ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim.asm"
+DunsparceAnimation:  INCLUDE "gfx/pokemon/dunsparce/anim.asm"
+GligarAnimation:     INCLUDE "gfx/pokemon/gligar/anim.asm"
+SteelixAnimation:    INCLUDE "gfx/pokemon/steelix/anim.asm"
+SnubbullAnimation:   INCLUDE "gfx/pokemon/snubbull/anim.asm"
+GranbullAnimation:   INCLUDE "gfx/pokemon/granbull/anim.asm"
+QwilfishAnimation:   INCLUDE "gfx/pokemon/qwilfish/anim.asm"
+ScizorAnimation:     INCLUDE "gfx/pokemon/scizor/anim.asm"
+ShuckleAnimation:    INCLUDE "gfx/pokemon/shuckle/anim.asm"
+HeracrossAnimation:  INCLUDE "gfx/pokemon/heracross/anim.asm"
+SneaselAnimation:    INCLUDE "gfx/pokemon/sneasel/anim.asm"
+TeddiursaAnimation:  INCLUDE "gfx/pokemon/teddiursa/anim.asm"
+UrsaringAnimation:   INCLUDE "gfx/pokemon/ursaring/anim.asm"
+SlugmaAnimation:     INCLUDE "gfx/pokemon/slugma/anim.asm"
+MagcargoAnimation:   INCLUDE "gfx/pokemon/magcargo/anim.asm"
+SwinubAnimation:     INCLUDE "gfx/pokemon/swinub/anim.asm"
+PiloswineAnimation:  INCLUDE "gfx/pokemon/piloswine/anim.asm"
+CorsolaAnimation:    INCLUDE "gfx/pokemon/corsola/anim.asm"
+RemoraidAnimation:   INCLUDE "gfx/pokemon/remoraid/anim.asm"
+OctilleryAnimation:  INCLUDE "gfx/pokemon/octillery/anim.asm"
+DelibirdAnimation:   INCLUDE "gfx/pokemon/delibird/anim.asm"
+MantineAnimation:    INCLUDE "gfx/pokemon/mantine/anim.asm"
+SkarmoryAnimation:   INCLUDE "gfx/pokemon/skarmory/anim.asm"
+HoundourAnimation:   INCLUDE "gfx/pokemon/houndour/anim.asm"
+HoundoomAnimation:   INCLUDE "gfx/pokemon/houndoom/anim.asm"
+KingdraAnimation:    INCLUDE "gfx/pokemon/kingdra/anim.asm"
+PhanpyAnimation:     INCLUDE "gfx/pokemon/phanpy/anim.asm"
+DonphanAnimation:    INCLUDE "gfx/pokemon/donphan/anim.asm"
+Porygon2Animation:   INCLUDE "gfx/pokemon/porygon2/anim.asm"
+StantlerAnimation:   INCLUDE "gfx/pokemon/stantler/anim.asm"
+SmeargleAnimation:   INCLUDE "gfx/pokemon/smeargle/anim.asm"
+TyrogueAnimation:    INCLUDE "gfx/pokemon/tyrogue/anim.asm"
+HitmontopAnimation:  INCLUDE "gfx/pokemon/hitmontop/anim.asm"
+SmoochumAnimation:   INCLUDE "gfx/pokemon/smoochum/anim.asm"
+ElekidAnimation:     INCLUDE "gfx/pokemon/elekid/anim.asm"
+MagbyAnimation:      INCLUDE "gfx/pokemon/magby/anim.asm"
+MiltankAnimation:    INCLUDE "gfx/pokemon/miltank/anim.asm"
+BlisseyAnimation:    INCLUDE "gfx/pokemon/blissey/anim.asm"
+RaikouAnimation:     INCLUDE "gfx/pokemon/raikou/anim.asm"
+EnteiAnimation:      INCLUDE "gfx/pokemon/entei/anim.asm"
+SuicuneAnimation:    INCLUDE "gfx/pokemon/suicune/anim.asm"
+LarvitarAnimation:   INCLUDE "gfx/pokemon/larvitar/anim.asm"
+PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim.asm"
+TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim.asm"
+LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim.asm"
+HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim.asm"
+CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim.asm"
+EggAnimation:        INCLUDE "gfx/pokemon/egg/anim.asm"
diff --git a/gfx/pokemon/arbok/anim0.asm b/gfx/pokemon/arbok/anim.asm
index 0ceceacac..0ceceacac 100644
--- a/gfx/pokemon/arbok/anim0.asm
+++ b/gfx/pokemon/arbok/anim.asm
diff --git a/gfx/pokemon/arbok/anim1.asm b/gfx/pokemon/arbok/anim_idle.asm
index c9f85e238..c9f85e238 100644
--- a/gfx/pokemon/arbok/anim1.asm
+++ b/gfx/pokemon/arbok/anim_idle.asm
diff --git a/gfx/pokemon/arcanine/anim0.asm b/gfx/pokemon/arcanine/anim.asm
index 0dc0dcacc..0dc0dcacc 100644
--- a/gfx/pokemon/arcanine/anim0.asm
+++ b/gfx/pokemon/arcanine/anim.asm
diff --git a/gfx/pokemon/arcanine/anim1.asm b/gfx/pokemon/arcanine/anim_idle.asm
index e178a2d24..e178a2d24 100644
--- a/gfx/pokemon/arcanine/anim1.asm
+++ b/gfx/pokemon/arcanine/anim_idle.asm
diff --git a/gfx/pokemon/ariados/anim0.asm b/gfx/pokemon/ariados/anim.asm
index 9a4d30385..9a4d30385 100644
--- a/gfx/pokemon/ariados/anim0.asm
+++ b/gfx/pokemon/ariados/anim.asm
diff --git a/gfx/pokemon/ariados/anim1.asm b/gfx/pokemon/ariados/anim_idle.asm
index 6b9f416be..6b9f416be 100644
--- a/gfx/pokemon/ariados/anim1.asm
+++ b/gfx/pokemon/ariados/anim_idle.asm
diff --git a/gfx/pokemon/articuno/anim0.asm b/gfx/pokemon/articuno/anim.asm
index ccb583766..ccb583766 100644
--- a/gfx/pokemon/articuno/anim0.asm
+++ b/gfx/pokemon/articuno/anim.asm
diff --git a/gfx/pokemon/articuno/anim1.asm b/gfx/pokemon/articuno/anim_idle.asm
index 634d8daff..634d8daff 100644
--- a/gfx/pokemon/articuno/anim1.asm
+++ b/gfx/pokemon/articuno/anim_idle.asm
diff --git a/gfx/pokemon/azumarill/anim0.asm b/gfx/pokemon/azumarill/anim.asm
index bbe46d4b7..bbe46d4b7 100644
--- a/gfx/pokemon/azumarill/anim0.asm
+++ b/gfx/pokemon/azumarill/anim.asm
diff --git a/gfx/pokemon/azumarill/anim1.asm b/gfx/pokemon/azumarill/anim_idle.asm
index 070e6145f..070e6145f 100644
--- a/gfx/pokemon/azumarill/anim1.asm
+++ b/gfx/pokemon/azumarill/anim_idle.asm
diff --git a/gfx/pokemon/bayleef/anim0.asm b/gfx/pokemon/bayleef/anim.asm
index de54fe495..de54fe495 100644
--- a/gfx/pokemon/bayleef/anim0.asm
+++ b/gfx/pokemon/bayleef/anim.asm
diff --git a/gfx/pokemon/bayleef/anim1.asm b/gfx/pokemon/bayleef/anim_idle.asm
index 59d3f1762..59d3f1762 100644
--- a/gfx/pokemon/bayleef/anim1.asm
+++ b/gfx/pokemon/bayleef/anim_idle.asm
diff --git a/gfx/pokemon/beedrill/anim0.asm b/gfx/pokemon/beedrill/anim.asm
index 036fbb738..036fbb738 100644
--- a/gfx/pokemon/beedrill/anim0.asm
+++ b/gfx/pokemon/beedrill/anim.asm
diff --git a/gfx/pokemon/beedrill/anim1.asm b/gfx/pokemon/beedrill/anim_idle.asm
index 8205f9a8c..8205f9a8c 100644
--- a/gfx/pokemon/beedrill/anim1.asm
+++ b/gfx/pokemon/beedrill/anim_idle.asm
diff --git a/gfx/pokemon/bellossom/anim0.asm b/gfx/pokemon/bellossom/anim.asm
index 7aa2e3568..7aa2e3568 100644
--- a/gfx/pokemon/bellossom/anim0.asm
+++ b/gfx/pokemon/bellossom/anim.asm
diff --git a/gfx/pokemon/bellossom/anim1.asm b/gfx/pokemon/bellossom/anim_idle.asm
index 322fa3758..322fa3758 100644
--- a/gfx/pokemon/bellossom/anim1.asm
+++ b/gfx/pokemon/bellossom/anim_idle.asm
diff --git a/gfx/pokemon/bellsprout/anim0.asm b/gfx/pokemon/bellsprout/anim.asm
index 9a71b29ac..9a71b29ac 100644
--- a/gfx/pokemon/bellsprout/anim0.asm
+++ b/gfx/pokemon/bellsprout/anim.asm
diff --git a/gfx/pokemon/bellsprout/anim1.asm b/gfx/pokemon/bellsprout/anim_idle.asm
index 31ad26997..31ad26997 100644
--- a/gfx/pokemon/bellsprout/anim1.asm
+++ b/gfx/pokemon/bellsprout/anim_idle.asm
diff --git a/gfx/pokemon/blastoise/anim0.asm b/gfx/pokemon/blastoise/anim.asm
index 2d8b464d0..2d8b464d0 100644
--- a/gfx/pokemon/blastoise/anim0.asm
+++ b/gfx/pokemon/blastoise/anim.asm
diff --git a/gfx/pokemon/blastoise/anim1.asm b/gfx/pokemon/blastoise/anim_idle.asm
index b25c75e5a..b25c75e5a 100644
--- a/gfx/pokemon/blastoise/anim1.asm
+++ b/gfx/pokemon/blastoise/anim_idle.asm
diff --git a/gfx/pokemon/blissey/anim0.asm b/gfx/pokemon/blissey/anim.asm
index 097ecc094..097ecc094 100644
--- a/gfx/pokemon/blissey/anim0.asm
+++ b/gfx/pokemon/blissey/anim.asm
diff --git a/gfx/pokemon/blissey/anim1.asm b/gfx/pokemon/blissey/anim_idle.asm
index 846d85003..846d85003 100644
--- a/gfx/pokemon/blissey/anim1.asm
+++ b/gfx/pokemon/blissey/anim_idle.asm
diff --git a/gfx/pokemon/bulbasaur/anim0.asm b/gfx/pokemon/bulbasaur/anim.asm
index e5c1cbe1e..e5c1cbe1e 100644
--- a/gfx/pokemon/bulbasaur/anim0.asm
+++ b/gfx/pokemon/bulbasaur/anim.asm
diff --git a/gfx/pokemon/bulbasaur/anim1.asm b/gfx/pokemon/bulbasaur/anim_idle.asm
index cfc0f54e9..cfc0f54e9 100644
--- a/gfx/pokemon/bulbasaur/anim1.asm
+++ b/gfx/pokemon/bulbasaur/anim_idle.asm
diff --git a/gfx/pokemon/butterfree/anim0.asm b/gfx/pokemon/butterfree/anim.asm
index d31161a28..d31161a28 100644
--- a/gfx/pokemon/butterfree/anim0.asm
+++ b/gfx/pokemon/butterfree/anim.asm
diff --git a/gfx/pokemon/butterfree/anim1.asm b/gfx/pokemon/butterfree/anim_idle.asm
index 1eb152f28..1eb152f28 100644
--- a/gfx/pokemon/butterfree/anim1.asm
+++ b/gfx/pokemon/butterfree/anim_idle.asm
diff --git a/gfx/pokemon/caterpie/anim0.asm b/gfx/pokemon/caterpie/anim.asm
index a5cf5f238..a5cf5f238 100644
--- a/gfx/pokemon/caterpie/anim0.asm
+++ b/gfx/pokemon/caterpie/anim.asm
diff --git a/gfx/pokemon/caterpie/anim1.asm b/gfx/pokemon/caterpie/anim_idle.asm
index e75b83f5c..e75b83f5c 100644
--- a/gfx/pokemon/caterpie/anim1.asm
+++ b/gfx/pokemon/caterpie/anim_idle.asm
diff --git a/gfx/pokemon/celebi/anim0.asm b/gfx/pokemon/celebi/anim.asm
index 9f218a43e..9f218a43e 100644
--- a/gfx/pokemon/celebi/anim0.asm
+++ b/gfx/pokemon/celebi/anim.asm
diff --git a/gfx/pokemon/celebi/anim1.asm b/gfx/pokemon/celebi/anim_idle.asm
index 6162488db..6162488db 100644
--- a/gfx/pokemon/celebi/anim1.asm
+++ b/gfx/pokemon/celebi/anim_idle.asm
diff --git a/gfx/pokemon/chansey/anim0.asm b/gfx/pokemon/chansey/anim.asm
index 75de3b32b..75de3b32b 100644
--- a/gfx/pokemon/chansey/anim0.asm
+++ b/gfx/pokemon/chansey/anim.asm
diff --git a/gfx/pokemon/chansey/anim1.asm b/gfx/pokemon/chansey/anim_idle.asm
index a78f8cf88..a78f8cf88 100644
--- a/gfx/pokemon/chansey/anim1.asm
+++ b/gfx/pokemon/chansey/anim_idle.asm
diff --git a/gfx/pokemon/charizard/anim0.asm b/gfx/pokemon/charizard/anim.asm
index b258e35c7..b258e35c7 100644
--- a/gfx/pokemon/charizard/anim0.asm
+++ b/gfx/pokemon/charizard/anim.asm
diff --git a/gfx/pokemon/charizard/anim1.asm b/gfx/pokemon/charizard/anim_idle.asm
index daffccb9d..daffccb9d 100644
--- a/gfx/pokemon/charizard/anim1.asm
+++ b/gfx/pokemon/charizard/anim_idle.asm
diff --git a/gfx/pokemon/charmander/anim0.asm b/gfx/pokemon/charmander/anim.asm
index 72a0fe83d..72a0fe83d 100644
--- a/gfx/pokemon/charmander/anim0.asm
+++ b/gfx/pokemon/charmander/anim.asm
diff --git a/gfx/pokemon/charmander/anim1.asm b/gfx/pokemon/charmander/anim_idle.asm
index 219b5407f..219b5407f 100644
--- a/gfx/pokemon/charmander/anim1.asm
+++ b/gfx/pokemon/charmander/anim_idle.asm
diff --git a/gfx/pokemon/charmeleon/anim0.asm b/gfx/pokemon/charmeleon/anim.asm
index 30eeae979..30eeae979 100644
--- a/gfx/pokemon/charmeleon/anim0.asm
+++ b/gfx/pokemon/charmeleon/anim.asm
diff --git a/gfx/pokemon/charmeleon/anim1.asm b/gfx/pokemon/charmeleon/anim_idle.asm
index d3320e33c..d3320e33c 100644
--- a/gfx/pokemon/charmeleon/anim1.asm
+++ b/gfx/pokemon/charmeleon/anim_idle.asm
diff --git a/gfx/pokemon/chikorita/anim0.asm b/gfx/pokemon/chikorita/anim.asm
index 2b8fa7d35..2b8fa7d35 100644
--- a/gfx/pokemon/chikorita/anim0.asm
+++ b/gfx/pokemon/chikorita/anim.asm
diff --git a/gfx/pokemon/chikorita/anim1.asm b/gfx/pokemon/chikorita/anim_idle.asm
index 9003c3ff2..9003c3ff2 100644
--- a/gfx/pokemon/chikorita/anim1.asm
+++ b/gfx/pokemon/chikorita/anim_idle.asm
diff --git a/gfx/pokemon/chinchou/anim0.asm b/gfx/pokemon/chinchou/anim.asm
index f765c151a..f765c151a 100644
--- a/gfx/pokemon/chinchou/anim0.asm
+++ b/gfx/pokemon/chinchou/anim.asm
diff --git a/gfx/pokemon/chinchou/anim1.asm b/gfx/pokemon/chinchou/anim_idle.asm
index bf38f8d87..bf38f8d87 100644
--- a/gfx/pokemon/chinchou/anim1.asm
+++ b/gfx/pokemon/chinchou/anim_idle.asm
diff --git a/gfx/pokemon/clefable/anim0.asm b/gfx/pokemon/clefable/anim.asm
index d442807e8..d442807e8 100644
--- a/gfx/pokemon/clefable/anim0.asm
+++ b/gfx/pokemon/clefable/anim.asm
diff --git a/gfx/pokemon/clefable/anim1.asm b/gfx/pokemon/clefable/anim_idle.asm
index 2b024ffd8..2b024ffd8 100644
--- a/gfx/pokemon/clefable/anim1.asm
+++ b/gfx/pokemon/clefable/anim_idle.asm
diff --git a/gfx/pokemon/clefairy/anim0.asm b/gfx/pokemon/clefairy/anim.asm
index 9905c4fcc..9905c4fcc 100644
--- a/gfx/pokemon/clefairy/anim0.asm
+++ b/gfx/pokemon/clefairy/anim.asm
diff --git a/gfx/pokemon/clefairy/anim1.asm b/gfx/pokemon/clefairy/anim_idle.asm
index c93613467..c93613467 100644
--- a/gfx/pokemon/clefairy/anim1.asm
+++ b/gfx/pokemon/clefairy/anim_idle.asm
diff --git a/gfx/pokemon/cleffa/anim0.asm b/gfx/pokemon/cleffa/anim.asm
index 37f3da590..37f3da590 100644
--- a/gfx/pokemon/cleffa/anim0.asm
+++ b/gfx/pokemon/cleffa/anim.asm
diff --git a/gfx/pokemon/cleffa/anim1.asm b/gfx/pokemon/cleffa/anim_idle.asm
index 129f123c2..129f123c2 100644
--- a/gfx/pokemon/cleffa/anim1.asm
+++ b/gfx/pokemon/cleffa/anim_idle.asm
diff --git a/gfx/pokemon/cloyster/anim0.asm b/gfx/pokemon/cloyster/anim.asm
index cc338f014..cc338f014 100644
--- a/gfx/pokemon/cloyster/anim0.asm
+++ b/gfx/pokemon/cloyster/anim.asm
diff --git a/gfx/pokemon/cloyster/anim1.asm b/gfx/pokemon/cloyster/anim_idle.asm
index e872bbc59..e872bbc59 100644
--- a/gfx/pokemon/cloyster/anim1.asm
+++ b/gfx/pokemon/cloyster/anim_idle.asm
diff --git a/gfx/pokemon/corsola/anim0.asm b/gfx/pokemon/corsola/anim.asm
index 68182e18e..68182e18e 100644
--- a/gfx/pokemon/corsola/anim0.asm
+++ b/gfx/pokemon/corsola/anim.asm
diff --git a/gfx/pokemon/corsola/anim1.asm b/gfx/pokemon/corsola/anim_idle.asm
index 6360176ca..6360176ca 100644
--- a/gfx/pokemon/corsola/anim1.asm
+++ b/gfx/pokemon/corsola/anim_idle.asm
diff --git a/gfx/pokemon/crobat/anim0.asm b/gfx/pokemon/crobat/anim.asm
index 99888ab81..99888ab81 100644
--- a/gfx/pokemon/crobat/anim0.asm
+++ b/gfx/pokemon/crobat/anim.asm
diff --git a/gfx/pokemon/crobat/anim1.asm b/gfx/pokemon/crobat/anim_idle.asm
index ec1dae2ac..ec1dae2ac 100644
--- a/gfx/pokemon/crobat/anim1.asm
+++ b/gfx/pokemon/crobat/anim_idle.asm
diff --git a/gfx/pokemon/croconaw/anim0.asm b/gfx/pokemon/croconaw/anim.asm
index c487abfd9..c487abfd9 100644
--- a/gfx/pokemon/croconaw/anim0.asm
+++ b/gfx/pokemon/croconaw/anim.asm
diff --git a/gfx/pokemon/croconaw/anim1.asm b/gfx/pokemon/croconaw/anim_idle.asm
index 78bd8518e..78bd8518e 100644
--- a/gfx/pokemon/croconaw/anim1.asm
+++ b/gfx/pokemon/croconaw/anim_idle.asm
diff --git a/gfx/pokemon/cubone/anim0.asm b/gfx/pokemon/cubone/anim.asm
index 2af8c522c..2af8c522c 100644
--- a/gfx/pokemon/cubone/anim0.asm
+++ b/gfx/pokemon/cubone/anim.asm
diff --git a/gfx/pokemon/cubone/anim1.asm b/gfx/pokemon/cubone/anim_idle.asm
index fb3b0b3ba..fb3b0b3ba 100644
--- a/gfx/pokemon/cubone/anim1.asm
+++ b/gfx/pokemon/cubone/anim_idle.asm
diff --git a/gfx/pokemon/cyndaquil/anim0.asm b/gfx/pokemon/cyndaquil/anim.asm
index b069cc300..b069cc300 100644
--- a/gfx/pokemon/cyndaquil/anim0.asm
+++ b/gfx/pokemon/cyndaquil/anim.asm
diff --git a/gfx/pokemon/cyndaquil/anim1.asm b/gfx/pokemon/cyndaquil/anim_idle.asm
index 43c4d495a..43c4d495a 100644
--- a/gfx/pokemon/cyndaquil/anim1.asm
+++ b/gfx/pokemon/cyndaquil/anim_idle.asm
diff --git a/gfx/pokemon/delibird/anim0.asm b/gfx/pokemon/delibird/anim.asm
index 3431ad1ae..3431ad1ae 100644
--- a/gfx/pokemon/delibird/anim0.asm
+++ b/gfx/pokemon/delibird/anim.asm
diff --git a/gfx/pokemon/delibird/anim1.asm b/gfx/pokemon/delibird/anim_idle.asm
index 8a416cc61..8a416cc61 100644
--- a/gfx/pokemon/delibird/anim1.asm
+++ b/gfx/pokemon/delibird/anim_idle.asm
diff --git a/gfx/pokemon/dewgong/anim0.asm b/gfx/pokemon/dewgong/anim.asm
index b7c3efecf..b7c3efecf 100644
--- a/gfx/pokemon/dewgong/anim0.asm
+++ b/gfx/pokemon/dewgong/anim.asm
diff --git a/gfx/pokemon/dewgong/anim1.asm b/gfx/pokemon/dewgong/anim_idle.asm
index 0357ce660..0357ce660 100644
--- a/gfx/pokemon/dewgong/anim1.asm
+++ b/gfx/pokemon/dewgong/anim_idle.asm
diff --git a/gfx/pokemon/diglett/anim0.asm b/gfx/pokemon/diglett/anim.asm
index a4d79bd56..a4d79bd56 100644
--- a/gfx/pokemon/diglett/anim0.asm
+++ b/gfx/pokemon/diglett/anim.asm
diff --git a/gfx/pokemon/diglett/anim1.asm b/gfx/pokemon/diglett/anim_idle.asm
index bd2a27e03..bd2a27e03 100644
--- a/gfx/pokemon/diglett/anim1.asm
+++ b/gfx/pokemon/diglett/anim_idle.asm
diff --git a/gfx/pokemon/ditto/anim0.asm b/gfx/pokemon/ditto/anim.asm
index 53f3f9afa..53f3f9afa 100644
--- a/gfx/pokemon/ditto/anim0.asm
+++ b/gfx/pokemon/ditto/anim.asm
diff --git a/gfx/pokemon/ditto/anim1.asm b/gfx/pokemon/ditto/anim_idle.asm
index 195808be1..195808be1 100644
--- a/gfx/pokemon/ditto/anim1.asm
+++ b/gfx/pokemon/ditto/anim_idle.asm
diff --git a/gfx/pokemon/dodrio/anim0.asm b/gfx/pokemon/dodrio/anim.asm
index 539f896d7..539f896d7 100644
--- a/gfx/pokemon/dodrio/anim0.asm
+++ b/gfx/pokemon/dodrio/anim.asm
diff --git a/gfx/pokemon/dodrio/anim1.asm b/gfx/pokemon/dodrio/anim_idle.asm
index a921058f3..a921058f3 100644
--- a/gfx/pokemon/dodrio/anim1.asm
+++ b/gfx/pokemon/dodrio/anim_idle.asm
diff --git a/gfx/pokemon/doduo/anim0.asm b/gfx/pokemon/doduo/anim.asm
index cd38ca192..cd38ca192 100644
--- a/gfx/pokemon/doduo/anim0.asm
+++ b/gfx/pokemon/doduo/anim.asm
diff --git a/gfx/pokemon/doduo/anim1.asm b/gfx/pokemon/doduo/anim_idle.asm
index 89715cae8..89715cae8 100644
--- a/gfx/pokemon/doduo/anim1.asm
+++ b/gfx/pokemon/doduo/anim_idle.asm
diff --git a/gfx/pokemon/donphan/anim0.asm b/gfx/pokemon/donphan/anim.asm
index fbfbd8d17..fbfbd8d17 100644
--- a/gfx/pokemon/donphan/anim0.asm
+++ b/gfx/pokemon/donphan/anim.asm
diff --git a/gfx/pokemon/donphan/anim1.asm b/gfx/pokemon/donphan/anim_idle.asm
index 341013ce9..341013ce9 100644
--- a/gfx/pokemon/donphan/anim1.asm
+++ b/gfx/pokemon/donphan/anim_idle.asm
diff --git a/gfx/pokemon/dragonair/anim0.asm b/gfx/pokemon/dragonair/anim.asm
index b7a2be64d..b7a2be64d 100644
--- a/gfx/pokemon/dragonair/anim0.asm
+++ b/gfx/pokemon/dragonair/anim.asm
diff --git a/gfx/pokemon/dragonair/anim1.asm b/gfx/pokemon/dragonair/anim_idle.asm
index afea7ab43..afea7ab43 100644
--- a/gfx/pokemon/dragonair/anim1.asm
+++ b/gfx/pokemon/dragonair/anim_idle.asm
diff --git a/gfx/pokemon/dragonite/anim0.asm b/gfx/pokemon/dragonite/anim.asm
index 9dd6bf84a..9dd6bf84a 100644
--- a/gfx/pokemon/dragonite/anim0.asm
+++ b/gfx/pokemon/dragonite/anim.asm
diff --git a/gfx/pokemon/dragonite/anim1.asm b/gfx/pokemon/dragonite/anim_idle.asm
index fe0d7edbb..fe0d7edbb 100644
--- a/gfx/pokemon/dragonite/anim1.asm
+++ b/gfx/pokemon/dragonite/anim_idle.asm
diff --git a/gfx/pokemon/dratini/anim0.asm b/gfx/pokemon/dratini/anim.asm
index f844a2eec..f844a2eec 100644
--- a/gfx/pokemon/dratini/anim0.asm
+++ b/gfx/pokemon/dratini/anim.asm
diff --git a/gfx/pokemon/dratini/anim1.asm b/gfx/pokemon/dratini/anim_idle.asm
index 441340446..441340446 100644
--- a/gfx/pokemon/dratini/anim1.asm
+++ b/gfx/pokemon/dratini/anim_idle.asm
diff --git a/gfx/pokemon/drowzee/anim0.asm b/gfx/pokemon/drowzee/anim.asm
index badc99074..badc99074 100644
--- a/gfx/pokemon/drowzee/anim0.asm
+++ b/gfx/pokemon/drowzee/anim.asm
diff --git a/gfx/pokemon/drowzee/anim1.asm b/gfx/pokemon/drowzee/anim_idle.asm
index 247ecb8fe..247ecb8fe 100644
--- a/gfx/pokemon/drowzee/anim1.asm
+++ b/gfx/pokemon/drowzee/anim_idle.asm
diff --git a/gfx/pokemon/dugtrio/anim0.asm b/gfx/pokemon/dugtrio/anim.asm
index 7b5038620..7b5038620 100644
--- a/gfx/pokemon/dugtrio/anim0.asm
+++ b/gfx/pokemon/dugtrio/anim.asm
diff --git a/gfx/pokemon/dugtrio/anim1.asm b/gfx/pokemon/dugtrio/anim_idle.asm
index 1b32b854c..1b32b854c 100644
--- a/gfx/pokemon/dugtrio/anim1.asm
+++ b/gfx/pokemon/dugtrio/anim_idle.asm
diff --git a/gfx/pokemon/dunsparce/anim0.asm b/gfx/pokemon/dunsparce/anim.asm
index b4217afbd..b4217afbd 100644
--- a/gfx/pokemon/dunsparce/anim0.asm
+++ b/gfx/pokemon/dunsparce/anim.asm
diff --git a/gfx/pokemon/dunsparce/anim1.asm b/gfx/pokemon/dunsparce/anim_idle.asm
index f5d6d9b05..f5d6d9b05 100644
--- a/gfx/pokemon/dunsparce/anim1.asm
+++ b/gfx/pokemon/dunsparce/anim_idle.asm
diff --git a/gfx/pokemon/eevee/anim0.asm b/gfx/pokemon/eevee/anim.asm
index 537cefb83..537cefb83 100644
--- a/gfx/pokemon/eevee/anim0.asm
+++ b/gfx/pokemon/eevee/anim.asm
diff --git a/gfx/pokemon/eevee/anim1.asm b/gfx/pokemon/eevee/anim_idle.asm
index 0f50b3cb8..0f50b3cb8 100644
--- a/gfx/pokemon/eevee/anim1.asm
+++ b/gfx/pokemon/eevee/anim_idle.asm
diff --git a/gfx/pokemon/egg/anim0.asm b/gfx/pokemon/egg/anim.asm
index 1ded66327..1ded66327 100644
--- a/gfx/pokemon/egg/anim0.asm
+++ b/gfx/pokemon/egg/anim.asm
diff --git a/gfx/pokemon/egg/anim1.asm b/gfx/pokemon/egg/anim_idle.asm
index 634736c6b..634736c6b 100644
--- a/gfx/pokemon/egg/anim1.asm
+++ b/gfx/pokemon/egg/anim_idle.asm
diff --git a/gfx/pokemon/ekans/anim0.asm b/gfx/pokemon/ekans/anim.asm
index 9728434c0..9728434c0 100644
--- a/gfx/pokemon/ekans/anim0.asm
+++ b/gfx/pokemon/ekans/anim.asm
diff --git a/gfx/pokemon/ekans/anim1.asm b/gfx/pokemon/ekans/anim_idle.asm
index 660a4f971..660a4f971 100644
--- a/gfx/pokemon/ekans/anim1.asm
+++ b/gfx/pokemon/ekans/anim_idle.asm
diff --git a/gfx/pokemon/electabuzz/anim0.asm b/gfx/pokemon/electabuzz/anim.asm
index 4e2a550ed..4e2a550ed 100644
--- a/gfx/pokemon/electabuzz/anim0.asm
+++ b/gfx/pokemon/electabuzz/anim.asm
diff --git a/gfx/pokemon/electabuzz/anim1.asm b/gfx/pokemon/electabuzz/anim_idle.asm
index efff4b3db..efff4b3db 100644
--- a/gfx/pokemon/electabuzz/anim1.asm
+++ b/gfx/pokemon/electabuzz/anim_idle.asm
diff --git a/gfx/pokemon/electrode/anim0.asm b/gfx/pokemon/electrode/anim.asm
index 18b31e305..18b31e305 100644
--- a/gfx/pokemon/electrode/anim0.asm
+++ b/gfx/pokemon/electrode/anim.asm
diff --git a/gfx/pokemon/electrode/anim1.asm b/gfx/pokemon/electrode/anim_idle.asm
index 30d1b1788..30d1b1788 100644
--- a/gfx/pokemon/electrode/anim1.asm
+++ b/gfx/pokemon/electrode/anim_idle.asm
diff --git a/gfx/pokemon/elekid/anim0.asm b/gfx/pokemon/elekid/anim.asm
index 590dccf14..590dccf14 100644
--- a/gfx/pokemon/elekid/anim0.asm
+++ b/gfx/pokemon/elekid/anim.asm
diff --git a/gfx/pokemon/elekid/anim1.asm b/gfx/pokemon/elekid/anim_idle.asm
index cd10626f6..cd10626f6 100644
--- a/gfx/pokemon/elekid/anim1.asm
+++ b/gfx/pokemon/elekid/anim_idle.asm
diff --git a/gfx/pokemon/entei/anim0.asm b/gfx/pokemon/entei/anim.asm
index 66c2c128d..66c2c128d 100644
--- a/gfx/pokemon/entei/anim0.asm
+++ b/gfx/pokemon/entei/anim.asm
diff --git a/gfx/pokemon/entei/anim1.asm b/gfx/pokemon/entei/anim_idle.asm
index f20e5d072..f20e5d072 100644
--- a/gfx/pokemon/entei/anim1.asm
+++ b/gfx/pokemon/entei/anim_idle.asm
diff --git a/gfx/pokemon/espeon/anim0.asm b/gfx/pokemon/espeon/anim.asm
index 8a54a9b97..8a54a9b97 100644
--- a/gfx/pokemon/espeon/anim0.asm
+++ b/gfx/pokemon/espeon/anim.asm
diff --git a/gfx/pokemon/espeon/anim1.asm b/gfx/pokemon/espeon/anim_idle.asm
index 33c88d1b4..33c88d1b4 100644
--- a/gfx/pokemon/espeon/anim1.asm
+++ b/gfx/pokemon/espeon/anim_idle.asm
diff --git a/gfx/pokemon/exeggcute/anim0.asm b/gfx/pokemon/exeggcute/anim.asm
index 0f0c10729..0f0c10729 100644
--- a/gfx/pokemon/exeggcute/anim0.asm
+++ b/gfx/pokemon/exeggcute/anim.asm
diff --git a/gfx/pokemon/exeggcute/anim1.asm b/gfx/pokemon/exeggcute/anim_idle.asm
index ef839f5d1..ef839f5d1 100644
--- a/gfx/pokemon/exeggcute/anim1.asm
+++ b/gfx/pokemon/exeggcute/anim_idle.asm
diff --git a/gfx/pokemon/exeggutor/anim0.asm b/gfx/pokemon/exeggutor/anim.asm
index 92f11a117..92f11a117 100644
--- a/gfx/pokemon/exeggutor/anim0.asm
+++ b/gfx/pokemon/exeggutor/anim.asm
diff --git a/gfx/pokemon/exeggutor/anim1.asm b/gfx/pokemon/exeggutor/anim_idle.asm
index 3e5542c97..3e5542c97 100644
--- a/gfx/pokemon/exeggutor/anim1.asm
+++ b/gfx/pokemon/exeggutor/anim_idle.asm
diff --git a/gfx/pokemon/extra_pointers.asm b/gfx/pokemon/extra_pointers.asm
deleted file mode 100644
index 7afd95148..000000000
--- a/gfx/pokemon/extra_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-AnimationExtraPointers:
-	dw BulbasaurAnimationExtra
-	dw IvysaurAnimationExtra
-	dw VenusaurAnimationExtra
-	dw CharmanderAnimationExtra
-	dw CharmeleonAnimationExtra
-	dw CharizardAnimationExtra
-	dw SquirtleAnimationExtra
-	dw WartortleAnimationExtra
-	dw BlastoiseAnimationExtra
-	dw CaterpieAnimationExtra
-	dw MetapodAnimationExtra
-	dw ButterfreeAnimationExtra
-	dw WeedleAnimationExtra
-	dw KakunaAnimationExtra
-	dw BeedrillAnimationExtra
-	dw PidgeyAnimationExtra
-	dw PidgeottoAnimationExtra
-	dw PidgeotAnimationExtra
-	dw RattataAnimationExtra
-	dw RaticateAnimationExtra
-	dw SpearowAnimationExtra
-	dw FearowAnimationExtra
-	dw EkansAnimationExtra
-	dw ArbokAnimationExtra
-	dw PikachuAnimationExtra
-	dw RaichuAnimationExtra
-	dw SandshrewAnimationExtra
-	dw SandslashAnimationExtra
-	dw NidoranFAnimationExtra
-	dw NidorinaAnimationExtra
-	dw NidoqueenAnimationExtra
-	dw NidoranMAnimationExtra
-	dw NidorinoAnimationExtra
-	dw NidokingAnimationExtra
-	dw ClefairyAnimationExtra
-	dw ClefableAnimationExtra
-	dw VulpixAnimationExtra
-	dw NinetalesAnimationExtra
-	dw JigglypuffAnimationExtra
-	dw WigglytuffAnimationExtra
-	dw ZubatAnimationExtra
-	dw GolbatAnimationExtra
-	dw OddishAnimationExtra
-	dw GloomAnimationExtra
-	dw VileplumeAnimationExtra
-	dw ParasAnimationExtra
-	dw ParasectAnimationExtra
-	dw VenonatAnimationExtra
-	dw VenomothAnimationExtra
-	dw DiglettAnimationExtra
-	dw DugtrioAnimationExtra
-	dw MeowthAnimationExtra
-	dw PersianAnimationExtra
-	dw PsyduckAnimationExtra
-	dw GolduckAnimationExtra
-	dw MankeyAnimationExtra
-	dw PrimeapeAnimationExtra
-	dw GrowlitheAnimationExtra
-	dw ArcanineAnimationExtra
-	dw PoliwagAnimationExtra
-	dw PoliwhirlAnimationExtra
-	dw PoliwrathAnimationExtra
-	dw AbraAnimationExtra
-	dw KadabraAnimationExtra
-	dw AlakazamAnimationExtra
-	dw MachopAnimationExtra
-	dw MachokeAnimationExtra
-	dw MachampAnimationExtra
-	dw BellsproutAnimationExtra
-	dw WeepinbellAnimationExtra
-	dw VictreebelAnimationExtra
-	dw TentacoolAnimationExtra
-	dw TentacruelAnimationExtra
-	dw GeodudeAnimationExtra
-	dw GravelerAnimationExtra
-	dw GolemAnimationExtra
-	dw PonytaAnimationExtra
-	dw RapidashAnimationExtra
-	dw SlowpokeAnimationExtra
-	dw SlowbroAnimationExtra
-	dw MagnemiteAnimationExtra
-	dw MagnetonAnimationExtra
-	dw FarfetchDAnimationExtra
-	dw DoduoAnimationExtra
-	dw DodrioAnimationExtra
-	dw SeelAnimationExtra
-	dw DewgongAnimationExtra
-	dw GrimerAnimationExtra
-	dw MukAnimationExtra
-	dw ShellderAnimationExtra
-	dw CloysterAnimationExtra
-	dw GastlyAnimationExtra
-	dw HaunterAnimationExtra
-	dw GengarAnimationExtra
-	dw OnixAnimationExtra
-	dw DrowzeeAnimationExtra
-	dw HypnoAnimationExtra
-	dw KrabbyAnimationExtra
-	dw KinglerAnimationExtra
-	dw VoltorbAnimationExtra
-	dw ElectrodeAnimationExtra
-	dw ExeggcuteAnimationExtra
-	dw ExeggutorAnimationExtra
-	dw CuboneAnimationExtra
-	dw MarowakAnimationExtra
-	dw HitmonleeAnimationExtra
-	dw HitmonchanAnimationExtra
-	dw LickitungAnimationExtra
-	dw KoffingAnimationExtra
-	dw WeezingAnimationExtra
-	dw RhyhornAnimationExtra
-	dw RhydonAnimationExtra
-	dw ChanseyAnimationExtra
-	dw TangelaAnimationExtra
-	dw KangaskhanAnimationExtra
-	dw HorseaAnimationExtra
-	dw SeadraAnimationExtra
-	dw GoldeenAnimationExtra
-	dw SeakingAnimationExtra
-	dw StaryuAnimationExtra
-	dw StarmieAnimationExtra
-	dw MrMimeAnimationExtra
-	dw ScytherAnimationExtra
-	dw JynxAnimationExtra
-	dw ElectabuzzAnimationExtra
-	dw MagmarAnimationExtra
-	dw PinsirAnimationExtra
-	dw TaurosAnimationExtra
-	dw MagikarpAnimationExtra
-	dw GyaradosAnimationExtra
-	dw LaprasAnimationExtra
-	dw DittoAnimationExtra
-	dw EeveeAnimationExtra
-	dw VaporeonAnimationExtra
-	dw JolteonAnimationExtra
-	dw FlareonAnimationExtra
-	dw PorygonAnimationExtra
-	dw OmanyteAnimationExtra
-	dw OmastarAnimationExtra
-	dw KabutoAnimationExtra
-	dw KabutopsAnimationExtra
-	dw AerodactylAnimationExtra
-	dw SnorlaxAnimationExtra
-	dw ArticunoAnimationExtra
-	dw ZapdosAnimationExtra
-	dw MoltresAnimationExtra
-	dw DratiniAnimationExtra
-	dw DragonairAnimationExtra
-	dw DragoniteAnimationExtra
-	dw MewtwoAnimationExtra
-	dw MewAnimationExtra
-	dw ChikoritaAnimationExtra
-	dw BayleefAnimationExtra
-	dw MeganiumAnimationExtra
-	dw CyndaquilAnimationExtra
-	dw QuilavaAnimationExtra
-	dw TyphlosionAnimationExtra
-	dw TotodileAnimationExtra
-	dw CroconawAnimationExtra
-	dw FeraligatrAnimationExtra
-	dw SentretAnimationExtra
-	dw FurretAnimationExtra
-	dw HoothootAnimationExtra
-	dw NoctowlAnimationExtra
-	dw LedybaAnimationExtra
-	dw LedianAnimationExtra
-	dw SpinarakAnimationExtra
-	dw AriadosAnimationExtra
-	dw CrobatAnimationExtra
-	dw ChinchouAnimationExtra
-	dw LanturnAnimationExtra
-	dw PichuAnimationExtra
-	dw CleffaAnimationExtra
-	dw IgglybuffAnimationExtra
-	dw TogepiAnimationExtra
-	dw TogeticAnimationExtra
-	dw NatuAnimationExtra
-	dw XatuAnimationExtra
-	dw MareepAnimationExtra
-	dw FlaaffyAnimationExtra
-	dw AmpharosAnimationExtra
-	dw BellossomAnimationExtra
-	dw MarillAnimationExtra
-	dw AzumarillAnimationExtra
-	dw SudowoodoAnimationExtra
-	dw PolitoedAnimationExtra
-	dw HoppipAnimationExtra
-	dw SkiploomAnimationExtra
-	dw JumpluffAnimationExtra
-	dw AipomAnimationExtra
-	dw SunkernAnimationExtra
-	dw SunfloraAnimationExtra
-	dw YanmaAnimationExtra
-	dw WooperAnimationExtra
-	dw QuagsireAnimationExtra
-	dw EspeonAnimationExtra
-	dw UmbreonAnimationExtra
-	dw MurkrowAnimationExtra
-	dw SlowkingAnimationExtra
-	dw MisdreavusAnimationExtra
-	dw UnownAnimationExtra
-	dw WobbuffetAnimationExtra
-	dw GirafarigAnimationExtra
-	dw PinecoAnimationExtra
-	dw ForretressAnimationExtra
-	dw DunsparceAnimationExtra
-	dw GligarAnimationExtra
-	dw SteelixAnimationExtra
-	dw SnubbullAnimationExtra
-	dw GranbullAnimationExtra
-	dw QwilfishAnimationExtra
-	dw ScizorAnimationExtra
-	dw ShuckleAnimationExtra
-	dw HeracrossAnimationExtra
-	dw SneaselAnimationExtra
-	dw TeddiursaAnimationExtra
-	dw UrsaringAnimationExtra
-	dw SlugmaAnimationExtra
-	dw MagcargoAnimationExtra
-	dw SwinubAnimationExtra
-	dw PiloswineAnimationExtra
-	dw CorsolaAnimationExtra
-	dw RemoraidAnimationExtra
-	dw OctilleryAnimationExtra
-	dw DelibirdAnimationExtra
-	dw MantineAnimationExtra
-	dw SkarmoryAnimationExtra
-	dw HoundourAnimationExtra
-	dw HoundoomAnimationExtra
-	dw KingdraAnimationExtra
-	dw PhanpyAnimationExtra
-	dw DonphanAnimationExtra
-	dw Porygon2AnimationExtra
-	dw StantlerAnimationExtra
-	dw SmeargleAnimationExtra
-	dw TyrogueAnimationExtra
-	dw HitmontopAnimationExtra
-	dw SmoochumAnimationExtra
-	dw ElekidAnimationExtra
-	dw MagbyAnimationExtra
-	dw MiltankAnimationExtra
-	dw BlisseyAnimationExtra
-	dw RaikouAnimationExtra
-	dw EnteiAnimationExtra
-	dw SuicuneAnimationExtra
-	dw LarvitarAnimationExtra
-	dw PupitarAnimationExtra
-	dw TyranitarAnimationExtra
-	dw LugiaAnimationExtra
-	dw HoOhAnimationExtra
-	dw CelebiAnimationExtra
diff --git a/gfx/pokemon/extras.asm b/gfx/pokemon/extras.asm
deleted file mode 100644
index 88cb6a77b..000000000
--- a/gfx/pokemon/extras.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurAnimationExtra:  INCLUDE "gfx/pokemon/bulbasaur/anim1.asm"
-IvysaurAnimationExtra:    INCLUDE "gfx/pokemon/ivysaur/anim1.asm"
-VenusaurAnimationExtra:   INCLUDE "gfx/pokemon/venusaur/anim1.asm"
-CharmanderAnimationExtra: INCLUDE "gfx/pokemon/charmander/anim1.asm"
-CharmeleonAnimationExtra: INCLUDE "gfx/pokemon/charmeleon/anim1.asm"
-CharizardAnimationExtra:  INCLUDE "gfx/pokemon/charizard/anim1.asm"
-SquirtleAnimationExtra:   INCLUDE "gfx/pokemon/squirtle/anim1.asm"
-WartortleAnimationExtra:  INCLUDE "gfx/pokemon/wartortle/anim1.asm"
-BlastoiseAnimationExtra:  INCLUDE "gfx/pokemon/blastoise/anim1.asm"
-CaterpieAnimationExtra:   INCLUDE "gfx/pokemon/caterpie/anim1.asm"
-MetapodAnimationExtra:    INCLUDE "gfx/pokemon/metapod/anim1.asm"
-ButterfreeAnimationExtra: INCLUDE "gfx/pokemon/butterfree/anim1.asm"
-WeedleAnimationExtra:     INCLUDE "gfx/pokemon/weedle/anim1.asm"
-KakunaAnimationExtra:     INCLUDE "gfx/pokemon/kakuna/anim1.asm"
-BeedrillAnimationExtra:   INCLUDE "gfx/pokemon/beedrill/anim1.asm"
-PidgeyAnimationExtra:     INCLUDE "gfx/pokemon/pidgey/anim1.asm"
-PidgeottoAnimationExtra:  INCLUDE "gfx/pokemon/pidgeotto/anim1.asm"
-PidgeotAnimationExtra:    INCLUDE "gfx/pokemon/pidgeot/anim1.asm"
-RattataAnimationExtra:    INCLUDE "gfx/pokemon/rattata/anim1.asm"
-RaticateAnimationExtra:   INCLUDE "gfx/pokemon/raticate/anim1.asm"
-SpearowAnimationExtra:    INCLUDE "gfx/pokemon/spearow/anim1.asm"
-FearowAnimationExtra:     INCLUDE "gfx/pokemon/fearow/anim1.asm"
-EkansAnimationExtra:      INCLUDE "gfx/pokemon/ekans/anim1.asm"
-ArbokAnimationExtra:      INCLUDE "gfx/pokemon/arbok/anim1.asm"
-PikachuAnimationExtra:    INCLUDE "gfx/pokemon/pikachu/anim1.asm"
-RaichuAnimationExtra:     INCLUDE "gfx/pokemon/raichu/anim1.asm"
-SandshrewAnimationExtra:  INCLUDE "gfx/pokemon/sandshrew/anim1.asm"
-SandslashAnimationExtra:  INCLUDE "gfx/pokemon/sandslash/anim1.asm"
-NidoranFAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_f/anim1.asm"
-NidorinaAnimationExtra:   INCLUDE "gfx/pokemon/nidorina/anim1.asm"
-NidoqueenAnimationExtra:  INCLUDE "gfx/pokemon/nidoqueen/anim1.asm"
-NidoranMAnimationExtra:   INCLUDE "gfx/pokemon/nidoran_m/anim1.asm"
-NidorinoAnimationExtra:   INCLUDE "gfx/pokemon/nidorino/anim1.asm"
-NidokingAnimationExtra:   INCLUDE "gfx/pokemon/nidoking/anim1.asm"
-ClefairyAnimationExtra:   INCLUDE "gfx/pokemon/clefairy/anim1.asm"
-ClefableAnimationExtra:   INCLUDE "gfx/pokemon/clefable/anim1.asm"
-VulpixAnimationExtra:     INCLUDE "gfx/pokemon/vulpix/anim1.asm"
-NinetalesAnimationExtra:  INCLUDE "gfx/pokemon/ninetales/anim1.asm"
-JigglypuffAnimationExtra: INCLUDE "gfx/pokemon/jigglypuff/anim1.asm"
-WigglytuffAnimationExtra: INCLUDE "gfx/pokemon/wigglytuff/anim1.asm"
-ZubatAnimationExtra:      INCLUDE "gfx/pokemon/zubat/anim1.asm"
-GolbatAnimationExtra:     INCLUDE "gfx/pokemon/golbat/anim1.asm"
-OddishAnimationExtra:     INCLUDE "gfx/pokemon/oddish/anim1.asm"
-GloomAnimationExtra:      INCLUDE "gfx/pokemon/gloom/anim1.asm"
-VileplumeAnimationExtra:  INCLUDE "gfx/pokemon/vileplume/anim1.asm"
-ParasAnimationExtra:      INCLUDE "gfx/pokemon/paras/anim1.asm"
-ParasectAnimationExtra:   INCLUDE "gfx/pokemon/parasect/anim1.asm"
-VenonatAnimationExtra:    INCLUDE "gfx/pokemon/venonat/anim1.asm"
-VenomothAnimationExtra:   INCLUDE "gfx/pokemon/venomoth/anim1.asm"
-DiglettAnimationExtra:    INCLUDE "gfx/pokemon/diglett/anim1.asm"
-DugtrioAnimationExtra:    INCLUDE "gfx/pokemon/dugtrio/anim1.asm"
-MeowthAnimationExtra:     INCLUDE "gfx/pokemon/meowth/anim1.asm"
-PersianAnimationExtra:    INCLUDE "gfx/pokemon/persian/anim1.asm"
-PsyduckAnimationExtra:    INCLUDE "gfx/pokemon/psyduck/anim1.asm"
-GolduckAnimationExtra:    INCLUDE "gfx/pokemon/golduck/anim1.asm"
-MankeyAnimationExtra:     INCLUDE "gfx/pokemon/mankey/anim1.asm"
-PrimeapeAnimationExtra:   INCLUDE "gfx/pokemon/primeape/anim1.asm"
-GrowlitheAnimationExtra:  INCLUDE "gfx/pokemon/growlithe/anim1.asm"
-ArcanineAnimationExtra:   INCLUDE "gfx/pokemon/arcanine/anim1.asm"
-PoliwagAnimationExtra:    INCLUDE "gfx/pokemon/poliwag/anim1.asm"
-PoliwhirlAnimationExtra:  INCLUDE "gfx/pokemon/poliwhirl/anim1.asm"
-PoliwrathAnimationExtra:  INCLUDE "gfx/pokemon/poliwrath/anim1.asm"
-AbraAnimationExtra:       INCLUDE "gfx/pokemon/abra/anim1.asm"
-KadabraAnimationExtra:    INCLUDE "gfx/pokemon/kadabra/anim1.asm"
-AlakazamAnimationExtra:   INCLUDE "gfx/pokemon/alakazam/anim1.asm"
-MachopAnimationExtra:     INCLUDE "gfx/pokemon/machop/anim1.asm"
-MachokeAnimationExtra:    INCLUDE "gfx/pokemon/machoke/anim1.asm"
-MachampAnimationExtra:    INCLUDE "gfx/pokemon/machamp/anim1.asm"
-BellsproutAnimationExtra: INCLUDE "gfx/pokemon/bellsprout/anim1.asm"
-WeepinbellAnimationExtra: INCLUDE "gfx/pokemon/weepinbell/anim1.asm"
-VictreebelAnimationExtra: INCLUDE "gfx/pokemon/victreebel/anim1.asm"
-TentacoolAnimationExtra:  INCLUDE "gfx/pokemon/tentacool/anim1.asm"
-TentacruelAnimationExtra: INCLUDE "gfx/pokemon/tentacruel/anim1.asm"
-GeodudeAnimationExtra:    INCLUDE "gfx/pokemon/geodude/anim1.asm"
-GravelerAnimationExtra:   INCLUDE "gfx/pokemon/graveler/anim1.asm"
-GolemAnimationExtra:      INCLUDE "gfx/pokemon/golem/anim1.asm"
-PonytaAnimationExtra:     INCLUDE "gfx/pokemon/ponyta/anim1.asm"
-RapidashAnimationExtra:   INCLUDE "gfx/pokemon/rapidash/anim1.asm"
-SlowpokeAnimationExtra:   INCLUDE "gfx/pokemon/slowpoke/anim1.asm"
-SlowbroAnimationExtra:    INCLUDE "gfx/pokemon/slowbro/anim1.asm"
-MagnemiteAnimationExtra:  INCLUDE "gfx/pokemon/magnemite/anim1.asm"
-MagnetonAnimationExtra:   INCLUDE "gfx/pokemon/magneton/anim1.asm"
-FarfetchDAnimationExtra:  INCLUDE "gfx/pokemon/farfetch_d/anim1.asm"
-DoduoAnimationExtra:      INCLUDE "gfx/pokemon/doduo/anim1.asm"
-DodrioAnimationExtra:     INCLUDE "gfx/pokemon/dodrio/anim1.asm"
-SeelAnimationExtra:       INCLUDE "gfx/pokemon/seel/anim1.asm"
-DewgongAnimationExtra:    INCLUDE "gfx/pokemon/dewgong/anim1.asm"
-GrimerAnimationExtra:     INCLUDE "gfx/pokemon/grimer/anim1.asm"
-MukAnimationExtra:        INCLUDE "gfx/pokemon/muk/anim1.asm"
-ShellderAnimationExtra:   INCLUDE "gfx/pokemon/shellder/anim1.asm"
-CloysterAnimationExtra:   INCLUDE "gfx/pokemon/cloyster/anim1.asm"
-GastlyAnimationExtra:     INCLUDE "gfx/pokemon/gastly/anim1.asm"
-HaunterAnimationExtra:    INCLUDE "gfx/pokemon/haunter/anim1.asm"
-GengarAnimationExtra:     INCLUDE "gfx/pokemon/gengar/anim1.asm"
-OnixAnimationExtra:       INCLUDE "gfx/pokemon/onix/anim1.asm"
-DrowzeeAnimationExtra:    INCLUDE "gfx/pokemon/drowzee/anim1.asm"
-HypnoAnimationExtra:      INCLUDE "gfx/pokemon/hypno/anim1.asm"
-KrabbyAnimationExtra:     INCLUDE "gfx/pokemon/krabby/anim1.asm"
-KinglerAnimationExtra:    INCLUDE "gfx/pokemon/kingler/anim1.asm"
-VoltorbAnimationExtra:    INCLUDE "gfx/pokemon/voltorb/anim1.asm"
-ElectrodeAnimationExtra:  INCLUDE "gfx/pokemon/electrode/anim1.asm"
-ExeggcuteAnimationExtra:  INCLUDE "gfx/pokemon/exeggcute/anim1.asm"
-ExeggutorAnimationExtra:  INCLUDE "gfx/pokemon/exeggutor/anim1.asm"
-CuboneAnimationExtra:     INCLUDE "gfx/pokemon/cubone/anim1.asm"
-MarowakAnimationExtra:    INCLUDE "gfx/pokemon/marowak/anim1.asm"
-HitmonleeAnimationExtra:  INCLUDE "gfx/pokemon/hitmonlee/anim1.asm"
-HitmonchanAnimationExtra: INCLUDE "gfx/pokemon/hitmonchan/anim1.asm"
-LickitungAnimationExtra:  INCLUDE "gfx/pokemon/lickitung/anim1.asm"
-KoffingAnimationExtra:    INCLUDE "gfx/pokemon/koffing/anim1.asm"
-WeezingAnimationExtra:    INCLUDE "gfx/pokemon/weezing/anim1.asm"
-RhyhornAnimationExtra:    INCLUDE "gfx/pokemon/rhyhorn/anim1.asm"
-RhydonAnimationExtra:     INCLUDE "gfx/pokemon/rhydon/anim1.asm"
-ChanseyAnimationExtra:    INCLUDE "gfx/pokemon/chansey/anim1.asm"
-TangelaAnimationExtra:    INCLUDE "gfx/pokemon/tangela/anim1.asm"
-KangaskhanAnimationExtra: INCLUDE "gfx/pokemon/kangaskhan/anim1.asm"
-HorseaAnimationExtra:     INCLUDE "gfx/pokemon/horsea/anim1.asm"
-SeadraAnimationExtra:     INCLUDE "gfx/pokemon/seadra/anim1.asm"
-GoldeenAnimationExtra:    INCLUDE "gfx/pokemon/goldeen/anim1.asm"
-SeakingAnimationExtra:    INCLUDE "gfx/pokemon/seaking/anim1.asm"
-StaryuAnimationExtra:     INCLUDE "gfx/pokemon/staryu/anim1.asm"
-StarmieAnimationExtra:    INCLUDE "gfx/pokemon/starmie/anim1.asm"
-MrMimeAnimationExtra:     INCLUDE "gfx/pokemon/mr__mime/anim1.asm"
-ScytherAnimationExtra:    INCLUDE "gfx/pokemon/scyther/anim1.asm"
-JynxAnimationExtra:       INCLUDE "gfx/pokemon/jynx/anim1.asm"
-ElectabuzzAnimationExtra: INCLUDE "gfx/pokemon/electabuzz/anim1.asm"
-MagmarAnimationExtra:     INCLUDE "gfx/pokemon/magmar/anim1.asm"
-PinsirAnimationExtra:     INCLUDE "gfx/pokemon/pinsir/anim1.asm"
-TaurosAnimationExtra:     INCLUDE "gfx/pokemon/tauros/anim1.asm"
-MagikarpAnimationExtra:   INCLUDE "gfx/pokemon/magikarp/anim1.asm"
-GyaradosAnimationExtra:   INCLUDE "gfx/pokemon/gyarados/anim1.asm"
-LaprasAnimationExtra:     INCLUDE "gfx/pokemon/lapras/anim1.asm"
-DittoAnimationExtra:      INCLUDE "gfx/pokemon/ditto/anim1.asm"
-EeveeAnimationExtra:      INCLUDE "gfx/pokemon/eevee/anim1.asm"
-VaporeonAnimationExtra:   INCLUDE "gfx/pokemon/vaporeon/anim1.asm"
-JolteonAnimationExtra:    INCLUDE "gfx/pokemon/jolteon/anim1.asm"
-FlareonAnimationExtra:    INCLUDE "gfx/pokemon/flareon/anim1.asm"
-PorygonAnimationExtra:    INCLUDE "gfx/pokemon/porygon/anim1.asm"
-OmanyteAnimationExtra:    INCLUDE "gfx/pokemon/omanyte/anim1.asm"
-OmastarAnimationExtra:    INCLUDE "gfx/pokemon/omastar/anim1.asm"
-KabutoAnimationExtra:     INCLUDE "gfx/pokemon/kabuto/anim1.asm"
-KabutopsAnimationExtra:   INCLUDE "gfx/pokemon/kabutops/anim1.asm"
-AerodactylAnimationExtra: INCLUDE "gfx/pokemon/aerodactyl/anim1.asm"
-SnorlaxAnimationExtra:    INCLUDE "gfx/pokemon/snorlax/anim1.asm"
-ArticunoAnimationExtra:   INCLUDE "gfx/pokemon/articuno/anim1.asm"
-ZapdosAnimationExtra:     INCLUDE "gfx/pokemon/zapdos/anim1.asm"
-MoltresAnimationExtra:    INCLUDE "gfx/pokemon/moltres/anim1.asm"
-DratiniAnimationExtra:    INCLUDE "gfx/pokemon/dratini/anim1.asm"
-DragonairAnimationExtra:  INCLUDE "gfx/pokemon/dragonair/anim1.asm"
-DragoniteAnimationExtra:  INCLUDE "gfx/pokemon/dragonite/anim1.asm"
-MewtwoAnimationExtra:     INCLUDE "gfx/pokemon/mewtwo/anim1.asm"
-MewAnimationExtra:        INCLUDE "gfx/pokemon/mew/anim1.asm"
-ChikoritaAnimationExtra:  INCLUDE "gfx/pokemon/chikorita/anim1.asm"
-BayleefAnimationExtra:    INCLUDE "gfx/pokemon/bayleef/anim1.asm"
-MeganiumAnimationExtra:   INCLUDE "gfx/pokemon/meganium/anim1.asm"
-CyndaquilAnimationExtra:  INCLUDE "gfx/pokemon/cyndaquil/anim1.asm"
-QuilavaAnimationExtra:    INCLUDE "gfx/pokemon/quilava/anim1.asm"
-TyphlosionAnimationExtra: INCLUDE "gfx/pokemon/typhlosion/anim1.asm"
-TotodileAnimationExtra:   INCLUDE "gfx/pokemon/totodile/anim1.asm"
-CroconawAnimationExtra:   INCLUDE "gfx/pokemon/croconaw/anim1.asm"
-FeraligatrAnimationExtra: INCLUDE "gfx/pokemon/feraligatr/anim1.asm"
-SentretAnimationExtra:    INCLUDE "gfx/pokemon/sentret/anim1.asm"
-FurretAnimationExtra:     INCLUDE "gfx/pokemon/furret/anim1.asm"
-HoothootAnimationExtra:   INCLUDE "gfx/pokemon/hoothoot/anim1.asm"
-NoctowlAnimationExtra:    INCLUDE "gfx/pokemon/noctowl/anim1.asm"
-LedybaAnimationExtra:     INCLUDE "gfx/pokemon/ledyba/anim1.asm"
-LedianAnimationExtra:     INCLUDE "gfx/pokemon/ledian/anim1.asm"
-SpinarakAnimationExtra:   INCLUDE "gfx/pokemon/spinarak/anim1.asm"
-AriadosAnimationExtra:    INCLUDE "gfx/pokemon/ariados/anim1.asm"
-CrobatAnimationExtra:     INCLUDE "gfx/pokemon/crobat/anim1.asm"
-ChinchouAnimationExtra:   INCLUDE "gfx/pokemon/chinchou/anim1.asm"
-LanturnAnimationExtra:    INCLUDE "gfx/pokemon/lanturn/anim1.asm"
-PichuAnimationExtra:      INCLUDE "gfx/pokemon/pichu/anim1.asm"
-CleffaAnimationExtra:     INCLUDE "gfx/pokemon/cleffa/anim1.asm"
-IgglybuffAnimationExtra:  INCLUDE "gfx/pokemon/igglybuff/anim1.asm"
-TogepiAnimationExtra:     INCLUDE "gfx/pokemon/togepi/anim1.asm"
-TogeticAnimationExtra:    INCLUDE "gfx/pokemon/togetic/anim1.asm"
-NatuAnimationExtra:       INCLUDE "gfx/pokemon/natu/anim1.asm"
-XatuAnimationExtra:       INCLUDE "gfx/pokemon/xatu/anim1.asm"
-MareepAnimationExtra:     INCLUDE "gfx/pokemon/mareep/anim1.asm"
-FlaaffyAnimationExtra:    INCLUDE "gfx/pokemon/flaaffy/anim1.asm"
-AmpharosAnimationExtra:   INCLUDE "gfx/pokemon/ampharos/anim1.asm"
-BellossomAnimationExtra:  INCLUDE "gfx/pokemon/bellossom/anim1.asm"
-MarillAnimationExtra:     INCLUDE "gfx/pokemon/marill/anim1.asm"
-AzumarillAnimationExtra:  INCLUDE "gfx/pokemon/azumarill/anim1.asm"
-SudowoodoAnimationExtra:  INCLUDE "gfx/pokemon/sudowoodo/anim1.asm"
-PolitoedAnimationExtra:   INCLUDE "gfx/pokemon/politoed/anim1.asm"
-HoppipAnimationExtra:     INCLUDE "gfx/pokemon/hoppip/anim1.asm"
-SkiploomAnimationExtra:   INCLUDE "gfx/pokemon/skiploom/anim1.asm"
-JumpluffAnimationExtra:   INCLUDE "gfx/pokemon/jumpluff/anim1.asm"
-AipomAnimationExtra:      INCLUDE "gfx/pokemon/aipom/anim1.asm"
-SunkernAnimationExtra:    INCLUDE "gfx/pokemon/sunkern/anim1.asm"
-SunfloraAnimationExtra:   INCLUDE "gfx/pokemon/sunflora/anim1.asm"
-YanmaAnimationExtra:      INCLUDE "gfx/pokemon/yanma/anim1.asm"
-WooperAnimationExtra:     INCLUDE "gfx/pokemon/wooper/anim1.asm"
-QuagsireAnimationExtra:   INCLUDE "gfx/pokemon/quagsire/anim1.asm"
-EspeonAnimationExtra:     INCLUDE "gfx/pokemon/espeon/anim1.asm"
-UmbreonAnimationExtra:    INCLUDE "gfx/pokemon/umbreon/anim1.asm"
-MurkrowAnimationExtra:    INCLUDE "gfx/pokemon/murkrow/anim1.asm"
-SlowkingAnimationExtra:   INCLUDE "gfx/pokemon/slowking/anim1.asm"
-MisdreavusAnimationExtra: INCLUDE "gfx/pokemon/misdreavus/anim1.asm"
-UnownAnimationExtra:      INCLUDE "gfx/pokemon/unown/anim1.asm"
-WobbuffetAnimationExtra:  INCLUDE "gfx/pokemon/wobbuffet/anim1.asm"
-GirafarigAnimationExtra:  INCLUDE "gfx/pokemon/girafarig/anim1.asm"
-PinecoAnimationExtra:     INCLUDE "gfx/pokemon/pineco/anim1.asm"
-ForretressAnimationExtra: INCLUDE "gfx/pokemon/forretress/anim1.asm"
-DunsparceAnimationExtra:  INCLUDE "gfx/pokemon/dunsparce/anim1.asm"
-GligarAnimationExtra:     INCLUDE "gfx/pokemon/gligar/anim1.asm"
-SteelixAnimationExtra:    INCLUDE "gfx/pokemon/steelix/anim1.asm"
-SnubbullAnimationExtra:   INCLUDE "gfx/pokemon/snubbull/anim1.asm"
-GranbullAnimationExtra:   INCLUDE "gfx/pokemon/granbull/anim1.asm"
-QwilfishAnimationExtra:   INCLUDE "gfx/pokemon/qwilfish/anim1.asm"
-ScizorAnimationExtra:     INCLUDE "gfx/pokemon/scizor/anim1.asm"
-ShuckleAnimationExtra:    INCLUDE "gfx/pokemon/shuckle/anim1.asm"
-HeracrossAnimationExtra:  INCLUDE "gfx/pokemon/heracross/anim1.asm"
-SneaselAnimationExtra:    INCLUDE "gfx/pokemon/sneasel/anim1.asm"
-TeddiursaAnimationExtra:  INCLUDE "gfx/pokemon/teddiursa/anim1.asm"
-UrsaringAnimationExtra:   INCLUDE "gfx/pokemon/ursaring/anim1.asm"
-SlugmaAnimationExtra:     INCLUDE "gfx/pokemon/slugma/anim1.asm"
-MagcargoAnimationExtra:   INCLUDE "gfx/pokemon/magcargo/anim1.asm"
-SwinubAnimationExtra:     INCLUDE "gfx/pokemon/swinub/anim1.asm"
-PiloswineAnimationExtra:  INCLUDE "gfx/pokemon/piloswine/anim1.asm"
-CorsolaAnimationExtra:    INCLUDE "gfx/pokemon/corsola/anim1.asm"
-RemoraidAnimationExtra:   INCLUDE "gfx/pokemon/remoraid/anim1.asm"
-OctilleryAnimationExtra:  INCLUDE "gfx/pokemon/octillery/anim1.asm"
-DelibirdAnimationExtra:   INCLUDE "gfx/pokemon/delibird/anim1.asm"
-MantineAnimationExtra:    INCLUDE "gfx/pokemon/mantine/anim1.asm"
-SkarmoryAnimationExtra:   INCLUDE "gfx/pokemon/skarmory/anim1.asm"
-HoundourAnimationExtra:   INCLUDE "gfx/pokemon/houndour/anim1.asm"
-HoundoomAnimationExtra:   INCLUDE "gfx/pokemon/houndoom/anim1.asm"
-KingdraAnimationExtra:    INCLUDE "gfx/pokemon/kingdra/anim1.asm"
-PhanpyAnimationExtra:     INCLUDE "gfx/pokemon/phanpy/anim1.asm"
-DonphanAnimationExtra:    INCLUDE "gfx/pokemon/donphan/anim1.asm"
-Porygon2AnimationExtra:   INCLUDE "gfx/pokemon/porygon2/anim1.asm"
-StantlerAnimationExtra:   INCLUDE "gfx/pokemon/stantler/anim1.asm"
-SmeargleAnimationExtra:   INCLUDE "gfx/pokemon/smeargle/anim1.asm"
-TyrogueAnimationExtra:    INCLUDE "gfx/pokemon/tyrogue/anim1.asm"
-HitmontopAnimationExtra:  INCLUDE "gfx/pokemon/hitmontop/anim1.asm"
-SmoochumAnimationExtra:   INCLUDE "gfx/pokemon/smoochum/anim1.asm"
-ElekidAnimationExtra:     INCLUDE "gfx/pokemon/elekid/anim1.asm"
-MagbyAnimationExtra:      INCLUDE "gfx/pokemon/magby/anim1.asm"
-MiltankAnimationExtra:    INCLUDE "gfx/pokemon/miltank/anim1.asm"
-BlisseyAnimationExtra:    INCLUDE "gfx/pokemon/blissey/anim1.asm"
-RaikouAnimationExtra:     INCLUDE "gfx/pokemon/raikou/anim1.asm"
-EnteiAnimationExtra:      INCLUDE "gfx/pokemon/entei/anim1.asm"
-SuicuneAnimationExtra:    INCLUDE "gfx/pokemon/suicune/anim1.asm"
-LarvitarAnimationExtra:   INCLUDE "gfx/pokemon/larvitar/anim1.asm"
-PupitarAnimationExtra:    INCLUDE "gfx/pokemon/pupitar/anim1.asm"
-TyranitarAnimationExtra:  INCLUDE "gfx/pokemon/tyranitar/anim1.asm"
-LugiaAnimationExtra:      INCLUDE "gfx/pokemon/lugia/anim1.asm"
-HoOhAnimationExtra:       INCLUDE "gfx/pokemon/ho_oh/anim1.asm"
-CelebiAnimationExtra:     INCLUDE "gfx/pokemon/celebi/anim1.asm"
-EggAnimationExtra:        INCLUDE "gfx/pokemon/egg/anim1.asm"
diff --git a/gfx/pokemon/farfetch_d/anim0.asm b/gfx/pokemon/farfetch_d/anim.asm
index 4dac6c1a4..4dac6c1a4 100644
--- a/gfx/pokemon/farfetch_d/anim0.asm
+++ b/gfx/pokemon/farfetch_d/anim.asm
diff --git a/gfx/pokemon/farfetch_d/anim1.asm b/gfx/pokemon/farfetch_d/anim_idle.asm
index 5dcfaa89d..5dcfaa89d 100644
--- a/gfx/pokemon/farfetch_d/anim1.asm
+++ b/gfx/pokemon/farfetch_d/anim_idle.asm
diff --git a/gfx/pokemon/fearow/anim0.asm b/gfx/pokemon/fearow/anim.asm
index 3a689af18..3a689af18 100644
--- a/gfx/pokemon/fearow/anim0.asm
+++ b/gfx/pokemon/fearow/anim.asm
diff --git a/gfx/pokemon/fearow/anim1.asm b/gfx/pokemon/fearow/anim_idle.asm
index 0233782c9..0233782c9 100644
--- a/gfx/pokemon/fearow/anim1.asm
+++ b/gfx/pokemon/fearow/anim_idle.asm
diff --git a/gfx/pokemon/feraligatr/anim0.asm b/gfx/pokemon/feraligatr/anim.asm
index 1a0cebd2e..1a0cebd2e 100644
--- a/gfx/pokemon/feraligatr/anim0.asm
+++ b/gfx/pokemon/feraligatr/anim.asm
diff --git a/gfx/pokemon/feraligatr/anim1.asm b/gfx/pokemon/feraligatr/anim_idle.asm
index c1c39258d..c1c39258d 100644
--- a/gfx/pokemon/feraligatr/anim1.asm
+++ b/gfx/pokemon/feraligatr/anim_idle.asm
diff --git a/gfx/pokemon/flaaffy/anim0.asm b/gfx/pokemon/flaaffy/anim.asm
index c9f1f4e7e..c9f1f4e7e 100644
--- a/gfx/pokemon/flaaffy/anim0.asm
+++ b/gfx/pokemon/flaaffy/anim.asm
diff --git a/gfx/pokemon/flaaffy/anim1.asm b/gfx/pokemon/flaaffy/anim_idle.asm
index b9ec0d483..b9ec0d483 100644
--- a/gfx/pokemon/flaaffy/anim1.asm
+++ b/gfx/pokemon/flaaffy/anim_idle.asm
diff --git a/gfx/pokemon/flareon/anim0.asm b/gfx/pokemon/flareon/anim.asm
index dbefae362..dbefae362 100644
--- a/gfx/pokemon/flareon/anim0.asm
+++ b/gfx/pokemon/flareon/anim.asm
diff --git a/gfx/pokemon/flareon/anim1.asm b/gfx/pokemon/flareon/anim_idle.asm
index 431573106..431573106 100644
--- a/gfx/pokemon/flareon/anim1.asm
+++ b/gfx/pokemon/flareon/anim_idle.asm
diff --git a/gfx/pokemon/forretress/anim0.asm b/gfx/pokemon/forretress/anim.asm
index 74c8e2e12..74c8e2e12 100644
--- a/gfx/pokemon/forretress/anim0.asm
+++ b/gfx/pokemon/forretress/anim.asm
diff --git a/gfx/pokemon/forretress/anim1.asm b/gfx/pokemon/forretress/anim_idle.asm
index 4fafa1a3e..4fafa1a3e 100644
--- a/gfx/pokemon/forretress/anim1.asm
+++ b/gfx/pokemon/forretress/anim_idle.asm
diff --git a/gfx/pokemon/furret/anim0.asm b/gfx/pokemon/furret/anim.asm
index 8503d74ec..8503d74ec 100644
--- a/gfx/pokemon/furret/anim0.asm
+++ b/gfx/pokemon/furret/anim.asm
diff --git a/gfx/pokemon/furret/anim1.asm b/gfx/pokemon/furret/anim_idle.asm
index e175bf7cc..e175bf7cc 100644
--- a/gfx/pokemon/furret/anim1.asm
+++ b/gfx/pokemon/furret/anim_idle.asm
diff --git a/gfx/pokemon/gastly/anim0.asm b/gfx/pokemon/gastly/anim.asm
index d9414d188..d9414d188 100644
--- a/gfx/pokemon/gastly/anim0.asm
+++ b/gfx/pokemon/gastly/anim.asm
diff --git a/gfx/pokemon/gastly/anim1.asm b/gfx/pokemon/gastly/anim_idle.asm
index 65dc17abf..65dc17abf 100644
--- a/gfx/pokemon/gastly/anim1.asm
+++ b/gfx/pokemon/gastly/anim_idle.asm
diff --git a/gfx/pokemon/gengar/anim0.asm b/gfx/pokemon/gengar/anim.asm
index 842c47c76..842c47c76 100644
--- a/gfx/pokemon/gengar/anim0.asm
+++ b/gfx/pokemon/gengar/anim.asm
diff --git a/gfx/pokemon/gengar/anim1.asm b/gfx/pokemon/gengar/anim_idle.asm
index 09df5dca3..09df5dca3 100644
--- a/gfx/pokemon/gengar/anim1.asm
+++ b/gfx/pokemon/gengar/anim_idle.asm
diff --git a/gfx/pokemon/geodude/anim0.asm b/gfx/pokemon/geodude/anim.asm
index 3c54bc94e..3c54bc94e 100644
--- a/gfx/pokemon/geodude/anim0.asm
+++ b/gfx/pokemon/geodude/anim.asm
diff --git a/gfx/pokemon/geodude/anim1.asm b/gfx/pokemon/geodude/anim_idle.asm
index 4ec72d9b1..4ec72d9b1 100644
--- a/gfx/pokemon/geodude/anim1.asm
+++ b/gfx/pokemon/geodude/anim_idle.asm
diff --git a/gfx/pokemon/girafarig/anim0.asm b/gfx/pokemon/girafarig/anim.asm
index 3a7ebd9fe..3a7ebd9fe 100644
--- a/gfx/pokemon/girafarig/anim0.asm
+++ b/gfx/pokemon/girafarig/anim.asm
diff --git a/gfx/pokemon/girafarig/anim1.asm b/gfx/pokemon/girafarig/anim_idle.asm
index 95b1131ca..95b1131ca 100644
--- a/gfx/pokemon/girafarig/anim1.asm
+++ b/gfx/pokemon/girafarig/anim_idle.asm
diff --git a/gfx/pokemon/gligar/anim0.asm b/gfx/pokemon/gligar/anim.asm
index 1dabf6cbd..1dabf6cbd 100644
--- a/gfx/pokemon/gligar/anim0.asm
+++ b/gfx/pokemon/gligar/anim.asm
diff --git a/gfx/pokemon/gligar/anim1.asm b/gfx/pokemon/gligar/anim_idle.asm
index 0cc7c0916..0cc7c0916 100644
--- a/gfx/pokemon/gligar/anim1.asm
+++ b/gfx/pokemon/gligar/anim_idle.asm
diff --git a/gfx/pokemon/gloom/anim0.asm b/gfx/pokemon/gloom/anim.asm
index 89c6805b9..89c6805b9 100644
--- a/gfx/pokemon/gloom/anim0.asm
+++ b/gfx/pokemon/gloom/anim.asm
diff --git a/gfx/pokemon/gloom/anim1.asm b/gfx/pokemon/gloom/anim_idle.asm
index cdb6c5191..cdb6c5191 100644
--- a/gfx/pokemon/gloom/anim1.asm
+++ b/gfx/pokemon/gloom/anim_idle.asm
diff --git a/gfx/pokemon/golbat/anim0.asm b/gfx/pokemon/golbat/anim.asm
index cb04c1a3b..cb04c1a3b 100644
--- a/gfx/pokemon/golbat/anim0.asm
+++ b/gfx/pokemon/golbat/anim.asm
diff --git a/gfx/pokemon/golbat/anim1.asm b/gfx/pokemon/golbat/anim_idle.asm
index 689aed3fd..689aed3fd 100644
--- a/gfx/pokemon/golbat/anim1.asm
+++ b/gfx/pokemon/golbat/anim_idle.asm
diff --git a/gfx/pokemon/goldeen/anim0.asm b/gfx/pokemon/goldeen/anim.asm
index c93141feb..c93141feb 100644
--- a/gfx/pokemon/goldeen/anim0.asm
+++ b/gfx/pokemon/goldeen/anim.asm
diff --git a/gfx/pokemon/goldeen/anim1.asm b/gfx/pokemon/goldeen/anim_idle.asm
index f31dfd1b2..f31dfd1b2 100644
--- a/gfx/pokemon/goldeen/anim1.asm
+++ b/gfx/pokemon/goldeen/anim_idle.asm
diff --git a/gfx/pokemon/golduck/anim0.asm b/gfx/pokemon/golduck/anim.asm
index 41ce17c55..41ce17c55 100644
--- a/gfx/pokemon/golduck/anim0.asm
+++ b/gfx/pokemon/golduck/anim.asm
diff --git a/gfx/pokemon/golduck/anim1.asm b/gfx/pokemon/golduck/anim_idle.asm
index a73476ca9..a73476ca9 100644
--- a/gfx/pokemon/golduck/anim1.asm
+++ b/gfx/pokemon/golduck/anim_idle.asm
diff --git a/gfx/pokemon/golem/anim0.asm b/gfx/pokemon/golem/anim.asm
index ef21ec211..ef21ec211 100644
--- a/gfx/pokemon/golem/anim0.asm
+++ b/gfx/pokemon/golem/anim.asm
diff --git a/gfx/pokemon/golem/anim1.asm b/gfx/pokemon/golem/anim_idle.asm
index 9d3c23ba3..9d3c23ba3 100644
--- a/gfx/pokemon/golem/anim1.asm
+++ b/gfx/pokemon/golem/anim_idle.asm
diff --git a/gfx/pokemon/granbull/anim0.asm b/gfx/pokemon/granbull/anim.asm
index 2f412479f..2f412479f 100644
--- a/gfx/pokemon/granbull/anim0.asm
+++ b/gfx/pokemon/granbull/anim.asm
diff --git a/gfx/pokemon/granbull/anim1.asm b/gfx/pokemon/granbull/anim_idle.asm
index 22e166977..22e166977 100644
--- a/gfx/pokemon/granbull/anim1.asm
+++ b/gfx/pokemon/granbull/anim_idle.asm
diff --git a/gfx/pokemon/graveler/anim0.asm b/gfx/pokemon/graveler/anim.asm
index 8c0fba1ac..8c0fba1ac 100644
--- a/gfx/pokemon/graveler/anim0.asm
+++ b/gfx/pokemon/graveler/anim.asm
diff --git a/gfx/pokemon/graveler/anim1.asm b/gfx/pokemon/graveler/anim_idle.asm
index e4ebc15e0..e4ebc15e0 100644
--- a/gfx/pokemon/graveler/anim1.asm
+++ b/gfx/pokemon/graveler/anim_idle.asm
diff --git a/gfx/pokemon/grimer/anim0.asm b/gfx/pokemon/grimer/anim.asm
index c8edda489..c8edda489 100644
--- a/gfx/pokemon/grimer/anim0.asm
+++ b/gfx/pokemon/grimer/anim.asm
diff --git a/gfx/pokemon/grimer/anim1.asm b/gfx/pokemon/grimer/anim_idle.asm
index 50829935e..50829935e 100644
--- a/gfx/pokemon/grimer/anim1.asm
+++ b/gfx/pokemon/grimer/anim_idle.asm
diff --git a/gfx/pokemon/growlithe/anim0.asm b/gfx/pokemon/growlithe/anim.asm
index 333c08e67..333c08e67 100644
--- a/gfx/pokemon/growlithe/anim0.asm
+++ b/gfx/pokemon/growlithe/anim.asm
diff --git a/gfx/pokemon/growlithe/anim1.asm b/gfx/pokemon/growlithe/anim_idle.asm
index bce18fa44..bce18fa44 100644
--- a/gfx/pokemon/growlithe/anim1.asm
+++ b/gfx/pokemon/growlithe/anim_idle.asm
diff --git a/gfx/pokemon/gyarados/anim0.asm b/gfx/pokemon/gyarados/anim.asm
index 89195fa31..89195fa31 100644
--- a/gfx/pokemon/gyarados/anim0.asm
+++ b/gfx/pokemon/gyarados/anim.asm
diff --git a/gfx/pokemon/gyarados/anim1.asm b/gfx/pokemon/gyarados/anim_idle.asm
index b33c52080..b33c52080 100644
--- a/gfx/pokemon/gyarados/anim1.asm
+++ b/gfx/pokemon/gyarados/anim_idle.asm
diff --git a/gfx/pokemon/haunter/anim0.asm b/gfx/pokemon/haunter/anim.asm
index a46d0f0bc..a46d0f0bc 100644
--- a/gfx/pokemon/haunter/anim0.asm
+++ b/gfx/pokemon/haunter/anim.asm
diff --git a/gfx/pokemon/haunter/anim1.asm b/gfx/pokemon/haunter/anim_idle.asm
index bf439b1e1..bf439b1e1 100644
--- a/gfx/pokemon/haunter/anim1.asm
+++ b/gfx/pokemon/haunter/anim_idle.asm
diff --git a/gfx/pokemon/heracross/anim0.asm b/gfx/pokemon/heracross/anim.asm
index 5bba06fad..5bba06fad 100644
--- a/gfx/pokemon/heracross/anim0.asm
+++ b/gfx/pokemon/heracross/anim.asm
diff --git a/gfx/pokemon/heracross/anim1.asm b/gfx/pokemon/heracross/anim_idle.asm
index 6c402379c..6c402379c 100644
--- a/gfx/pokemon/heracross/anim1.asm
+++ b/gfx/pokemon/heracross/anim_idle.asm
diff --git a/gfx/pokemon/hitmonchan/anim0.asm b/gfx/pokemon/hitmonchan/anim.asm
index b6ddd647e..b6ddd647e 100644
--- a/gfx/pokemon/hitmonchan/anim0.asm
+++ b/gfx/pokemon/hitmonchan/anim.asm
diff --git a/gfx/pokemon/hitmonchan/anim1.asm b/gfx/pokemon/hitmonchan/anim_idle.asm
index 6f67577a0..6f67577a0 100644
--- a/gfx/pokemon/hitmonchan/anim1.asm
+++ b/gfx/pokemon/hitmonchan/anim_idle.asm
diff --git a/gfx/pokemon/hitmonlee/anim0.asm b/gfx/pokemon/hitmonlee/anim.asm
index 4260d7753..4260d7753 100644
--- a/gfx/pokemon/hitmonlee/anim0.asm
+++ b/gfx/pokemon/hitmonlee/anim.asm
diff --git a/gfx/pokemon/hitmonlee/anim1.asm b/gfx/pokemon/hitmonlee/anim_idle.asm
index 4d7d191bf..4d7d191bf 100644
--- a/gfx/pokemon/hitmonlee/anim1.asm
+++ b/gfx/pokemon/hitmonlee/anim_idle.asm
diff --git a/gfx/pokemon/hitmontop/anim0.asm b/gfx/pokemon/hitmontop/anim.asm
index 195f1554b..195f1554b 100644
--- a/gfx/pokemon/hitmontop/anim0.asm
+++ b/gfx/pokemon/hitmontop/anim.asm
diff --git a/gfx/pokemon/hitmontop/anim1.asm b/gfx/pokemon/hitmontop/anim_idle.asm
index 3b4f17403..3b4f17403 100644
--- a/gfx/pokemon/hitmontop/anim1.asm
+++ b/gfx/pokemon/hitmontop/anim_idle.asm
diff --git a/gfx/pokemon/ho_oh/anim0.asm b/gfx/pokemon/ho_oh/anim.asm
index 5ae27b487..5ae27b487 100644
--- a/gfx/pokemon/ho_oh/anim0.asm
+++ b/gfx/pokemon/ho_oh/anim.asm
diff --git a/gfx/pokemon/ho_oh/anim1.asm b/gfx/pokemon/ho_oh/anim_idle.asm
index d7808f281..d7808f281 100644
--- a/gfx/pokemon/ho_oh/anim1.asm
+++ b/gfx/pokemon/ho_oh/anim_idle.asm
diff --git a/gfx/pokemon/hoothoot/anim0.asm b/gfx/pokemon/hoothoot/anim.asm
index 813faf909..813faf909 100644
--- a/gfx/pokemon/hoothoot/anim0.asm
+++ b/gfx/pokemon/hoothoot/anim.asm
diff --git a/gfx/pokemon/hoothoot/anim1.asm b/gfx/pokemon/hoothoot/anim_idle.asm
index 4aaf1a124..4aaf1a124 100644
--- a/gfx/pokemon/hoothoot/anim1.asm
+++ b/gfx/pokemon/hoothoot/anim_idle.asm
diff --git a/gfx/pokemon/hoppip/anim0.asm b/gfx/pokemon/hoppip/anim.asm
index 6af60ab0b..6af60ab0b 100644
--- a/gfx/pokemon/hoppip/anim0.asm
+++ b/gfx/pokemon/hoppip/anim.asm
diff --git a/gfx/pokemon/hoppip/anim1.asm b/gfx/pokemon/hoppip/anim_idle.asm
index d0281ca1c..d0281ca1c 100644
--- a/gfx/pokemon/hoppip/anim1.asm
+++ b/gfx/pokemon/hoppip/anim_idle.asm
diff --git a/gfx/pokemon/horsea/anim0.asm b/gfx/pokemon/horsea/anim.asm
index 18d51863c..18d51863c 100644
--- a/gfx/pokemon/horsea/anim0.asm
+++ b/gfx/pokemon/horsea/anim.asm
diff --git a/gfx/pokemon/horsea/anim1.asm b/gfx/pokemon/horsea/anim_idle.asm
index 2475abfdb..2475abfdb 100644
--- a/gfx/pokemon/horsea/anim1.asm
+++ b/gfx/pokemon/horsea/anim_idle.asm
diff --git a/gfx/pokemon/houndoom/anim0.asm b/gfx/pokemon/houndoom/anim.asm
index 60ad08726..60ad08726 100644
--- a/gfx/pokemon/houndoom/anim0.asm
+++ b/gfx/pokemon/houndoom/anim.asm
diff --git a/gfx/pokemon/houndoom/anim1.asm b/gfx/pokemon/houndoom/anim_idle.asm
index 78fa8610c..78fa8610c 100644
--- a/gfx/pokemon/houndoom/anim1.asm
+++ b/gfx/pokemon/houndoom/anim_idle.asm
diff --git a/gfx/pokemon/houndour/anim0.asm b/gfx/pokemon/houndour/anim.asm
index 2235850c0..2235850c0 100644
--- a/gfx/pokemon/houndour/anim0.asm
+++ b/gfx/pokemon/houndour/anim.asm
diff --git a/gfx/pokemon/houndour/anim1.asm b/gfx/pokemon/houndour/anim_idle.asm
index dd8318689..dd8318689 100644
--- a/gfx/pokemon/houndour/anim1.asm
+++ b/gfx/pokemon/houndour/anim_idle.asm
diff --git a/gfx/pokemon/hypno/anim0.asm b/gfx/pokemon/hypno/anim.asm
index b6c3e6463..b6c3e6463 100644
--- a/gfx/pokemon/hypno/anim0.asm
+++ b/gfx/pokemon/hypno/anim.asm
diff --git a/gfx/pokemon/hypno/anim1.asm b/gfx/pokemon/hypno/anim_idle.asm
index 4d981c442..4d981c442 100644
--- a/gfx/pokemon/hypno/anim1.asm
+++ b/gfx/pokemon/hypno/anim_idle.asm
diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm
new file mode 100644
index 000000000..34345fe77
--- /dev/null
+++ b/gfx/pokemon/idle_pointers.asm
@@ -0,0 +1,252 @@
+AnimationIdlePointers:
+	dw BulbasaurAnimationIdle
+	dw IvysaurAnimationIdle
+	dw VenusaurAnimationIdle
+	dw CharmanderAnimationIdle
+	dw CharmeleonAnimationIdle
+	dw CharizardAnimationIdle
+	dw SquirtleAnimationIdle
+	dw WartortleAnimationIdle
+	dw BlastoiseAnimationIdle
+	dw CaterpieAnimationIdle
+	dw MetapodAnimationIdle
+	dw ButterfreeAnimationIdle
+	dw WeedleAnimationIdle
+	dw KakunaAnimationIdle
+	dw BeedrillAnimationIdle
+	dw PidgeyAnimationIdle
+	dw PidgeottoAnimationIdle
+	dw PidgeotAnimationIdle
+	dw RattataAnimationIdle
+	dw RaticateAnimationIdle
+	dw SpearowAnimationIdle
+	dw FearowAnimationIdle
+	dw EkansAnimationIdle
+	dw ArbokAnimationIdle
+	dw PikachuAnimationIdle
+	dw RaichuAnimationIdle
+	dw SandshrewAnimationIdle
+	dw SandslashAnimationIdle
+	dw NidoranFAnimationIdle
+	dw NidorinaAnimationIdle
+	dw NidoqueenAnimationIdle
+	dw NidoranMAnimationIdle
+	dw NidorinoAnimationIdle
+	dw NidokingAnimationIdle
+	dw ClefairyAnimationIdle
+	dw ClefableAnimationIdle
+	dw VulpixAnimationIdle
+	dw NinetalesAnimationIdle
+	dw JigglypuffAnimationIdle
+	dw WigglytuffAnimationIdle
+	dw ZubatAnimationIdle
+	dw GolbatAnimationIdle
+	dw OddishAnimationIdle
+	dw GloomAnimationIdle
+	dw VileplumeAnimationIdle
+	dw ParasAnimationIdle
+	dw ParasectAnimationIdle
+	dw VenonatAnimationIdle
+	dw VenomothAnimationIdle
+	dw DiglettAnimationIdle
+	dw DugtrioAnimationIdle
+	dw MeowthAnimationIdle
+	dw PersianAnimationIdle
+	dw PsyduckAnimationIdle
+	dw GolduckAnimationIdle
+	dw MankeyAnimationIdle
+	dw PrimeapeAnimationIdle
+	dw GrowlitheAnimationIdle
+	dw ArcanineAnimationIdle
+	dw PoliwagAnimationIdle
+	dw PoliwhirlAnimationIdle
+	dw PoliwrathAnimationIdle
+	dw AbraAnimationIdle
+	dw KadabraAnimationIdle
+	dw AlakazamAnimationIdle
+	dw MachopAnimationIdle
+	dw MachokeAnimationIdle
+	dw MachampAnimationIdle
+	dw BellsproutAnimationIdle
+	dw WeepinbellAnimationIdle
+	dw VictreebelAnimationIdle
+	dw TentacoolAnimationIdle
+	dw TentacruelAnimationIdle
+	dw GeodudeAnimationIdle
+	dw GravelerAnimationIdle
+	dw GolemAnimationIdle
+	dw PonytaAnimationIdle
+	dw RapidashAnimationIdle
+	dw SlowpokeAnimationIdle
+	dw SlowbroAnimationIdle
+	dw MagnemiteAnimationIdle
+	dw MagnetonAnimationIdle
+	dw FarfetchDAnimationIdle
+	dw DoduoAnimationIdle
+	dw DodrioAnimationIdle
+	dw SeelAnimationIdle
+	dw DewgongAnimationIdle
+	dw GrimerAnimationIdle
+	dw MukAnimationIdle
+	dw ShellderAnimationIdle
+	dw CloysterAnimationIdle
+	dw GastlyAnimationIdle
+	dw HaunterAnimationIdle
+	dw GengarAnimationIdle
+	dw OnixAnimationIdle
+	dw DrowzeeAnimationIdle
+	dw HypnoAnimationIdle
+	dw KrabbyAnimationIdle
+	dw KinglerAnimationIdle
+	dw VoltorbAnimationIdle
+	dw ElectrodeAnimationIdle
+	dw ExeggcuteAnimationIdle
+	dw ExeggutorAnimationIdle
+	dw CuboneAnimationIdle
+	dw MarowakAnimationIdle
+	dw HitmonleeAnimationIdle
+	dw HitmonchanAnimationIdle
+	dw LickitungAnimationIdle
+	dw KoffingAnimationIdle
+	dw WeezingAnimationIdle
+	dw RhyhornAnimationIdle
+	dw RhydonAnimationIdle
+	dw ChanseyAnimationIdle
+	dw TangelaAnimationIdle
+	dw KangaskhanAnimationIdle
+	dw HorseaAnimationIdle
+	dw SeadraAnimationIdle
+	dw GoldeenAnimationIdle
+	dw SeakingAnimationIdle
+	dw StaryuAnimationIdle
+	dw StarmieAnimationIdle
+	dw MrMimeAnimationIdle
+	dw ScytherAnimationIdle
+	dw JynxAnimationIdle
+	dw ElectabuzzAnimationIdle
+	dw MagmarAnimationIdle
+	dw PinsirAnimationIdle
+	dw TaurosAnimationIdle
+	dw MagikarpAnimationIdle
+	dw GyaradosAnimationIdle
+	dw LaprasAnimationIdle
+	dw DittoAnimationIdle
+	dw EeveeAnimationIdle
+	dw VaporeonAnimationIdle
+	dw JolteonAnimationIdle
+	dw FlareonAnimationIdle
+	dw PorygonAnimationIdle
+	dw OmanyteAnimationIdle
+	dw OmastarAnimationIdle
+	dw KabutoAnimationIdle
+	dw KabutopsAnimationIdle
+	dw AerodactylAnimationIdle
+	dw SnorlaxAnimationIdle
+	dw ArticunoAnimationIdle
+	dw ZapdosAnimationIdle
+	dw MoltresAnimationIdle
+	dw DratiniAnimationIdle
+	dw DragonairAnimationIdle
+	dw DragoniteAnimationIdle
+	dw MewtwoAnimationIdle
+	dw MewAnimationIdle
+	dw ChikoritaAnimationIdle
+	dw BayleefAnimationIdle
+	dw MeganiumAnimationIdle
+	dw CyndaquilAnimationIdle
+	dw QuilavaAnimationIdle
+	dw TyphlosionAnimationIdle
+	dw TotodileAnimationIdle
+	dw CroconawAnimationIdle
+	dw FeraligatrAnimationIdle
+	dw SentretAnimationIdle
+	dw FurretAnimationIdle
+	dw HoothootAnimationIdle
+	dw NoctowlAnimationIdle
+	dw LedybaAnimationIdle
+	dw LedianAnimationIdle
+	dw SpinarakAnimationIdle
+	dw AriadosAnimationIdle
+	dw CrobatAnimationIdle
+	dw ChinchouAnimationIdle
+	dw LanturnAnimationIdle
+	dw PichuAnimationIdle
+	dw CleffaAnimationIdle
+	dw IgglybuffAnimationIdle
+	dw TogepiAnimationIdle
+	dw TogeticAnimationIdle
+	dw NatuAnimationIdle
+	dw XatuAnimationIdle
+	dw MareepAnimationIdle
+	dw FlaaffyAnimationIdle
+	dw AmpharosAnimationIdle
+	dw BellossomAnimationIdle
+	dw MarillAnimationIdle
+	dw AzumarillAnimationIdle
+	dw SudowoodoAnimationIdle
+	dw PolitoedAnimationIdle
+	dw HoppipAnimationIdle
+	dw SkiploomAnimationIdle
+	dw JumpluffAnimationIdle
+	dw AipomAnimationIdle
+	dw SunkernAnimationIdle
+	dw SunfloraAnimationIdle
+	dw YanmaAnimationIdle
+	dw WooperAnimationIdle
+	dw QuagsireAnimationIdle
+	dw EspeonAnimationIdle
+	dw UmbreonAnimationIdle
+	dw MurkrowAnimationIdle
+	dw SlowkingAnimationIdle
+	dw MisdreavusAnimationIdle
+	dw UnownAnimationIdle
+	dw WobbuffetAnimationIdle
+	dw GirafarigAnimationIdle
+	dw PinecoAnimationIdle
+	dw ForretressAnimationIdle
+	dw DunsparceAnimationIdle
+	dw GligarAnimationIdle
+	dw SteelixAnimationIdle
+	dw SnubbullAnimationIdle
+	dw GranbullAnimationIdle
+	dw QwilfishAnimationIdle
+	dw ScizorAnimationIdle
+	dw ShuckleAnimationIdle
+	dw HeracrossAnimationIdle
+	dw SneaselAnimationIdle
+	dw TeddiursaAnimationIdle
+	dw UrsaringAnimationIdle
+	dw SlugmaAnimationIdle
+	dw MagcargoAnimationIdle
+	dw SwinubAnimationIdle
+	dw PiloswineAnimationIdle
+	dw CorsolaAnimationIdle
+	dw RemoraidAnimationIdle
+	dw OctilleryAnimationIdle
+	dw DelibirdAnimationIdle
+	dw MantineAnimationIdle
+	dw SkarmoryAnimationIdle
+	dw HoundourAnimationIdle
+	dw HoundoomAnimationIdle
+	dw KingdraAnimationIdle
+	dw PhanpyAnimationIdle
+	dw DonphanAnimationIdle
+	dw Porygon2AnimationIdle
+	dw StantlerAnimationIdle
+	dw SmeargleAnimationIdle
+	dw TyrogueAnimationIdle
+	dw HitmontopAnimationIdle
+	dw SmoochumAnimationIdle
+	dw ElekidAnimationIdle
+	dw MagbyAnimationIdle
+	dw MiltankAnimationIdle
+	dw BlisseyAnimationIdle
+	dw RaikouAnimationIdle
+	dw EnteiAnimationIdle
+	dw SuicuneAnimationIdle
+	dw LarvitarAnimationIdle
+	dw PupitarAnimationIdle
+	dw TyranitarAnimationIdle
+	dw LugiaAnimationIdle
+	dw HoOhAnimationIdle
+	dw CelebiAnimationIdle
diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm
new file mode 100644
index 000000000..952aae2e3
--- /dev/null
+++ b/gfx/pokemon/idles.asm
@@ -0,0 +1,252 @@
+BulbasaurAnimationIdle:  INCLUDE "gfx/pokemon/bulbasaur/anim_idle.asm"
+IvysaurAnimationIdle:    INCLUDE "gfx/pokemon/ivysaur/anim_idle.asm"
+VenusaurAnimationIdle:   INCLUDE "gfx/pokemon/venusaur/anim_idle.asm"
+CharmanderAnimationIdle: INCLUDE "gfx/pokemon/charmander/anim_idle.asm"
+CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm"
+CharizardAnimationIdle:  INCLUDE "gfx/pokemon/charizard/anim_idle.asm"
+SquirtleAnimationIdle:   INCLUDE "gfx/pokemon/squirtle/anim_idle.asm"
+WartortleAnimationIdle:  INCLUDE "gfx/pokemon/wartortle/anim_idle.asm"
+BlastoiseAnimationIdle:  INCLUDE "gfx/pokemon/blastoise/anim_idle.asm"
+CaterpieAnimationIdle:   INCLUDE "gfx/pokemon/caterpie/anim_idle.asm"
+MetapodAnimationIdle:    INCLUDE "gfx/pokemon/metapod/anim_idle.asm"
+ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm"
+WeedleAnimationIdle:     INCLUDE "gfx/pokemon/weedle/anim_idle.asm"
+KakunaAnimationIdle:     INCLUDE "gfx/pokemon/kakuna/anim_idle.asm"
+BeedrillAnimationIdle:   INCLUDE "gfx/pokemon/beedrill/anim_idle.asm"
+PidgeyAnimationIdle:     INCLUDE "gfx/pokemon/pidgey/anim_idle.asm"
+PidgeottoAnimationIdle:  INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm"
+PidgeotAnimationIdle:    INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm"
+RattataAnimationIdle:    INCLUDE "gfx/pokemon/rattata/anim_idle.asm"
+RaticateAnimationIdle:   INCLUDE "gfx/pokemon/raticate/anim_idle.asm"
+SpearowAnimationIdle:    INCLUDE "gfx/pokemon/spearow/anim_idle.asm"
+FearowAnimationIdle:     INCLUDE "gfx/pokemon/fearow/anim_idle.asm"
+EkansAnimationIdle:      INCLUDE "gfx/pokemon/ekans/anim_idle.asm"
+ArbokAnimationIdle:      INCLUDE "gfx/pokemon/arbok/anim_idle.asm"
+PikachuAnimationIdle:    INCLUDE "gfx/pokemon/pikachu/anim_idle.asm"
+RaichuAnimationIdle:     INCLUDE "gfx/pokemon/raichu/anim_idle.asm"
+SandshrewAnimationIdle:  INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm"
+SandslashAnimationIdle:  INCLUDE "gfx/pokemon/sandslash/anim_idle.asm"
+NidoranFAnimationIdle:   INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm"
+NidorinaAnimationIdle:   INCLUDE "gfx/pokemon/nidorina/anim_idle.asm"
+NidoqueenAnimationIdle:  INCLUDE "gfx/pokemon/nidoqueen/anim_idle.asm"
+NidoranMAnimationIdle:   INCLUDE "gfx/pokemon/nidoran_m/anim_idle.asm"
+NidorinoAnimationIdle:   INCLUDE "gfx/pokemon/nidorino/anim_idle.asm"
+NidokingAnimationIdle:   INCLUDE "gfx/pokemon/nidoking/anim_idle.asm"
+ClefairyAnimationIdle:   INCLUDE "gfx/pokemon/clefairy/anim_idle.asm"
+ClefableAnimationIdle:   INCLUDE "gfx/pokemon/clefable/anim_idle.asm"
+VulpixAnimationIdle:     INCLUDE "gfx/pokemon/vulpix/anim_idle.asm"
+NinetalesAnimationIdle:  INCLUDE "gfx/pokemon/ninetales/anim_idle.asm"
+JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm"
+WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm"
+ZubatAnimationIdle:      INCLUDE "gfx/pokemon/zubat/anim_idle.asm"
+GolbatAnimationIdle:     INCLUDE "gfx/pokemon/golbat/anim_idle.asm"
+OddishAnimationIdle:     INCLUDE "gfx/pokemon/oddish/anim_idle.asm"
+GloomAnimationIdle:      INCLUDE "gfx/pokemon/gloom/anim_idle.asm"
+VileplumeAnimationIdle:  INCLUDE "gfx/pokemon/vileplume/anim_idle.asm"
+ParasAnimationIdle:      INCLUDE "gfx/pokemon/paras/anim_idle.asm"
+ParasectAnimationIdle:   INCLUDE "gfx/pokemon/parasect/anim_idle.asm"
+VenonatAnimationIdle:    INCLUDE "gfx/pokemon/venonat/anim_idle.asm"
+VenomothAnimationIdle:   INCLUDE "gfx/pokemon/venomoth/anim_idle.asm"
+DiglettAnimationIdle:    INCLUDE "gfx/pokemon/diglett/anim_idle.asm"
+DugtrioAnimationIdle:    INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm"
+MeowthAnimationIdle:     INCLUDE "gfx/pokemon/meowth/anim_idle.asm"
+PersianAnimationIdle:    INCLUDE "gfx/pokemon/persian/anim_idle.asm"
+PsyduckAnimationIdle:    INCLUDE "gfx/pokemon/psyduck/anim_idle.asm"
+GolduckAnimationIdle:    INCLUDE "gfx/pokemon/golduck/anim_idle.asm"
+MankeyAnimationIdle:     INCLUDE "gfx/pokemon/mankey/anim_idle.asm"
+PrimeapeAnimationIdle:   INCLUDE "gfx/pokemon/primeape/anim_idle.asm"
+GrowlitheAnimationIdle:  INCLUDE "gfx/pokemon/growlithe/anim_idle.asm"
+ArcanineAnimationIdle:   INCLUDE "gfx/pokemon/arcanine/anim_idle.asm"
+PoliwagAnimationIdle:    INCLUDE "gfx/pokemon/poliwag/anim_idle.asm"
+PoliwhirlAnimationIdle:  INCLUDE "gfx/pokemon/poliwhirl/anim_idle.asm"
+PoliwrathAnimationIdle:  INCLUDE "gfx/pokemon/poliwrath/anim_idle.asm"
+AbraAnimationIdle:       INCLUDE "gfx/pokemon/abra/anim_idle.asm"
+KadabraAnimationIdle:    INCLUDE "gfx/pokemon/kadabra/anim_idle.asm"
+AlakazamAnimationIdle:   INCLUDE "gfx/pokemon/alakazam/anim_idle.asm"
+MachopAnimationIdle:     INCLUDE "gfx/pokemon/machop/anim_idle.asm"
+MachokeAnimationIdle:    INCLUDE "gfx/pokemon/machoke/anim_idle.asm"
+MachampAnimationIdle:    INCLUDE "gfx/pokemon/machamp/anim_idle.asm"
+BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm"
+WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm"
+VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
+TentacoolAnimationIdle:  INCLUDE "gfx/pokemon/tentacool/anim_idle.asm"
+TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm"
+GeodudeAnimationIdle:    INCLUDE "gfx/pokemon/geodude/anim_idle.asm"
+GravelerAnimationIdle:   INCLUDE "gfx/pokemon/graveler/anim_idle.asm"
+GolemAnimationIdle:      INCLUDE "gfx/pokemon/golem/anim_idle.asm"
+PonytaAnimationIdle:     INCLUDE "gfx/pokemon/ponyta/anim_idle.asm"
+RapidashAnimationIdle:   INCLUDE "gfx/pokemon/rapidash/anim_idle.asm"
+SlowpokeAnimationIdle:   INCLUDE "gfx/pokemon/slowpoke/anim_idle.asm"
+SlowbroAnimationIdle:    INCLUDE "gfx/pokemon/slowbro/anim_idle.asm"
+MagnemiteAnimationIdle:  INCLUDE "gfx/pokemon/magnemite/anim_idle.asm"
+MagnetonAnimationIdle:   INCLUDE "gfx/pokemon/magneton/anim_idle.asm"
+FarfetchDAnimationIdle:  INCLUDE "gfx/pokemon/farfetch_d/anim_idle.asm"
+DoduoAnimationIdle:      INCLUDE "gfx/pokemon/doduo/anim_idle.asm"
+DodrioAnimationIdle:     INCLUDE "gfx/pokemon/dodrio/anim_idle.asm"
+SeelAnimationIdle:       INCLUDE "gfx/pokemon/seel/anim_idle.asm"
+DewgongAnimationIdle:    INCLUDE "gfx/pokemon/dewgong/anim_idle.asm"
+GrimerAnimationIdle:     INCLUDE "gfx/pokemon/grimer/anim_idle.asm"
+MukAnimationIdle:        INCLUDE "gfx/pokemon/muk/anim_idle.asm"
+ShellderAnimationIdle:   INCLUDE "gfx/pokemon/shellder/anim_idle.asm"
+CloysterAnimationIdle:   INCLUDE "gfx/pokemon/cloyster/anim_idle.asm"
+GastlyAnimationIdle:     INCLUDE "gfx/pokemon/gastly/anim_idle.asm"
+HaunterAnimationIdle:    INCLUDE "gfx/pokemon/haunter/anim_idle.asm"
+GengarAnimationIdle:     INCLUDE "gfx/pokemon/gengar/anim_idle.asm"
+OnixAnimationIdle:       INCLUDE "gfx/pokemon/onix/anim_idle.asm"
+DrowzeeAnimationIdle:    INCLUDE "gfx/pokemon/drowzee/anim_idle.asm"
+HypnoAnimationIdle:      INCLUDE "gfx/pokemon/hypno/anim_idle.asm"
+KrabbyAnimationIdle:     INCLUDE "gfx/pokemon/krabby/anim_idle.asm"
+KinglerAnimationIdle:    INCLUDE "gfx/pokemon/kingler/anim_idle.asm"
+VoltorbAnimationIdle:    INCLUDE "gfx/pokemon/voltorb/anim_idle.asm"
+ElectrodeAnimationIdle:  INCLUDE "gfx/pokemon/electrode/anim_idle.asm"
+ExeggcuteAnimationIdle:  INCLUDE "gfx/pokemon/exeggcute/anim_idle.asm"
+ExeggutorAnimationIdle:  INCLUDE "gfx/pokemon/exeggutor/anim_idle.asm"
+CuboneAnimationIdle:     INCLUDE "gfx/pokemon/cubone/anim_idle.asm"
+MarowakAnimationIdle:    INCLUDE "gfx/pokemon/marowak/anim_idle.asm"
+HitmonleeAnimationIdle:  INCLUDE "gfx/pokemon/hitmonlee/anim_idle.asm"
+HitmonchanAnimationIdle: INCLUDE "gfx/pokemon/hitmonchan/anim_idle.asm"
+LickitungAnimationIdle:  INCLUDE "gfx/pokemon/lickitung/anim_idle.asm"
+KoffingAnimationIdle:    INCLUDE "gfx/pokemon/koffing/anim_idle.asm"
+WeezingAnimationIdle:    INCLUDE "gfx/pokemon/weezing/anim_idle.asm"
+RhyhornAnimationIdle:    INCLUDE "gfx/pokemon/rhyhorn/anim_idle.asm"
+RhydonAnimationIdle:     INCLUDE "gfx/pokemon/rhydon/anim_idle.asm"
+ChanseyAnimationIdle:    INCLUDE "gfx/pokemon/chansey/anim_idle.asm"
+TangelaAnimationIdle:    INCLUDE "gfx/pokemon/tangela/anim_idle.asm"
+KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm"
+HorseaAnimationIdle:     INCLUDE "gfx/pokemon/horsea/anim_idle.asm"
+SeadraAnimationIdle:     INCLUDE "gfx/pokemon/seadra/anim_idle.asm"
+GoldeenAnimationIdle:    INCLUDE "gfx/pokemon/goldeen/anim_idle.asm"
+SeakingAnimationIdle:    INCLUDE "gfx/pokemon/seaking/anim_idle.asm"
+StaryuAnimationIdle:     INCLUDE "gfx/pokemon/staryu/anim_idle.asm"
+StarmieAnimationIdle:    INCLUDE "gfx/pokemon/starmie/anim_idle.asm"
+MrMimeAnimationIdle:     INCLUDE "gfx/pokemon/mr__mime/anim_idle.asm"
+ScytherAnimationIdle:    INCLUDE "gfx/pokemon/scyther/anim_idle.asm"
+JynxAnimationIdle:       INCLUDE "gfx/pokemon/jynx/anim_idle.asm"
+ElectabuzzAnimationIdle: INCLUDE "gfx/pokemon/electabuzz/anim_idle.asm"
+MagmarAnimationIdle:     INCLUDE "gfx/pokemon/magmar/anim_idle.asm"
+PinsirAnimationIdle:     INCLUDE "gfx/pokemon/pinsir/anim_idle.asm"
+TaurosAnimationIdle:     INCLUDE "gfx/pokemon/tauros/anim_idle.asm"
+MagikarpAnimationIdle:   INCLUDE "gfx/pokemon/magikarp/anim_idle.asm"
+GyaradosAnimationIdle:   INCLUDE "gfx/pokemon/gyarados/anim_idle.asm"
+LaprasAnimationIdle:     INCLUDE "gfx/pokemon/lapras/anim_idle.asm"
+DittoAnimationIdle:      INCLUDE "gfx/pokemon/ditto/anim_idle.asm"
+EeveeAnimationIdle:      INCLUDE "gfx/pokemon/eevee/anim_idle.asm"
+VaporeonAnimationIdle:   INCLUDE "gfx/pokemon/vaporeon/anim_idle.asm"
+JolteonAnimationIdle:    INCLUDE "gfx/pokemon/jolteon/anim_idle.asm"
+FlareonAnimationIdle:    INCLUDE "gfx/pokemon/flareon/anim_idle.asm"
+PorygonAnimationIdle:    INCLUDE "gfx/pokemon/porygon/anim_idle.asm"
+OmanyteAnimationIdle:    INCLUDE "gfx/pokemon/omanyte/anim_idle.asm"
+OmastarAnimationIdle:    INCLUDE "gfx/pokemon/omastar/anim_idle.asm"
+KabutoAnimationIdle:     INCLUDE "gfx/pokemon/kabuto/anim_idle.asm"
+KabutopsAnimationIdle:   INCLUDE "gfx/pokemon/kabutops/anim_idle.asm"
+AerodactylAnimationIdle: INCLUDE "gfx/pokemon/aerodactyl/anim_idle.asm"
+SnorlaxAnimationIdle:    INCLUDE "gfx/pokemon/snorlax/anim_idle.asm"
+ArticunoAnimationIdle:   INCLUDE "gfx/pokemon/articuno/anim_idle.asm"
+ZapdosAnimationIdle:     INCLUDE "gfx/pokemon/zapdos/anim_idle.asm"
+MoltresAnimationIdle:    INCLUDE "gfx/pokemon/moltres/anim_idle.asm"
+DratiniAnimationIdle:    INCLUDE "gfx/pokemon/dratini/anim_idle.asm"
+DragonairAnimationIdle:  INCLUDE "gfx/pokemon/dragonair/anim_idle.asm"
+DragoniteAnimationIdle:  INCLUDE "gfx/pokemon/dragonite/anim_idle.asm"
+MewtwoAnimationIdle:     INCLUDE "gfx/pokemon/mewtwo/anim_idle.asm"
+MewAnimationIdle:        INCLUDE "gfx/pokemon/mew/anim_idle.asm"
+ChikoritaAnimationIdle:  INCLUDE "gfx/pokemon/chikorita/anim_idle.asm"
+BayleefAnimationIdle:    INCLUDE "gfx/pokemon/bayleef/anim_idle.asm"
+MeganiumAnimationIdle:   INCLUDE "gfx/pokemon/meganium/anim_idle.asm"
+CyndaquilAnimationIdle:  INCLUDE "gfx/pokemon/cyndaquil/anim_idle.asm"
+QuilavaAnimationIdle:    INCLUDE "gfx/pokemon/quilava/anim_idle.asm"
+TyphlosionAnimationIdle: INCLUDE "gfx/pokemon/typhlosion/anim_idle.asm"
+TotodileAnimationIdle:   INCLUDE "gfx/pokemon/totodile/anim_idle.asm"
+CroconawAnimationIdle:   INCLUDE "gfx/pokemon/croconaw/anim_idle.asm"
+FeraligatrAnimationIdle: INCLUDE "gfx/pokemon/feraligatr/anim_idle.asm"
+SentretAnimationIdle:    INCLUDE "gfx/pokemon/sentret/anim_idle.asm"
+FurretAnimationIdle:     INCLUDE "gfx/pokemon/furret/anim_idle.asm"
+HoothootAnimationIdle:   INCLUDE "gfx/pokemon/hoothoot/anim_idle.asm"
+NoctowlAnimationIdle:    INCLUDE "gfx/pokemon/noctowl/anim_idle.asm"
+LedybaAnimationIdle:     INCLUDE "gfx/pokemon/ledyba/anim_idle.asm"
+LedianAnimationIdle:     INCLUDE "gfx/pokemon/ledian/anim_idle.asm"
+SpinarakAnimationIdle:   INCLUDE "gfx/pokemon/spinarak/anim_idle.asm"
+AriadosAnimationIdle:    INCLUDE "gfx/pokemon/ariados/anim_idle.asm"
+CrobatAnimationIdle:     INCLUDE "gfx/pokemon/crobat/anim_idle.asm"
+ChinchouAnimationIdle:   INCLUDE "gfx/pokemon/chinchou/anim_idle.asm"
+LanturnAnimationIdle:    INCLUDE "gfx/pokemon/lanturn/anim_idle.asm"
+PichuAnimationIdle:      INCLUDE "gfx/pokemon/pichu/anim_idle.asm"
+CleffaAnimationIdle:     INCLUDE "gfx/pokemon/cleffa/anim_idle.asm"
+IgglybuffAnimationIdle:  INCLUDE "gfx/pokemon/igglybuff/anim_idle.asm"
+TogepiAnimationIdle:     INCLUDE "gfx/pokemon/togepi/anim_idle.asm"
+TogeticAnimationIdle:    INCLUDE "gfx/pokemon/togetic/anim_idle.asm"
+NatuAnimationIdle:       INCLUDE "gfx/pokemon/natu/anim_idle.asm"
+XatuAnimationIdle:       INCLUDE "gfx/pokemon/xatu/anim_idle.asm"
+MareepAnimationIdle:     INCLUDE "gfx/pokemon/mareep/anim_idle.asm"
+FlaaffyAnimationIdle:    INCLUDE "gfx/pokemon/flaaffy/anim_idle.asm"
+AmpharosAnimationIdle:   INCLUDE "gfx/pokemon/ampharos/anim_idle.asm"
+BellossomAnimationIdle:  INCLUDE "gfx/pokemon/bellossom/anim_idle.asm"
+MarillAnimationIdle:     INCLUDE "gfx/pokemon/marill/anim_idle.asm"
+AzumarillAnimationIdle:  INCLUDE "gfx/pokemon/azumarill/anim_idle.asm"
+SudowoodoAnimationIdle:  INCLUDE "gfx/pokemon/sudowoodo/anim_idle.asm"
+PolitoedAnimationIdle:   INCLUDE "gfx/pokemon/politoed/anim_idle.asm"
+HoppipAnimationIdle:     INCLUDE "gfx/pokemon/hoppip/anim_idle.asm"
+SkiploomAnimationIdle:   INCLUDE "gfx/pokemon/skiploom/anim_idle.asm"
+JumpluffAnimationIdle:   INCLUDE "gfx/pokemon/jumpluff/anim_idle.asm"
+AipomAnimationIdle:      INCLUDE "gfx/pokemon/aipom/anim_idle.asm"
+SunkernAnimationIdle:    INCLUDE "gfx/pokemon/sunkern/anim_idle.asm"
+SunfloraAnimationIdle:   INCLUDE "gfx/pokemon/sunflora/anim_idle.asm"
+YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
+WooperAnimationIdle:     INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
+QuagsireAnimationIdle:   INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
+EspeonAnimationIdle:     INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
+UmbreonAnimationIdle:    INCLUDE "gfx/pokemon/umbreon/anim_idle.asm"
+MurkrowAnimationIdle:    INCLUDE "gfx/pokemon/murkrow/anim_idle.asm"
+SlowkingAnimationIdle:   INCLUDE "gfx/pokemon/slowking/anim_idle.asm"
+MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm"
+UnownAnimationIdle:      INCLUDE "gfx/pokemon/unown/anim_idle.asm"
+WobbuffetAnimationIdle:  INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm"
+GirafarigAnimationIdle:  INCLUDE "gfx/pokemon/girafarig/anim_idle.asm"
+PinecoAnimationIdle:     INCLUDE "gfx/pokemon/pineco/anim_idle.asm"
+ForretressAnimationIdle: INCLUDE "gfx/pokemon/forretress/anim_idle.asm"
+DunsparceAnimationIdle:  INCLUDE "gfx/pokemon/dunsparce/anim_idle.asm"
+GligarAnimationIdle:     INCLUDE "gfx/pokemon/gligar/anim_idle.asm"
+SteelixAnimationIdle:    INCLUDE "gfx/pokemon/steelix/anim_idle.asm"
+SnubbullAnimationIdle:   INCLUDE "gfx/pokemon/snubbull/anim_idle.asm"
+GranbullAnimationIdle:   INCLUDE "gfx/pokemon/granbull/anim_idle.asm"
+QwilfishAnimationIdle:   INCLUDE "gfx/pokemon/qwilfish/anim_idle.asm"
+ScizorAnimationIdle:     INCLUDE "gfx/pokemon/scizor/anim_idle.asm"
+ShuckleAnimationIdle:    INCLUDE "gfx/pokemon/shuckle/anim_idle.asm"
+HeracrossAnimationIdle:  INCLUDE "gfx/pokemon/heracross/anim_idle.asm"
+SneaselAnimationIdle:    INCLUDE "gfx/pokemon/sneasel/anim_idle.asm"
+TeddiursaAnimationIdle:  INCLUDE "gfx/pokemon/teddiursa/anim_idle.asm"
+UrsaringAnimationIdle:   INCLUDE "gfx/pokemon/ursaring/anim_idle.asm"
+SlugmaAnimationIdle:     INCLUDE "gfx/pokemon/slugma/anim_idle.asm"
+MagcargoAnimationIdle:   INCLUDE "gfx/pokemon/magcargo/anim_idle.asm"
+SwinubAnimationIdle:     INCLUDE "gfx/pokemon/swinub/anim_idle.asm"
+PiloswineAnimationIdle:  INCLUDE "gfx/pokemon/piloswine/anim_idle.asm"
+CorsolaAnimationIdle:    INCLUDE "gfx/pokemon/corsola/anim_idle.asm"
+RemoraidAnimationIdle:   INCLUDE "gfx/pokemon/remoraid/anim_idle.asm"
+OctilleryAnimationIdle:  INCLUDE "gfx/pokemon/octillery/anim_idle.asm"
+DelibirdAnimationIdle:   INCLUDE "gfx/pokemon/delibird/anim_idle.asm"
+MantineAnimationIdle:    INCLUDE "gfx/pokemon/mantine/anim_idle.asm"
+SkarmoryAnimationIdle:   INCLUDE "gfx/pokemon/skarmory/anim_idle.asm"
+HoundourAnimationIdle:   INCLUDE "gfx/pokemon/houndour/anim_idle.asm"
+HoundoomAnimationIdle:   INCLUDE "gfx/pokemon/houndoom/anim_idle.asm"
+KingdraAnimationIdle:    INCLUDE "gfx/pokemon/kingdra/anim_idle.asm"
+PhanpyAnimationIdle:     INCLUDE "gfx/pokemon/phanpy/anim_idle.asm"
+DonphanAnimationIdle:    INCLUDE "gfx/pokemon/donphan/anim_idle.asm"
+Porygon2AnimationIdle:   INCLUDE "gfx/pokemon/porygon2/anim_idle.asm"
+StantlerAnimationIdle:   INCLUDE "gfx/pokemon/stantler/anim_idle.asm"
+SmeargleAnimationIdle:   INCLUDE "gfx/pokemon/smeargle/anim_idle.asm"
+TyrogueAnimationIdle:    INCLUDE "gfx/pokemon/tyrogue/anim_idle.asm"
+HitmontopAnimationIdle:  INCLUDE "gfx/pokemon/hitmontop/anim_idle.asm"
+SmoochumAnimationIdle:   INCLUDE "gfx/pokemon/smoochum/anim_idle.asm"
+ElekidAnimationIdle:     INCLUDE "gfx/pokemon/elekid/anim_idle.asm"
+MagbyAnimationIdle:      INCLUDE "gfx/pokemon/magby/anim_idle.asm"
+MiltankAnimationIdle:    INCLUDE "gfx/pokemon/miltank/anim_idle.asm"
+BlisseyAnimationIdle:    INCLUDE "gfx/pokemon/blissey/anim_idle.asm"
+RaikouAnimationIdle:     INCLUDE "gfx/pokemon/raikou/anim_idle.asm"
+EnteiAnimationIdle:      INCLUDE "gfx/pokemon/entei/anim_idle.asm"
+SuicuneAnimationIdle:    INCLUDE "gfx/pokemon/suicune/anim_idle.asm"
+LarvitarAnimationIdle:   INCLUDE "gfx/pokemon/larvitar/anim_idle.asm"
+PupitarAnimationIdle:    INCLUDE "gfx/pokemon/pupitar/anim_idle.asm"
+TyranitarAnimationIdle:  INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm"
+LugiaAnimationIdle:      INCLUDE "gfx/pokemon/lugia/anim_idle.asm"
+HoOhAnimationIdle:       INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm"
+CelebiAnimationIdle:     INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
+EggAnimationIdle:        INCLUDE "gfx/pokemon/egg/anim_idle.asm"
diff --git a/gfx/pokemon/igglybuff/anim0.asm b/gfx/pokemon/igglybuff/anim.asm
index 0b2430e44..0b2430e44 100644
--- a/gfx/pokemon/igglybuff/anim0.asm
+++ b/gfx/pokemon/igglybuff/anim.asm
diff --git a/gfx/pokemon/igglybuff/anim1.asm b/gfx/pokemon/igglybuff/anim_idle.asm
index 338a0ab2d..338a0ab2d 100644
--- a/gfx/pokemon/igglybuff/anim1.asm
+++ b/gfx/pokemon/igglybuff/anim_idle.asm
diff --git a/gfx/pokemon/ivysaur/anim0.asm b/gfx/pokemon/ivysaur/anim.asm
index 65e89f5ab..65e89f5ab 100644
--- a/gfx/pokemon/ivysaur/anim0.asm
+++ b/gfx/pokemon/ivysaur/anim.asm
diff --git a/gfx/pokemon/ivysaur/anim1.asm b/gfx/pokemon/ivysaur/anim_idle.asm
index 3df18b2cd..3df18b2cd 100644
--- a/gfx/pokemon/ivysaur/anim1.asm
+++ b/gfx/pokemon/ivysaur/anim_idle.asm
diff --git a/gfx/pokemon/jigglypuff/anim0.asm b/gfx/pokemon/jigglypuff/anim.asm
index ada7e0d99..ada7e0d99 100644
--- a/gfx/pokemon/jigglypuff/anim0.asm
+++ b/gfx/pokemon/jigglypuff/anim.asm
diff --git a/gfx/pokemon/jigglypuff/anim1.asm b/gfx/pokemon/jigglypuff/anim_idle.asm
index 40584de87..40584de87 100644
--- a/gfx/pokemon/jigglypuff/anim1.asm
+++ b/gfx/pokemon/jigglypuff/anim_idle.asm
diff --git a/gfx/pokemon/jolteon/anim0.asm b/gfx/pokemon/jolteon/anim.asm
index c4c01e60a..c4c01e60a 100644
--- a/gfx/pokemon/jolteon/anim0.asm
+++ b/gfx/pokemon/jolteon/anim.asm
diff --git a/gfx/pokemon/jolteon/anim1.asm b/gfx/pokemon/jolteon/anim_idle.asm
index 0b5481afd..0b5481afd 100644
--- a/gfx/pokemon/jolteon/anim1.asm
+++ b/gfx/pokemon/jolteon/anim_idle.asm
diff --git a/gfx/pokemon/jumpluff/anim0.asm b/gfx/pokemon/jumpluff/anim.asm
index c4161560e..c4161560e 100644
--- a/gfx/pokemon/jumpluff/anim0.asm
+++ b/gfx/pokemon/jumpluff/anim.asm
diff --git a/gfx/pokemon/jumpluff/anim1.asm b/gfx/pokemon/jumpluff/anim_idle.asm
index 5013b953f..5013b953f 100644
--- a/gfx/pokemon/jumpluff/anim1.asm
+++ b/gfx/pokemon/jumpluff/anim_idle.asm
diff --git a/gfx/pokemon/jynx/anim0.asm b/gfx/pokemon/jynx/anim.asm
index 78f0e63ed..78f0e63ed 100644
--- a/gfx/pokemon/jynx/anim0.asm
+++ b/gfx/pokemon/jynx/anim.asm
diff --git a/gfx/pokemon/jynx/anim1.asm b/gfx/pokemon/jynx/anim_idle.asm
index 42f42859c..42f42859c 100644
--- a/gfx/pokemon/jynx/anim1.asm
+++ b/gfx/pokemon/jynx/anim_idle.asm
diff --git a/gfx/pokemon/kabuto/anim0.asm b/gfx/pokemon/kabuto/anim.asm
index de308c900..de308c900 100644
--- a/gfx/pokemon/kabuto/anim0.asm
+++ b/gfx/pokemon/kabuto/anim.asm
diff --git a/gfx/pokemon/kabuto/anim1.asm b/gfx/pokemon/kabuto/anim_idle.asm
index 0e347c87d..0e347c87d 100644
--- a/gfx/pokemon/kabuto/anim1.asm
+++ b/gfx/pokemon/kabuto/anim_idle.asm
diff --git a/gfx/pokemon/kabutops/anim0.asm b/gfx/pokemon/kabutops/anim.asm
index f5812126a..f5812126a 100644
--- a/gfx/pokemon/kabutops/anim0.asm
+++ b/gfx/pokemon/kabutops/anim.asm
diff --git a/gfx/pokemon/kabutops/anim1.asm b/gfx/pokemon/kabutops/anim_idle.asm
index 32a70f827..32a70f827 100644
--- a/gfx/pokemon/kabutops/anim1.asm
+++ b/gfx/pokemon/kabutops/anim_idle.asm
diff --git a/gfx/pokemon/kadabra/anim0.asm b/gfx/pokemon/kadabra/anim.asm
index 9b132e26b..9b132e26b 100644
--- a/gfx/pokemon/kadabra/anim0.asm
+++ b/gfx/pokemon/kadabra/anim.asm
diff --git a/gfx/pokemon/kadabra/anim1.asm b/gfx/pokemon/kadabra/anim_idle.asm
index eabcdb07d..eabcdb07d 100644
--- a/gfx/pokemon/kadabra/anim1.asm
+++ b/gfx/pokemon/kadabra/anim_idle.asm
diff --git a/gfx/pokemon/kakuna/anim0.asm b/gfx/pokemon/kakuna/anim.asm
index b67e66e26..b67e66e26 100644
--- a/gfx/pokemon/kakuna/anim0.asm
+++ b/gfx/pokemon/kakuna/anim.asm
diff --git a/gfx/pokemon/kakuna/anim1.asm b/gfx/pokemon/kakuna/anim_idle.asm
index a7ca98540..a7ca98540 100644
--- a/gfx/pokemon/kakuna/anim1.asm
+++ b/gfx/pokemon/kakuna/anim_idle.asm
diff --git a/gfx/pokemon/kangaskhan/anim0.asm b/gfx/pokemon/kangaskhan/anim.asm
index 34363f893..34363f893 100644
--- a/gfx/pokemon/kangaskhan/anim0.asm
+++ b/gfx/pokemon/kangaskhan/anim.asm
diff --git a/gfx/pokemon/kangaskhan/anim1.asm b/gfx/pokemon/kangaskhan/anim_idle.asm
index 0da29ec4a..0da29ec4a 100644
--- a/gfx/pokemon/kangaskhan/anim1.asm
+++ b/gfx/pokemon/kangaskhan/anim_idle.asm
diff --git a/gfx/pokemon/kingdra/anim0.asm b/gfx/pokemon/kingdra/anim.asm
index c7bc2991f..c7bc2991f 100644
--- a/gfx/pokemon/kingdra/anim0.asm
+++ b/gfx/pokemon/kingdra/anim.asm
diff --git a/gfx/pokemon/kingdra/anim1.asm b/gfx/pokemon/kingdra/anim_idle.asm
index 2ec7e99ae..2ec7e99ae 100644
--- a/gfx/pokemon/kingdra/anim1.asm
+++ b/gfx/pokemon/kingdra/anim_idle.asm
diff --git a/gfx/pokemon/kingler/anim0.asm b/gfx/pokemon/kingler/anim.asm
index 2be7b62be..2be7b62be 100644
--- a/gfx/pokemon/kingler/anim0.asm
+++ b/gfx/pokemon/kingler/anim.asm
diff --git a/gfx/pokemon/kingler/anim1.asm b/gfx/pokemon/kingler/anim_idle.asm
index 25af73bc9..25af73bc9 100644
--- a/gfx/pokemon/kingler/anim1.asm
+++ b/gfx/pokemon/kingler/anim_idle.asm
diff --git a/gfx/pokemon/koffing/anim0.asm b/gfx/pokemon/koffing/anim.asm
index fc574f528..fc574f528 100644
--- a/gfx/pokemon/koffing/anim0.asm
+++ b/gfx/pokemon/koffing/anim.asm
diff --git a/gfx/pokemon/koffing/anim1.asm b/gfx/pokemon/koffing/anim_idle.asm
index e0e81b4d3..e0e81b4d3 100644
--- a/gfx/pokemon/koffing/anim1.asm
+++ b/gfx/pokemon/koffing/anim_idle.asm
diff --git a/gfx/pokemon/krabby/anim0.asm b/gfx/pokemon/krabby/anim.asm
index 22f5657e5..22f5657e5 100644
--- a/gfx/pokemon/krabby/anim0.asm
+++ b/gfx/pokemon/krabby/anim.asm
diff --git a/gfx/pokemon/krabby/anim1.asm b/gfx/pokemon/krabby/anim_idle.asm
index 0b89ffc33..0b89ffc33 100644
--- a/gfx/pokemon/krabby/anim1.asm
+++ b/gfx/pokemon/krabby/anim_idle.asm
diff --git a/gfx/pokemon/lanturn/anim0.asm b/gfx/pokemon/lanturn/anim.asm
index 18882deb5..18882deb5 100644
--- a/gfx/pokemon/lanturn/anim0.asm
+++ b/gfx/pokemon/lanturn/anim.asm
diff --git a/gfx/pokemon/lanturn/anim1.asm b/gfx/pokemon/lanturn/anim_idle.asm
index d57dd04b1..d57dd04b1 100644
--- a/gfx/pokemon/lanturn/anim1.asm
+++ b/gfx/pokemon/lanturn/anim_idle.asm
diff --git a/gfx/pokemon/lapras/anim0.asm b/gfx/pokemon/lapras/anim.asm
index 9ae8f4e5c..9ae8f4e5c 100644
--- a/gfx/pokemon/lapras/anim0.asm
+++ b/gfx/pokemon/lapras/anim.asm
diff --git a/gfx/pokemon/lapras/anim1.asm b/gfx/pokemon/lapras/anim_idle.asm
index 790cccf05..790cccf05 100644
--- a/gfx/pokemon/lapras/anim1.asm
+++ b/gfx/pokemon/lapras/anim_idle.asm
diff --git a/gfx/pokemon/larvitar/anim0.asm b/gfx/pokemon/larvitar/anim.asm
index bb861f733..bb861f733 100644
--- a/gfx/pokemon/larvitar/anim0.asm
+++ b/gfx/pokemon/larvitar/anim.asm
diff --git a/gfx/pokemon/larvitar/anim1.asm b/gfx/pokemon/larvitar/anim_idle.asm
index 2b87de7be..2b87de7be 100644
--- a/gfx/pokemon/larvitar/anim1.asm
+++ b/gfx/pokemon/larvitar/anim_idle.asm
diff --git a/gfx/pokemon/ledian/anim0.asm b/gfx/pokemon/ledian/anim.asm
index ece77ff44..ece77ff44 100644
--- a/gfx/pokemon/ledian/anim0.asm
+++ b/gfx/pokemon/ledian/anim.asm
diff --git a/gfx/pokemon/ledian/anim1.asm b/gfx/pokemon/ledian/anim_idle.asm
index cf5a0e011..cf5a0e011 100644
--- a/gfx/pokemon/ledian/anim1.asm
+++ b/gfx/pokemon/ledian/anim_idle.asm
diff --git a/gfx/pokemon/ledyba/anim0.asm b/gfx/pokemon/ledyba/anim.asm
index ac4c8e154..ac4c8e154 100644
--- a/gfx/pokemon/ledyba/anim0.asm
+++ b/gfx/pokemon/ledyba/anim.asm
diff --git a/gfx/pokemon/ledyba/anim1.asm b/gfx/pokemon/ledyba/anim_idle.asm
index d493c5fbc..d493c5fbc 100644
--- a/gfx/pokemon/ledyba/anim1.asm
+++ b/gfx/pokemon/ledyba/anim_idle.asm
diff --git a/gfx/pokemon/lickitung/anim0.asm b/gfx/pokemon/lickitung/anim.asm
index 2fb31e50b..2fb31e50b 100644
--- a/gfx/pokemon/lickitung/anim0.asm
+++ b/gfx/pokemon/lickitung/anim.asm
diff --git a/gfx/pokemon/lickitung/anim1.asm b/gfx/pokemon/lickitung/anim_idle.asm
index cf0355a03..cf0355a03 100644
--- a/gfx/pokemon/lickitung/anim1.asm
+++ b/gfx/pokemon/lickitung/anim_idle.asm
diff --git a/gfx/pokemon/lugia/anim0.asm b/gfx/pokemon/lugia/anim.asm
index 3c3c021a5..3c3c021a5 100644
--- a/gfx/pokemon/lugia/anim0.asm
+++ b/gfx/pokemon/lugia/anim.asm
diff --git a/gfx/pokemon/lugia/anim1.asm b/gfx/pokemon/lugia/anim_idle.asm
index 31f2ea09c..31f2ea09c 100644
--- a/gfx/pokemon/lugia/anim1.asm
+++ b/gfx/pokemon/lugia/anim_idle.asm
diff --git a/gfx/pokemon/machamp/anim0.asm b/gfx/pokemon/machamp/anim.asm
index 6202aefe5..6202aefe5 100644
--- a/gfx/pokemon/machamp/anim0.asm
+++ b/gfx/pokemon/machamp/anim.asm
diff --git a/gfx/pokemon/machamp/anim1.asm b/gfx/pokemon/machamp/anim_idle.asm
index 5171d3966..5171d3966 100644
--- a/gfx/pokemon/machamp/anim1.asm
+++ b/gfx/pokemon/machamp/anim_idle.asm
diff --git a/gfx/pokemon/machoke/anim0.asm b/gfx/pokemon/machoke/anim.asm
index 6d89ab174..6d89ab174 100644
--- a/gfx/pokemon/machoke/anim0.asm
+++ b/gfx/pokemon/machoke/anim.asm
diff --git a/gfx/pokemon/machoke/anim1.asm b/gfx/pokemon/machoke/anim_idle.asm
index c79f108d7..c79f108d7 100644
--- a/gfx/pokemon/machoke/anim1.asm
+++ b/gfx/pokemon/machoke/anim_idle.asm
diff --git a/gfx/pokemon/machop/anim0.asm b/gfx/pokemon/machop/anim.asm
index 8fee766ce..8fee766ce 100644
--- a/gfx/pokemon/machop/anim0.asm
+++ b/gfx/pokemon/machop/anim.asm
diff --git a/gfx/pokemon/machop/anim1.asm b/gfx/pokemon/machop/anim_idle.asm
index 20658284d..20658284d 100644
--- a/gfx/pokemon/machop/anim1.asm
+++ b/gfx/pokemon/machop/anim_idle.asm
diff --git a/gfx/pokemon/magby/anim0.asm b/gfx/pokemon/magby/anim.asm
index b0f8c7a10..b0f8c7a10 100644
--- a/gfx/pokemon/magby/anim0.asm
+++ b/gfx/pokemon/magby/anim.asm
diff --git a/gfx/pokemon/magby/anim1.asm b/gfx/pokemon/magby/anim_idle.asm
index 20b2b7997..20b2b7997 100644
--- a/gfx/pokemon/magby/anim1.asm
+++ b/gfx/pokemon/magby/anim_idle.asm
diff --git a/gfx/pokemon/magcargo/anim0.asm b/gfx/pokemon/magcargo/anim.asm
index d6bf7543a..d6bf7543a 100644
--- a/gfx/pokemon/magcargo/anim0.asm
+++ b/gfx/pokemon/magcargo/anim.asm
diff --git a/gfx/pokemon/magcargo/anim1.asm b/gfx/pokemon/magcargo/anim_idle.asm
index 3c76a44df..3c76a44df 100644
--- a/gfx/pokemon/magcargo/anim1.asm
+++ b/gfx/pokemon/magcargo/anim_idle.asm
diff --git a/gfx/pokemon/magikarp/anim0.asm b/gfx/pokemon/magikarp/anim.asm
index f06f21a40..f06f21a40 100644
--- a/gfx/pokemon/magikarp/anim0.asm
+++ b/gfx/pokemon/magikarp/anim.asm
diff --git a/gfx/pokemon/magikarp/anim1.asm b/gfx/pokemon/magikarp/anim_idle.asm
index 7c3f5cb76..7c3f5cb76 100644
--- a/gfx/pokemon/magikarp/anim1.asm
+++ b/gfx/pokemon/magikarp/anim_idle.asm
diff --git a/gfx/pokemon/magmar/anim0.asm b/gfx/pokemon/magmar/anim.asm
index 8fde5d3b5..8fde5d3b5 100644
--- a/gfx/pokemon/magmar/anim0.asm
+++ b/gfx/pokemon/magmar/anim.asm
diff --git a/gfx/pokemon/magmar/anim1.asm b/gfx/pokemon/magmar/anim_idle.asm
index 784bdcd3d..784bdcd3d 100644
--- a/gfx/pokemon/magmar/anim1.asm
+++ b/gfx/pokemon/magmar/anim_idle.asm
diff --git a/gfx/pokemon/magnemite/anim0.asm b/gfx/pokemon/magnemite/anim.asm
index 4f038b0ed..4f038b0ed 100644
--- a/gfx/pokemon/magnemite/anim0.asm
+++ b/gfx/pokemon/magnemite/anim.asm
diff --git a/gfx/pokemon/magnemite/anim1.asm b/gfx/pokemon/magnemite/anim_idle.asm
index a41239563..a41239563 100644
--- a/gfx/pokemon/magnemite/anim1.asm
+++ b/gfx/pokemon/magnemite/anim_idle.asm
diff --git a/gfx/pokemon/magneton/anim0.asm b/gfx/pokemon/magneton/anim.asm
index 26b34d4ec..26b34d4ec 100644
--- a/gfx/pokemon/magneton/anim0.asm
+++ b/gfx/pokemon/magneton/anim.asm
diff --git a/gfx/pokemon/magneton/anim1.asm b/gfx/pokemon/magneton/anim_idle.asm
index 6045d8fae..6045d8fae 100644
--- a/gfx/pokemon/magneton/anim1.asm
+++ b/gfx/pokemon/magneton/anim_idle.asm
diff --git a/gfx/pokemon/mankey/anim0.asm b/gfx/pokemon/mankey/anim.asm
index 7d6ef1fa5..7d6ef1fa5 100644
--- a/gfx/pokemon/mankey/anim0.asm
+++ b/gfx/pokemon/mankey/anim.asm
diff --git a/gfx/pokemon/mankey/anim1.asm b/gfx/pokemon/mankey/anim_idle.asm
index c5874fc6d..c5874fc6d 100644
--- a/gfx/pokemon/mankey/anim1.asm
+++ b/gfx/pokemon/mankey/anim_idle.asm
diff --git a/gfx/pokemon/mantine/anim0.asm b/gfx/pokemon/mantine/anim.asm
index d0a51de3e..d0a51de3e 100644
--- a/gfx/pokemon/mantine/anim0.asm
+++ b/gfx/pokemon/mantine/anim.asm
diff --git a/gfx/pokemon/mantine/anim1.asm b/gfx/pokemon/mantine/anim_idle.asm
index f552b1f09..f552b1f09 100644
--- a/gfx/pokemon/mantine/anim1.asm
+++ b/gfx/pokemon/mantine/anim_idle.asm
diff --git a/gfx/pokemon/mareep/anim0.asm b/gfx/pokemon/mareep/anim.asm
index e74a78cad..e74a78cad 100644
--- a/gfx/pokemon/mareep/anim0.asm
+++ b/gfx/pokemon/mareep/anim.asm
diff --git a/gfx/pokemon/mareep/anim1.asm b/gfx/pokemon/mareep/anim_idle.asm
index 21d7a79f8..21d7a79f8 100644
--- a/gfx/pokemon/mareep/anim1.asm
+++ b/gfx/pokemon/mareep/anim_idle.asm
diff --git a/gfx/pokemon/marill/anim0.asm b/gfx/pokemon/marill/anim.asm
index 5b8c7fc2a..5b8c7fc2a 100644
--- a/gfx/pokemon/marill/anim0.asm
+++ b/gfx/pokemon/marill/anim.asm
diff --git a/gfx/pokemon/marill/anim1.asm b/gfx/pokemon/marill/anim_idle.asm
index 3be2dd1dc..3be2dd1dc 100644
--- a/gfx/pokemon/marill/anim1.asm
+++ b/gfx/pokemon/marill/anim_idle.asm
diff --git a/gfx/pokemon/marowak/anim0.asm b/gfx/pokemon/marowak/anim.asm
index 23c9d2f92..23c9d2f92 100644
--- a/gfx/pokemon/marowak/anim0.asm
+++ b/gfx/pokemon/marowak/anim.asm
diff --git a/gfx/pokemon/marowak/anim1.asm b/gfx/pokemon/marowak/anim_idle.asm
index 5cdcd7594..5cdcd7594 100644
--- a/gfx/pokemon/marowak/anim1.asm
+++ b/gfx/pokemon/marowak/anim_idle.asm
diff --git a/gfx/pokemon/meganium/anim0.asm b/gfx/pokemon/meganium/anim.asm
index adf80db8f..adf80db8f 100644
--- a/gfx/pokemon/meganium/anim0.asm
+++ b/gfx/pokemon/meganium/anim.asm
diff --git a/gfx/pokemon/meganium/anim1.asm b/gfx/pokemon/meganium/anim_idle.asm
index f28c9d97a..f28c9d97a 100644
--- a/gfx/pokemon/meganium/anim1.asm
+++ b/gfx/pokemon/meganium/anim_idle.asm
diff --git a/gfx/pokemon/meowth/anim0.asm b/gfx/pokemon/meowth/anim.asm
index ff95e9c6d..ff95e9c6d 100644
--- a/gfx/pokemon/meowth/anim0.asm
+++ b/gfx/pokemon/meowth/anim.asm
diff --git a/gfx/pokemon/meowth/anim1.asm b/gfx/pokemon/meowth/anim_idle.asm
index 7f1e9eba8..7f1e9eba8 100644
--- a/gfx/pokemon/meowth/anim1.asm
+++ b/gfx/pokemon/meowth/anim_idle.asm
diff --git a/gfx/pokemon/metapod/anim0.asm b/gfx/pokemon/metapod/anim.asm
index da76c7094..da76c7094 100644
--- a/gfx/pokemon/metapod/anim0.asm
+++ b/gfx/pokemon/metapod/anim.asm
diff --git a/gfx/pokemon/metapod/anim1.asm b/gfx/pokemon/metapod/anim_idle.asm
index e22d46cb7..e22d46cb7 100644
--- a/gfx/pokemon/metapod/anim1.asm
+++ b/gfx/pokemon/metapod/anim_idle.asm
diff --git a/gfx/pokemon/mew/anim0.asm b/gfx/pokemon/mew/anim.asm
index b01e307de..b01e307de 100644
--- a/gfx/pokemon/mew/anim0.asm
+++ b/gfx/pokemon/mew/anim.asm
diff --git a/gfx/pokemon/mew/anim1.asm b/gfx/pokemon/mew/anim_idle.asm
index c22e552cb..c22e552cb 100644
--- a/gfx/pokemon/mew/anim1.asm
+++ b/gfx/pokemon/mew/anim_idle.asm
diff --git a/gfx/pokemon/mewtwo/anim0.asm b/gfx/pokemon/mewtwo/anim.asm
index 78682c111..78682c111 100644
--- a/gfx/pokemon/mewtwo/anim0.asm
+++ b/gfx/pokemon/mewtwo/anim.asm
diff --git a/gfx/pokemon/mewtwo/anim1.asm b/gfx/pokemon/mewtwo/anim_idle.asm
index a80a56899..a80a56899 100644
--- a/gfx/pokemon/mewtwo/anim1.asm
+++ b/gfx/pokemon/mewtwo/anim_idle.asm
diff --git a/gfx/pokemon/miltank/anim0.asm b/gfx/pokemon/miltank/anim.asm
index 6d12f2d5d..6d12f2d5d 100644
--- a/gfx/pokemon/miltank/anim0.asm
+++ b/gfx/pokemon/miltank/anim.asm
diff --git a/gfx/pokemon/miltank/anim1.asm b/gfx/pokemon/miltank/anim_idle.asm
index a6a76db7b..a6a76db7b 100644
--- a/gfx/pokemon/miltank/anim1.asm
+++ b/gfx/pokemon/miltank/anim_idle.asm
diff --git a/gfx/pokemon/misdreavus/anim0.asm b/gfx/pokemon/misdreavus/anim.asm
index d833c96fb..d833c96fb 100644
--- a/gfx/pokemon/misdreavus/anim0.asm
+++ b/gfx/pokemon/misdreavus/anim.asm
diff --git a/gfx/pokemon/misdreavus/anim1.asm b/gfx/pokemon/misdreavus/anim_idle.asm
index 3f0ee9517..3f0ee9517 100644
--- a/gfx/pokemon/misdreavus/anim1.asm
+++ b/gfx/pokemon/misdreavus/anim_idle.asm
diff --git a/gfx/pokemon/moltres/anim0.asm b/gfx/pokemon/moltres/anim.asm
index 220626749..220626749 100644
--- a/gfx/pokemon/moltres/anim0.asm
+++ b/gfx/pokemon/moltres/anim.asm
diff --git a/gfx/pokemon/moltres/anim1.asm b/gfx/pokemon/moltres/anim_idle.asm
index 258191b6e..258191b6e 100644
--- a/gfx/pokemon/moltres/anim1.asm
+++ b/gfx/pokemon/moltres/anim_idle.asm
diff --git a/gfx/pokemon/mr__mime/anim0.asm b/gfx/pokemon/mr__mime/anim.asm
index fcb597a5a..fcb597a5a 100644
--- a/gfx/pokemon/mr__mime/anim0.asm
+++ b/gfx/pokemon/mr__mime/anim.asm
diff --git a/gfx/pokemon/mr__mime/anim1.asm b/gfx/pokemon/mr__mime/anim_idle.asm
index c3747ac1e..c3747ac1e 100644
--- a/gfx/pokemon/mr__mime/anim1.asm
+++ b/gfx/pokemon/mr__mime/anim_idle.asm
diff --git a/gfx/pokemon/muk/anim0.asm b/gfx/pokemon/muk/anim.asm
index 1bacba421..1bacba421 100644
--- a/gfx/pokemon/muk/anim0.asm
+++ b/gfx/pokemon/muk/anim.asm
diff --git a/gfx/pokemon/muk/anim1.asm b/gfx/pokemon/muk/anim_idle.asm
index db37bf515..db37bf515 100644
--- a/gfx/pokemon/muk/anim1.asm
+++ b/gfx/pokemon/muk/anim_idle.asm
diff --git a/gfx/pokemon/murkrow/anim0.asm b/gfx/pokemon/murkrow/anim.asm
index 8f0ca6a72..8f0ca6a72 100644
--- a/gfx/pokemon/murkrow/anim0.asm
+++ b/gfx/pokemon/murkrow/anim.asm
diff --git a/gfx/pokemon/murkrow/anim1.asm b/gfx/pokemon/murkrow/anim_idle.asm
index 85e2f9c56..85e2f9c56 100644
--- a/gfx/pokemon/murkrow/anim1.asm
+++ b/gfx/pokemon/murkrow/anim_idle.asm
diff --git a/gfx/pokemon/natu/anim0.asm b/gfx/pokemon/natu/anim.asm
index 22c2659db..22c2659db 100644
--- a/gfx/pokemon/natu/anim0.asm
+++ b/gfx/pokemon/natu/anim.asm
diff --git a/gfx/pokemon/natu/anim1.asm b/gfx/pokemon/natu/anim_idle.asm
index a4a974877..a4a974877 100644
--- a/gfx/pokemon/natu/anim1.asm
+++ b/gfx/pokemon/natu/anim_idle.asm
diff --git a/gfx/pokemon/nidoking/anim0.asm b/gfx/pokemon/nidoking/anim.asm
index a32945d49..a32945d49 100644
--- a/gfx/pokemon/nidoking/anim0.asm
+++ b/gfx/pokemon/nidoking/anim.asm
diff --git a/gfx/pokemon/nidoking/anim1.asm b/gfx/pokemon/nidoking/anim_idle.asm
index 4e56028e1..4e56028e1 100644
--- a/gfx/pokemon/nidoking/anim1.asm
+++ b/gfx/pokemon/nidoking/anim_idle.asm
diff --git a/gfx/pokemon/nidoqueen/anim0.asm b/gfx/pokemon/nidoqueen/anim.asm
index bd9d8eee8..bd9d8eee8 100644
--- a/gfx/pokemon/nidoqueen/anim0.asm
+++ b/gfx/pokemon/nidoqueen/anim.asm
diff --git a/gfx/pokemon/nidoqueen/anim1.asm b/gfx/pokemon/nidoqueen/anim_idle.asm
index 1cc934c42..1cc934c42 100644
--- a/gfx/pokemon/nidoqueen/anim1.asm
+++ b/gfx/pokemon/nidoqueen/anim_idle.asm
diff --git a/gfx/pokemon/nidoran_f/anim0.asm b/gfx/pokemon/nidoran_f/anim.asm
index 623db13d1..623db13d1 100644
--- a/gfx/pokemon/nidoran_f/anim0.asm
+++ b/gfx/pokemon/nidoran_f/anim.asm
diff --git a/gfx/pokemon/nidoran_f/anim1.asm b/gfx/pokemon/nidoran_f/anim_idle.asm
index 348179aac..348179aac 100644
--- a/gfx/pokemon/nidoran_f/anim1.asm
+++ b/gfx/pokemon/nidoran_f/anim_idle.asm
diff --git a/gfx/pokemon/nidoran_m/anim0.asm b/gfx/pokemon/nidoran_m/anim.asm
index 9b8a38133..9b8a38133 100644
--- a/gfx/pokemon/nidoran_m/anim0.asm
+++ b/gfx/pokemon/nidoran_m/anim.asm
diff --git a/gfx/pokemon/nidoran_m/anim1.asm b/gfx/pokemon/nidoran_m/anim_idle.asm
index 20b437f6a..20b437f6a 100644
--- a/gfx/pokemon/nidoran_m/anim1.asm
+++ b/gfx/pokemon/nidoran_m/anim_idle.asm
diff --git a/gfx/pokemon/nidorina/anim0.asm b/gfx/pokemon/nidorina/anim.asm
index 6ab079db4..6ab079db4 100644
--- a/gfx/pokemon/nidorina/anim0.asm
+++ b/gfx/pokemon/nidorina/anim.asm
diff --git a/gfx/pokemon/nidorina/anim1.asm b/gfx/pokemon/nidorina/anim_idle.asm
index 6afb1cbc8..6afb1cbc8 100644
--- a/gfx/pokemon/nidorina/anim1.asm
+++ b/gfx/pokemon/nidorina/anim_idle.asm
diff --git a/gfx/pokemon/nidorino/anim0.asm b/gfx/pokemon/nidorino/anim.asm
index 16a6cb1dc..16a6cb1dc 100644
--- a/gfx/pokemon/nidorino/anim0.asm
+++ b/gfx/pokemon/nidorino/anim.asm
diff --git a/gfx/pokemon/nidorino/anim1.asm b/gfx/pokemon/nidorino/anim_idle.asm
index 40e17f454..40e17f454 100644
--- a/gfx/pokemon/nidorino/anim1.asm
+++ b/gfx/pokemon/nidorino/anim_idle.asm
diff --git a/gfx/pokemon/ninetales/anim0.asm b/gfx/pokemon/ninetales/anim.asm
index 0d691ee9d..0d691ee9d 100644
--- a/gfx/pokemon/ninetales/anim0.asm
+++ b/gfx/pokemon/ninetales/anim.asm
diff --git a/gfx/pokemon/ninetales/anim1.asm b/gfx/pokemon/ninetales/anim_idle.asm
index 68d1e8051..68d1e8051 100644
--- a/gfx/pokemon/ninetales/anim1.asm
+++ b/gfx/pokemon/ninetales/anim_idle.asm
diff --git a/gfx/pokemon/noctowl/anim0.asm b/gfx/pokemon/noctowl/anim.asm
index ce19c30a5..ce19c30a5 100644
--- a/gfx/pokemon/noctowl/anim0.asm
+++ b/gfx/pokemon/noctowl/anim.asm
diff --git a/gfx/pokemon/noctowl/anim1.asm b/gfx/pokemon/noctowl/anim_idle.asm
index 4fe81f336..4fe81f336 100644
--- a/gfx/pokemon/noctowl/anim1.asm
+++ b/gfx/pokemon/noctowl/anim_idle.asm
diff --git a/gfx/pokemon/octillery/anim0.asm b/gfx/pokemon/octillery/anim.asm
index 2405d46a1..2405d46a1 100644
--- a/gfx/pokemon/octillery/anim0.asm
+++ b/gfx/pokemon/octillery/anim.asm
diff --git a/gfx/pokemon/octillery/anim1.asm b/gfx/pokemon/octillery/anim_idle.asm
index 0903a867a..0903a867a 100644
--- a/gfx/pokemon/octillery/anim1.asm
+++ b/gfx/pokemon/octillery/anim_idle.asm
diff --git a/gfx/pokemon/oddish/anim0.asm b/gfx/pokemon/oddish/anim.asm
index 338771fce..338771fce 100644
--- a/gfx/pokemon/oddish/anim0.asm
+++ b/gfx/pokemon/oddish/anim.asm
diff --git a/gfx/pokemon/oddish/anim1.asm b/gfx/pokemon/oddish/anim_idle.asm
index 92d041ff5..92d041ff5 100644
--- a/gfx/pokemon/oddish/anim1.asm
+++ b/gfx/pokemon/oddish/anim_idle.asm
diff --git a/gfx/pokemon/omanyte/anim0.asm b/gfx/pokemon/omanyte/anim.asm
index 5863efecc..5863efecc 100644
--- a/gfx/pokemon/omanyte/anim0.asm
+++ b/gfx/pokemon/omanyte/anim.asm
diff --git a/gfx/pokemon/omanyte/anim1.asm b/gfx/pokemon/omanyte/anim_idle.asm
index ffdce5abd..ffdce5abd 100644
--- a/gfx/pokemon/omanyte/anim1.asm
+++ b/gfx/pokemon/omanyte/anim_idle.asm
diff --git a/gfx/pokemon/omastar/anim0.asm b/gfx/pokemon/omastar/anim.asm
index 76d8c3aa8..76d8c3aa8 100644
--- a/gfx/pokemon/omastar/anim0.asm
+++ b/gfx/pokemon/omastar/anim.asm
diff --git a/gfx/pokemon/omastar/anim1.asm b/gfx/pokemon/omastar/anim_idle.asm
index 60bcf04d2..60bcf04d2 100644
--- a/gfx/pokemon/omastar/anim1.asm
+++ b/gfx/pokemon/omastar/anim_idle.asm
diff --git a/gfx/pokemon/onix/anim0.asm b/gfx/pokemon/onix/anim.asm
index a5b18f5b6..a5b18f5b6 100644
--- a/gfx/pokemon/onix/anim0.asm
+++ b/gfx/pokemon/onix/anim.asm
diff --git a/gfx/pokemon/onix/anim1.asm b/gfx/pokemon/onix/anim_idle.asm
index e4ae7acac..e4ae7acac 100644
--- a/gfx/pokemon/onix/anim1.asm
+++ b/gfx/pokemon/onix/anim_idle.asm
diff --git a/gfx/pokemon/paras/anim0.asm b/gfx/pokemon/paras/anim.asm
index 6fcc935e9..6fcc935e9 100644
--- a/gfx/pokemon/paras/anim0.asm
+++ b/gfx/pokemon/paras/anim.asm
diff --git a/gfx/pokemon/paras/anim1.asm b/gfx/pokemon/paras/anim_idle.asm
index 3ce495f04..3ce495f04 100644
--- a/gfx/pokemon/paras/anim1.asm
+++ b/gfx/pokemon/paras/anim_idle.asm
diff --git a/gfx/pokemon/parasect/anim0.asm b/gfx/pokemon/parasect/anim.asm
index e9e253cee..e9e253cee 100644
--- a/gfx/pokemon/parasect/anim0.asm
+++ b/gfx/pokemon/parasect/anim.asm
diff --git a/gfx/pokemon/parasect/anim1.asm b/gfx/pokemon/parasect/anim_idle.asm
index 8275690a6..8275690a6 100644
--- a/gfx/pokemon/parasect/anim1.asm
+++ b/gfx/pokemon/parasect/anim_idle.asm
diff --git a/gfx/pokemon/persian/anim0.asm b/gfx/pokemon/persian/anim.asm
index ae771c09c..ae771c09c 100644
--- a/gfx/pokemon/persian/anim0.asm
+++ b/gfx/pokemon/persian/anim.asm
diff --git a/gfx/pokemon/persian/anim1.asm b/gfx/pokemon/persian/anim_idle.asm
index ca9129bfa..ca9129bfa 100644
--- a/gfx/pokemon/persian/anim1.asm
+++ b/gfx/pokemon/persian/anim_idle.asm
diff --git a/gfx/pokemon/phanpy/anim0.asm b/gfx/pokemon/phanpy/anim.asm
index 7ec513762..7ec513762 100644
--- a/gfx/pokemon/phanpy/anim0.asm
+++ b/gfx/pokemon/phanpy/anim.asm
diff --git a/gfx/pokemon/phanpy/anim1.asm b/gfx/pokemon/phanpy/anim_idle.asm
index 43148da49..43148da49 100644
--- a/gfx/pokemon/phanpy/anim1.asm
+++ b/gfx/pokemon/phanpy/anim_idle.asm
diff --git a/gfx/pokemon/pichu/anim0.asm b/gfx/pokemon/pichu/anim.asm
index 50a1ae73c..50a1ae73c 100644
--- a/gfx/pokemon/pichu/anim0.asm
+++ b/gfx/pokemon/pichu/anim.asm
diff --git a/gfx/pokemon/pichu/anim1.asm b/gfx/pokemon/pichu/anim_idle.asm
index dd39adcab..dd39adcab 100644
--- a/gfx/pokemon/pichu/anim1.asm
+++ b/gfx/pokemon/pichu/anim_idle.asm
diff --git a/gfx/pokemon/pidgeot/anim0.asm b/gfx/pokemon/pidgeot/anim.asm
index 34d5d3a98..34d5d3a98 100644
--- a/gfx/pokemon/pidgeot/anim0.asm
+++ b/gfx/pokemon/pidgeot/anim.asm
diff --git a/gfx/pokemon/pidgeot/anim1.asm b/gfx/pokemon/pidgeot/anim_idle.asm
index 6ba60e83e..6ba60e83e 100644
--- a/gfx/pokemon/pidgeot/anim1.asm
+++ b/gfx/pokemon/pidgeot/anim_idle.asm
diff --git a/gfx/pokemon/pidgeotto/anim0.asm b/gfx/pokemon/pidgeotto/anim.asm
index 53008855f..53008855f 100644
--- a/gfx/pokemon/pidgeotto/anim0.asm
+++ b/gfx/pokemon/pidgeotto/anim.asm
diff --git a/gfx/pokemon/pidgeotto/anim1.asm b/gfx/pokemon/pidgeotto/anim_idle.asm
index 95a27bb15..95a27bb15 100644
--- a/gfx/pokemon/pidgeotto/anim1.asm
+++ b/gfx/pokemon/pidgeotto/anim_idle.asm
diff --git a/gfx/pokemon/pidgey/anim0.asm b/gfx/pokemon/pidgey/anim.asm
index 4ca6553d2..4ca6553d2 100644
--- a/gfx/pokemon/pidgey/anim0.asm
+++ b/gfx/pokemon/pidgey/anim.asm
diff --git a/gfx/pokemon/pidgey/anim1.asm b/gfx/pokemon/pidgey/anim_idle.asm
index 25a55fb45..25a55fb45 100644
--- a/gfx/pokemon/pidgey/anim1.asm
+++ b/gfx/pokemon/pidgey/anim_idle.asm
diff --git a/gfx/pokemon/pikachu/anim0.asm b/gfx/pokemon/pikachu/anim.asm
index 6a1ac0954..6a1ac0954 100644
--- a/gfx/pokemon/pikachu/anim0.asm
+++ b/gfx/pokemon/pikachu/anim.asm
diff --git a/gfx/pokemon/pikachu/anim1.asm b/gfx/pokemon/pikachu/anim_idle.asm
index 0454a2855..0454a2855 100644
--- a/gfx/pokemon/pikachu/anim1.asm
+++ b/gfx/pokemon/pikachu/anim_idle.asm
diff --git a/gfx/pokemon/piloswine/anim0.asm b/gfx/pokemon/piloswine/anim.asm
index 5b57b3ef9..5b57b3ef9 100644
--- a/gfx/pokemon/piloswine/anim0.asm
+++ b/gfx/pokemon/piloswine/anim.asm
diff --git a/gfx/pokemon/piloswine/anim1.asm b/gfx/pokemon/piloswine/anim_idle.asm
index c1cba5ee2..c1cba5ee2 100644
--- a/gfx/pokemon/piloswine/anim1.asm
+++ b/gfx/pokemon/piloswine/anim_idle.asm
diff --git a/gfx/pokemon/pineco/anim0.asm b/gfx/pokemon/pineco/anim.asm
index 4579032ec..4579032ec 100644
--- a/gfx/pokemon/pineco/anim0.asm
+++ b/gfx/pokemon/pineco/anim.asm
diff --git a/gfx/pokemon/pineco/anim1.asm b/gfx/pokemon/pineco/anim_idle.asm
index f1b4e949e..f1b4e949e 100644
--- a/gfx/pokemon/pineco/anim1.asm
+++ b/gfx/pokemon/pineco/anim_idle.asm
diff --git a/gfx/pokemon/pinsir/anim0.asm b/gfx/pokemon/pinsir/anim.asm
index f45752006..f45752006 100644
--- a/gfx/pokemon/pinsir/anim0.asm
+++ b/gfx/pokemon/pinsir/anim.asm
diff --git a/gfx/pokemon/pinsir/anim1.asm b/gfx/pokemon/pinsir/anim_idle.asm
index 73895c2e0..73895c2e0 100644
--- a/gfx/pokemon/pinsir/anim1.asm
+++ b/gfx/pokemon/pinsir/anim_idle.asm
diff --git a/gfx/pokemon/politoed/anim0.asm b/gfx/pokemon/politoed/anim.asm
index 72347714f..72347714f 100644
--- a/gfx/pokemon/politoed/anim0.asm
+++ b/gfx/pokemon/politoed/anim.asm
diff --git a/gfx/pokemon/politoed/anim1.asm b/gfx/pokemon/politoed/anim_idle.asm
index 8ec01df37..8ec01df37 100644
--- a/gfx/pokemon/politoed/anim1.asm
+++ b/gfx/pokemon/politoed/anim_idle.asm
diff --git a/gfx/pokemon/poliwag/anim0.asm b/gfx/pokemon/poliwag/anim.asm
index 8446897c0..8446897c0 100644
--- a/gfx/pokemon/poliwag/anim0.asm
+++ b/gfx/pokemon/poliwag/anim.asm
diff --git a/gfx/pokemon/poliwag/anim1.asm b/gfx/pokemon/poliwag/anim_idle.asm
index 839e57e87..839e57e87 100644
--- a/gfx/pokemon/poliwag/anim1.asm
+++ b/gfx/pokemon/poliwag/anim_idle.asm
diff --git a/gfx/pokemon/poliwhirl/anim0.asm b/gfx/pokemon/poliwhirl/anim.asm
index 14cb89029..14cb89029 100644
--- a/gfx/pokemon/poliwhirl/anim0.asm
+++ b/gfx/pokemon/poliwhirl/anim.asm
diff --git a/gfx/pokemon/poliwhirl/anim1.asm b/gfx/pokemon/poliwhirl/anim_idle.asm
index 72ba07245..72ba07245 100644
--- a/gfx/pokemon/poliwhirl/anim1.asm
+++ b/gfx/pokemon/poliwhirl/anim_idle.asm
diff --git a/gfx/pokemon/poliwrath/anim0.asm b/gfx/pokemon/poliwrath/anim.asm
index 2b5fb0eef..2b5fb0eef 100644
--- a/gfx/pokemon/poliwrath/anim0.asm
+++ b/gfx/pokemon/poliwrath/anim.asm
diff --git a/gfx/pokemon/poliwrath/anim1.asm b/gfx/pokemon/poliwrath/anim_idle.asm
index f709ea35c..f709ea35c 100644
--- a/gfx/pokemon/poliwrath/anim1.asm
+++ b/gfx/pokemon/poliwrath/anim_idle.asm
diff --git a/gfx/pokemon/ponyta/anim0.asm b/gfx/pokemon/ponyta/anim.asm
index 34c3a82b6..34c3a82b6 100644
--- a/gfx/pokemon/ponyta/anim0.asm
+++ b/gfx/pokemon/ponyta/anim.asm
diff --git a/gfx/pokemon/ponyta/anim1.asm b/gfx/pokemon/ponyta/anim_idle.asm
index 10c9f42dd..10c9f42dd 100644
--- a/gfx/pokemon/ponyta/anim1.asm
+++ b/gfx/pokemon/ponyta/anim_idle.asm
diff --git a/gfx/pokemon/porygon/anim0.asm b/gfx/pokemon/porygon/anim.asm
index 0246a5621..0246a5621 100644
--- a/gfx/pokemon/porygon/anim0.asm
+++ b/gfx/pokemon/porygon/anim.asm
diff --git a/gfx/pokemon/porygon/anim1.asm b/gfx/pokemon/porygon/anim_idle.asm
index 89af5d13f..89af5d13f 100644
--- a/gfx/pokemon/porygon/anim1.asm
+++ b/gfx/pokemon/porygon/anim_idle.asm
diff --git a/gfx/pokemon/porygon2/anim0.asm b/gfx/pokemon/porygon2/anim.asm
index b94920e29..b94920e29 100644
--- a/gfx/pokemon/porygon2/anim0.asm
+++ b/gfx/pokemon/porygon2/anim.asm
diff --git a/gfx/pokemon/porygon2/anim1.asm b/gfx/pokemon/porygon2/anim_idle.asm
index b3a029047..b3a029047 100644
--- a/gfx/pokemon/porygon2/anim1.asm
+++ b/gfx/pokemon/porygon2/anim_idle.asm
diff --git a/gfx/pokemon/primeape/anim0.asm b/gfx/pokemon/primeape/anim.asm
index a2a427059..a2a427059 100644
--- a/gfx/pokemon/primeape/anim0.asm
+++ b/gfx/pokemon/primeape/anim.asm
diff --git a/gfx/pokemon/primeape/anim1.asm b/gfx/pokemon/primeape/anim_idle.asm
index 7d1c8a2d7..7d1c8a2d7 100644
--- a/gfx/pokemon/primeape/anim1.asm
+++ b/gfx/pokemon/primeape/anim_idle.asm
diff --git a/gfx/pokemon/psyduck/anim0.asm b/gfx/pokemon/psyduck/anim.asm
index da6f3aec6..da6f3aec6 100644
--- a/gfx/pokemon/psyduck/anim0.asm
+++ b/gfx/pokemon/psyduck/anim.asm
diff --git a/gfx/pokemon/psyduck/anim1.asm b/gfx/pokemon/psyduck/anim_idle.asm
index 2fabc5b19..2fabc5b19 100644
--- a/gfx/pokemon/psyduck/anim1.asm
+++ b/gfx/pokemon/psyduck/anim_idle.asm
diff --git a/gfx/pokemon/pupitar/anim0.asm b/gfx/pokemon/pupitar/anim.asm
index c3ea44bc9..c3ea44bc9 100644
--- a/gfx/pokemon/pupitar/anim0.asm
+++ b/gfx/pokemon/pupitar/anim.asm
diff --git a/gfx/pokemon/pupitar/anim1.asm b/gfx/pokemon/pupitar/anim_idle.asm
index efc0f3bb4..efc0f3bb4 100644
--- a/gfx/pokemon/pupitar/anim1.asm
+++ b/gfx/pokemon/pupitar/anim_idle.asm
diff --git a/gfx/pokemon/quagsire/anim0.asm b/gfx/pokemon/quagsire/anim.asm
index 852780069..852780069 100644
--- a/gfx/pokemon/quagsire/anim0.asm
+++ b/gfx/pokemon/quagsire/anim.asm
diff --git a/gfx/pokemon/quagsire/anim1.asm b/gfx/pokemon/quagsire/anim_idle.asm
index f5c2ed31b..f5c2ed31b 100644
--- a/gfx/pokemon/quagsire/anim1.asm
+++ b/gfx/pokemon/quagsire/anim_idle.asm
diff --git a/gfx/pokemon/quilava/anim0.asm b/gfx/pokemon/quilava/anim.asm
index b5df67978..b5df67978 100644
--- a/gfx/pokemon/quilava/anim0.asm
+++ b/gfx/pokemon/quilava/anim.asm
diff --git a/gfx/pokemon/quilava/anim1.asm b/gfx/pokemon/quilava/anim_idle.asm
index 09f187796..09f187796 100644
--- a/gfx/pokemon/quilava/anim1.asm
+++ b/gfx/pokemon/quilava/anim_idle.asm
diff --git a/gfx/pokemon/qwilfish/anim0.asm b/gfx/pokemon/qwilfish/anim.asm
index 6e5d62d04..6e5d62d04 100644
--- a/gfx/pokemon/qwilfish/anim0.asm
+++ b/gfx/pokemon/qwilfish/anim.asm
diff --git a/gfx/pokemon/qwilfish/anim1.asm b/gfx/pokemon/qwilfish/anim_idle.asm
index 4330e80cc..4330e80cc 100644
--- a/gfx/pokemon/qwilfish/anim1.asm
+++ b/gfx/pokemon/qwilfish/anim_idle.asm
diff --git a/gfx/pokemon/raichu/anim0.asm b/gfx/pokemon/raichu/anim.asm
index a7312c7ae..a7312c7ae 100644
--- a/gfx/pokemon/raichu/anim0.asm
+++ b/gfx/pokemon/raichu/anim.asm
diff --git a/gfx/pokemon/raichu/anim1.asm b/gfx/pokemon/raichu/anim_idle.asm
index 87f07ce9c..87f07ce9c 100644
--- a/gfx/pokemon/raichu/anim1.asm
+++ b/gfx/pokemon/raichu/anim_idle.asm
diff --git a/gfx/pokemon/raikou/anim0.asm b/gfx/pokemon/raikou/anim.asm
index 91931b3ef..91931b3ef 100644
--- a/gfx/pokemon/raikou/anim0.asm
+++ b/gfx/pokemon/raikou/anim.asm
diff --git a/gfx/pokemon/raikou/anim1.asm b/gfx/pokemon/raikou/anim_idle.asm
index ec54577cd..ec54577cd 100644
--- a/gfx/pokemon/raikou/anim1.asm
+++ b/gfx/pokemon/raikou/anim_idle.asm
diff --git a/gfx/pokemon/rapidash/anim0.asm b/gfx/pokemon/rapidash/anim.asm
index 6fe29db8f..6fe29db8f 100644
--- a/gfx/pokemon/rapidash/anim0.asm
+++ b/gfx/pokemon/rapidash/anim.asm
diff --git a/gfx/pokemon/rapidash/anim1.asm b/gfx/pokemon/rapidash/anim_idle.asm
index 0105673c9..0105673c9 100644
--- a/gfx/pokemon/rapidash/anim1.asm
+++ b/gfx/pokemon/rapidash/anim_idle.asm
diff --git a/gfx/pokemon/raticate/anim0.asm b/gfx/pokemon/raticate/anim.asm
index ad6450f27..ad6450f27 100644
--- a/gfx/pokemon/raticate/anim0.asm
+++ b/gfx/pokemon/raticate/anim.asm
diff --git a/gfx/pokemon/raticate/anim1.asm b/gfx/pokemon/raticate/anim_idle.asm
index 3ff83aa1c..3ff83aa1c 100644
--- a/gfx/pokemon/raticate/anim1.asm
+++ b/gfx/pokemon/raticate/anim_idle.asm
diff --git a/gfx/pokemon/rattata/anim0.asm b/gfx/pokemon/rattata/anim.asm
index 0c72f16f9..0c72f16f9 100644
--- a/gfx/pokemon/rattata/anim0.asm
+++ b/gfx/pokemon/rattata/anim.asm
diff --git a/gfx/pokemon/rattata/anim1.asm b/gfx/pokemon/rattata/anim_idle.asm
index a760b136e..a760b136e 100644
--- a/gfx/pokemon/rattata/anim1.asm
+++ b/gfx/pokemon/rattata/anim_idle.asm
diff --git a/gfx/pokemon/remoraid/anim0.asm b/gfx/pokemon/remoraid/anim.asm
index 5fca75d12..5fca75d12 100644
--- a/gfx/pokemon/remoraid/anim0.asm
+++ b/gfx/pokemon/remoraid/anim.asm
diff --git a/gfx/pokemon/remoraid/anim1.asm b/gfx/pokemon/remoraid/anim_idle.asm
index cb14bb7a7..cb14bb7a7 100644
--- a/gfx/pokemon/remoraid/anim1.asm
+++ b/gfx/pokemon/remoraid/anim_idle.asm
diff --git a/gfx/pokemon/rhydon/anim0.asm b/gfx/pokemon/rhydon/anim.asm
index 77d736a55..77d736a55 100644
--- a/gfx/pokemon/rhydon/anim0.asm
+++ b/gfx/pokemon/rhydon/anim.asm
diff --git a/gfx/pokemon/rhydon/anim1.asm b/gfx/pokemon/rhydon/anim_idle.asm
index b572a54ed..b572a54ed 100644
--- a/gfx/pokemon/rhydon/anim1.asm
+++ b/gfx/pokemon/rhydon/anim_idle.asm
diff --git a/gfx/pokemon/rhyhorn/anim0.asm b/gfx/pokemon/rhyhorn/anim.asm
index b966557c4..b966557c4 100644
--- a/gfx/pokemon/rhyhorn/anim0.asm
+++ b/gfx/pokemon/rhyhorn/anim.asm
diff --git a/gfx/pokemon/rhyhorn/anim1.asm b/gfx/pokemon/rhyhorn/anim_idle.asm
index 66e53642e..66e53642e 100644
--- a/gfx/pokemon/rhyhorn/anim1.asm
+++ b/gfx/pokemon/rhyhorn/anim_idle.asm
diff --git a/gfx/pokemon/sandshrew/anim0.asm b/gfx/pokemon/sandshrew/anim.asm
index 01827dda4..01827dda4 100644
--- a/gfx/pokemon/sandshrew/anim0.asm
+++ b/gfx/pokemon/sandshrew/anim.asm
diff --git a/gfx/pokemon/sandshrew/anim1.asm b/gfx/pokemon/sandshrew/anim_idle.asm
index 545b445bd..545b445bd 100644
--- a/gfx/pokemon/sandshrew/anim1.asm
+++ b/gfx/pokemon/sandshrew/anim_idle.asm
diff --git a/gfx/pokemon/sandslash/anim0.asm b/gfx/pokemon/sandslash/anim.asm
index 040c0c429..040c0c429 100644
--- a/gfx/pokemon/sandslash/anim0.asm
+++ b/gfx/pokemon/sandslash/anim.asm
diff --git a/gfx/pokemon/sandslash/anim1.asm b/gfx/pokemon/sandslash/anim_idle.asm
index b3480762d..b3480762d 100644
--- a/gfx/pokemon/sandslash/anim1.asm
+++ b/gfx/pokemon/sandslash/anim_idle.asm
diff --git a/gfx/pokemon/scizor/anim0.asm b/gfx/pokemon/scizor/anim.asm
index d269c91d1..d269c91d1 100644
--- a/gfx/pokemon/scizor/anim0.asm
+++ b/gfx/pokemon/scizor/anim.asm
diff --git a/gfx/pokemon/scizor/anim1.asm b/gfx/pokemon/scizor/anim_idle.asm
index 744d6cafc..744d6cafc 100644
--- a/gfx/pokemon/scizor/anim1.asm
+++ b/gfx/pokemon/scizor/anim_idle.asm
diff --git a/gfx/pokemon/scyther/anim0.asm b/gfx/pokemon/scyther/anim.asm
index 572161065..572161065 100644
--- a/gfx/pokemon/scyther/anim0.asm
+++ b/gfx/pokemon/scyther/anim.asm
diff --git a/gfx/pokemon/scyther/anim1.asm b/gfx/pokemon/scyther/anim_idle.asm
index e251a964d..e251a964d 100644
--- a/gfx/pokemon/scyther/anim1.asm
+++ b/gfx/pokemon/scyther/anim_idle.asm
diff --git a/gfx/pokemon/seadra/anim0.asm b/gfx/pokemon/seadra/anim.asm
index d06adbdb0..d06adbdb0 100644
--- a/gfx/pokemon/seadra/anim0.asm
+++ b/gfx/pokemon/seadra/anim.asm
diff --git a/gfx/pokemon/seadra/anim1.asm b/gfx/pokemon/seadra/anim_idle.asm
index d4c171276..d4c171276 100644
--- a/gfx/pokemon/seadra/anim1.asm
+++ b/gfx/pokemon/seadra/anim_idle.asm
diff --git a/gfx/pokemon/seaking/anim0.asm b/gfx/pokemon/seaking/anim.asm
index a147346e2..a147346e2 100644
--- a/gfx/pokemon/seaking/anim0.asm
+++ b/gfx/pokemon/seaking/anim.asm
diff --git a/gfx/pokemon/seaking/anim1.asm b/gfx/pokemon/seaking/anim_idle.asm
index 3d949a4bb..3d949a4bb 100644
--- a/gfx/pokemon/seaking/anim1.asm
+++ b/gfx/pokemon/seaking/anim_idle.asm
diff --git a/gfx/pokemon/seel/anim0.asm b/gfx/pokemon/seel/anim.asm
index ea92a35be..ea92a35be 100644
--- a/gfx/pokemon/seel/anim0.asm
+++ b/gfx/pokemon/seel/anim.asm
diff --git a/gfx/pokemon/seel/anim1.asm b/gfx/pokemon/seel/anim_idle.asm
index c601e55e5..c601e55e5 100644
--- a/gfx/pokemon/seel/anim1.asm
+++ b/gfx/pokemon/seel/anim_idle.asm
diff --git a/gfx/pokemon/sentret/anim0.asm b/gfx/pokemon/sentret/anim.asm
index 8080c7303..8080c7303 100644
--- a/gfx/pokemon/sentret/anim0.asm
+++ b/gfx/pokemon/sentret/anim.asm
diff --git a/gfx/pokemon/sentret/anim1.asm b/gfx/pokemon/sentret/anim_idle.asm
index 9fcaecad0..9fcaecad0 100644
--- a/gfx/pokemon/sentret/anim1.asm
+++ b/gfx/pokemon/sentret/anim_idle.asm
diff --git a/gfx/pokemon/shellder/anim0.asm b/gfx/pokemon/shellder/anim.asm
index 71aa3d358..71aa3d358 100644
--- a/gfx/pokemon/shellder/anim0.asm
+++ b/gfx/pokemon/shellder/anim.asm
diff --git a/gfx/pokemon/shellder/anim1.asm b/gfx/pokemon/shellder/anim_idle.asm
index c32e9d19c..c32e9d19c 100644
--- a/gfx/pokemon/shellder/anim1.asm
+++ b/gfx/pokemon/shellder/anim_idle.asm
diff --git a/gfx/pokemon/shuckle/anim0.asm b/gfx/pokemon/shuckle/anim.asm
index 148d2bf7d..148d2bf7d 100644
--- a/gfx/pokemon/shuckle/anim0.asm
+++ b/gfx/pokemon/shuckle/anim.asm
diff --git a/gfx/pokemon/shuckle/anim1.asm b/gfx/pokemon/shuckle/anim_idle.asm
index 4dd072951..4dd072951 100644
--- a/gfx/pokemon/shuckle/anim1.asm
+++ b/gfx/pokemon/shuckle/anim_idle.asm
diff --git a/gfx/pokemon/skarmory/anim0.asm b/gfx/pokemon/skarmory/anim.asm
index 64c2bfaf0..64c2bfaf0 100644
--- a/gfx/pokemon/skarmory/anim0.asm
+++ b/gfx/pokemon/skarmory/anim.asm
diff --git a/gfx/pokemon/skarmory/anim1.asm b/gfx/pokemon/skarmory/anim_idle.asm
index 1853c881f..1853c881f 100644
--- a/gfx/pokemon/skarmory/anim1.asm
+++ b/gfx/pokemon/skarmory/anim_idle.asm
diff --git a/gfx/pokemon/skiploom/anim0.asm b/gfx/pokemon/skiploom/anim.asm
index 2ab6422e5..2ab6422e5 100644
--- a/gfx/pokemon/skiploom/anim0.asm
+++ b/gfx/pokemon/skiploom/anim.asm
diff --git a/gfx/pokemon/skiploom/anim1.asm b/gfx/pokemon/skiploom/anim_idle.asm
index d26d1717e..d26d1717e 100644
--- a/gfx/pokemon/skiploom/anim1.asm
+++ b/gfx/pokemon/skiploom/anim_idle.asm
diff --git a/gfx/pokemon/slowbro/anim0.asm b/gfx/pokemon/slowbro/anim.asm
index cc288a464..cc288a464 100644
--- a/gfx/pokemon/slowbro/anim0.asm
+++ b/gfx/pokemon/slowbro/anim.asm
diff --git a/gfx/pokemon/slowbro/anim1.asm b/gfx/pokemon/slowbro/anim_idle.asm
index 9e793ee00..9e793ee00 100644
--- a/gfx/pokemon/slowbro/anim1.asm
+++ b/gfx/pokemon/slowbro/anim_idle.asm
diff --git a/gfx/pokemon/slowking/anim0.asm b/gfx/pokemon/slowking/anim.asm
index d7ab700bd..d7ab700bd 100644
--- a/gfx/pokemon/slowking/anim0.asm
+++ b/gfx/pokemon/slowking/anim.asm
diff --git a/gfx/pokemon/slowking/anim1.asm b/gfx/pokemon/slowking/anim_idle.asm
index 36fd7cd7a..36fd7cd7a 100644
--- a/gfx/pokemon/slowking/anim1.asm
+++ b/gfx/pokemon/slowking/anim_idle.asm
diff --git a/gfx/pokemon/slowpoke/anim0.asm b/gfx/pokemon/slowpoke/anim.asm
index fa391743c..fa391743c 100644
--- a/gfx/pokemon/slowpoke/anim0.asm
+++ b/gfx/pokemon/slowpoke/anim.asm
diff --git a/gfx/pokemon/slowpoke/anim1.asm b/gfx/pokemon/slowpoke/anim_idle.asm
index 805a281c5..805a281c5 100644
--- a/gfx/pokemon/slowpoke/anim1.asm
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
diff --git a/gfx/pokemon/slugma/anim0.asm b/gfx/pokemon/slugma/anim.asm
index 1c867ec37..1c867ec37 100644
--- a/gfx/pokemon/slugma/anim0.asm
+++ b/gfx/pokemon/slugma/anim.asm
diff --git a/gfx/pokemon/slugma/anim1.asm b/gfx/pokemon/slugma/anim_idle.asm
index 5bfe4e799..5bfe4e799 100644
--- a/gfx/pokemon/slugma/anim1.asm
+++ b/gfx/pokemon/slugma/anim_idle.asm
diff --git a/gfx/pokemon/smeargle/anim0.asm b/gfx/pokemon/smeargle/anim.asm
index 2144197fc..2144197fc 100644
--- a/gfx/pokemon/smeargle/anim0.asm
+++ b/gfx/pokemon/smeargle/anim.asm
diff --git a/gfx/pokemon/smeargle/anim1.asm b/gfx/pokemon/smeargle/anim_idle.asm
index 178b14959..178b14959 100644
--- a/gfx/pokemon/smeargle/anim1.asm
+++ b/gfx/pokemon/smeargle/anim_idle.asm
diff --git a/gfx/pokemon/smoochum/anim0.asm b/gfx/pokemon/smoochum/anim.asm
index 39f5e7ebe..39f5e7ebe 100644
--- a/gfx/pokemon/smoochum/anim0.asm
+++ b/gfx/pokemon/smoochum/anim.asm
diff --git a/gfx/pokemon/smoochum/anim1.asm b/gfx/pokemon/smoochum/anim_idle.asm
index 5ba02f113..5ba02f113 100644
--- a/gfx/pokemon/smoochum/anim1.asm
+++ b/gfx/pokemon/smoochum/anim_idle.asm
diff --git a/gfx/pokemon/sneasel/anim0.asm b/gfx/pokemon/sneasel/anim.asm
index 5b7f3fb79..5b7f3fb79 100644
--- a/gfx/pokemon/sneasel/anim0.asm
+++ b/gfx/pokemon/sneasel/anim.asm
diff --git a/gfx/pokemon/sneasel/anim1.asm b/gfx/pokemon/sneasel/anim_idle.asm
index 1d3e3a41d..1d3e3a41d 100644
--- a/gfx/pokemon/sneasel/anim1.asm
+++ b/gfx/pokemon/sneasel/anim_idle.asm
diff --git a/gfx/pokemon/snorlax/anim0.asm b/gfx/pokemon/snorlax/anim.asm
index 3825f3bca..3825f3bca 100644
--- a/gfx/pokemon/snorlax/anim0.asm
+++ b/gfx/pokemon/snorlax/anim.asm
diff --git a/gfx/pokemon/snorlax/anim1.asm b/gfx/pokemon/snorlax/anim_idle.asm
index 4969f8f1f..4969f8f1f 100644
--- a/gfx/pokemon/snorlax/anim1.asm
+++ b/gfx/pokemon/snorlax/anim_idle.asm
diff --git a/gfx/pokemon/snubbull/anim0.asm b/gfx/pokemon/snubbull/anim.asm
index d97f9b354..d97f9b354 100644
--- a/gfx/pokemon/snubbull/anim0.asm
+++ b/gfx/pokemon/snubbull/anim.asm
diff --git a/gfx/pokemon/snubbull/anim1.asm b/gfx/pokemon/snubbull/anim_idle.asm
index 08cae5b71..08cae5b71 100644
--- a/gfx/pokemon/snubbull/anim1.asm
+++ b/gfx/pokemon/snubbull/anim_idle.asm
diff --git a/gfx/pokemon/spearow/anim0.asm b/gfx/pokemon/spearow/anim.asm
index 35780c784..35780c784 100644
--- a/gfx/pokemon/spearow/anim0.asm
+++ b/gfx/pokemon/spearow/anim.asm
diff --git a/gfx/pokemon/spearow/anim1.asm b/gfx/pokemon/spearow/anim_idle.asm
index ed487ecc3..ed487ecc3 100644
--- a/gfx/pokemon/spearow/anim1.asm
+++ b/gfx/pokemon/spearow/anim_idle.asm
diff --git a/gfx/pokemon/spinarak/anim0.asm b/gfx/pokemon/spinarak/anim.asm
index be299fc49..be299fc49 100644
--- a/gfx/pokemon/spinarak/anim0.asm
+++ b/gfx/pokemon/spinarak/anim.asm
diff --git a/gfx/pokemon/spinarak/anim1.asm b/gfx/pokemon/spinarak/anim_idle.asm
index c605578ef..c605578ef 100644
--- a/gfx/pokemon/spinarak/anim1.asm
+++ b/gfx/pokemon/spinarak/anim_idle.asm
diff --git a/gfx/pokemon/squirtle/anim0.asm b/gfx/pokemon/squirtle/anim.asm
index 9969d4263..9969d4263 100644
--- a/gfx/pokemon/squirtle/anim0.asm
+++ b/gfx/pokemon/squirtle/anim.asm
diff --git a/gfx/pokemon/squirtle/anim1.asm b/gfx/pokemon/squirtle/anim_idle.asm
index de24c37a6..de24c37a6 100644
--- a/gfx/pokemon/squirtle/anim1.asm
+++ b/gfx/pokemon/squirtle/anim_idle.asm
diff --git a/gfx/pokemon/stantler/anim0.asm b/gfx/pokemon/stantler/anim.asm
index 8f4c133d8..8f4c133d8 100644
--- a/gfx/pokemon/stantler/anim0.asm
+++ b/gfx/pokemon/stantler/anim.asm
diff --git a/gfx/pokemon/stantler/anim1.asm b/gfx/pokemon/stantler/anim_idle.asm
index 7444d761a..7444d761a 100644
--- a/gfx/pokemon/stantler/anim1.asm
+++ b/gfx/pokemon/stantler/anim_idle.asm
diff --git a/gfx/pokemon/starmie/anim0.asm b/gfx/pokemon/starmie/anim.asm
index c81477807..c81477807 100644
--- a/gfx/pokemon/starmie/anim0.asm
+++ b/gfx/pokemon/starmie/anim.asm
diff --git a/gfx/pokemon/starmie/anim1.asm b/gfx/pokemon/starmie/anim_idle.asm
index 7508e6e10..7508e6e10 100644
--- a/gfx/pokemon/starmie/anim1.asm
+++ b/gfx/pokemon/starmie/anim_idle.asm
diff --git a/gfx/pokemon/staryu/anim0.asm b/gfx/pokemon/staryu/anim.asm
index d257949e7..d257949e7 100644
--- a/gfx/pokemon/staryu/anim0.asm
+++ b/gfx/pokemon/staryu/anim.asm
diff --git a/gfx/pokemon/staryu/anim1.asm b/gfx/pokemon/staryu/anim_idle.asm
index 184806574..184806574 100644
--- a/gfx/pokemon/staryu/anim1.asm
+++ b/gfx/pokemon/staryu/anim_idle.asm
diff --git a/gfx/pokemon/steelix/anim0.asm b/gfx/pokemon/steelix/anim.asm
index 9acb2af0a..9acb2af0a 100644
--- a/gfx/pokemon/steelix/anim0.asm
+++ b/gfx/pokemon/steelix/anim.asm
diff --git a/gfx/pokemon/steelix/anim1.asm b/gfx/pokemon/steelix/anim_idle.asm
index 3c1de78fb..3c1de78fb 100644
--- a/gfx/pokemon/steelix/anim1.asm
+++ b/gfx/pokemon/steelix/anim_idle.asm
diff --git a/gfx/pokemon/sudowoodo/anim0.asm b/gfx/pokemon/sudowoodo/anim.asm
index 8e974a074..8e974a074 100644
--- a/gfx/pokemon/sudowoodo/anim0.asm
+++ b/gfx/pokemon/sudowoodo/anim.asm
diff --git a/gfx/pokemon/sudowoodo/anim1.asm b/gfx/pokemon/sudowoodo/anim_idle.asm
index e42e960f9..e42e960f9 100644
--- a/gfx/pokemon/sudowoodo/anim1.asm
+++ b/gfx/pokemon/sudowoodo/anim_idle.asm
diff --git a/gfx/pokemon/suicune/anim0.asm b/gfx/pokemon/suicune/anim.asm
index 0f2528116..0f2528116 100644
--- a/gfx/pokemon/suicune/anim0.asm
+++ b/gfx/pokemon/suicune/anim.asm
diff --git a/gfx/pokemon/suicune/anim1.asm b/gfx/pokemon/suicune/anim_idle.asm
index 9e018683a..9e018683a 100644
--- a/gfx/pokemon/suicune/anim1.asm
+++ b/gfx/pokemon/suicune/anim_idle.asm
diff --git a/gfx/pokemon/sunflora/anim0.asm b/gfx/pokemon/sunflora/anim.asm
index aad8ddadd..aad8ddadd 100644
--- a/gfx/pokemon/sunflora/anim0.asm
+++ b/gfx/pokemon/sunflora/anim.asm
diff --git a/gfx/pokemon/sunflora/anim1.asm b/gfx/pokemon/sunflora/anim_idle.asm
index e78d5449e..e78d5449e 100644
--- a/gfx/pokemon/sunflora/anim1.asm
+++ b/gfx/pokemon/sunflora/anim_idle.asm
diff --git a/gfx/pokemon/sunkern/anim0.asm b/gfx/pokemon/sunkern/anim.asm
index c282b1fb2..c282b1fb2 100644
--- a/gfx/pokemon/sunkern/anim0.asm
+++ b/gfx/pokemon/sunkern/anim.asm
diff --git a/gfx/pokemon/sunkern/anim1.asm b/gfx/pokemon/sunkern/anim_idle.asm
index f92d267a1..f92d267a1 100644
--- a/gfx/pokemon/sunkern/anim1.asm
+++ b/gfx/pokemon/sunkern/anim_idle.asm
diff --git a/gfx/pokemon/swinub/anim0.asm b/gfx/pokemon/swinub/anim.asm
index f1d93138a..f1d93138a 100644
--- a/gfx/pokemon/swinub/anim0.asm
+++ b/gfx/pokemon/swinub/anim.asm
diff --git a/gfx/pokemon/swinub/anim1.asm b/gfx/pokemon/swinub/anim_idle.asm
index 5fe97a2ba..5fe97a2ba 100644
--- a/gfx/pokemon/swinub/anim1.asm
+++ b/gfx/pokemon/swinub/anim_idle.asm
diff --git a/gfx/pokemon/tangela/anim0.asm b/gfx/pokemon/tangela/anim.asm
index 57a237afe..57a237afe 100644
--- a/gfx/pokemon/tangela/anim0.asm
+++ b/gfx/pokemon/tangela/anim.asm
diff --git a/gfx/pokemon/tangela/anim1.asm b/gfx/pokemon/tangela/anim_idle.asm
index 7d8b2550f..7d8b2550f 100644
--- a/gfx/pokemon/tangela/anim1.asm
+++ b/gfx/pokemon/tangela/anim_idle.asm
diff --git a/gfx/pokemon/tauros/anim0.asm b/gfx/pokemon/tauros/anim.asm
index 52c9264c3..52c9264c3 100644
--- a/gfx/pokemon/tauros/anim0.asm
+++ b/gfx/pokemon/tauros/anim.asm
diff --git a/gfx/pokemon/tauros/anim1.asm b/gfx/pokemon/tauros/anim_idle.asm
index ab6608d0d..ab6608d0d 100644
--- a/gfx/pokemon/tauros/anim1.asm
+++ b/gfx/pokemon/tauros/anim_idle.asm
diff --git a/gfx/pokemon/teddiursa/anim0.asm b/gfx/pokemon/teddiursa/anim.asm
index 78bbeae60..78bbeae60 100644
--- a/gfx/pokemon/teddiursa/anim0.asm
+++ b/gfx/pokemon/teddiursa/anim.asm
diff --git a/gfx/pokemon/teddiursa/anim1.asm b/gfx/pokemon/teddiursa/anim_idle.asm
index 85cae5284..85cae5284 100644
--- a/gfx/pokemon/teddiursa/anim1.asm
+++ b/gfx/pokemon/teddiursa/anim_idle.asm
diff --git a/gfx/pokemon/tentacool/anim0.asm b/gfx/pokemon/tentacool/anim.asm
index 19b7d3a14..19b7d3a14 100644
--- a/gfx/pokemon/tentacool/anim0.asm
+++ b/gfx/pokemon/tentacool/anim.asm
diff --git a/gfx/pokemon/tentacool/anim1.asm b/gfx/pokemon/tentacool/anim_idle.asm
index 4e9ba0b11..4e9ba0b11 100644
--- a/gfx/pokemon/tentacool/anim1.asm
+++ b/gfx/pokemon/tentacool/anim_idle.asm
diff --git a/gfx/pokemon/tentacruel/anim0.asm b/gfx/pokemon/tentacruel/anim.asm
index 4fed8e9d4..4fed8e9d4 100644
--- a/gfx/pokemon/tentacruel/anim0.asm
+++ b/gfx/pokemon/tentacruel/anim.asm
diff --git a/gfx/pokemon/tentacruel/anim1.asm b/gfx/pokemon/tentacruel/anim_idle.asm
index fd8d510b4..fd8d510b4 100644
--- a/gfx/pokemon/tentacruel/anim1.asm
+++ b/gfx/pokemon/tentacruel/anim_idle.asm
diff --git a/gfx/pokemon/togepi/anim0.asm b/gfx/pokemon/togepi/anim.asm
index a09192323..a09192323 100644
--- a/gfx/pokemon/togepi/anim0.asm
+++ b/gfx/pokemon/togepi/anim.asm
diff --git a/gfx/pokemon/togepi/anim1.asm b/gfx/pokemon/togepi/anim_idle.asm
index e3bd76591..e3bd76591 100644
--- a/gfx/pokemon/togepi/anim1.asm
+++ b/gfx/pokemon/togepi/anim_idle.asm
diff --git a/gfx/pokemon/togetic/anim0.asm b/gfx/pokemon/togetic/anim.asm
index cd1ac8f9b..cd1ac8f9b 100644
--- a/gfx/pokemon/togetic/anim0.asm
+++ b/gfx/pokemon/togetic/anim.asm
diff --git a/gfx/pokemon/togetic/anim1.asm b/gfx/pokemon/togetic/anim_idle.asm
index 543befa82..543befa82 100644
--- a/gfx/pokemon/togetic/anim1.asm
+++ b/gfx/pokemon/togetic/anim_idle.asm
diff --git a/gfx/pokemon/totodile/anim0.asm b/gfx/pokemon/totodile/anim.asm
index c320f4646..c320f4646 100644
--- a/gfx/pokemon/totodile/anim0.asm
+++ b/gfx/pokemon/totodile/anim.asm
diff --git a/gfx/pokemon/totodile/anim1.asm b/gfx/pokemon/totodile/anim_idle.asm
index 35379db93..35379db93 100644
--- a/gfx/pokemon/totodile/anim1.asm
+++ b/gfx/pokemon/totodile/anim_idle.asm
diff --git a/gfx/pokemon/typhlosion/anim0.asm b/gfx/pokemon/typhlosion/anim.asm
index bb4b30d6c..bb4b30d6c 100644
--- a/gfx/pokemon/typhlosion/anim0.asm
+++ b/gfx/pokemon/typhlosion/anim.asm
diff --git a/gfx/pokemon/typhlosion/anim1.asm b/gfx/pokemon/typhlosion/anim_idle.asm
index 2f7ed3abc..2f7ed3abc 100644
--- a/gfx/pokemon/typhlosion/anim1.asm
+++ b/gfx/pokemon/typhlosion/anim_idle.asm
diff --git a/gfx/pokemon/tyranitar/anim0.asm b/gfx/pokemon/tyranitar/anim.asm
index f345bdd8e..f345bdd8e 100644
--- a/gfx/pokemon/tyranitar/anim0.asm
+++ b/gfx/pokemon/tyranitar/anim.asm
diff --git a/gfx/pokemon/tyranitar/anim1.asm b/gfx/pokemon/tyranitar/anim_idle.asm
index 29788fd1d..29788fd1d 100644
--- a/gfx/pokemon/tyranitar/anim1.asm
+++ b/gfx/pokemon/tyranitar/anim_idle.asm
diff --git a/gfx/pokemon/tyrogue/anim0.asm b/gfx/pokemon/tyrogue/anim.asm
index e1470d816..e1470d816 100644
--- a/gfx/pokemon/tyrogue/anim0.asm
+++ b/gfx/pokemon/tyrogue/anim.asm
diff --git a/gfx/pokemon/tyrogue/anim1.asm b/gfx/pokemon/tyrogue/anim_idle.asm
index da73f62e3..da73f62e3 100644
--- a/gfx/pokemon/tyrogue/anim1.asm
+++ b/gfx/pokemon/tyrogue/anim_idle.asm
diff --git a/gfx/pokemon/umbreon/anim0.asm b/gfx/pokemon/umbreon/anim.asm
index 541539979..541539979 100644
--- a/gfx/pokemon/umbreon/anim0.asm
+++ b/gfx/pokemon/umbreon/anim.asm
diff --git a/gfx/pokemon/umbreon/anim1.asm b/gfx/pokemon/umbreon/anim_idle.asm
index adb0158e2..adb0158e2 100644
--- a/gfx/pokemon/umbreon/anim1.asm
+++ b/gfx/pokemon/umbreon/anim_idle.asm
diff --git a/gfx/pokemon/unown/anim0.asm b/gfx/pokemon/unown/anim.asm
index 510d2751c..510d2751c 100644
--- a/gfx/pokemon/unown/anim0.asm
+++ b/gfx/pokemon/unown/anim.asm
diff --git a/gfx/pokemon/unown/anim1.asm b/gfx/pokemon/unown/anim_idle.asm
index 3d0f65488..3d0f65488 100644
--- a/gfx/pokemon/unown/anim1.asm
+++ b/gfx/pokemon/unown/anim_idle.asm
diff --git a/gfx/pokemon/unown_a/anim0.asm b/gfx/pokemon/unown_a/anim.asm
index 7243ed0fb..7243ed0fb 100644
--- a/gfx/pokemon/unown_a/anim0.asm
+++ b/gfx/pokemon/unown_a/anim.asm
diff --git a/gfx/pokemon/unown_a/anim1.asm b/gfx/pokemon/unown_a/anim_idle.asm
index d995ba44d..d995ba44d 100644
--- a/gfx/pokemon/unown_a/anim1.asm
+++ b/gfx/pokemon/unown_a/anim_idle.asm
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
index cb5bf0aa2..ea4d46410 100644
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -1,27 +1,27 @@
 UnownAnimations:
-UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim0.asm"
-UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim0.asm"
-UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim0.asm"
-UnownDAnimation: INCLUDE "gfx/pokemon/unown_d/anim0.asm"
-UnownEAnimation: INCLUDE "gfx/pokemon/unown_e/anim0.asm"
-UnownFAnimation: INCLUDE "gfx/pokemon/unown_f/anim0.asm"
-UnownGAnimation: INCLUDE "gfx/pokemon/unown_g/anim0.asm"
-UnownHAnimation: INCLUDE "gfx/pokemon/unown_h/anim0.asm"
-UnownIAnimation: INCLUDE "gfx/pokemon/unown_i/anim0.asm"
-UnownJAnimation: INCLUDE "gfx/pokemon/unown_j/anim0.asm"
-UnownKAnimation: INCLUDE "gfx/pokemon/unown_k/anim0.asm"
-UnownLAnimation: INCLUDE "gfx/pokemon/unown_l/anim0.asm"
-UnownMAnimation: INCLUDE "gfx/pokemon/unown_m/anim0.asm"
-UnownNAnimation: INCLUDE "gfx/pokemon/unown_n/anim0.asm"
-UnownOAnimation: INCLUDE "gfx/pokemon/unown_o/anim0.asm"
-UnownPAnimation: INCLUDE "gfx/pokemon/unown_p/anim0.asm"
-UnownQAnimation: INCLUDE "gfx/pokemon/unown_q/anim0.asm"
-UnownRAnimation: INCLUDE "gfx/pokemon/unown_r/anim0.asm"
-UnownSAnimation: INCLUDE "gfx/pokemon/unown_s/anim0.asm"
-UnownTAnimation: INCLUDE "gfx/pokemon/unown_t/anim0.asm"
-UnownUAnimation: INCLUDE "gfx/pokemon/unown_u/anim0.asm"
-UnownVAnimation: INCLUDE "gfx/pokemon/unown_v/anim0.asm"
-UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim0.asm"
-UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim0.asm"
-UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim0.asm"
-UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim0.asm"
+UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
+UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
+UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"
+UnownDAnimation: INCLUDE "gfx/pokemon/unown_d/anim.asm"
+UnownEAnimation: INCLUDE "gfx/pokemon/unown_e/anim.asm"
+UnownFAnimation: INCLUDE "gfx/pokemon/unown_f/anim.asm"
+UnownGAnimation: INCLUDE "gfx/pokemon/unown_g/anim.asm"
+UnownHAnimation: INCLUDE "gfx/pokemon/unown_h/anim.asm"
+UnownIAnimation: INCLUDE "gfx/pokemon/unown_i/anim.asm"
+UnownJAnimation: INCLUDE "gfx/pokemon/unown_j/anim.asm"
+UnownKAnimation: INCLUDE "gfx/pokemon/unown_k/anim.asm"
+UnownLAnimation: INCLUDE "gfx/pokemon/unown_l/anim.asm"
+UnownMAnimation: INCLUDE "gfx/pokemon/unown_m/anim.asm"
+UnownNAnimation: INCLUDE "gfx/pokemon/unown_n/anim.asm"
+UnownOAnimation: INCLUDE "gfx/pokemon/unown_o/anim.asm"
+UnownPAnimation: INCLUDE "gfx/pokemon/unown_p/anim.asm"
+UnownQAnimation: INCLUDE "gfx/pokemon/unown_q/anim.asm"
+UnownRAnimation: INCLUDE "gfx/pokemon/unown_r/anim.asm"
+UnownSAnimation: INCLUDE "gfx/pokemon/unown_s/anim.asm"
+UnownTAnimation: INCLUDE "gfx/pokemon/unown_t/anim.asm"
+UnownUAnimation: INCLUDE "gfx/pokemon/unown_u/anim.asm"
+UnownVAnimation: INCLUDE "gfx/pokemon/unown_v/anim.asm"
+UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim.asm"
+UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim.asm"
+UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim.asm"
+UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim.asm"
diff --git a/gfx/pokemon/unown_b/anim0.asm b/gfx/pokemon/unown_b/anim.asm
index 7683b9e84..7683b9e84 100644
--- a/gfx/pokemon/unown_b/anim0.asm
+++ b/gfx/pokemon/unown_b/anim.asm
diff --git a/gfx/pokemon/unown_b/anim1.asm b/gfx/pokemon/unown_b/anim_idle.asm
index b8e03b299..b8e03b299 100644
--- a/gfx/pokemon/unown_b/anim1.asm
+++ b/gfx/pokemon/unown_b/anim_idle.asm
diff --git a/gfx/pokemon/unown_c/anim0.asm b/gfx/pokemon/unown_c/anim.asm
index 1e8b894ab..1e8b894ab 100644
--- a/gfx/pokemon/unown_c/anim0.asm
+++ b/gfx/pokemon/unown_c/anim.asm
diff --git a/gfx/pokemon/unown_c/anim1.asm b/gfx/pokemon/unown_c/anim_idle.asm
index fcf07ced3..fcf07ced3 100644
--- a/gfx/pokemon/unown_c/anim1.asm
+++ b/gfx/pokemon/unown_c/anim_idle.asm
diff --git a/gfx/pokemon/unown_d/anim0.asm b/gfx/pokemon/unown_d/anim.asm
index 51c3b2de1..51c3b2de1 100644
--- a/gfx/pokemon/unown_d/anim0.asm
+++ b/gfx/pokemon/unown_d/anim.asm
diff --git a/gfx/pokemon/unown_d/anim1.asm b/gfx/pokemon/unown_d/anim_idle.asm
index 17604ce36..17604ce36 100644
--- a/gfx/pokemon/unown_d/anim1.asm
+++ b/gfx/pokemon/unown_d/anim_idle.asm
diff --git a/gfx/pokemon/unown_e/anim0.asm b/gfx/pokemon/unown_e/anim.asm
index 0a58feb4d..0a58feb4d 100644
--- a/gfx/pokemon/unown_e/anim0.asm
+++ b/gfx/pokemon/unown_e/anim.asm
diff --git a/gfx/pokemon/unown_e/anim1.asm b/gfx/pokemon/unown_e/anim_idle.asm
index 53db93c1f..53db93c1f 100644
--- a/gfx/pokemon/unown_e/anim1.asm
+++ b/gfx/pokemon/unown_e/anim_idle.asm
diff --git a/gfx/pokemon/unown_extra_pointers.asm b/gfx/pokemon/unown_extra_pointers.asm
deleted file mode 100644
index 5b466064d..000000000
--- a/gfx/pokemon/unown_extra_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimationExtraPointers:
-	dw UnownAAnimationExtra
-	dw UnownBAnimationExtra
-	dw UnownCAnimationExtra
-	dw UnownDAnimationExtra
-	dw UnownEAnimationExtra
-	dw UnownFAnimationExtra
-	dw UnownGAnimationExtra
-	dw UnownHAnimationExtra
-	dw UnownIAnimationExtra
-	dw UnownJAnimationExtra
-	dw UnownKAnimationExtra
-	dw UnownLAnimationExtra
-	dw UnownMAnimationExtra
-	dw UnownNAnimationExtra
-	dw UnownOAnimationExtra
-	dw UnownPAnimationExtra
-	dw UnownQAnimationExtra
-	dw UnownRAnimationExtra
-	dw UnownSAnimationExtra
-	dw UnownTAnimationExtra
-	dw UnownUAnimationExtra
-	dw UnownVAnimationExtra
-	dw UnownWAnimationExtra
-	dw UnownXAnimationExtra
-	dw UnownYAnimationExtra
-	dw UnownZAnimationExtra
diff --git a/gfx/pokemon/unown_extras.asm b/gfx/pokemon/unown_extras.asm
deleted file mode 100644
index 218a539fe..000000000
--- a/gfx/pokemon/unown_extras.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownAAnimationExtra: INCLUDE "gfx/pokemon/unown_a/anim1.asm"
-UnownBAnimationExtra: INCLUDE "gfx/pokemon/unown_b/anim1.asm"
-UnownCAnimationExtra: INCLUDE "gfx/pokemon/unown_c/anim1.asm"
-UnownDAnimationExtra: INCLUDE "gfx/pokemon/unown_d/anim1.asm"
-UnownEAnimationExtra: INCLUDE "gfx/pokemon/unown_e/anim1.asm"
-UnownFAnimationExtra: INCLUDE "gfx/pokemon/unown_f/anim1.asm"
-UnownGAnimationExtra: INCLUDE "gfx/pokemon/unown_g/anim1.asm"
-UnownHAnimationExtra: INCLUDE "gfx/pokemon/unown_h/anim1.asm"
-UnownIAnimationExtra: INCLUDE "gfx/pokemon/unown_i/anim1.asm"
-UnownJAnimationExtra: INCLUDE "gfx/pokemon/unown_j/anim1.asm"
-UnownKAnimationExtra: INCLUDE "gfx/pokemon/unown_k/anim1.asm"
-UnownLAnimationExtra: INCLUDE "gfx/pokemon/unown_l/anim1.asm"
-UnownMAnimationExtra: INCLUDE "gfx/pokemon/unown_m/anim1.asm"
-UnownNAnimationExtra: INCLUDE "gfx/pokemon/unown_n/anim1.asm"
-UnownOAnimationExtra: INCLUDE "gfx/pokemon/unown_o/anim1.asm"
-UnownPAnimationExtra: INCLUDE "gfx/pokemon/unown_p/anim1.asm"
-UnownQAnimationExtra: INCLUDE "gfx/pokemon/unown_q/anim1.asm"
-UnownRAnimationExtra: INCLUDE "gfx/pokemon/unown_r/anim1.asm"
-UnownSAnimationExtra: INCLUDE "gfx/pokemon/unown_s/anim1.asm"
-UnownTAnimationExtra: INCLUDE "gfx/pokemon/unown_t/anim1.asm"
-UnownUAnimationExtra: INCLUDE "gfx/pokemon/unown_u/anim1.asm"
-UnownVAnimationExtra: INCLUDE "gfx/pokemon/unown_v/anim1.asm"
-UnownWAnimationExtra: INCLUDE "gfx/pokemon/unown_w/anim1.asm"
-UnownXAnimationExtra: INCLUDE "gfx/pokemon/unown_x/anim1.asm"
-UnownYAnimationExtra: INCLUDE "gfx/pokemon/unown_y/anim1.asm"
-UnownZAnimationExtra: INCLUDE "gfx/pokemon/unown_z/anim1.asm"
diff --git a/gfx/pokemon/unown_f/anim0.asm b/gfx/pokemon/unown_f/anim.asm
index f81c298a6..f81c298a6 100644
--- a/gfx/pokemon/unown_f/anim0.asm
+++ b/gfx/pokemon/unown_f/anim.asm
diff --git a/gfx/pokemon/unown_f/anim1.asm b/gfx/pokemon/unown_f/anim_idle.asm
index a75176981..a75176981 100644
--- a/gfx/pokemon/unown_f/anim1.asm
+++ b/gfx/pokemon/unown_f/anim_idle.asm
diff --git a/gfx/pokemon/unown_g/anim0.asm b/gfx/pokemon/unown_g/anim.asm
index 48100274f..48100274f 100644
--- a/gfx/pokemon/unown_g/anim0.asm
+++ b/gfx/pokemon/unown_g/anim.asm
diff --git a/gfx/pokemon/unown_g/anim1.asm b/gfx/pokemon/unown_g/anim_idle.asm
index 45906aed4..45906aed4 100644
--- a/gfx/pokemon/unown_g/anim1.asm
+++ b/gfx/pokemon/unown_g/anim_idle.asm
diff --git a/gfx/pokemon/unown_h/anim0.asm b/gfx/pokemon/unown_h/anim.asm
index fdee3822b..fdee3822b 100644
--- a/gfx/pokemon/unown_h/anim0.asm
+++ b/gfx/pokemon/unown_h/anim.asm
diff --git a/gfx/pokemon/unown_h/anim1.asm b/gfx/pokemon/unown_h/anim_idle.asm
index e6fb90d5e..e6fb90d5e 100644
--- a/gfx/pokemon/unown_h/anim1.asm
+++ b/gfx/pokemon/unown_h/anim_idle.asm
diff --git a/gfx/pokemon/unown_i/anim0.asm b/gfx/pokemon/unown_i/anim.asm
index 38e19a0c9..38e19a0c9 100644
--- a/gfx/pokemon/unown_i/anim0.asm
+++ b/gfx/pokemon/unown_i/anim.asm
diff --git a/gfx/pokemon/unown_i/anim1.asm b/gfx/pokemon/unown_i/anim_idle.asm
index 1d5ce67ad..1d5ce67ad 100644
--- a/gfx/pokemon/unown_i/anim1.asm
+++ b/gfx/pokemon/unown_i/anim_idle.asm
diff --git a/gfx/pokemon/unown_idle_pointers.asm b/gfx/pokemon/unown_idle_pointers.asm
new file mode 100644
index 000000000..5b922b0a9
--- /dev/null
+++ b/gfx/pokemon/unown_idle_pointers.asm
@@ -0,0 +1,27 @@
+UnownAnimationIdlePointers:
+	dw UnownAAnimationIdle
+	dw UnownBAnimationIdle
+	dw UnownCAnimationIdle
+	dw UnownDAnimationIdle
+	dw UnownEAnimationIdle
+	dw UnownFAnimationIdle
+	dw UnownGAnimationIdle
+	dw UnownHAnimationIdle
+	dw UnownIAnimationIdle
+	dw UnownJAnimationIdle
+	dw UnownKAnimationIdle
+	dw UnownLAnimationIdle
+	dw UnownMAnimationIdle
+	dw UnownNAnimationIdle
+	dw UnownOAnimationIdle
+	dw UnownPAnimationIdle
+	dw UnownQAnimationIdle
+	dw UnownRAnimationIdle
+	dw UnownSAnimationIdle
+	dw UnownTAnimationIdle
+	dw UnownUAnimationIdle
+	dw UnownVAnimationIdle
+	dw UnownWAnimationIdle
+	dw UnownXAnimationIdle
+	dw UnownYAnimationIdle
+	dw UnownZAnimationIdle
diff --git a/gfx/pokemon/unown_idles.asm b/gfx/pokemon/unown_idles.asm
new file mode 100644
index 000000000..6964a485b
--- /dev/null
+++ b/gfx/pokemon/unown_idles.asm
@@ -0,0 +1,26 @@
+UnownAAnimationIdle: INCLUDE "gfx/pokemon/unown_a/anim_idle.asm"
+UnownBAnimationIdle: INCLUDE "gfx/pokemon/unown_b/anim_idle.asm"
+UnownCAnimationIdle: INCLUDE "gfx/pokemon/unown_c/anim_idle.asm"
+UnownDAnimationIdle: INCLUDE "gfx/pokemon/unown_d/anim_idle.asm"
+UnownEAnimationIdle: INCLUDE "gfx/pokemon/unown_e/anim_idle.asm"
+UnownFAnimationIdle: INCLUDE "gfx/pokemon/unown_f/anim_idle.asm"
+UnownGAnimationIdle: INCLUDE "gfx/pokemon/unown_g/anim_idle.asm"
+UnownHAnimationIdle: INCLUDE "gfx/pokemon/unown_h/anim_idle.asm"
+UnownIAnimationIdle: INCLUDE "gfx/pokemon/unown_i/anim_idle.asm"
+UnownJAnimationIdle: INCLUDE "gfx/pokemon/unown_j/anim_idle.asm"
+UnownKAnimationIdle: INCLUDE "gfx/pokemon/unown_k/anim_idle.asm"
+UnownLAnimationIdle: INCLUDE "gfx/pokemon/unown_l/anim_idle.asm"
+UnownMAnimationIdle: INCLUDE "gfx/pokemon/unown_m/anim_idle.asm"
+UnownNAnimationIdle: INCLUDE "gfx/pokemon/unown_n/anim_idle.asm"
+UnownOAnimationIdle: INCLUDE "gfx/pokemon/unown_o/anim_idle.asm"
+UnownPAnimationIdle: INCLUDE "gfx/pokemon/unown_p/anim_idle.asm"
+UnownQAnimationIdle: INCLUDE "gfx/pokemon/unown_q/anim_idle.asm"
+UnownRAnimationIdle: INCLUDE "gfx/pokemon/unown_r/anim_idle.asm"
+UnownSAnimationIdle: INCLUDE "gfx/pokemon/unown_s/anim_idle.asm"
+UnownTAnimationIdle: INCLUDE "gfx/pokemon/unown_t/anim_idle.asm"
+UnownUAnimationIdle: INCLUDE "gfx/pokemon/unown_u/anim_idle.asm"
+UnownVAnimationIdle: INCLUDE "gfx/pokemon/unown_v/anim_idle.asm"
+UnownWAnimationIdle: INCLUDE "gfx/pokemon/unown_w/anim_idle.asm"
+UnownXAnimationIdle: INCLUDE "gfx/pokemon/unown_x/anim_idle.asm"
+UnownYAnimationIdle: INCLUDE "gfx/pokemon/unown_y/anim_idle.asm"
+UnownZAnimationIdle: INCLUDE "gfx/pokemon/unown_z/anim_idle.asm"
diff --git a/gfx/pokemon/unown_j/anim0.asm b/gfx/pokemon/unown_j/anim.asm
index 3a7467d45..3a7467d45 100644
--- a/gfx/pokemon/unown_j/anim0.asm
+++ b/gfx/pokemon/unown_j/anim.asm
diff --git a/gfx/pokemon/unown_j/anim1.asm b/gfx/pokemon/unown_j/anim_idle.asm
index d46b36028..d46b36028 100644
--- a/gfx/pokemon/unown_j/anim1.asm
+++ b/gfx/pokemon/unown_j/anim_idle.asm
diff --git a/gfx/pokemon/unown_k/anim0.asm b/gfx/pokemon/unown_k/anim.asm
index 0948f212d..0948f212d 100644
--- a/gfx/pokemon/unown_k/anim0.asm
+++ b/gfx/pokemon/unown_k/anim.asm
diff --git a/gfx/pokemon/unown_k/anim1.asm b/gfx/pokemon/unown_k/anim_idle.asm
index 8f8a4acb1..8f8a4acb1 100644
--- a/gfx/pokemon/unown_k/anim1.asm
+++ b/gfx/pokemon/unown_k/anim_idle.asm
diff --git a/gfx/pokemon/unown_l/anim0.asm b/gfx/pokemon/unown_l/anim.asm
index 7b4e5e21c..7b4e5e21c 100644
--- a/gfx/pokemon/unown_l/anim0.asm
+++ b/gfx/pokemon/unown_l/anim.asm
diff --git a/gfx/pokemon/unown_l/anim1.asm b/gfx/pokemon/unown_l/anim_idle.asm
index 859dec2ec..859dec2ec 100644
--- a/gfx/pokemon/unown_l/anim1.asm
+++ b/gfx/pokemon/unown_l/anim_idle.asm
diff --git a/gfx/pokemon/unown_m/anim0.asm b/gfx/pokemon/unown_m/anim.asm
index bb5292446..bb5292446 100644
--- a/gfx/pokemon/unown_m/anim0.asm
+++ b/gfx/pokemon/unown_m/anim.asm
diff --git a/gfx/pokemon/unown_m/anim1.asm b/gfx/pokemon/unown_m/anim_idle.asm
index 710300f20..710300f20 100644
--- a/gfx/pokemon/unown_m/anim1.asm
+++ b/gfx/pokemon/unown_m/anim_idle.asm
diff --git a/gfx/pokemon/unown_n/anim0.asm b/gfx/pokemon/unown_n/anim.asm
index 1f6924926..1f6924926 100644
--- a/gfx/pokemon/unown_n/anim0.asm
+++ b/gfx/pokemon/unown_n/anim.asm
diff --git a/gfx/pokemon/unown_n/anim1.asm b/gfx/pokemon/unown_n/anim_idle.asm
index 5275e3463..5275e3463 100644
--- a/gfx/pokemon/unown_n/anim1.asm
+++ b/gfx/pokemon/unown_n/anim_idle.asm
diff --git a/gfx/pokemon/unown_o/anim0.asm b/gfx/pokemon/unown_o/anim.asm
index 581d47b9d..581d47b9d 100644
--- a/gfx/pokemon/unown_o/anim0.asm
+++ b/gfx/pokemon/unown_o/anim.asm
diff --git a/gfx/pokemon/unown_o/anim1.asm b/gfx/pokemon/unown_o/anim_idle.asm
index fec231c84..fec231c84 100644
--- a/gfx/pokemon/unown_o/anim1.asm
+++ b/gfx/pokemon/unown_o/anim_idle.asm
diff --git a/gfx/pokemon/unown_p/anim0.asm b/gfx/pokemon/unown_p/anim.asm
index 0cbaf30ed..0cbaf30ed 100644
--- a/gfx/pokemon/unown_p/anim0.asm
+++ b/gfx/pokemon/unown_p/anim.asm
diff --git a/gfx/pokemon/unown_p/anim1.asm b/gfx/pokemon/unown_p/anim_idle.asm
index 51e0e0941..51e0e0941 100644
--- a/gfx/pokemon/unown_p/anim1.asm
+++ b/gfx/pokemon/unown_p/anim_idle.asm
diff --git a/gfx/pokemon/unown_q/anim0.asm b/gfx/pokemon/unown_q/anim.asm
index 555f61cf3..555f61cf3 100644
--- a/gfx/pokemon/unown_q/anim0.asm
+++ b/gfx/pokemon/unown_q/anim.asm
diff --git a/gfx/pokemon/unown_q/anim1.asm b/gfx/pokemon/unown_q/anim_idle.asm
index a17caa474..a17caa474 100644
--- a/gfx/pokemon/unown_q/anim1.asm
+++ b/gfx/pokemon/unown_q/anim_idle.asm
diff --git a/gfx/pokemon/unown_r/anim0.asm b/gfx/pokemon/unown_r/anim.asm
index fde5a58ab..fde5a58ab 100644
--- a/gfx/pokemon/unown_r/anim0.asm
+++ b/gfx/pokemon/unown_r/anim.asm
diff --git a/gfx/pokemon/unown_r/anim1.asm b/gfx/pokemon/unown_r/anim_idle.asm
index b1db8166a..b1db8166a 100644
--- a/gfx/pokemon/unown_r/anim1.asm
+++ b/gfx/pokemon/unown_r/anim_idle.asm
diff --git a/gfx/pokemon/unown_s/anim0.asm b/gfx/pokemon/unown_s/anim.asm
index 9cac3910d..9cac3910d 100644
--- a/gfx/pokemon/unown_s/anim0.asm
+++ b/gfx/pokemon/unown_s/anim.asm
diff --git a/gfx/pokemon/unown_s/anim1.asm b/gfx/pokemon/unown_s/anim_idle.asm
index 49483f8f5..49483f8f5 100644
--- a/gfx/pokemon/unown_s/anim1.asm
+++ b/gfx/pokemon/unown_s/anim_idle.asm
diff --git a/gfx/pokemon/unown_t/anim0.asm b/gfx/pokemon/unown_t/anim.asm
index feba7be07..feba7be07 100644
--- a/gfx/pokemon/unown_t/anim0.asm
+++ b/gfx/pokemon/unown_t/anim.asm
diff --git a/gfx/pokemon/unown_t/anim1.asm b/gfx/pokemon/unown_t/anim_idle.asm
index d295d6830..d295d6830 100644
--- a/gfx/pokemon/unown_t/anim1.asm
+++ b/gfx/pokemon/unown_t/anim_idle.asm
diff --git a/gfx/pokemon/unown_u/anim0.asm b/gfx/pokemon/unown_u/anim.asm
index 12c53636d..12c53636d 100644
--- a/gfx/pokemon/unown_u/anim0.asm
+++ b/gfx/pokemon/unown_u/anim.asm
diff --git a/gfx/pokemon/unown_u/anim1.asm b/gfx/pokemon/unown_u/anim_idle.asm
index 834e75999..834e75999 100644
--- a/gfx/pokemon/unown_u/anim1.asm
+++ b/gfx/pokemon/unown_u/anim_idle.asm
diff --git a/gfx/pokemon/unown_v/anim0.asm b/gfx/pokemon/unown_v/anim.asm
index acc500009..acc500009 100644
--- a/gfx/pokemon/unown_v/anim0.asm
+++ b/gfx/pokemon/unown_v/anim.asm
diff --git a/gfx/pokemon/unown_v/anim1.asm b/gfx/pokemon/unown_v/anim_idle.asm
index 818f727ea..818f727ea 100644
--- a/gfx/pokemon/unown_v/anim1.asm
+++ b/gfx/pokemon/unown_v/anim_idle.asm
diff --git a/gfx/pokemon/unown_w/anim0.asm b/gfx/pokemon/unown_w/anim.asm
index 620ff03e5..620ff03e5 100644
--- a/gfx/pokemon/unown_w/anim0.asm
+++ b/gfx/pokemon/unown_w/anim.asm
diff --git a/gfx/pokemon/unown_w/anim1.asm b/gfx/pokemon/unown_w/anim_idle.asm
index b43d44bbc..b43d44bbc 100644
--- a/gfx/pokemon/unown_w/anim1.asm
+++ b/gfx/pokemon/unown_w/anim_idle.asm
diff --git a/gfx/pokemon/unown_x/anim0.asm b/gfx/pokemon/unown_x/anim.asm
index 0bb204da6..0bb204da6 100644
--- a/gfx/pokemon/unown_x/anim0.asm
+++ b/gfx/pokemon/unown_x/anim.asm
diff --git a/gfx/pokemon/unown_x/anim1.asm b/gfx/pokemon/unown_x/anim_idle.asm
index 22b15a504..22b15a504 100644
--- a/gfx/pokemon/unown_x/anim1.asm
+++ b/gfx/pokemon/unown_x/anim_idle.asm
diff --git a/gfx/pokemon/unown_y/anim0.asm b/gfx/pokemon/unown_y/anim.asm
index e65aa4134..e65aa4134 100644
--- a/gfx/pokemon/unown_y/anim0.asm
+++ b/gfx/pokemon/unown_y/anim.asm
diff --git a/gfx/pokemon/unown_y/anim1.asm b/gfx/pokemon/unown_y/anim_idle.asm
index e1a9a2acb..e1a9a2acb 100644
--- a/gfx/pokemon/unown_y/anim1.asm
+++ b/gfx/pokemon/unown_y/anim_idle.asm
diff --git a/gfx/pokemon/unown_z/anim0.asm b/gfx/pokemon/unown_z/anim.asm
index 197978f9b..197978f9b 100644
--- a/gfx/pokemon/unown_z/anim0.asm
+++ b/gfx/pokemon/unown_z/anim.asm
diff --git a/gfx/pokemon/unown_z/anim1.asm b/gfx/pokemon/unown_z/anim_idle.asm
index 4eb7513f6..4eb7513f6 100644
--- a/gfx/pokemon/unown_z/anim1.asm
+++ b/gfx/pokemon/unown_z/anim_idle.asm
diff --git a/gfx/pokemon/ursaring/anim0.asm b/gfx/pokemon/ursaring/anim.asm
index f571913ea..f571913ea 100644
--- a/gfx/pokemon/ursaring/anim0.asm
+++ b/gfx/pokemon/ursaring/anim.asm
diff --git a/gfx/pokemon/ursaring/anim1.asm b/gfx/pokemon/ursaring/anim_idle.asm
index 01ebc0f1a..01ebc0f1a 100644
--- a/gfx/pokemon/ursaring/anim1.asm
+++ b/gfx/pokemon/ursaring/anim_idle.asm
diff --git a/gfx/pokemon/vaporeon/anim0.asm b/gfx/pokemon/vaporeon/anim.asm
index d13f1dd94..d13f1dd94 100644
--- a/gfx/pokemon/vaporeon/anim0.asm
+++ b/gfx/pokemon/vaporeon/anim.asm
diff --git a/gfx/pokemon/vaporeon/anim1.asm b/gfx/pokemon/vaporeon/anim_idle.asm
index 79c386650..79c386650 100644
--- a/gfx/pokemon/vaporeon/anim1.asm
+++ b/gfx/pokemon/vaporeon/anim_idle.asm
diff --git a/gfx/pokemon/venomoth/anim0.asm b/gfx/pokemon/venomoth/anim.asm
index ba6014d59..ba6014d59 100644
--- a/gfx/pokemon/venomoth/anim0.asm
+++ b/gfx/pokemon/venomoth/anim.asm
diff --git a/gfx/pokemon/venomoth/anim1.asm b/gfx/pokemon/venomoth/anim_idle.asm
index 619c19b73..619c19b73 100644
--- a/gfx/pokemon/venomoth/anim1.asm
+++ b/gfx/pokemon/venomoth/anim_idle.asm
diff --git a/gfx/pokemon/venonat/anim0.asm b/gfx/pokemon/venonat/anim.asm
index 508cbd84a..508cbd84a 100644
--- a/gfx/pokemon/venonat/anim0.asm
+++ b/gfx/pokemon/venonat/anim.asm
diff --git a/gfx/pokemon/venonat/anim1.asm b/gfx/pokemon/venonat/anim_idle.asm
index ecd7a45f1..ecd7a45f1 100644
--- a/gfx/pokemon/venonat/anim1.asm
+++ b/gfx/pokemon/venonat/anim_idle.asm
diff --git a/gfx/pokemon/venusaur/anim0.asm b/gfx/pokemon/venusaur/anim.asm
index 9ee74b6c0..9ee74b6c0 100644
--- a/gfx/pokemon/venusaur/anim0.asm
+++ b/gfx/pokemon/venusaur/anim.asm
diff --git a/gfx/pokemon/venusaur/anim1.asm b/gfx/pokemon/venusaur/anim_idle.asm
index 6eebd7cd3..6eebd7cd3 100644
--- a/gfx/pokemon/venusaur/anim1.asm
+++ b/gfx/pokemon/venusaur/anim_idle.asm
diff --git a/gfx/pokemon/victreebel/anim0.asm b/gfx/pokemon/victreebel/anim.asm
index ec490f7fb..ec490f7fb 100644
--- a/gfx/pokemon/victreebel/anim0.asm
+++ b/gfx/pokemon/victreebel/anim.asm
diff --git a/gfx/pokemon/victreebel/anim1.asm b/gfx/pokemon/victreebel/anim_idle.asm
index 121550865..121550865 100644
--- a/gfx/pokemon/victreebel/anim1.asm
+++ b/gfx/pokemon/victreebel/anim_idle.asm
diff --git a/gfx/pokemon/vileplume/anim0.asm b/gfx/pokemon/vileplume/anim.asm
index 98c2a86de..98c2a86de 100644
--- a/gfx/pokemon/vileplume/anim0.asm
+++ b/gfx/pokemon/vileplume/anim.asm
diff --git a/gfx/pokemon/vileplume/anim1.asm b/gfx/pokemon/vileplume/anim_idle.asm
index e57622363..e57622363 100644
--- a/gfx/pokemon/vileplume/anim1.asm
+++ b/gfx/pokemon/vileplume/anim_idle.asm
diff --git a/gfx/pokemon/voltorb/anim0.asm b/gfx/pokemon/voltorb/anim.asm
index fdb49b9af..fdb49b9af 100644
--- a/gfx/pokemon/voltorb/anim0.asm
+++ b/gfx/pokemon/voltorb/anim.asm
diff --git a/gfx/pokemon/voltorb/anim1.asm b/gfx/pokemon/voltorb/anim_idle.asm
index be799fe4a..be799fe4a 100644
--- a/gfx/pokemon/voltorb/anim1.asm
+++ b/gfx/pokemon/voltorb/anim_idle.asm
diff --git a/gfx/pokemon/vulpix/anim0.asm b/gfx/pokemon/vulpix/anim.asm
index 878054202..878054202 100644
--- a/gfx/pokemon/vulpix/anim0.asm
+++ b/gfx/pokemon/vulpix/anim.asm
diff --git a/gfx/pokemon/vulpix/anim1.asm b/gfx/pokemon/vulpix/anim_idle.asm
index f7c9e3671..f7c9e3671 100644
--- a/gfx/pokemon/vulpix/anim1.asm
+++ b/gfx/pokemon/vulpix/anim_idle.asm
diff --git a/gfx/pokemon/wartortle/anim0.asm b/gfx/pokemon/wartortle/anim.asm
index 832b87b88..832b87b88 100644
--- a/gfx/pokemon/wartortle/anim0.asm
+++ b/gfx/pokemon/wartortle/anim.asm
diff --git a/gfx/pokemon/wartortle/anim1.asm b/gfx/pokemon/wartortle/anim_idle.asm
index 40c4fcd14..40c4fcd14 100644
--- a/gfx/pokemon/wartortle/anim1.asm
+++ b/gfx/pokemon/wartortle/anim_idle.asm
diff --git a/gfx/pokemon/weedle/anim0.asm b/gfx/pokemon/weedle/anim.asm
index 5d959a772..5d959a772 100644
--- a/gfx/pokemon/weedle/anim0.asm
+++ b/gfx/pokemon/weedle/anim.asm
diff --git a/gfx/pokemon/weedle/anim1.asm b/gfx/pokemon/weedle/anim_idle.asm
index 30dcb9185..30dcb9185 100644
--- a/gfx/pokemon/weedle/anim1.asm
+++ b/gfx/pokemon/weedle/anim_idle.asm
diff --git a/gfx/pokemon/weepinbell/anim0.asm b/gfx/pokemon/weepinbell/anim.asm
index 6f710d29a..6f710d29a 100644
--- a/gfx/pokemon/weepinbell/anim0.asm
+++ b/gfx/pokemon/weepinbell/anim.asm
diff --git a/gfx/pokemon/weepinbell/anim1.asm b/gfx/pokemon/weepinbell/anim_idle.asm
index 0e56c9cc1..0e56c9cc1 100644
--- a/gfx/pokemon/weepinbell/anim1.asm
+++ b/gfx/pokemon/weepinbell/anim_idle.asm
diff --git a/gfx/pokemon/weezing/anim0.asm b/gfx/pokemon/weezing/anim.asm
index e64ca5d37..e64ca5d37 100644
--- a/gfx/pokemon/weezing/anim0.asm
+++ b/gfx/pokemon/weezing/anim.asm
diff --git a/gfx/pokemon/weezing/anim1.asm b/gfx/pokemon/weezing/anim_idle.asm
index 1ba31dd74..1ba31dd74 100644
--- a/gfx/pokemon/weezing/anim1.asm
+++ b/gfx/pokemon/weezing/anim_idle.asm
diff --git a/gfx/pokemon/wigglytuff/anim0.asm b/gfx/pokemon/wigglytuff/anim.asm
index 53b468fdd..53b468fdd 100644
--- a/gfx/pokemon/wigglytuff/anim0.asm
+++ b/gfx/pokemon/wigglytuff/anim.asm
diff --git a/gfx/pokemon/wigglytuff/anim1.asm b/gfx/pokemon/wigglytuff/anim_idle.asm
index b99bf002c..b99bf002c 100644
--- a/gfx/pokemon/wigglytuff/anim1.asm
+++ b/gfx/pokemon/wigglytuff/anim_idle.asm
diff --git a/gfx/pokemon/wobbuffet/anim0.asm b/gfx/pokemon/wobbuffet/anim.asm
index 340f3df46..340f3df46 100644
--- a/gfx/pokemon/wobbuffet/anim0.asm
+++ b/gfx/pokemon/wobbuffet/anim.asm
diff --git a/gfx/pokemon/wobbuffet/anim1.asm b/gfx/pokemon/wobbuffet/anim_idle.asm
index 8a3564daa..8a3564daa 100644
--- a/gfx/pokemon/wobbuffet/anim1.asm
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
diff --git a/gfx/pokemon/wooper/anim0.asm b/gfx/pokemon/wooper/anim.asm
index 2c9becf9e..2c9becf9e 100644
--- a/gfx/pokemon/wooper/anim0.asm
+++ b/gfx/pokemon/wooper/anim.asm
diff --git a/gfx/pokemon/wooper/anim1.asm b/gfx/pokemon/wooper/anim_idle.asm
index 3f152d035..3f152d035 100644
--- a/gfx/pokemon/wooper/anim1.asm
+++ b/gfx/pokemon/wooper/anim_idle.asm
diff --git a/gfx/pokemon/xatu/anim0.asm b/gfx/pokemon/xatu/anim.asm
index 002f905b8..002f905b8 100644
--- a/gfx/pokemon/xatu/anim0.asm
+++ b/gfx/pokemon/xatu/anim.asm
diff --git a/gfx/pokemon/xatu/anim1.asm b/gfx/pokemon/xatu/anim_idle.asm
index 3fa8d7875..3fa8d7875 100644
--- a/gfx/pokemon/xatu/anim1.asm
+++ b/gfx/pokemon/xatu/anim_idle.asm
diff --git a/gfx/pokemon/yanma/anim0.asm b/gfx/pokemon/yanma/anim.asm
index 4f1aaa929..4f1aaa929 100644
--- a/gfx/pokemon/yanma/anim0.asm
+++ b/gfx/pokemon/yanma/anim.asm
diff --git a/gfx/pokemon/yanma/anim1.asm b/gfx/pokemon/yanma/anim_idle.asm
index 75464b3f1..75464b3f1 100644
--- a/gfx/pokemon/yanma/anim1.asm
+++ b/gfx/pokemon/yanma/anim_idle.asm
diff --git a/gfx/pokemon/zapdos/anim0.asm b/gfx/pokemon/zapdos/anim.asm
index a22540c2a..a22540c2a 100644
--- a/gfx/pokemon/zapdos/anim0.asm
+++ b/gfx/pokemon/zapdos/anim.asm
diff --git a/gfx/pokemon/zapdos/anim1.asm b/gfx/pokemon/zapdos/anim_idle.asm
index 3d8c8fd57..3d8c8fd57 100644
--- a/gfx/pokemon/zapdos/anim1.asm
+++ b/gfx/pokemon/zapdos/anim_idle.asm
diff --git a/gfx/pokemon/zubat/anim0.asm b/gfx/pokemon/zubat/anim.asm
index a34a66671..a34a66671 100644
--- a/gfx/pokemon/zubat/anim0.asm
+++ b/gfx/pokemon/zubat/anim.asm
diff --git a/gfx/pokemon/zubat/anim1.asm b/gfx/pokemon/zubat/anim_idle.asm
index cfba587f9..cfba587f9 100644
--- a/gfx/pokemon/zubat/anim1.asm
+++ b/gfx/pokemon/zubat/anim_idle.asm
diff --git a/main.asm b/main.asm
index 727453db8..d28bdf559 100644
--- a/main.asm
+++ b/main.asm
@@ -416,12 +416,12 @@ SECTION "Pic Animations 1", ROMX
 INCLUDE "engine/pic_animation.asm"
 INCLUDE "gfx/pokemon/anim_pointers.asm"
 INCLUDE "gfx/pokemon/anims.asm"
-INCLUDE "gfx/pokemon/extra_pointers.asm"
-INCLUDE "gfx/pokemon/extras.asm"
+INCLUDE "gfx/pokemon/idle_pointers.asm"
+INCLUDE "gfx/pokemon/idles.asm"
 INCLUDE "gfx/pokemon/unown_anim_pointers.asm"
 INCLUDE "gfx/pokemon/unown_anims.asm"
-INCLUDE "gfx/pokemon/unown_extra_pointers.asm"
-INCLUDE "gfx/pokemon/unown_extras.asm"
+INCLUDE "gfx/pokemon/unown_idle_pointers.asm"
+INCLUDE "gfx/pokemon/unown_idles.asm"
 INCLUDE "gfx/pokemon/bitmask_pointers.asm"
 INCLUDE "gfx/pokemon/bitmasks.asm"
 INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
diff --git a/wram.asm b/wram.asm
index 2f9b8dda7..0313dc217 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2794,7 +2794,7 @@ wPokeAnimGraphicStartTile:: db
 wPokeAnimCoord:: dw
 wPokeAnimFrontpicHeight:: db
 ; PokeAnim Data
-wPokeAnimExtraFlag:: db
+wPokeAnimIdleFlag:: db
 wPokeAnimSpeed:: db
 wPokeAnimPointerBank:: db
 wPokeAnimPointerAddr:: dw