shithub: pokecrystal

Download patch

ref: b373984ab90ee055420e279b05c69328f0773b7b
parent: e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Dec 28 06:05:42 EST 2017

Rename pokemon animation files (fix #439)

--- 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)
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -77,13 +77,13 @@
 
 .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 @@
 	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 @@
 	ret
 ; d012f
 
-PokeAnim_Extra: ; d012f
+PokeAnim_Idle: ; d012f
 	ld c, TRUE
 	ld b, 0
 	call PokeAnim_InitAnim
@@ -360,11 +360,11 @@
 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
@@ -371,7 +371,7 @@
 	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 @@
 
 	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 @@
 .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
--- /dev/null
+++ b/gfx/pokemon/abra/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 3
+	frame 0, 09
+	frame 1, 10
+	frame 2, 09
+	dorepeat 1
+	endanim
+; 0xd0c5a
--- a/gfx/pokemon/abra/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 3
-	frame 0, 09
-	frame 1, 10
-	frame 2, 09
-	dorepeat 1
-	endanim
-; 0xd0c5a
--- a/gfx/pokemon/abra/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd1b38
--- /dev/null
+++ b/gfx/pokemon/abra/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd1b38
--- /dev/null
+++ b/gfx/pokemon/aerodactyl/anim.asm
@@ -1,0 +1,9 @@
+	frame 2, 12
+	frame 0, 12
+	frame 2, 16
+	setrepeat 3
+	frame 0, 08
+	frame 1, 08
+	dorepeat 4
+	endanim
+; 0xd10a1
--- a/gfx/pokemon/aerodactyl/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 2, 12
-	frame 0, 12
-	frame 2, 16
-	setrepeat 3
-	frame 0, 08
-	frame 1, 08
-	dorepeat 4
-	endanim
-; 0xd10a1
--- a/gfx/pokemon/aerodactyl/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1e2b
--- /dev/null
+++ b/gfx/pokemon/aerodactyl/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1e2b
--- /dev/null
+++ b/gfx/pokemon/aipom/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 24
+	setrepeat 2
+	frame 0, 12
+	frame 2, 12
+	dorepeat 2
+	endanim
+; 0xd1369
--- a/gfx/pokemon/aipom/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 24
-	setrepeat 2
-	frame 0, 12
-	frame 2, 12
-	dorepeat 2
-	endanim
-; 0xd1369
--- a/gfx/pokemon/aipom/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd200b
--- /dev/null
+++ b/gfx/pokemon/aipom/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd200b
--- /dev/null
+++ b/gfx/pokemon/alakazam/anim.asm
@@ -1,0 +1,9 @@
+	frame 3, 10
+	setrepeat 2
+	frame 1, 12
+	frame 2, 12
+	frame 3, 12
+	dorepeat 2
+	frame 3, 07
+	endanim
+; 0xd0c76
--- a/gfx/pokemon/alakazam/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 3, 10
-	setrepeat 2
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	dorepeat 2
-	frame 3, 07
-	endanim
-; 0xd0c76
--- a/gfx/pokemon/alakazam/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 4, 15
-	frame 5, 45
-	frame 3, 10
-	endanim
-; 0xd1b48
--- /dev/null
+++ b/gfx/pokemon/alakazam/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 4, 15
+	frame 5, 45
+	frame 3, 10
+	endanim
+; 0xd1b48
--- /dev/null
+++ b/gfx/pokemon/ampharos/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 10
+	frame 2, 08
+	setrepeat 7
+	frame 2, 02
+	frame 3, 02
+	dorepeat 3
+	frame 1, 06
+	frame 4, 06
+	endanim
+; 0xd12fa
--- a/gfx/pokemon/ampharos/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 10
-	frame 2, 08
-	setrepeat 7
-	frame 2, 02
-	frame 3, 02
-	dorepeat 3
-	frame 1, 06
-	frame 4, 06
-	endanim
-; 0xd12fa
--- a/gfx/pokemon/ampharos/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 4, 10
-	setrepeat 2
-	frame 5, 06
-	frame 6, 06
-	dorepeat 2
-	endanim
-; 0xd1fb6
--- /dev/null
+++ b/gfx/pokemon/ampharos/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 4, 10
+	setrepeat 2
+	frame 5, 06
+	frame 6, 06
+	dorepeat 2
+	endanim
+; 0xd1fb6
--- 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"
--- /dev/null
+++ b/gfx/pokemon/arbok/anim.asm
@@ -1,0 +1,15 @@
+	frame 0, 04
+	frame 4, 08
+	setrepeat 2
+	frame 5, 08
+	frame 6, 08
+	dorepeat 3
+	frame 4, 08
+	setrepeat 3
+	frame 0, 07
+	frame 1, 07
+	frame 2, 05
+	frame 3, 05
+	dorepeat 8
+	endanim
+; 0xd09ed
--- a/gfx/pokemon/arbok/anim0.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-	frame 0, 04
-	frame 4, 08
-	setrepeat 2
-	frame 5, 08
-	frame 6, 08
-	dorepeat 3
-	frame 4, 08
-	setrepeat 3
-	frame 0, 07
-	frame 1, 07
-	frame 2, 05
-	frame 3, 05
-	dorepeat 8
-	endanim
-; 0xd09ed
--- a/gfx/pokemon/arbok/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 4, 06
-	frame 5, 04
-	frame 6, 04
-	frame 5, 04
-	frame 4, 06
-	endanim
-; 0xd19a9
--- /dev/null
+++ b/gfx/pokemon/arbok/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 4, 06
+	frame 5, 04
+	frame 6, 04
+	frame 5, 04
+	frame 4, 06
+	endanim
+; 0xd19a9
--- /dev/null
+++ b/gfx/pokemon/arcanine/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 05
+	frame 2, 25
+	frame 3, 10
+	frame 4, 10
+	frame 7, 25
+	endanim
+; 0xd0c26
--- a/gfx/pokemon/arcanine/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 05
-	frame 2, 25
-	frame 3, 10
-	frame 4, 10
-	frame 7, 25
-	endanim
-; 0xd0c26
--- a/gfx/pokemon/arcanine/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 4
-	frame 5, 09
-	frame 6, 09
-	dorepeat 1
-	endanim
-; 0xd1b0c
--- /dev/null
+++ b/gfx/pokemon/arcanine/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 4
+	frame 5, 09
+	frame 6, 09
+	dorepeat 1
+	endanim
+; 0xd1b0c
--- /dev/null
+++ b/gfx/pokemon/ariados/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 12
+	setrepeat 6
+	frame 2, 03
+	frame 3, 03
+	dorepeat 2
+	frame 1, 24
+	endanim
+; 0xd124d
--- a/gfx/pokemon/ariados/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 12
-	setrepeat 6
-	frame 2, 03
-	frame 3, 03
-	dorepeat 2
-	frame 1, 24
-	endanim
-; 0xd124d
--- a/gfx/pokemon/ariados/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 08
-	setrepeat 2
-	frame 4, 06
-	frame 1, 06
-	dorepeat 2
-	frame 1, 08
-	endanim
-; 0xd1f3b
--- /dev/null
+++ b/gfx/pokemon/ariados/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 1, 08
+	setrepeat 2
+	frame 4, 06
+	frame 1, 06
+	dorepeat 2
+	frame 1, 08
+	endanim
+; 0xd1f3b
--- /dev/null
+++ b/gfx/pokemon/articuno/anim.asm
@@ -1,0 +1,9 @@
+	frame 5, 08
+	setrepeat 2
+	frame 1, 10
+	frame 2, 10
+	frame 3, 10
+	dorepeat 2
+	frame 5, 12
+	endanim
+; 0xd10c1
--- a/gfx/pokemon/articuno/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 5, 08
-	setrepeat 2
-	frame 1, 10
-	frame 2, 10
-	frame 3, 10
-	dorepeat 2
-	frame 5, 12
-	endanim
-; 0xd10c1
--- a/gfx/pokemon/articuno/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 5, 08
-	setrepeat 2
-	frame 4, 06
-	frame 1, 06
-	dorepeat 2
-	frame 5, 12
-	endanim
-; 0xd1e41
--- /dev/null
+++ b/gfx/pokemon/articuno/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 5, 08
+	setrepeat 2
+	frame 4, 06
+	frame 1, 06
+	dorepeat 2
+	frame 5, 12
+	endanim
+; 0xd1e41
--- /dev/null
+++ b/gfx/pokemon/azumarill/anim.asm
@@ -1,0 +1,9 @@
+	setrepeat 2
+	frame 2, 06
+	frame 3, 06
+	dorepeat 1
+	frame 0, 08
+	frame 1, 08
+	frame 4, 08
+	endanim
+; 0xd1329
--- a/gfx/pokemon/azumarill/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 2
-	frame 2, 06
-	frame 3, 06
-	dorepeat 1
-	frame 0, 08
-	frame 1, 08
-	frame 4, 08
-	endanim
-; 0xd1329
--- a/gfx/pokemon/azumarill/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1fd3
--- /dev/null
+++ b/gfx/pokemon/azumarill/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1fd3
--- /dev/null
+++ b/gfx/pokemon/bayleef/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 12
+	frame 2, 11
+	frame 3, 15
+	endanim
+; 0xd116c
--- a/gfx/pokemon/bayleef/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 12
-	frame 2, 11
-	frame 3, 15
-	endanim
-; 0xd116c
--- a/gfx/pokemon/bayleef/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1ea8
--- /dev/null
+++ b/gfx/pokemon/bayleef/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1ea8
--- /dev/null
+++ b/gfx/pokemon/beedrill/anim.asm
@@ -1,0 +1,12 @@
+	setrepeat 8
+	frame 3, 02
+	frame 1, 01
+	frame 2, 01
+	frame 1, 02
+	dorepeat 1
+	setrepeat 2
+	frame 0, 10
+	frame 3, 10
+	dorepeat 7
+	endanim
+; 0xd0954
--- a/gfx/pokemon/beedrill/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	setrepeat 8
-	frame 3, 02
-	frame 1, 01
-	frame 2, 01
-	frame 1, 02
-	dorepeat 1
-	setrepeat 2
-	frame 0, 10
-	frame 3, 10
-	dorepeat 7
-	endanim
-; 0xd0954
--- a/gfx/pokemon/beedrill/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 4
-	frame 3, 02
-	frame 1, 01
-	frame 2, 01
-	frame 1, 02
-	dorepeat 1
-	frame 0, 25
-	frame 3, 10
-	endanim
-; 0xd193c
--- /dev/null
+++ b/gfx/pokemon/beedrill/anim_idle.asm
@@ -1,0 +1,10 @@
+	setrepeat 4
+	frame 3, 02
+	frame 1, 01
+	frame 2, 01
+	frame 1, 02
+	dorepeat 1
+	frame 0, 25
+	frame 3, 10
+	endanim
+; 0xd193c
--- /dev/null
+++ b/gfx/pokemon/bellossom/anim.asm
@@ -1,0 +1,10 @@
+	frame 3, 12
+	frame 1, 12
+	frame 2, 12
+	frame 4, 10
+	frame 0, 12
+	frame 4, 10
+	frame 5, 12
+	frame 4, 10
+	endanim
+; 0xd130b
--- a/gfx/pokemon/bellossom/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 3, 12
-	frame 1, 12
-	frame 2, 12
-	frame 4, 10
-	frame 0, 12
-	frame 4, 10
-	frame 5, 12
-	frame 4, 10
-	endanim
-; 0xd130b
--- a/gfx/pokemon/bellossom/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 6, 06
-	dorepeat 1
-	endanim
-; 0xd1fbf
--- /dev/null
+++ b/gfx/pokemon/bellossom/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 1
+	endanim
+; 0xd1fbf
--- /dev/null
+++ b/gfx/pokemon/bellsprout/anim.asm
@@ -1,0 +1,12 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	setrepeat 2
+	frame 0, 08
+	frame 1, 08
+	frame 2, 12
+	frame 1, 08
+	dorepeat 5
+	endanim
+; 0xd0cb2
--- a/gfx/pokemon/bellsprout/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	setrepeat 2
-	frame 0, 08
-	frame 1, 08
-	frame 2, 12
-	frame 1, 08
-	dorepeat 5
-	endanim
-; 0xd0cb2
--- a/gfx/pokemon/bellsprout/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 4, 10
-	frame 5, 10
-	setrepeat 3
-	frame 0, 05
-	frame 6, 05
-	dorepeat 3
-	endanim
-; 0xd1b78
--- /dev/null
+++ b/gfx/pokemon/bellsprout/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 4, 10
+	frame 5, 10
+	setrepeat 3
+	frame 0, 05
+	frame 6, 05
+	dorepeat 3
+	endanim
+; 0xd1b78
--- /dev/null
+++ b/gfx/pokemon/blastoise/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 06
+	frame 2, 40
+	frame 3, 08
+	frame 1, 04
+	endanim
+; 0xd0908
--- a/gfx/pokemon/blastoise/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 06
-	frame 2, 40
-	frame 3, 08
-	frame 1, 04
-	endanim
-; 0xd0908
--- a/gfx/pokemon/blastoise/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 12
-	frame 4, 12
-	dorepeat 1
-	endanim
-; 0xd18f0
--- /dev/null
+++ b/gfx/pokemon/blastoise/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 12
+	frame 4, 12
+	dorepeat 1
+	endanim
+; 0xd18f0
--- /dev/null
+++ b/gfx/pokemon/blissey/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 12
+	frame 2, 14
+	frame 1, 10
+	frame 3, 04
+	frame 0, 06
+	frame 3, 08
+	endanim
+; 0xd1607
--- a/gfx/pokemon/blissey/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 12
-	frame 2, 14
-	frame 1, 10
-	frame 3, 04
-	frame 0, 06
-	frame 3, 08
-	endanim
-; 0xd1607
--- a/gfx/pokemon/blissey/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd21c1
--- /dev/null
+++ b/gfx/pokemon/blissey/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd21c1
--- /dev/null
+++ b/gfx/pokemon/bulbasaur/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 10
+	frame 2, 10
+	frame 1, 08
+	frame 2, 06
+	frame 4, 20
+	frame 3, 06
+	frame 0, 05
+	frame 5, 05
+	endanim
+; 0xd089c
--- a/gfx/pokemon/bulbasaur/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 1, 08
-	frame 2, 06
-	frame 4, 20
-	frame 3, 06
-	frame 0, 05
-	frame 5, 05
-	endanim
-; 0xd089c
--- a/gfx/pokemon/bulbasaur/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 5, 05
-	frame 0, 05
-	frame 5, 05
-	endanim
-; 0xd18a0
--- /dev/null
+++ b/gfx/pokemon/bulbasaur/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 5, 05
+	frame 0, 05
+	frame 5, 05
+	endanim
+; 0xd18a0
--- /dev/null
+++ b/gfx/pokemon/butterfree/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 04
+	frame 2, 24
+	setrepeat 3
+	frame 0, 06
+	frame 1, 06
+	dorepeat 3
+	endanim
+; 0xd0929
--- a/gfx/pokemon/butterfree/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 04
-	frame 2, 24
-	setrepeat 3
-	frame 0, 06
-	frame 1, 06
-	dorepeat 3
-	endanim
-; 0xd0929
--- a/gfx/pokemon/butterfree/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	dorepeat 1
-	endanim
-; 0xd190d
--- /dev/null
+++ b/gfx/pokemon/butterfree/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	dorepeat 1
+	endanim
+; 0xd190d
--- /dev/null
+++ b/gfx/pokemon/caterpie/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 08
+	frame 2, 12
+	frame 1, 12
+	frame 2, 08
+	frame 1, 08
+	endanim
+; 0xd0915
--- a/gfx/pokemon/caterpie/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 08
-	frame 2, 12
-	frame 1, 12
-	frame 2, 08
-	frame 1, 08
-	endanim
-; 0xd0915
--- a/gfx/pokemon/caterpie/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd18f9
--- /dev/null
+++ b/gfx/pokemon/caterpie/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd18f9
--- /dev/null
+++ b/gfx/pokemon/celebi/anim.asm
@@ -1,0 +1,16 @@
+	frame 1, 05
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	frame 5, 05
+	frame 6, 05
+	frame 7, 05
+	frame 8, 05
+	frame 9, 05
+	frame 10, 05
+	setrepeat 3
+	frame 12, 05
+	frame 13, 05
+	dorepeat 11
+	endanim
+; 0xd1696
--- a/gfx/pokemon/celebi/anim0.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-	frame 1, 05
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	frame 5, 05
-	frame 6, 05
-	frame 7, 05
-	frame 8, 05
-	frame 9, 05
-	frame 10, 05
-	setrepeat 3
-	frame 12, 05
-	frame 13, 05
-	dorepeat 11
-	endanim
-; 0xd1696
--- a/gfx/pokemon/celebi/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 07
-	frame 11, 07
-	setrepeat 2
-	frame 0, 05
-	frame 11, 05
-	dorepeat 3
-	endanim
-; 0xd2222
--- /dev/null
+++ b/gfx/pokemon/celebi/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 0, 07
+	frame 11, 07
+	setrepeat 2
+	frame 0, 05
+	frame 11, 05
+	dorepeat 3
+	endanim
+; 0xd2222
--- /dev/null
+++ b/gfx/pokemon/chansey/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 06
+	frame 4, 06
+	frame 1, 06
+	frame 2, 10
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 5
+	endanim
+; 0xd0f26
--- a/gfx/pokemon/chansey/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 06
-	frame 4, 06
-	frame 1, 06
-	frame 2, 10
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 5
-	endanim
-; 0xd0f26
--- a/gfx/pokemon/chansey/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd1d16
--- /dev/null
+++ b/gfx/pokemon/chansey/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd1d16
--- /dev/null
+++ b/gfx/pokemon/charizard/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 16
+	setrepeat 2
+	frame 2, 09
+	frame 1, 09
+	dorepeat 3
+	endanim
+; 0xd08e1
--- a/gfx/pokemon/charizard/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 16
-	setrepeat 2
-	frame 2, 09
-	frame 1, 09
-	dorepeat 3
-	endanim
-; 0xd08e1
--- a/gfx/pokemon/charizard/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd18d5
--- /dev/null
+++ b/gfx/pokemon/charizard/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd18d5
--- /dev/null
+++ b/gfx/pokemon/charmander/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 04
+	frame 1, 08
+	frame 2, 24
+	frame 1, 08
+	frame 4, 10
+	frame 0, 10
+	frame 4, 10
+	endanim
+; 0xd08c5
--- a/gfx/pokemon/charmander/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 04
-	frame 1, 08
-	frame 2, 24
-	frame 1, 08
-	frame 4, 10
-	frame 0, 10
-	frame 4, 10
-	endanim
-; 0xd08c5
--- a/gfx/pokemon/charmander/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd18bf
--- /dev/null
+++ b/gfx/pokemon/charmander/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd18bf
--- /dev/null
+++ b/gfx/pokemon/charmeleon/anim.asm
@@ -1,0 +1,9 @@
+	frame 3, 08
+	frame 2, 08
+	frame 3, 08
+	frame 2, 08
+	frame 1, 15
+	frame 3, 08
+	frame 4, 30
+	endanim
+; 0xd08d4
--- a/gfx/pokemon/charmeleon/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 3, 08
-	frame 2, 08
-	frame 3, 08
-	frame 2, 08
-	frame 1, 15
-	frame 3, 08
-	frame 4, 30
-	endanim
-; 0xd08d4
--- a/gfx/pokemon/charmeleon/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 3, 08
-	frame 4, 15
-	setrepeat 2
-	frame 0, 08
-	frame 1, 10
-	dorepeat 3
-	endanim
-; 0xd18cc
--- /dev/null
+++ b/gfx/pokemon/charmeleon/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 3, 08
+	frame 4, 15
+	setrepeat 2
+	frame 0, 08
+	frame 1, 10
+	dorepeat 3
+	endanim
+; 0xd18cc
--- /dev/null
+++ b/gfx/pokemon/chikorita/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 04
+	frame 1, 24
+	frame 0, 08
+	setrepeat 2
+	frame 2, 03
+	frame 3, 04
+	frame 4, 05
+	dorepeat 4
+	endanim
+; 0xd1165
--- a/gfx/pokemon/chikorita/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 04
-	frame 1, 24
-	frame 0, 08
-	setrepeat 2
-	frame 2, 03
-	frame 3, 04
-	frame 4, 05
-	dorepeat 4
-	endanim
-; 0xd1165
--- a/gfx/pokemon/chikorita/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 5, 06
-	dorepeat 1
-	endanim
-; 0xd1e9f
--- /dev/null
+++ b/gfx/pokemon/chikorita/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 5, 06
+	dorepeat 1
+	endanim
+; 0xd1e9f
--- /dev/null
+++ b/gfx/pokemon/chinchou/anim.asm
@@ -1,0 +1,11 @@
+	setrepeat 2
+	frame 2, 05
+	frame 1, 05
+	dorepeat 1
+	setrepeat 7
+	frame 3, 02
+	frame 0, 01
+	dorepeat 5
+	frame 3, 10
+	endanim
+; 0xd1271
--- a/gfx/pokemon/chinchou/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	setrepeat 2
-	frame 2, 05
-	frame 1, 05
-	dorepeat 1
-	setrepeat 7
-	frame 3, 02
-	frame 0, 01
-	dorepeat 5
-	frame 3, 10
-	endanim
-; 0xd1271
--- a/gfx/pokemon/chinchou/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1f4d
--- /dev/null
+++ b/gfx/pokemon/chinchou/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1f4d
--- /dev/null
+++ b/gfx/pokemon/clefable/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 04
+	frame 1, 10
+	frame 2, 10
+	frame 1, 10
+	endanim
+; 0xd0aa7
--- a/gfx/pokemon/clefable/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 10
-	frame 1, 10
-	endanim
-; 0xd0aa7
--- a/gfx/pokemon/clefable/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd1a29
--- /dev/null
+++ b/gfx/pokemon/clefable/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd1a29
--- /dev/null
+++ b/gfx/pokemon/clefairy/anim.asm
@@ -1,0 +1,9 @@
+	frame 2, 06
+	frame 1, 06
+	frame 2, 06
+	setrepeat 3
+	frame 0, 05
+	frame 3, 05
+	dorepeat 4
+	endanim
+; 0xd0a9e
--- a/gfx/pokemon/clefairy/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 2, 06
-	frame 1, 06
-	frame 2, 06
-	setrepeat 3
-	frame 0, 05
-	frame 3, 05
-	dorepeat 4
-	endanim
-; 0xd0a9e
--- a/gfx/pokemon/clefairy/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 4, 12
-	frame 5, 12
-	dorepeat 1
-	frame 0, 05
-	frame 3, 05
-	endanim
-; 0xd1a20
--- /dev/null
+++ b/gfx/pokemon/clefairy/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 4, 12
+	frame 5, 12
+	dorepeat 1
+	frame 0, 05
+	frame 3, 05
+	endanim
+; 0xd1a20
--- /dev/null
+++ b/gfx/pokemon/cleffa/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 10
+	frame 2, 10
+	frame 3, 10
+	endanim
+; 0xd1290
--- a/gfx/pokemon/cleffa/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 3, 10
-	endanim
-; 0xd1290
--- a/gfx/pokemon/cleffa/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 1, 08
-	dorepeat 1
-	endanim
-; 0xd1f68
--- /dev/null
+++ b/gfx/pokemon/cleffa/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 1, 08
+	dorepeat 1
+	endanim
+; 0xd1f68
--- /dev/null
+++ b/gfx/pokemon/cloyster/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 1, 09
+	frame 2, 09
+	dorepeat 1
+	frame 3, 09
+	endanim
+; 0xd0dd0
--- a/gfx/pokemon/cloyster/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 1, 09
-	frame 2, 09
-	dorepeat 1
-	frame 3, 09
-	endanim
-; 0xd0dd0
--- a/gfx/pokemon/cloyster/anim1.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 4, 52
-	dorepeat 1
-	endanim
-; 0xd1c4e
--- /dev/null
+++ b/gfx/pokemon/cloyster/anim_idle.asm
@@ -1,0 +1,4 @@
+	frame 4, 52
+	dorepeat 1
+	endanim
+; 0xd1c4e
--- /dev/null
+++ b/gfx/pokemon/corsola/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	frame 2, 22
+	frame 1, 10
+	frame 0, 12
+	frame 3, 18
+	endanim
+; 0xd1501
--- a/gfx/pokemon/corsola/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	frame 2, 22
-	frame 1, 10
-	frame 0, 12
-	frame 3, 18
-	endanim
-; 0xd1501
--- a/gfx/pokemon/corsola/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd210b
--- /dev/null
+++ b/gfx/pokemon/corsola/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd210b
--- /dev/null
+++ b/gfx/pokemon/crobat/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 0, 05
+	frame 1, 05
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd125e
--- a/gfx/pokemon/crobat/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 1, 05
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd125e
--- a/gfx/pokemon/crobat/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 5
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd1f44
--- /dev/null
+++ b/gfx/pokemon/crobat/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 5
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd1f44
--- /dev/null
+++ b/gfx/pokemon/croconaw/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 5
+	frame 3, 05
+	frame 2, 05
+	frame 1, 05
+	dorepeat 1
+	endanim
+; 0xd11d2
--- a/gfx/pokemon/croconaw/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 5
-	frame 3, 05
-	frame 2, 05
-	frame 1, 05
-	dorepeat 1
-	endanim
-; 0xd11d2
--- a/gfx/pokemon/croconaw/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 4, 10
-	dorepeat 1
-	endanim
-; 0xd1ee0
--- /dev/null
+++ b/gfx/pokemon/croconaw/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 4, 10
+	dorepeat 1
+	endanim
+; 0xd1ee0
--- /dev/null
+++ b/gfx/pokemon/cubone/anim.asm
@@ -1,0 +1,12 @@
+	frame 0, 04
+	frame 5, 19
+	frame 1, 08
+	frame 2, 06
+	frame 6, 03
+	frame 3, 02
+	frame 4, 40
+	frame 3, 02
+	frame 6, 02
+	frame 1, 08
+	endanim
+; 0xd0e9f
--- a/gfx/pokemon/cubone/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 0, 04
-	frame 5, 19
-	frame 1, 08
-	frame 2, 06
-	frame 6, 03
-	frame 3, 02
-	frame 4, 40
-	frame 3, 02
-	frame 6, 02
-	frame 1, 08
-	endanim
-; 0xd0e9f
--- a/gfx/pokemon/cubone/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd1cc3
--- /dev/null
+++ b/gfx/pokemon/cubone/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd1cc3
--- /dev/null
+++ b/gfx/pokemon/cyndaquil/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 04
+	frame 4, 04
+	frame 1, 04
+	setrepeat 4
+	frame 4, 03
+	frame 1, 03
+	dorepeat 4
+	frame 2, 03
+	frame 3, 09
+	frame 1, 03
+	endanim
+; 0xd1194
--- a/gfx/pokemon/cyndaquil/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 04
-	frame 4, 04
-	frame 1, 04
-	setrepeat 4
-	frame 4, 03
-	frame 1, 03
-	dorepeat 4
-	frame 2, 03
-	frame 3, 09
-	frame 1, 03
-	endanim
-; 0xd1194
--- a/gfx/pokemon/cyndaquil/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 4, 10
-	dorepeat 1
-	endanim
-; 0xd1eba
--- /dev/null
+++ b/gfx/pokemon/cyndaquil/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 4, 10
+	dorepeat 1
+	endanim
+; 0xd1eba
--- /dev/null
+++ b/gfx/pokemon/delibird/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 02
+	frame 2, 10
+	setrepeat 2
+	frame 3, 09
+	frame 2, 09
+	dorepeat 3
+	frame 2, 13
+	frame 1, 02
+	frame 0, 05
+	frame 6, 05
+	endanim
+; 0xd152a
--- a/gfx/pokemon/delibird/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 02
-	frame 2, 10
-	setrepeat 2
-	frame 3, 09
-	frame 2, 09
-	dorepeat 3
-	frame 2, 13
-	frame 1, 02
-	frame 0, 05
-	frame 6, 05
-	endanim
-; 0xd152a
--- a/gfx/pokemon/delibird/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 4
-	frame 4, 06
-	frame 5, 06
-	dorepeat 1
-	endanim
-; 0xd2126
--- /dev/null
+++ b/gfx/pokemon/delibird/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 4
+	frame 4, 06
+	frame 5, 06
+	dorepeat 1
+	endanim
+; 0xd2126
--- /dev/null
+++ b/gfx/pokemon/dewgong/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 09
+	frame 2, 09
+	frame 3, 09
+	frame 4, 09
+	frame 5, 14
+	endanim
+; 0xd0daa
--- a/gfx/pokemon/dewgong/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 09
-	frame 2, 09
-	frame 3, 09
-	frame 4, 09
-	frame 5, 14
-	endanim
-; 0xd0daa
--- a/gfx/pokemon/dewgong/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 6, 06
-	frame 7, 06
-	frame 8, 06
-	frame 9, 06
-	dorepeat 1
-	endanim
-; 0xd1c2a
--- /dev/null
+++ b/gfx/pokemon/dewgong/anim_idle.asm
@@ -1,0 +1,9 @@
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	frame 7, 06
+	frame 8, 06
+	frame 9, 06
+	dorepeat 1
+	endanim
+; 0xd1c2a
--- /dev/null
+++ b/gfx/pokemon/diglett/anim.asm
@@ -1,0 +1,7 @@
+	frame 3, 04
+	setrepeat 2
+	frame 2, 08
+	frame 1, 09
+	dorepeat 2
+	endanim
+; 0xd0b97
--- a/gfx/pokemon/diglett/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 3, 04
-	setrepeat 2
-	frame 2, 08
-	frame 1, 09
-	dorepeat 2
-	endanim
-; 0xd0b97
--- a/gfx/pokemon/diglett/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1aad
--- /dev/null
+++ b/gfx/pokemon/diglett/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1aad
--- /dev/null
+++ b/gfx/pokemon/ditto/anim.asm
@@ -1,0 +1,11 @@
+	frame 5, 08
+	frame 1, 08
+	frame 2, 08
+	frame 3, 06
+	frame 2, 06
+	frame 0, 12
+	frame 6, 12
+	frame 7, 12
+	frame 8, 12
+	endanim
+; 0xd1029
--- a/gfx/pokemon/ditto/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 5, 08
-	frame 1, 08
-	frame 2, 08
-	frame 3, 06
-	frame 2, 06
-	frame 0, 12
-	frame 6, 12
-	frame 7, 12
-	frame 8, 12
-	endanim
-; 0xd1029
--- a/gfx/pokemon/ditto/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd1dc9
--- /dev/null
+++ b/gfx/pokemon/ditto/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd1dc9
--- /dev/null
+++ b/gfx/pokemon/dodrio/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 10
+	frame 2, 10
+	frame 4, 10
+	frame 1, 09
+	endanim
+; 0xd0d92
--- a/gfx/pokemon/dodrio/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 4, 10
-	frame 1, 09
-	endanim
-; 0xd0d92
--- a/gfx/pokemon/dodrio/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 3, 10
-	frame 0, 08
-	dorepeat 1
-	endanim
-; 0xd1c10
--- /dev/null
+++ b/gfx/pokemon/dodrio/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 3, 10
+	frame 0, 08
+	dorepeat 1
+	endanim
+; 0xd1c10
--- /dev/null
+++ b/gfx/pokemon/doduo/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 12
+	frame 2, 32
+	frame 1, 24
+	setrepeat 2
+	frame 3, 08
+	frame 1, 08
+	dorepeat 4
+	endanim
+; 0xd0d89
--- a/gfx/pokemon/doduo/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 12
-	frame 2, 32
-	frame 1, 24
-	setrepeat 2
-	frame 3, 08
-	frame 1, 08
-	dorepeat 4
-	endanim
-; 0xd0d89
--- a/gfx/pokemon/doduo/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 12
-	setrepeat 2
-	frame 3, 06
-	frame 1, 06
-	dorepeat 2
-	frame 1, 30
-	endanim
-; 0xd1c07
--- /dev/null
+++ b/gfx/pokemon/doduo/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 1, 12
+	setrepeat 2
+	frame 3, 06
+	frame 1, 06
+	dorepeat 2
+	frame 1, 30
+	endanim
+; 0xd1c07
--- /dev/null
+++ b/gfx/pokemon/donphan/anim.asm
@@ -1,0 +1,6 @@
+	frame 2, 08
+	frame 1, 24
+	frame 3, 10
+	frame 4, 06
+	endanim
+; 0xd1587
--- a/gfx/pokemon/donphan/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 2, 08
-	frame 1, 24
-	frame 3, 10
-	frame 4, 06
-	endanim
-; 0xd1587
--- a/gfx/pokemon/donphan/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd2169
--- /dev/null
+++ b/gfx/pokemon/donphan/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd2169
--- /dev/null
+++ b/gfx/pokemon/dragonair/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 08
+	frame 2, 08
+	frame 3, 08
+	frame 2, 08
+	dorepeat 1
+	endanim
+; 0xd10fd
--- a/gfx/pokemon/dragonair/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 08
-	frame 2, 08
-	frame 3, 08
-	frame 2, 08
-	dorepeat 1
-	endanim
-; 0xd10fd
--- a/gfx/pokemon/dragonair/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	frame 0, 06
-	frame 5, 06
-	frame 6, 06
-	frame 5, 06
-	endanim
-; 0xd1e71
--- /dev/null
+++ b/gfx/pokemon/dragonair/anim_idle.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	frame 0, 06
+	frame 5, 06
+	frame 6, 06
+	frame 5, 06
+	endanim
+; 0xd1e71
--- /dev/null
+++ b/gfx/pokemon/dragonite/anim.asm
@@ -1,0 +1,13 @@
+	frame 1, 12
+	frame 2, 12
+	setrepeat 2
+	frame 3, 12
+	frame 4, 12
+	dorepeat 3
+	frame 1, 12
+	setrepeat 3
+	frame 0, 12
+	frame 1, 12
+	dorepeat 8
+	endanim
+; 0xd1114
--- a/gfx/pokemon/dragonite/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 1, 12
-	frame 2, 12
-	setrepeat 2
-	frame 3, 12
-	frame 4, 12
-	dorepeat 3
-	frame 1, 12
-	setrepeat 3
-	frame 0, 12
-	frame 1, 12
-	dorepeat 8
-	endanim
-; 0xd1114
--- a/gfx/pokemon/dragonite/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 20
-	frame 1, 20
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 3
-	endanim
-; 0xd1e7e
--- /dev/null
+++ b/gfx/pokemon/dragonite/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 0, 20
+	frame 1, 20
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 3
+	endanim
+; 0xd1e7e
--- /dev/null
+++ b/gfx/pokemon/dratini/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	frame 2, 09
+	frame 3, 09
+	endanim
+; 0xd10f0
--- a/gfx/pokemon/dratini/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	frame 2, 09
-	frame 3, 09
-	endanim
-; 0xd10f0
--- a/gfx/pokemon/dratini/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd1e60
--- /dev/null
+++ b/gfx/pokemon/dratini/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd1e60
--- /dev/null
+++ b/gfx/pokemon/drowzee/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 08
+	frame 2, 08
+	frame 3, 08
+	frame 4, 08
+	frame 0, 05
+	frame 1, 05
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	endanim
+; 0xd0e1b
--- a/gfx/pokemon/drowzee/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 08
-	frame 2, 08
-	frame 3, 08
-	frame 4, 08
-	frame 0, 05
-	frame 1, 05
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	endanim
-; 0xd0e1b
--- a/gfx/pokemon/drowzee/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 5, 06
-	dorepeat 1
-	frame 0, 08
-	frame 5, 08
-	endanim
-; 0xd1c81
--- /dev/null
+++ b/gfx/pokemon/drowzee/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 06
+	frame 5, 06
+	dorepeat 1
+	frame 0, 08
+	frame 5, 08
+	endanim
+; 0xd1c81
--- /dev/null
+++ b/gfx/pokemon/dugtrio/anim.asm
@@ -1,0 +1,16 @@
+	frame 1, 08
+	frame 2, 08
+	frame 3, 12
+	frame 4, 06
+	frame 3, 05
+	frame 5, 06
+	frame 3, 05
+	setrepeat 4
+	frame 3, 05
+	frame 6, 05
+	dorepeat 8
+	frame 6, 15
+	frame 2, 06
+	frame 1, 06
+	endanim
+; 0xd0bb4
--- a/gfx/pokemon/dugtrio/anim0.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-	frame 1, 08
-	frame 2, 08
-	frame 3, 12
-	frame 4, 06
-	frame 3, 05
-	frame 5, 06
-	frame 3, 05
-	setrepeat 4
-	frame 3, 05
-	frame 6, 05
-	dorepeat 8
-	frame 6, 15
-	frame 2, 06
-	frame 1, 06
-	endanim
-; 0xd0bb4
--- a/gfx/pokemon/dugtrio/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 20
-	frame 3, 10
-	frame 7, 16
-	setrepeat 2
-	frame 6, 04
-	frame 7, 04
-	dorepeat 4
-	frame 6, 20
-	endanim
-; 0xd1abe
--- /dev/null
+++ b/gfx/pokemon/dugtrio/anim_idle.asm
@@ -1,0 +1,10 @@
+	frame 0, 20
+	frame 3, 10
+	frame 7, 16
+	setrepeat 2
+	frame 6, 04
+	frame 7, 04
+	dorepeat 4
+	frame 6, 20
+	endanim
+; 0xd1abe
--- /dev/null
+++ b/gfx/pokemon/dunsparce/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 12
+	setrepeat 5
+	frame 2, 03
+	frame 3, 03
+	dorepeat 2
+	frame 4, 12
+	endanim
+; 0xd1441
--- a/gfx/pokemon/dunsparce/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 12
-	setrepeat 5
-	frame 2, 03
-	frame 3, 03
-	dorepeat 2
-	frame 4, 12
-	endanim
-; 0xd1441
--- a/gfx/pokemon/dunsparce/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd2089
--- /dev/null
+++ b/gfx/pokemon/dunsparce/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd2089
--- /dev/null
+++ b/gfx/pokemon/eevee/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 06
+	frame 2, 06
+	setrepeat 2
+	frame 3, 07
+	frame 4, 07
+	dorepeat 3
+	frame 2, 10
+	endanim
+; 0xd1038
--- a/gfx/pokemon/eevee/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 06
-	frame 2, 06
-	setrepeat 2
-	frame 3, 07
-	frame 4, 07
-	dorepeat 3
-	frame 2, 10
-	endanim
-; 0xd1038
--- a/gfx/pokemon/eevee/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 3
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	frame 0, 09
-	frame 5, 13
-	endanim
-; 0xd1dd6
--- /dev/null
+++ b/gfx/pokemon/eevee/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 3
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	frame 0, 09
+	frame 5, 13
+	endanim
+; 0xd1dd6
--- /dev/null
+++ b/gfx/pokemon/egg/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 04
+	frame 0, 04
+	frame 2, 04
+	frame 0, 04
+	dorepeat 1
+	endanim
+; 0xd16a3
--- a/gfx/pokemon/egg/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 04
-	frame 0, 04
-	frame 2, 04
-	frame 0, 04
-	dorepeat 1
-	endanim
-; 0xd16a3
--- a/gfx/pokemon/egg/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 03
-	frame 0, 03
-	frame 2, 03
-	endanim
-; 0xd2229
--- /dev/null
+++ b/gfx/pokemon/egg/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 1, 03
+	frame 0, 03
+	frame 2, 03
+	endanim
+; 0xd2229
--- /dev/null
+++ b/gfx/pokemon/ekans/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 08
+	frame 0, 05
+	setrepeat 7
+	frame 2, 03
+	frame 3, 03
+	dorepeat 3
+	frame 2, 20
+	endanim
+; 0xd09d2
--- a/gfx/pokemon/ekans/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 08
-	frame 0, 05
-	setrepeat 7
-	frame 2, 03
-	frame 3, 03
-	dorepeat 3
-	frame 2, 20
-	endanim
-; 0xd09d2
--- a/gfx/pokemon/ekans/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 5
-	frame 4, 02
-	frame 5, 02
-	frame 4, 02
-	frame 0, 02
-	dorepeat 1
-	endanim
-; 0xd199c
--- /dev/null
+++ b/gfx/pokemon/ekans/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 5
+	frame 4, 02
+	frame 5, 02
+	frame 4, 02
+	frame 0, 02
+	dorepeat 1
+	endanim
+; 0xd199c
--- /dev/null
+++ b/gfx/pokemon/electabuzz/anim.asm
@@ -1,0 +1,13 @@
+	frame 1, 08
+	setrepeat 3
+	setrepeat 3
+	frame 1, 02
+	frame 2, 02
+	dorepeat 3
+	setrepeat 4
+	frame 3, 02
+	frame 4, 02
+	dorepeat 7
+	dorepeat 7
+	endanim
+; 0xd0fcc
--- a/gfx/pokemon/electabuzz/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 1, 08
-	setrepeat 3
-	setrepeat 3
-	frame 1, 02
-	frame 2, 02
-	dorepeat 3
-	setrepeat 4
-	frame 3, 02
-	frame 4, 02
-	dorepeat 7
-	dorepeat 7
-	endanim
-; 0xd0fcc
--- a/gfx/pokemon/electabuzz/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 4
-	frame 0, 04
-	frame 5, 04
-	dorepeat 1
-	endanim
-; 0xd1d8a
--- /dev/null
+++ b/gfx/pokemon/electabuzz/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 4
+	frame 0, 04
+	frame 5, 04
+	dorepeat 1
+	endanim
+; 0xd1d8a
--- /dev/null
+++ b/gfx/pokemon/electrode/anim.asm
@@ -1,0 +1,4 @@
+	frame 1, 05
+	frame 2, 40
+	endanim
+; 0xd0e5c
--- a/gfx/pokemon/electrode/anim0.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 1, 05
-	frame 2, 40
-	endanim
-; 0xd0e5c
--- a/gfx/pokemon/electrode/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 3, 45
-	endanim
-; 0xd1ca8
--- /dev/null
+++ b/gfx/pokemon/electrode/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 3, 45
+	endanim
+; 0xd1ca8
--- /dev/null
+++ b/gfx/pokemon/elekid/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 07
+	setrepeat 7
+	frame 2, 03
+	frame 1, 03
+	dorepeat 2
+	setrepeat 4
+	frame 4, 03
+	frame 3, 03
+	dorepeat 6
+	endanim
+; 0xd15e0
--- a/gfx/pokemon/elekid/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 07
-	setrepeat 7
-	frame 2, 03
-	frame 1, 03
-	dorepeat 2
-	setrepeat 4
-	frame 4, 03
-	frame 3, 03
-	dorepeat 6
-	endanim
-; 0xd15e0
--- a/gfx/pokemon/elekid/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 5, 09
-	frame 3, 09
-	dorepeat 1
-	frame 3, 20
-	endanim
-; 0xd21a6
--- /dev/null
+++ b/gfx/pokemon/elekid/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 5, 09
+	frame 3, 09
+	dorepeat 1
+	frame 3, 20
+	endanim
+; 0xd21a6
--- /dev/null
+++ b/gfx/pokemon/entei/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 04
+	frame 1, 10
+	frame 2, 12
+	frame 3, 30
+	endanim
+; 0xd161d
--- a/gfx/pokemon/entei/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 12
-	frame 3, 30
-	endanim
-; 0xd161d
--- a/gfx/pokemon/entei/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd21d7
--- /dev/null
+++ b/gfx/pokemon/entei/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd21d7
--- /dev/null
+++ b/gfx/pokemon/espeon/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 08
+	frame 1, 26
+	setrepeat 2
+	frame 0, 07
+	frame 2, 07
+	frame 3, 07
+	dorepeat 3
+	endanim
+; 0xd13af
--- a/gfx/pokemon/espeon/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 08
-	frame 1, 26
-	setrepeat 2
-	frame 0, 07
-	frame 2, 07
-	frame 3, 07
-	dorepeat 3
-	endanim
-; 0xd13af
--- a/gfx/pokemon/espeon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd203d
--- /dev/null
+++ b/gfx/pokemon/espeon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd203d
--- /dev/null
+++ b/gfx/pokemon/exeggcute/anim.asm
@@ -1,0 +1,17 @@
+	frame 0, 08
+	setrepeat 2
+	frame 1, 04
+	frame 2, 04
+	dorepeat 2
+	frame 0, 01
+	setrepeat 3
+	frame 1, 03
+	frame 2, 03
+	dorepeat 7
+	frame 0, 01
+	frame 1, 04
+	frame 2, 04
+	frame 0, 08
+	frame 3, 08
+	endanim
+; 0xd0e7b
--- a/gfx/pokemon/exeggcute/anim0.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-	frame 0, 08
-	setrepeat 2
-	frame 1, 04
-	frame 2, 04
-	dorepeat 2
-	frame 0, 01
-	setrepeat 3
-	frame 1, 03
-	frame 2, 03
-	dorepeat 7
-	frame 0, 01
-	frame 1, 04
-	frame 2, 04
-	frame 0, 08
-	frame 3, 08
-	endanim
-; 0xd0e7b
--- a/gfx/pokemon/exeggcute/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1cb1
--- /dev/null
+++ b/gfx/pokemon/exeggcute/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1cb1
--- /dev/null
+++ b/gfx/pokemon/exeggutor/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 07
+	frame 0, 07
+	frame 1, 07
+	setrepeat 3
+	frame 2, 06
+	frame 0, 06
+	dorepeat 4
+	endanim
+; 0xd0e8a
--- a/gfx/pokemon/exeggutor/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 07
-	frame 0, 07
-	frame 1, 07
-	setrepeat 3
-	frame 2, 06
-	frame 0, 06
-	dorepeat 4
-	endanim
-; 0xd0e8a
--- a/gfx/pokemon/exeggutor/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 4
-	frame 0, 06
-	frame 1, 06
-	dorepeat 1
-	endanim
-; 0xd1cba
--- /dev/null
+++ b/gfx/pokemon/exeggutor/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 4
+	frame 0, 06
+	frame 1, 06
+	dorepeat 1
+	endanim
+; 0xd1cba
--- a/gfx/pokemon/extra_pointers.asm
+++ /dev/null
@@ -1,252 +1,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
--- a/gfx/pokemon/extras.asm
+++ /dev/null
@@ -1,252 +1,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"
--- /dev/null
+++ b/gfx/pokemon/farfetch_d/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 06
+	frame 2, 06
+	frame 3, 14
+	frame 2, 06
+	endanim
+; 0xd0d7a
--- a/gfx/pokemon/farfetch_d/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 06
-	frame 2, 06
-	frame 3, 14
-	frame 2, 06
-	endanim
-; 0xd0d7a
--- a/gfx/pokemon/farfetch_d/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 4, 10
-	frame 5, 07
-	frame 4, 07
-	endanim
-; 0xd1bfa
--- /dev/null
+++ b/gfx/pokemon/farfetch_d/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 4, 10
+	frame 5, 07
+	frame 4, 07
+	endanim
+; 0xd1bfa
--- /dev/null
+++ b/gfx/pokemon/fearow/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 02
+	setrepeat 3
+	frame 1, 08
+	frame 3, 10
+	frame 2, 06
+	dorepeat 2
+	endanim
+; 0xd09c3
--- a/gfx/pokemon/fearow/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 02
-	setrepeat 3
-	frame 1, 08
-	frame 3, 10
-	frame 2, 06
-	dorepeat 2
-	endanim
-; 0xd09c3
--- a/gfx/pokemon/fearow/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 4, 05
-	frame 0, 05
-	dorepeat 1
-	endanim
-; 0xd198f
--- /dev/null
+++ b/gfx/pokemon/fearow/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 4, 05
+	frame 0, 05
+	dorepeat 1
+	endanim
+; 0xd198f
--- /dev/null
+++ b/gfx/pokemon/feraligatr/anim.asm
@@ -1,0 +1,7 @@
+	frame 0, 04
+	frame 1, 10
+	frame 2, 16
+	frame 3, 36
+	frame 2, 12
+	endanim
+; 0xd11dd
--- a/gfx/pokemon/feraligatr/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 16
-	frame 3, 36
-	frame 2, 12
-	endanim
-; 0xd11dd
--- a/gfx/pokemon/feraligatr/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1ee9
--- /dev/null
+++ b/gfx/pokemon/feraligatr/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1ee9
--- /dev/null
+++ b/gfx/pokemon/flaaffy/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 06
+	setrepeat 5
+	frame 3, 02
+	frame 2, 02
+	dorepeat 2
+	frame 3, 18
+	endanim
+; 0xd12e9
--- a/gfx/pokemon/flaaffy/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 06
-	setrepeat 5
-	frame 3, 02
-	frame 2, 02
-	dorepeat 2
-	frame 3, 18
-	endanim
-; 0xd12e9
--- a/gfx/pokemon/flaaffy/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd1fab
--- /dev/null
+++ b/gfx/pokemon/flaaffy/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd1fab
--- /dev/null
+++ b/gfx/pokemon/flareon/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	setrepeat 3
+	frame 2, 08
+	frame 3, 08
+	dorepeat 2
+	endanim
+; 0xd105f
--- a/gfx/pokemon/flareon/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	setrepeat 3
-	frame 2, 08
-	frame 3, 08
-	dorepeat 2
-	endanim
-; 0xd105f
--- a/gfx/pokemon/flareon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1df1
--- /dev/null
+++ b/gfx/pokemon/flareon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1df1
--- /dev/null
+++ b/gfx/pokemon/forretress/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 08
+	frame 2, 16
+	setrepeat 2
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	dorepeat 3
+	frame 2, 25
+	frame 1, 08
+	endanim
+; 0xd1434
--- a/gfx/pokemon/forretress/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 08
-	frame 2, 16
-	setrepeat 2
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	dorepeat 3
-	frame 2, 25
-	frame 1, 08
-	endanim
-; 0xd1434
--- a/gfx/pokemon/forretress/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 5, 06
-	dorepeat 1
-	endanim
-; 0xd2080
--- /dev/null
+++ b/gfx/pokemon/forretress/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 5, 06
+	dorepeat 1
+	endanim
+; 0xd2080
--- /dev/null
+++ b/gfx/pokemon/furret/anim.asm
@@ -1,0 +1,8 @@
+	frame 3, 22
+	setrepeat 2
+	frame 0, 08
+	frame 1, 08
+	frame 2, 08
+	dorepeat 2
+	endanim
+; 0xd11f3
--- a/gfx/pokemon/furret/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 3, 22
-	setrepeat 2
-	frame 0, 08
-	frame 1, 08
-	frame 2, 08
-	dorepeat 2
-	endanim
-; 0xd11f3
--- a/gfx/pokemon/furret/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1efb
--- /dev/null
+++ b/gfx/pokemon/furret/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1efb
--- /dev/null
+++ b/gfx/pokemon/gastly/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 04
+	frame 1, 18
+	frame 2, 24
+	frame 1, 18
+	frame 0, 12
+	frame 1, 12
+	endanim
+; 0xd0ddd
--- a/gfx/pokemon/gastly/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 04
-	frame 1, 18
-	frame 2, 24
-	frame 1, 18
-	frame 0, 12
-	frame 1, 12
-	endanim
-; 0xd0ddd
--- a/gfx/pokemon/gastly/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1c57
--- /dev/null
+++ b/gfx/pokemon/gastly/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1c57
--- /dev/null
+++ b/gfx/pokemon/gengar/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 06
+	frame 4, 07
+	frame 2, 50
+	setrepeat 3
+	frame 0, 09
+	frame 3, 09
+	dorepeat 4
+	endanim
+; 0xd0df7
--- a/gfx/pokemon/gengar/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 06
-	frame 4, 07
-	frame 2, 50
-	setrepeat 3
-	frame 0, 09
-	frame 3, 09
-	dorepeat 4
-	endanim
-; 0xd0df7
--- a/gfx/pokemon/gengar/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 2
-	frame 5, 02
-	frame 0, 02
-	dorepeat 1
-	frame 5, 09
-	frame 6, 09
-	frame 5, 09
-	endanim
-; 0xd1c69
--- /dev/null
+++ b/gfx/pokemon/gengar/anim_idle.asm
@@ -1,0 +1,9 @@
+	setrepeat 2
+	frame 5, 02
+	frame 0, 02
+	dorepeat 1
+	frame 5, 09
+	frame 6, 09
+	frame 5, 09
+	endanim
+; 0xd1c69
--- /dev/null
+++ b/gfx/pokemon/geodude/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 16
+	setrepeat 3
+	frame 2, 07
+	frame 1, 07
+	dorepeat 3
+	endanim
+; 0xd0ceb
--- a/gfx/pokemon/geodude/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 16
-	setrepeat 3
-	frame 2, 07
-	frame 1, 07
-	dorepeat 3
-	endanim
-; 0xd0ceb
--- a/gfx/pokemon/geodude/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1ba9
--- /dev/null
+++ b/gfx/pokemon/geodude/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1ba9
--- /dev/null
+++ b/gfx/pokemon/girafarig/anim.asm
@@ -1,0 +1,14 @@
+	frame 1, 15
+	frame 4, 04
+	setrepeat 2
+	frame 1, 05
+	frame 2, 05
+	dorepeat 3
+	setrepeat 3
+	frame 1, 05
+	frame 4, 05
+	dorepeat 7
+	frame 5, 05
+	frame 3, 05
+	endanim
+; 0xd141c
--- a/gfx/pokemon/girafarig/anim0.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-	frame 1, 15
-	frame 4, 04
-	setrepeat 2
-	frame 1, 05
-	frame 2, 05
-	dorepeat 3
-	setrepeat 3
-	frame 1, 05
-	frame 4, 05
-	dorepeat 7
-	frame 5, 05
-	frame 3, 05
-	endanim
-; 0xd141c
--- a/gfx/pokemon/girafarig/anim1.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 5, 16
-	frame 3, 16
-	endanim
-; 0xd206e
--- /dev/null
+++ b/gfx/pokemon/girafarig/anim_idle.asm
@@ -1,0 +1,4 @@
+	frame 5, 16
+	frame 3, 16
+	endanim
+; 0xd206e
--- /dev/null
+++ b/gfx/pokemon/gligar/anim.asm
@@ -1,0 +1,3 @@
+	frame 1, 35
+	endanim
+; 0xd1444
--- a/gfx/pokemon/gligar/anim0.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 1, 35
-	endanim
-; 0xd1444
--- a/gfx/pokemon/gligar/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 1, 35
-	endanim
-; 0xd208c
--- /dev/null
+++ b/gfx/pokemon/gligar/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 1, 35
+	endanim
+; 0xd208c
--- /dev/null
+++ b/gfx/pokemon/gloom/anim.asm
@@ -1,0 +1,12 @@
+	frame 0, 04
+	frame 1, 10
+	frame 2, 14
+	frame 3, 20
+	frame 2, 10
+	frame 3, 08
+	frame 4, 07
+	frame 5, 07
+	frame 0, 06
+	frame 5, 06
+	endanim
+; 0xd0b35
--- a/gfx/pokemon/gloom/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 14
-	frame 3, 20
-	frame 2, 10
-	frame 3, 08
-	frame 4, 07
-	frame 5, 07
-	frame 0, 06
-	frame 5, 06
-	endanim
-; 0xd0b35
--- a/gfx/pokemon/gloom/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 5, 10
-	dorepeat 1
-	endanim
-; 0xd1a75
--- /dev/null
+++ b/gfx/pokemon/gloom/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 5, 10
+	dorepeat 1
+	endanim
+; 0xd1a75
--- /dev/null
+++ b/gfx/pokemon/golbat/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 08
+	setrepeat 2
+	frame 2, 09
+	frame 3, 09
+	dorepeat 2
+	setrepeat 3
+	frame 3, 08
+	frame 1, 08
+	dorepeat 6
+	endanim
+; 0xd0b0d
--- a/gfx/pokemon/golbat/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 08
-	setrepeat 2
-	frame 2, 09
-	frame 3, 09
-	dorepeat 2
-	setrepeat 3
-	frame 3, 08
-	frame 1, 08
-	dorepeat 6
-	endanim
-; 0xd0b0d
--- a/gfx/pokemon/golbat/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1a63
--- /dev/null
+++ b/gfx/pokemon/golbat/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1a63
--- /dev/null
+++ b/gfx/pokemon/goldeen/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 30
+	frame 0, 16
+	setrepeat 4
+	frame 2, 12
+	frame 0, 12
+	dorepeat 3
+	endanim
+; 0xd0f61
--- a/gfx/pokemon/goldeen/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 30
-	frame 0, 16
-	setrepeat 4
-	frame 2, 12
-	frame 0, 12
-	dorepeat 3
-	endanim
-; 0xd0f61
--- a/gfx/pokemon/goldeen/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd1d49
--- /dev/null
+++ b/gfx/pokemon/goldeen/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd1d49
--- /dev/null
+++ b/gfx/pokemon/golduck/anim.asm
@@ -1,0 +1,13 @@
+	frame 1, 07
+	frame 2, 15
+	setrepeat 2
+	frame 3, 08
+	frame 4, 05
+	dorepeat 3
+	frame 5, 13
+	setrepeat 3
+	frame 5, 10
+	frame 6, 10
+	dorepeat 8
+	endanim
+; 0xd0bf4
--- a/gfx/pokemon/golduck/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 1, 07
-	frame 2, 15
-	setrepeat 2
-	frame 3, 08
-	frame 4, 05
-	dorepeat 3
-	frame 5, 13
-	setrepeat 3
-	frame 5, 10
-	frame 6, 10
-	dorepeat 8
-	endanim
-; 0xd0bf4
--- a/gfx/pokemon/golduck/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 7, 15
-	dorepeat 1
-	endanim
-; 0xd1ae2
--- /dev/null
+++ b/gfx/pokemon/golduck/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 7, 15
+	dorepeat 1
+	endanim
+; 0xd1ae2
--- /dev/null
+++ b/gfx/pokemon/golem/anim.asm
@@ -1,0 +1,7 @@
+	frame 0, 08
+	frame 1, 12
+	frame 2, 18
+	frame 1, 12
+	frame 3, 12
+	endanim
+; 0xd0d07
--- a/gfx/pokemon/golem/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 0, 08
-	frame 1, 12
-	frame 2, 18
-	frame 1, 12
-	frame 3, 12
-	endanim
-; 0xd0d07
--- a/gfx/pokemon/golem/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1bbd
--- /dev/null
+++ b/gfx/pokemon/golem/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1bbd
--- /dev/null
+++ b/gfx/pokemon/granbull/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 32
+	frame 0, 16
+	setrepeat 2
+	frame 1, 07
+	frame 0, 07
+	dorepeat 3
+	endanim
+; 0xd146f
--- a/gfx/pokemon/granbull/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 32
-	frame 0, 16
-	setrepeat 2
-	frame 1, 07
-	frame 0, 07
-	dorepeat 3
-	endanim
-; 0xd146f
--- a/gfx/pokemon/granbull/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	dorepeat 1
-	endanim
-; 0xd20a7
--- /dev/null
+++ b/gfx/pokemon/granbull/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	dorepeat 1
+	endanim
+; 0xd20a7
--- /dev/null
+++ b/gfx/pokemon/graveler/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 12
+	frame 2, 12
+	frame 3, 17
+	frame 0, 15
+	setrepeat 2
+	frame 0, 09
+	frame 4, 09
+	dorepeat 5
+	endanim
+; 0xd0cfc
--- a/gfx/pokemon/graveler/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 12
-	frame 2, 12
-	frame 3, 17
-	frame 0, 15
-	setrepeat 2
-	frame 0, 09
-	frame 4, 09
-	dorepeat 5
-	endanim
-; 0xd0cfc
--- a/gfx/pokemon/graveler/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 2, 35
-	setrepeat 2
-	frame 0, 20
-	frame 5, 20
-	dorepeat 2
-	endanim
-; 0xd1bb4
--- /dev/null
+++ b/gfx/pokemon/graveler/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 2, 35
+	setrepeat 2
+	frame 0, 20
+	frame 5, 20
+	dorepeat 2
+	endanim
+; 0xd1bb4
--- /dev/null
+++ b/gfx/pokemon/grimer/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 04
+	frame 2, 12
+	frame 1, 08
+	frame 2, 28
+	endanim
+; 0xd0db3
--- a/gfx/pokemon/grimer/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 04
-	frame 2, 12
-	frame 1, 08
-	frame 2, 28
-	endanim
-; 0xd0db3
--- a/gfx/pokemon/grimer/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 3, 04
-	setrepeat 2
-	frame 1, 08
-	frame 4, 08
-	dorepeat 2
-	frame 2, 16
-	endanim
-; 0xd1c37
--- /dev/null
+++ b/gfx/pokemon/grimer/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 3, 04
+	setrepeat 2
+	frame 1, 08
+	frame 4, 08
+	dorepeat 2
+	frame 2, 16
+	endanim
+; 0xd1c37
--- /dev/null
+++ b/gfx/pokemon/growlithe/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 08
+	frame 2, 10
+	frame 0, 18
+	setrepeat 3
+	frame 1, 08
+	frame 2, 08
+	dorepeat 4
+	endanim
+; 0xd0c1b
--- a/gfx/pokemon/growlithe/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 08
-	frame 2, 10
-	frame 0, 18
-	setrepeat 3
-	frame 1, 08
-	frame 2, 08
-	dorepeat 4
-	endanim
-; 0xd0c1b
--- a/gfx/pokemon/growlithe/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 2, 08
-	frame 3, 08
-	dorepeat 1
-	frame 2, 16
-	endanim
-; 0xd1b03
--- /dev/null
+++ b/gfx/pokemon/growlithe/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 2, 08
+	frame 3, 08
+	dorepeat 1
+	frame 2, 16
+	endanim
+; 0xd1b03
--- /dev/null
+++ b/gfx/pokemon/gyarados/anim.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 1, 11
+	frame 2, 11
+	dorepeat 1
+	endanim
+; 0xd100b
--- a/gfx/pokemon/gyarados/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 1, 11
-	frame 2, 11
-	dorepeat 1
-	endanim
-; 0xd100b
--- a/gfx/pokemon/gyarados/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1db7
--- /dev/null
+++ b/gfx/pokemon/gyarados/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1db7
--- /dev/null
+++ b/gfx/pokemon/haunter/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	frame 2, 10
+	frame 3, 44
+	frame 2, 10
+	frame 1, 10
+	endanim
+; 0xd0de8
--- a/gfx/pokemon/haunter/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 3, 44
-	frame 2, 10
-	frame 1, 10
-	endanim
-; 0xd0de8
--- a/gfx/pokemon/haunter/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 4, 58
-	endanim
-; 0xd1c5a
--- /dev/null
+++ b/gfx/pokemon/haunter/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 4, 58
+	endanim
+; 0xd1c5a
--- /dev/null
+++ b/gfx/pokemon/heracross/anim.asm
@@ -1,0 +1,5 @@
+	frame 0, 06
+	frame 1, 20
+	frame 2, 18
+	endanim
+; 0xd14a5
--- a/gfx/pokemon/heracross/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 0, 06
-	frame 1, 20
-	frame 2, 18
-	endanim
-; 0xd14a5
--- a/gfx/pokemon/heracross/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd20cb
--- /dev/null
+++ b/gfx/pokemon/heracross/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd20cb
--- /dev/null
+++ b/gfx/pokemon/hitmonchan/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 20
+	setrepeat 3
+	frame 1, 06
+	frame 2, 06
+	dorepeat 2
+	frame 1, 15
+	frame 3, 06
+	frame 1, 40
+	frame 2, 10
+	endanim
+; 0xd0eda
--- a/gfx/pokemon/hitmonchan/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 20
-	setrepeat 3
-	frame 1, 06
-	frame 2, 06
-	dorepeat 2
-	frame 1, 15
-	frame 3, 06
-	frame 1, 40
-	frame 2, 10
-	endanim
-; 0xd0eda
--- a/gfx/pokemon/hitmonchan/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 40
-	setrepeat 4
-	frame 5, 09
-	frame 4, 09
-	dorepeat 2
-	frame 4, 20
-	endanim
-; 0xd1ce2
--- /dev/null
+++ b/gfx/pokemon/hitmonchan/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 1, 40
+	setrepeat 4
+	frame 5, 09
+	frame 4, 09
+	dorepeat 2
+	frame 4, 20
+	endanim
+; 0xd1ce2
--- /dev/null
+++ b/gfx/pokemon/hitmonlee/anim.asm
@@ -1,0 +1,13 @@
+	frame 0, 04
+	frame 5, 24
+	frame 1, 12
+	frame 2, 06
+	frame 3, 10
+	frame 4, 06
+	frame 1, 05
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	frame 1, 08
+	endanim
+; 0xd0ec7
--- a/gfx/pokemon/hitmonlee/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 0, 04
-	frame 5, 24
-	frame 1, 12
-	frame 2, 06
-	frame 3, 10
-	frame 4, 06
-	frame 1, 05
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	frame 1, 08
-	endanim
-; 0xd0ec7
--- a/gfx/pokemon/hitmonlee/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd1cd5
--- /dev/null
+++ b/gfx/pokemon/hitmonlee/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd1cd5
--- /dev/null
+++ b/gfx/pokemon/hitmontop/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 12
+	frame 4, 05
+	setrepeat 4
+	frame 2, 08
+	frame 3, 08
+	dorepeat 3
+	frame 4, 25
+	endanim
+; 0xd15c6
--- a/gfx/pokemon/hitmontop/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 12
-	frame 4, 05
-	setrepeat 4
-	frame 2, 08
-	frame 3, 08
-	dorepeat 3
-	frame 4, 25
-	endanim
-; 0xd15c6
--- a/gfx/pokemon/hitmontop/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 4, 08
-	frame 0, 08
-	dorepeat 1
-	frame 4, 30
-	endanim
-; 0xd2192
--- /dev/null
+++ b/gfx/pokemon/hitmontop/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 4, 08
+	frame 0, 08
+	dorepeat 1
+	frame 4, 30
+	endanim
+; 0xd2192
--- /dev/null
+++ b/gfx/pokemon/ho_oh/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 04
+	frame 1, 08
+	frame 2, 12
+	setrepeat 5
+	frame 0, 05
+	frame 3, 05
+	dorepeat 4
+	frame 0, 06
+	frame 4, 12
+	endanim
+; 0xd1679
--- a/gfx/pokemon/ho_oh/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 04
-	frame 1, 08
-	frame 2, 12
-	setrepeat 5
-	frame 0, 05
-	frame 3, 05
-	dorepeat 4
-	frame 0, 06
-	frame 4, 12
-	endanim
-; 0xd1679
--- a/gfx/pokemon/ho_oh/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd2215
--- /dev/null
+++ b/gfx/pokemon/ho_oh/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd2215
--- /dev/null
+++ b/gfx/pokemon/hoothoot/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 15
+	frame 2, 04
+	frame 3, 07
+	frame 4, 07
+	frame 3, 07
+	frame 4, 07
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 7
+	endanim
+; 0xd1208
--- a/gfx/pokemon/hoothoot/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 15
-	frame 2, 04
-	frame 3, 07
-	frame 4, 07
-	frame 3, 07
-	frame 4, 07
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 7
-	endanim
-; 0xd1208
--- a/gfx/pokemon/hoothoot/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	frame 0, 13
-	frame 5, 05
-	endanim
-; 0xd1f08
--- /dev/null
+++ b/gfx/pokemon/hoothoot/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	frame 0, 13
+	frame 5, 05
+	endanim
+; 0xd1f08
--- /dev/null
+++ b/gfx/pokemon/hoppip/anim.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 1, 10
+	frame 2, 10
+	dorepeat 1
+	endanim
+; 0xd134e
--- a/gfx/pokemon/hoppip/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 1, 10
-	frame 2, 10
-	dorepeat 1
-	endanim
-; 0xd134e
--- a/gfx/pokemon/hoppip/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 2, 10
-	dorepeat 1
-	frame 2, 20
-	endanim
-; 0xd1ff0
--- /dev/null
+++ b/gfx/pokemon/hoppip/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 10
+	frame 2, 10
+	dorepeat 1
+	frame 2, 20
+	endanim
+; 0xd1ff0
--- /dev/null
+++ b/gfx/pokemon/horsea/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 16
+	frame 2, 24
+	setrepeat 3
+	frame 0, 03
+	frame 3, 03
+	dorepeat 3
+	endanim
+; 0xd0f49
--- a/gfx/pokemon/horsea/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 16
-	frame 2, 24
-	setrepeat 3
-	frame 0, 03
-	frame 3, 03
-	dorepeat 3
-	endanim
-; 0xd0f49
--- a/gfx/pokemon/horsea/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1d35
--- /dev/null
+++ b/gfx/pokemon/horsea/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1d35
--- /dev/null
+++ b/gfx/pokemon/houndoom/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 11
+	setrepeat 9
+	frame 2, 02
+	frame 3, 02
+	dorepeat 2
+	frame 2, 04
+	frame 3, 04
+	frame 4, 08
+	endanim
+; 0xd1560
--- a/gfx/pokemon/houndoom/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 11
-	setrepeat 9
-	frame 2, 02
-	frame 3, 02
-	dorepeat 2
-	frame 2, 04
-	frame 3, 04
-	frame 4, 08
-	endanim
-; 0xd1560
--- a/gfx/pokemon/houndoom/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 12
-	frame 5, 12
-	dorepeat 1
-	endanim
-; 0xd214e
--- /dev/null
+++ b/gfx/pokemon/houndoom/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 12
+	frame 5, 12
+	dorepeat 1
+	endanim
+; 0xd214e
--- /dev/null
+++ b/gfx/pokemon/houndour/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 05
+	frame 2, 05
+	frame 1, 05
+	frame 0, 07
+	frame 3, 07
+	endanim
+; 0xd154f
--- a/gfx/pokemon/houndour/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 05
-	frame 2, 05
-	frame 1, 05
-	frame 0, 07
-	frame 3, 07
-	endanim
-; 0xd154f
--- a/gfx/pokemon/houndour/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	setrepeat 2
-	frame 3, 07
-	frame 4, 07
-	dorepeat 2
-	frame 3, 16
-	endanim
-; 0xd2145
--- /dev/null
+++ b/gfx/pokemon/houndour/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	setrepeat 2
+	frame 3, 07
+	frame 4, 07
+	dorepeat 2
+	frame 3, 16
+	endanim
+; 0xd2145
--- /dev/null
+++ b/gfx/pokemon/hypno/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 1, 15
+	frame 2, 15
+	frame 3, 15
+	dorepeat 1
+	endanim
+; 0xd0e26
--- a/gfx/pokemon/hypno/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 1, 15
-	frame 2, 15
-	frame 3, 15
-	dorepeat 1
-	endanim
-; 0xd0e26
--- a/gfx/pokemon/hypno/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1c8a
--- /dev/null
+++ b/gfx/pokemon/hypno/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1c8a
--- /dev/null
+++ b/gfx/pokemon/idle_pointers.asm
@@ -1,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
--- /dev/null
+++ b/gfx/pokemon/idles.asm
@@ -1,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"
--- /dev/null
+++ b/gfx/pokemon/igglybuff/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 04
+	frame 1, 08
+	frame 2, 14
+	frame 1, 06
+	endanim
+; 0xd1299
--- a/gfx/pokemon/igglybuff/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 04
-	frame 1, 08
-	frame 2, 14
-	frame 1, 06
-	endanim
-; 0xd1299
--- a/gfx/pokemon/igglybuff/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1f71
--- /dev/null
+++ b/gfx/pokemon/igglybuff/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1f71
--- /dev/null
+++ b/gfx/pokemon/ivysaur/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 1, 08
+	frame 2, 20
+	frame 1, 06
+	endanim
+; 0xd08a5
--- a/gfx/pokemon/ivysaur/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 1, 08
-	frame 2, 20
-	frame 1, 06
-	endanim
-; 0xd08a5
--- a/gfx/pokemon/ivysaur/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	frame 0, 08
-	frame 1, 06
-	endanim
-; 0xd18ad
--- /dev/null
+++ b/gfx/pokemon/ivysaur/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	frame 0, 08
+	frame 1, 06
+	endanim
+; 0xd18ad
--- /dev/null
+++ b/gfx/pokemon/jigglypuff/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 14
+	frame 2, 09
+	frame 3, 09
+	frame 2, 06
+	frame 4, 20
+	setrepeat 2
+	frame 3, 05
+	frame 4, 05
+	dorepeat 6
+	endanim
+; 0xd0ade
--- a/gfx/pokemon/jigglypuff/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 14
-	frame 2, 09
-	frame 3, 09
-	frame 2, 06
-	frame 4, 20
-	setrepeat 2
-	frame 3, 05
-	frame 4, 05
-	dorepeat 6
-	endanim
-; 0xd0ade
--- a/gfx/pokemon/jigglypuff/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd1a46
--- /dev/null
+++ b/gfx/pokemon/jigglypuff/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd1a46
--- /dev/null
+++ b/gfx/pokemon/jolteon/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 05
+	frame 2, 38
+	frame 1, 08
+	frame 0, 20
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 5
+	endanim
+; 0xd1054
--- a/gfx/pokemon/jolteon/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 05
-	frame 2, 38
-	frame 1, 08
-	frame 0, 20
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 5
-	endanim
-; 0xd1054
--- a/gfx/pokemon/jolteon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1de8
--- /dev/null
+++ b/gfx/pokemon/jolteon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1de8
--- /dev/null
+++ b/gfx/pokemon/jumpluff/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 09
+	frame 2, 09
+	frame 3, 09
+	endanim
+; 0xd135e
--- a/gfx/pokemon/jumpluff/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 09
-	frame 2, 09
-	frame 3, 09
-	endanim
-; 0xd135e
--- a/gfx/pokemon/jumpluff/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd2002
--- /dev/null
+++ b/gfx/pokemon/jumpluff/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd2002
--- /dev/null
+++ b/gfx/pokemon/jynx/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 16
+	frame 1, 16
+	frame 2, 16
+	frame 1, 16
+	dorepeat 1
+	endanim
+; 0xd0fb5
--- a/gfx/pokemon/jynx/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 16
-	frame 1, 16
-	frame 2, 16
-	frame 1, 16
-	dorepeat 1
-	endanim
-; 0xd0fb5
--- a/gfx/pokemon/jynx/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1d81
--- /dev/null
+++ b/gfx/pokemon/jynx/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1d81
--- /dev/null
+++ b/gfx/pokemon/kabuto/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 2, 12
+	frame 1, 16
+	frame 2, 12
+	endanim
+; 0xd1085
--- a/gfx/pokemon/kabuto/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 2, 12
-	frame 1, 16
-	frame 2, 12
-	endanim
-; 0xd1085
--- a/gfx/pokemon/kabuto/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	frame 0, 18
-	frame 3, 04
-	endanim
-; 0xd1e19
--- /dev/null
+++ b/gfx/pokemon/kabuto/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	frame 0, 18
+	frame 3, 04
+	endanim
+; 0xd1e19
--- /dev/null
+++ b/gfx/pokemon/kabutops/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 40
+	setrepeat 2
+	frame 1, 05
+	frame 2, 05
+	dorepeat 2
+	frame 1, 25
+	endanim
+; 0xd1092
--- a/gfx/pokemon/kabutops/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 40
-	setrepeat 2
-	frame 1, 05
-	frame 2, 05
-	dorepeat 2
-	frame 1, 25
-	endanim
-; 0xd1092
--- a/gfx/pokemon/kabutops/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1e22
--- /dev/null
+++ b/gfx/pokemon/kabutops/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1e22
--- /dev/null
+++ b/gfx/pokemon/kadabra/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 08
+	setrepeat 4
+	frame 2, 06
+	frame 3, 06
+	dorepeat 2
+	frame 1, 12
+	endanim
+; 0xd0c67
--- a/gfx/pokemon/kadabra/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 08
-	setrepeat 4
-	frame 2, 06
-	frame 3, 06
-	dorepeat 2
-	frame 1, 12
-	endanim
-; 0xd0c67
--- a/gfx/pokemon/kadabra/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd1b41
--- /dev/null
+++ b/gfx/pokemon/kadabra/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd1b41
--- /dev/null
+++ b/gfx/pokemon/kakuna/anim.asm
@@ -1,0 +1,4 @@
+	frame 0, 12
+	frame 1, 24
+	endanim
+; 0xd093f
--- a/gfx/pokemon/kakuna/anim0.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 0, 12
-	frame 1, 24
-	endanim
-; 0xd093f
--- a/gfx/pokemon/kakuna/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd192b
--- /dev/null
+++ b/gfx/pokemon/kakuna/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd192b
--- /dev/null
+++ b/gfx/pokemon/kangaskhan/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 30
+	frame 5, 10
+	frame 2, 12
+	frame 3, 09
+	frame 4, 09
+	frame 3, 09
+	frame 4, 15
+	endanim
+; 0xd0f3c
--- a/gfx/pokemon/kangaskhan/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 30
-	frame 5, 10
-	frame 2, 12
-	frame 3, 09
-	frame 4, 09
-	frame 3, 09
-	frame 4, 15
-	endanim
-; 0xd0f3c
--- a/gfx/pokemon/kangaskhan/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 6, 06
-	dorepeat 1
-	frame 0, 15
-	frame 4, 25
-	endanim
-; 0xd1d2c
--- /dev/null
+++ b/gfx/pokemon/kangaskhan/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 1
+	frame 0, 15
+	frame 4, 25
+	endanim
+; 0xd1d2c
--- /dev/null
+++ b/gfx/pokemon/kingdra/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 12
+	frame 2, 12
+	frame 3, 12
+	frame 0, 12
+	setrepeat 3
+	frame 4, 06
+	frame 5, 06
+	dorepeat 5
+	endanim
+; 0xd1571
--- a/gfx/pokemon/kingdra/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	frame 0, 12
-	setrepeat 3
-	frame 4, 06
-	frame 5, 06
-	dorepeat 5
-	endanim
-; 0xd1571
--- a/gfx/pokemon/kingdra/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 6, 06
-	dorepeat 1
-	endanim
-; 0xd2157
--- /dev/null
+++ b/gfx/pokemon/kingdra/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 1
+	endanim
+; 0xd2157
--- /dev/null
+++ b/gfx/pokemon/kingler/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 1, 11
+	frame 2, 11
+	dorepeat 1
+	frame 0, 11
+	frame 2, 11
+	frame 0, 15
+	frame 2, 15
+	endanim
+; 0xd0e4a
--- a/gfx/pokemon/kingler/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 1, 11
-	frame 2, 11
-	dorepeat 1
-	frame 0, 11
-	frame 2, 11
-	frame 0, 15
-	frame 2, 15
-	endanim
-; 0xd0e4a
--- a/gfx/pokemon/kingler/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 4
-	frame 0, 10
-	frame 3, 10
-	dorepeat 1
-	endanim
-; 0xd1c9a
--- /dev/null
+++ b/gfx/pokemon/kingler/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 4
+	frame 0, 10
+	frame 3, 10
+	dorepeat 1
+	endanim
+; 0xd1c9a
--- /dev/null
+++ b/gfx/pokemon/koffing/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 20
+	frame 2, 06
+	frame 3, 05
+	frame 4, 10
+	frame 5, 15
+	endanim
+; 0xd0ef0
--- a/gfx/pokemon/koffing/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 20
-	frame 2, 06
-	frame 3, 05
-	frame 4, 10
-	frame 5, 15
-	endanim
-; 0xd0ef0
--- a/gfx/pokemon/koffing/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 5, 48
-	endanim
-; 0xd1cee
--- /dev/null
+++ b/gfx/pokemon/koffing/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 5, 48
+	endanim
+; 0xd1cee
--- /dev/null
+++ b/gfx/pokemon/krabby/anim.asm
@@ -1,0 +1,11 @@
+	frame 5, 18
+	frame 0, 06
+	setrepeat 2
+	frame 0, 06
+	frame 1, 04
+	frame 2, 03
+	frame 3, 04
+	frame 4, 03
+	dorepeat 3
+	endanim
+; 0xd0e39
--- a/gfx/pokemon/krabby/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 5, 18
-	frame 0, 06
-	setrepeat 2
-	frame 0, 06
-	frame 1, 04
-	frame 2, 03
-	frame 3, 04
-	frame 4, 03
-	dorepeat 3
-	endanim
-; 0xd0e39
--- a/gfx/pokemon/krabby/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 0, 06
-	frame 7, 06
-	dorepeat 3
-	endanim
-; 0xd1c91
--- /dev/null
+++ b/gfx/pokemon/krabby/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 0, 06
+	frame 7, 06
+	dorepeat 3
+	endanim
+; 0xd1c91
--- /dev/null
+++ b/gfx/pokemon/lanturn/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 12
+	frame 2, 12
+	frame 3, 12
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 4
+	endanim
+; 0xd1280
--- a/gfx/pokemon/lanturn/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 4
-	endanim
-; 0xd1280
--- a/gfx/pokemon/lanturn/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1f56
--- /dev/null
+++ b/gfx/pokemon/lanturn/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1f56
--- /dev/null
+++ b/gfx/pokemon/lapras/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	frame 2, 07
+	frame 3, 40
+	frame 2, 09
+	frame 1, 10
+	endanim
+; 0xd1016
--- a/gfx/pokemon/lapras/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	frame 2, 07
-	frame 3, 40
-	frame 2, 09
-	frame 1, 10
-	endanim
-; 0xd1016
--- a/gfx/pokemon/lapras/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 4, 10
-	frame 5, 30
-	frame 0, 12
-	frame 5, 12
-	endanim
-; 0xd1dc0
--- /dev/null
+++ b/gfx/pokemon/lapras/anim_idle.asm
@@ -1,0 +1,6 @@
+	frame 4, 10
+	frame 5, 30
+	frame 0, 12
+	frame 5, 12
+	endanim
+; 0xd1dc0
--- /dev/null
+++ b/gfx/pokemon/larvitar/anim.asm
@@ -1,0 +1,6 @@
+	frame 3, 12
+	frame 1, 12
+	frame 2, 28
+	frame 3, 08
+	endanim
+; 0xd163d
--- a/gfx/pokemon/larvitar/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 3, 12
-	frame 1, 12
-	frame 2, 28
-	frame 3, 08
-	endanim
-; 0xd163d
--- a/gfx/pokemon/larvitar/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd21eb
--- /dev/null
+++ b/gfx/pokemon/larvitar/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd21eb
--- /dev/null
+++ b/gfx/pokemon/ledian/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 04
+	frame 2, 24
+	setrepeat 7
+	frame 1, 02
+	frame 3, 02
+	dorepeat 3
+	frame 1, 08
+	endanim
+; 0xd1233
--- a/gfx/pokemon/ledian/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 04
-	frame 2, 24
-	setrepeat 7
-	frame 1, 02
-	frame 3, 02
-	dorepeat 3
-	frame 1, 08
-	endanim
-; 0xd1233
--- a/gfx/pokemon/ledian/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd1f25
--- /dev/null
+++ b/gfx/pokemon/ledian/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd1f25
--- /dev/null
+++ b/gfx/pokemon/ledyba/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 08
+	setrepeat 2
+	frame 2, 10
+	frame 3, 12
+	dorepeat 2
+	endanim
+; 0xd1224
--- a/gfx/pokemon/ledyba/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 08
-	setrepeat 2
-	frame 2, 10
-	frame 3, 12
-	dorepeat 2
-	endanim
-; 0xd1224
--- a/gfx/pokemon/ledyba/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 3, 07
-	setrepeat 3
-	frame 4, 05
-	frame 3, 05
-	dorepeat 2
-	endanim
-; 0xd1f1c
--- /dev/null
+++ b/gfx/pokemon/ledyba/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 3, 07
+	setrepeat 3
+	frame 4, 05
+	frame 3, 05
+	dorepeat 2
+	endanim
+; 0xd1f1c
--- /dev/null
+++ b/gfx/pokemon/lickitung/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 16
+	frame 2, 06
+	frame 3, 06
+	frame 0, 06
+	frame 3, 06
+	endanim
+; 0xd0ee5
--- a/gfx/pokemon/lickitung/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 16
-	frame 2, 06
-	frame 3, 06
-	frame 0, 06
-	frame 3, 06
-	endanim
-; 0xd0ee5
--- a/gfx/pokemon/lickitung/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1ceb
--- /dev/null
+++ b/gfx/pokemon/lickitung/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1ceb
--- /dev/null
+++ b/gfx/pokemon/lugia/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 11
+	frame 2, 11
+	frame 3, 14
+	frame 4, 14
+	frame 5, 14
+	frame 6, 11
+	endanim
+; 0xd1666
--- a/gfx/pokemon/lugia/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 11
-	frame 2, 11
-	frame 3, 14
-	frame 4, 14
-	frame 5, 14
-	frame 6, 11
-	endanim
-; 0xd1666
--- a/gfx/pokemon/lugia/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 3
-	frame 9, 10
-	frame 7, 10
-	dorepeat 1
-	frame 8, 10
-	frame 3, 10
-	endanim
-; 0xd220c
--- /dev/null
+++ b/gfx/pokemon/lugia/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 3
+	frame 9, 10
+	frame 7, 10
+	dorepeat 1
+	frame 8, 10
+	frame 3, 10
+	endanim
+; 0xd220c
--- /dev/null
+++ b/gfx/pokemon/machamp/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 04
+	frame 1, 30
+	setrepeat 3
+	frame 2, 05
+	frame 6, 03
+	frame 3, 05
+	frame 4, 03
+	dorepeat 3
+	frame 7, 08
+	endanim
+; 0xd0c9d
--- a/gfx/pokemon/machamp/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 04
-	frame 1, 30
-	setrepeat 3
-	frame 2, 05
-	frame 6, 03
-	frame 3, 05
-	frame 4, 03
-	dorepeat 3
-	frame 7, 08
-	endanim
-; 0xd0c9d
--- a/gfx/pokemon/machamp/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 5, 07
-	dorepeat 1
-	endanim
-; 0xd1b6b
--- /dev/null
+++ b/gfx/pokemon/machamp/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 5, 07
+	dorepeat 1
+	endanim
+; 0xd1b6b
--- /dev/null
+++ b/gfx/pokemon/machoke/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 12
+	frame 2, 40
+	frame 1, 10
+	endanim
+; 0xd0c8a
--- a/gfx/pokemon/machoke/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 12
-	frame 2, 40
-	frame 1, 10
-	endanim
-; 0xd0c8a
--- a/gfx/pokemon/machoke/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 4, 06
-	frame 5, 25
-	frame 4, 05
-	frame 6, 20
-	setrepeat 2
-	frame 3, 08
-	frame 6, 08
-	dorepeat 5
-	endanim
-; 0xd1b62
--- /dev/null
+++ b/gfx/pokemon/machoke/anim_idle.asm
@@ -1,0 +1,10 @@
+	frame 4, 06
+	frame 5, 25
+	frame 4, 05
+	frame 6, 20
+	setrepeat 2
+	frame 3, 08
+	frame 6, 08
+	dorepeat 5
+	endanim
+; 0xd1b62
--- /dev/null
+++ b/gfx/pokemon/machop/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	frame 2, 22
+	setrepeat 2
+	frame 0, 12
+	frame 1, 12
+	dorepeat 3
+	endanim
+; 0xd0c83
--- a/gfx/pokemon/machop/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	frame 2, 22
-	setrepeat 2
-	frame 0, 12
-	frame 1, 12
-	dorepeat 3
-	endanim
-; 0xd0c83
--- a/gfx/pokemon/machop/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1b51
--- /dev/null
+++ b/gfx/pokemon/machop/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1b51
--- /dev/null
+++ b/gfx/pokemon/magby/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 14
+	setrepeat 2
+	frame 2, 07
+	frame 3, 07
+	dorepeat 2
+	frame 4, 16
+	endanim
+; 0xd15ed
--- a/gfx/pokemon/magby/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 14
-	setrepeat 2
-	frame 2, 07
-	frame 3, 07
-	dorepeat 2
-	frame 4, 16
-	endanim
-; 0xd15ed
--- a/gfx/pokemon/magby/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 09
-	frame 5, 09
-	dorepeat 1
-	endanim
-; 0xd21af
--- /dev/null
+++ b/gfx/pokemon/magby/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 09
+	frame 5, 09
+	dorepeat 1
+	endanim
+; 0xd21af
--- /dev/null
+++ b/gfx/pokemon/magcargo/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 05
+	frame 2, 10
+	frame 3, 10
+	frame 4, 10
+	frame 1, 25
+	endanim
+; 0xd14e4
--- a/gfx/pokemon/magcargo/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 05
-	frame 2, 10
-	frame 3, 10
-	frame 4, 10
-	frame 1, 25
-	endanim
-; 0xd14e4
--- a/gfx/pokemon/magcargo/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 1, 60
-	endanim
-; 0xd20f0
--- /dev/null
+++ b/gfx/pokemon/magcargo/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 1, 60
+	endanim
+; 0xd20f0
--- /dev/null
+++ b/gfx/pokemon/magikarp/anim.asm
@@ -1,0 +1,7 @@
+	frame 0, 12
+	setrepeat 3
+	frame 1, 09
+	frame 2, 07
+	dorepeat 2
+	endanim
+; 0xd1002
--- a/gfx/pokemon/magikarp/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 0, 12
-	setrepeat 3
-	frame 1, 09
-	frame 2, 07
-	dorepeat 2
-	endanim
-; 0xd1002
--- a/gfx/pokemon/magikarp/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 10
-	frame 3, 10
-	dorepeat 1
-	endanim
-; 0xd1dae
--- /dev/null
+++ b/gfx/pokemon/magikarp/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 10
+	frame 3, 10
+	dorepeat 1
+	endanim
+; 0xd1dae
--- /dev/null
+++ b/gfx/pokemon/magmar/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 16
+	setrepeat 3
+	frame 2, 07
+	frame 3, 07
+	dorepeat 2
+	endanim
+; 0xd0fd7
--- a/gfx/pokemon/magmar/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 16
-	setrepeat 3
-	frame 2, 07
-	frame 3, 07
-	dorepeat 2
-	endanim
-; 0xd0fd7
--- a/gfx/pokemon/magmar/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd1d93
--- /dev/null
+++ b/gfx/pokemon/magmar/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd1d93
--- /dev/null
+++ b/gfx/pokemon/magnemite/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 08
+	frame 2, 08
+	frame 3, 08
+	frame 0, 08
+	dorepeat 1
+	endanim
+; 0xd0d5c
--- a/gfx/pokemon/magnemite/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 08
-	frame 2, 08
-	frame 3, 08
-	frame 0, 08
-	dorepeat 1
-	endanim
-; 0xd0d5c
--- a/gfx/pokemon/magnemite/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 4, 08
-	frame 5, 08
-	frame 6, 08
-	dorepeat 1
-	endanim
-; 0xd1be4
--- /dev/null
+++ b/gfx/pokemon/magnemite/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 4, 08
+	frame 5, 08
+	frame 6, 08
+	dorepeat 1
+	endanim
+; 0xd1be4
--- /dev/null
+++ b/gfx/pokemon/magneton/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 08
+	frame 2, 08
+	frame 3, 08
+	frame 4, 08
+	frame 5, 08
+	frame 6, 08
+	frame 7, 08
+	frame 1, 04
+	frame 2, 04
+	frame 3, 04
+	endanim
+; 0xd0d71
--- a/gfx/pokemon/magneton/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 08
-	frame 2, 08
-	frame 3, 08
-	frame 4, 08
-	frame 5, 08
-	frame 6, 08
-	frame 7, 08
-	frame 1, 04
-	frame 2, 04
-	frame 3, 04
-	endanim
-; 0xd0d71
--- a/gfx/pokemon/magneton/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 8, 10
-	dorepeat 1
-	frame 1, 24
-	frame 2, 24
-	frame 3, 24
-	endanim
-; 0xd1bf3
--- /dev/null
+++ b/gfx/pokemon/magneton/anim_idle.asm
@@ -1,0 +1,9 @@
+	setrepeat 2
+	frame 0, 10
+	frame 8, 10
+	dorepeat 1
+	frame 1, 24
+	frame 2, 24
+	frame 3, 24
+	endanim
+; 0xd1bf3
--- /dev/null
+++ b/gfx/pokemon/mankey/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 24
+	setrepeat 3
+	frame 0, 08
+	frame 2, 08
+	dorepeat 2
+	endanim
+; 0xd0bff
--- a/gfx/pokemon/mankey/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 24
-	setrepeat 3
-	frame 0, 08
-	frame 2, 08
-	dorepeat 2
-	endanim
-; 0xd0bff
--- a/gfx/pokemon/mankey/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1aeb
--- /dev/null
+++ b/gfx/pokemon/mankey/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1aeb
--- /dev/null
+++ b/gfx/pokemon/mantine/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 15
+	frame 2, 15
+	frame 3, 15
+	frame 0, 15
+	frame 4, 15
+	frame 0, 15
+	frame 5, 15
+	endanim
+; 0xd1539
--- a/gfx/pokemon/mantine/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 15
-	frame 2, 15
-	frame 3, 15
-	frame 0, 15
-	frame 4, 15
-	frame 0, 15
-	frame 5, 15
-	endanim
-; 0xd1539
--- a/gfx/pokemon/mantine/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 6, 08
-	dorepeat 1
-	endanim
-; 0xd212f
--- /dev/null
+++ b/gfx/pokemon/mantine/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 6, 08
+	dorepeat 1
+	endanim
+; 0xd212f
--- /dev/null
+++ b/gfx/pokemon/mareep/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 08
+	frame 0, 07
+	frame 1, 05
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	dorepeat 4
+	endanim
+; 0xd12dc
--- a/gfx/pokemon/mareep/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 08
-	frame 0, 07
-	frame 1, 05
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	dorepeat 4
-	endanim
-; 0xd12dc
--- a/gfx/pokemon/mareep/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 2, 07
-	dorepeat 1
-	endanim
-; 0xd1fa2
--- /dev/null
+++ b/gfx/pokemon/mareep/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 2, 07
+	dorepeat 1
+	endanim
+; 0xd1fa2
--- /dev/null
+++ b/gfx/pokemon/marill/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 10
+	frame 2, 36
+	frame 3, 10
+	setrepeat 3
+	frame 0, 10
+	frame 3, 10
+	dorepeat 4
+	endanim
+; 0xd131a
--- a/gfx/pokemon/marill/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 10
-	frame 2, 36
-	frame 3, 10
-	setrepeat 3
-	frame 0, 10
-	frame 3, 10
-	dorepeat 4
-	endanim
-; 0xd131a
--- a/gfx/pokemon/marill/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 4, 40
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 2
-	endanim
-; 0xd1fca
--- /dev/null
+++ b/gfx/pokemon/marill/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 4, 40
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 2
+	endanim
+; 0xd1fca
--- /dev/null
+++ b/gfx/pokemon/marowak/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 3
+	frame 1, 07
+	frame 2, 07
+	dorepeat 1
+	setrepeat 2
+	frame 3, 07
+	frame 4, 07
+	dorepeat 5
+	endanim
+; 0xd0eb0
--- a/gfx/pokemon/marowak/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 3
-	frame 1, 07
-	frame 2, 07
-	dorepeat 1
-	setrepeat 2
-	frame 3, 07
-	frame 4, 07
-	dorepeat 5
-	endanim
-; 0xd0eb0
--- a/gfx/pokemon/marowak/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 15
-	frame 5, 15
-	dorepeat 1
-	endanim
-; 0xd1ccc
--- /dev/null
+++ b/gfx/pokemon/marowak/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 15
+	frame 5, 15
+	dorepeat 1
+	endanim
+; 0xd1ccc
--- /dev/null
+++ b/gfx/pokemon/meganium/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 06
+	frame 1, 10
+	frame 2, 26
+	frame 1, 12
+	frame 0, 08
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 6
+	endanim
+; 0xd117f
--- a/gfx/pokemon/meganium/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 06
-	frame 1, 10
-	frame 2, 26
-	frame 1, 12
-	frame 0, 08
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 6
-	endanim
-; 0xd117f
--- a/gfx/pokemon/meganium/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1eb1
--- /dev/null
+++ b/gfx/pokemon/meganium/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1eb1
--- /dev/null
+++ b/gfx/pokemon/meowth/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 24
+	setrepeat 2
+	frame 2, 14
+	frame 3, 14
+	dorepeat 2
+	endanim
+; 0xd0bbf
--- a/gfx/pokemon/meowth/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 24
-	setrepeat 2
-	frame 2, 14
-	frame 3, 14
-	dorepeat 2
-	endanim
-; 0xd0bbf
--- a/gfx/pokemon/meowth/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1ac7
--- /dev/null
+++ b/gfx/pokemon/meowth/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1ac7
--- /dev/null
+++ b/gfx/pokemon/metapod/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 12
+	frame 2, 24
+	frame 1, 12
+	endanim
+; 0xd091c
--- a/gfx/pokemon/metapod/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 12
-	frame 2, 24
-	frame 1, 12
-	endanim
-; 0xd091c
--- a/gfx/pokemon/metapod/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1904
--- /dev/null
+++ b/gfx/pokemon/metapod/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1904
--- /dev/null
+++ b/gfx/pokemon/mew/anim.asm
@@ -1,0 +1,18 @@
+	frame 1, 07
+	frame 2, 07
+	frame 3, 06
+	frame 2, 06
+	frame 3, 05
+	frame 2, 05
+	setrepeat 3
+	frame 3, 03
+	frame 2, 03
+	dorepeat 7
+	setrepeat 2
+	frame 3, 25
+	frame 2, 20
+	dorepeat 11
+	frame 0, 15
+	frame 4, 15
+	endanim
+; 0xd1154
--- a/gfx/pokemon/mew/anim0.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-	frame 1, 07
-	frame 2, 07
-	frame 3, 06
-	frame 2, 06
-	frame 3, 05
-	frame 2, 05
-	setrepeat 3
-	frame 3, 03
-	frame 2, 03
-	dorepeat 7
-	setrepeat 2
-	frame 3, 25
-	frame 2, 20
-	dorepeat 11
-	frame 0, 15
-	frame 4, 15
-	endanim
-; 0xd1154
--- a/gfx/pokemon/mew/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	frame 0, 10
-	frame 4, 20
-	dorepeat 1
-	endanim
-; 0xd1e96
--- /dev/null
+++ b/gfx/pokemon/mew/anim_idle.asm
@@ -1,0 +1,9 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	frame 0, 10
+	frame 4, 20
+	dorepeat 1
+	endanim
+; 0xd1e96
--- /dev/null
+++ b/gfx/pokemon/mewtwo/anim.asm
@@ -1,0 +1,17 @@
+	frame 3, 08
+	setrepeat 2
+	frame 2, 04
+	frame 3, 02
+	dorepeat 2
+	setrepeat 3
+	frame 4, 02
+	frame 3, 02
+	dorepeat 6
+	setrepeat 5
+	frame 5, 02
+	frame 3, 01
+	dorepeat 10
+	frame 5, 14
+	frame 3, 04
+	endanim
+; 0xd1133
--- a/gfx/pokemon/mewtwo/anim0.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-	frame 3, 08
-	setrepeat 2
-	frame 2, 04
-	frame 3, 02
-	dorepeat 2
-	setrepeat 3
-	frame 4, 02
-	frame 3, 02
-	dorepeat 6
-	setrepeat 5
-	frame 5, 02
-	frame 3, 01
-	dorepeat 10
-	frame 5, 14
-	frame 3, 04
-	endanim
-; 0xd1133
--- a/gfx/pokemon/mewtwo/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 1, 06
-	dorepeat 1
-	endanim
-; 0xd1e87
--- /dev/null
+++ b/gfx/pokemon/mewtwo/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 1, 06
+	dorepeat 1
+	endanim
+; 0xd1e87
--- /dev/null
+++ b/gfx/pokemon/miltank/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 10
+	setrepeat 2
+	frame 2, 09
+	frame 1, 09
+	dorepeat 2
+	frame 3, 05
+	endanim
+; 0xd15fa
--- a/gfx/pokemon/miltank/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 10
-	setrepeat 2
-	frame 2, 09
-	frame 1, 09
-	dorepeat 2
-	frame 3, 05
-	endanim
-; 0xd15fa
--- a/gfx/pokemon/miltank/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd21b8
--- /dev/null
+++ b/gfx/pokemon/miltank/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd21b8
--- /dev/null
+++ b/gfx/pokemon/misdreavus/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 18
+	frame 2, 13
+	frame 3, 13
+	endanim
+; 0xd13e9
--- a/gfx/pokemon/misdreavus/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 18
-	frame 2, 13
-	frame 3, 13
-	endanim
-; 0xd13e9
--- a/gfx/pokemon/misdreavus/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 4, 08
-	frame 0, 08
-	dorepeat 1
-	endanim
-; 0xd205d
--- /dev/null
+++ b/gfx/pokemon/misdreavus/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 4, 08
+	frame 0, 08
+	dorepeat 1
+	endanim
+; 0xd205d
--- /dev/null
+++ b/gfx/pokemon/moltres/anim.asm
@@ -1,0 +1,13 @@
+	frame 1, 10
+	frame 5, 10
+	frame 2, 10
+	frame 3, 10
+	frame 4, 10
+	frame 0, 10
+	frame 1, 10
+	frame 5, 10
+	frame 1, 10
+	frame 0, 12
+	frame 1, 12
+	endanim
+; 0xd10e3
--- a/gfx/pokemon/moltres/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 1, 10
-	frame 5, 10
-	frame 2, 10
-	frame 3, 10
-	frame 4, 10
-	frame 0, 10
-	frame 1, 10
-	frame 5, 10
-	frame 1, 10
-	frame 0, 12
-	frame 1, 12
-	endanim
-; 0xd10e3
--- a/gfx/pokemon/moltres/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 6, 05
-	frame 0, 05
-	frame 7, 05
-	frame 1, 05
-	frame 0, 12
-	frame 1, 12
-	frame 5, 12
-	endanim
-; 0xd1e57
--- /dev/null
+++ b/gfx/pokemon/moltres/anim_idle.asm
@@ -1,0 +1,9 @@
+	frame 6, 05
+	frame 0, 05
+	frame 7, 05
+	frame 1, 05
+	frame 0, 12
+	frame 1, 12
+	frame 5, 12
+	endanim
+; 0xd1e57
--- /dev/null
+++ b/gfx/pokemon/mr__mime/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 08
+	frame 2, 08
+	frame 8, 08
+	frame 3, 08
+	frame 4, 08
+	frame 5, 08
+	frame 7, 08
+	frame 0, 32
+	frame 6, 06
+	endanim
+; 0xd0f99
--- a/gfx/pokemon/mr__mime/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 08
-	frame 2, 08
-	frame 8, 08
-	frame 3, 08
-	frame 4, 08
-	frame 5, 08
-	frame 7, 08
-	frame 0, 32
-	frame 6, 06
-	endanim
-; 0xd0f99
--- a/gfx/pokemon/mr__mime/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 6, 06
-	dorepeat 1
-	endanim
-; 0xd1d6f
--- /dev/null
+++ b/gfx/pokemon/mr__mime/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 1
+	endanim
+; 0xd1d6f
--- /dev/null
+++ b/gfx/pokemon/muk/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 12
+	frame 2, 12
+	frame 3, 12
+	frame 1, 12
+	endanim
+; 0xd0dbc
--- a/gfx/pokemon/muk/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	frame 1, 12
-	endanim
-; 0xd0dbc
--- a/gfx/pokemon/muk/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 12
-	frame 4, 12
-	dorepeat 1
-	endanim
-; 0xd1c40
--- /dev/null
+++ b/gfx/pokemon/muk/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 12
+	frame 4, 12
+	dorepeat 1
+	endanim
+; 0xd1c40
--- /dev/null
+++ b/gfx/pokemon/murkrow/anim.asm
@@ -1,0 +1,10 @@
+	frame 2, 10
+	setrepeat 2
+	frame 1, 06
+	frame 2, 06
+	dorepeat 2
+	frame 1, 07
+	frame 0, 07
+	frame 1, 07
+	endanim
+; 0xd13cf
--- a/gfx/pokemon/murkrow/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 2, 10
-	setrepeat 2
-	frame 1, 06
-	frame 2, 06
-	dorepeat 2
-	frame 1, 07
-	frame 0, 07
-	frame 1, 07
-	endanim
-; 0xd13cf
--- a/gfx/pokemon/murkrow/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd204f
--- /dev/null
+++ b/gfx/pokemon/murkrow/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd204f
--- /dev/null
+++ b/gfx/pokemon/natu/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 10
+	frame 2, 10
+	frame 3, 25
+	frame 2, 10
+	endanim
+; 0xd12bc
--- a/gfx/pokemon/natu/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 3, 25
-	frame 2, 10
-	endanim
-; 0xd12bc
--- a/gfx/pokemon/natu/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 4, 35
-	endanim
-; 0xd1f86
--- /dev/null
+++ b/gfx/pokemon/natu/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 4, 35
+	endanim
+; 0xd1f86
--- /dev/null
+++ b/gfx/pokemon/nidoking/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 1, 12
+	frame 2, 36
+	frame 1, 12
+	endanim
+; 0xd0a8f
--- a/gfx/pokemon/nidoking/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 1, 12
-	frame 2, 36
-	frame 1, 12
-	endanim
-; 0xd0a8f
--- a/gfx/pokemon/nidoking/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1a13
--- /dev/null
+++ b/gfx/pokemon/nidoking/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1a13
--- /dev/null
+++ b/gfx/pokemon/nidoqueen/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 05
+	frame 2, 10
+	frame 3, 10
+	frame 4, 10
+	frame 3, 10
+	frame 1, 10
+	frame 0, 10
+	frame 5, 10
+	endanim
+; 0xd0a64
--- a/gfx/pokemon/nidoqueen/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 05
-	frame 2, 10
-	frame 3, 10
-	frame 4, 10
-	frame 3, 10
-	frame 1, 10
-	frame 0, 10
-	frame 5, 10
-	endanim
-; 0xd0a64
--- a/gfx/pokemon/nidoqueen/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 6, 50
-	setrepeat 2
-	frame 0, 07
-	frame 6, 07
-	dorepeat 2
-	endanim
-; 0xd19f4
--- /dev/null
+++ b/gfx/pokemon/nidoqueen/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 6, 50
+	setrepeat 2
+	frame 0, 07
+	frame 6, 07
+	dorepeat 2
+	endanim
+; 0xd19f4
--- /dev/null
+++ b/gfx/pokemon/nidoran_f/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 04
+	frame 2, 19
+	setrepeat 3
+	frame 3, 05
+	frame 0, 05
+	dorepeat 3
+	endanim
+; 0xd0a44
--- a/gfx/pokemon/nidoran_f/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 04
-	frame 2, 19
-	setrepeat 3
-	frame 3, 05
-	frame 0, 05
-	dorepeat 3
-	endanim
-; 0xd0a44
--- a/gfx/pokemon/nidoran_f/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd19e0
--- /dev/null
+++ b/gfx/pokemon/nidoran_f/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd19e0
--- /dev/null
+++ b/gfx/pokemon/nidoran_m/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	frame 2, 22
+	setrepeat 3
+	frame 0, 06
+	frame 1, 06
+	dorepeat 3
+	endanim
+; 0xd0a71
--- a/gfx/pokemon/nidoran_m/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	frame 2, 22
-	setrepeat 3
-	frame 0, 06
-	frame 1, 06
-	dorepeat 3
-	endanim
-; 0xd0a71
--- a/gfx/pokemon/nidoran_m/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd19fd
--- /dev/null
+++ b/gfx/pokemon/nidoran_m/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd19fd
--- /dev/null
+++ b/gfx/pokemon/nidorina/anim.asm
@@ -1,0 +1,9 @@
+	frame 3, 20
+	setrepeat 2
+	frame 0, 06
+	frame 1, 12
+	frame 0, 03
+	frame 2, 06
+	dorepeat 2
+	endanim
+; 0xd0a53
--- a/gfx/pokemon/nidorina/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 3, 20
-	setrepeat 2
-	frame 0, 06
-	frame 1, 12
-	frame 0, 03
-	frame 2, 06
-	dorepeat 2
-	endanim
-; 0xd0a53
--- a/gfx/pokemon/nidorina/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 4, 04
-	dorepeat 1
-	endanim
-; 0xd19e9
--- /dev/null
+++ b/gfx/pokemon/nidorina/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 04
+	frame 4, 04
+	dorepeat 1
+	endanim
+; 0xd19e9
--- /dev/null
+++ b/gfx/pokemon/nidorino/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 10
+	frame 6, 30
+	frame 0, 05
+	frame 5, 07
+	frame 0, 10
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	frame 3, 06
+	dorepeat 6
+	endanim
+; 0xd0a86
--- a/gfx/pokemon/nidorino/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 10
-	frame 6, 30
-	frame 0, 05
-	frame 5, 07
-	frame 0, 10
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	frame 3, 06
-	dorepeat 6
-	endanim
-; 0xd0a86
--- a/gfx/pokemon/nidorino/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 3
-	frame 4, 06
-	frame 5, 06
-	dorepeat 1
-	frame 0, 06
-	frame 4, 06
-	endanim
-; 0xd1a0a
--- /dev/null
+++ b/gfx/pokemon/nidorino/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 3
+	frame 4, 06
+	frame 5, 06
+	dorepeat 1
+	frame 0, 06
+	frame 4, 06
+	endanim
+; 0xd1a0a
--- /dev/null
+++ b/gfx/pokemon/ninetales/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 07
+	frame 1, 08
+	frame 2, 09
+	frame 3, 09
+	frame 4, 10
+	frame 3, 12
+	frame 2, 10
+	frame 1, 08
+	endanim
+; 0xd0acb
--- a/gfx/pokemon/ninetales/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 07
-	frame 1, 08
-	frame 2, 09
-	frame 3, 09
-	frame 4, 10
-	frame 3, 12
-	frame 2, 10
-	frame 1, 08
-	endanim
-; 0xd0acb
--- a/gfx/pokemon/ninetales/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 5, 06
-	dorepeat 1
-	endanim
-; 0xd1a3d
--- /dev/null
+++ b/gfx/pokemon/ninetales/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 5, 06
+	dorepeat 1
+	endanim
+; 0xd1a3d
--- /dev/null
+++ b/gfx/pokemon/noctowl/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 04
+	frame 1, 20
+	frame 3, 24
+	frame 2, 20
+	setrepeat 3
+	frame 4, 06
+	frame 2, 06
+	dorepeat 5
+	endanim
+; 0xd1219
--- a/gfx/pokemon/noctowl/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 04
-	frame 1, 20
-	frame 3, 24
-	frame 2, 20
-	setrepeat 3
-	frame 4, 06
-	frame 2, 06
-	dorepeat 5
-	endanim
-; 0xd1219
--- a/gfx/pokemon/noctowl/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd1f11
--- /dev/null
+++ b/gfx/pokemon/noctowl/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd1f11
--- /dev/null
+++ b/gfx/pokemon/octillery/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	frame 1, 24
+	setrepeat 4
+	frame 2, 05
+	frame 0, 05
+	dorepeat 3
+	endanim
+; 0xd1515
--- a/gfx/pokemon/octillery/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	frame 1, 24
-	setrepeat 4
-	frame 2, 05
-	frame 0, 05
-	dorepeat 3
-	endanim
-; 0xd1515
--- a/gfx/pokemon/octillery/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd211d
--- /dev/null
+++ b/gfx/pokemon/octillery/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd211d
--- /dev/null
+++ b/gfx/pokemon/oddish/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 10
+	frame 2, 20
+	frame 1, 07
+	frame 4, 05
+	frame 0, 15
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 6
+	endanim
+; 0xd0b20
--- a/gfx/pokemon/oddish/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 10
-	frame 2, 20
-	frame 1, 07
-	frame 4, 05
-	frame 0, 15
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 6
-	endanim
-; 0xd0b20
--- a/gfx/pokemon/oddish/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd1a6c
--- /dev/null
+++ b/gfx/pokemon/oddish/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd1a6c
--- /dev/null
+++ b/gfx/pokemon/omanyte/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 08
+	frame 2, 22
+	frame 1, 08
+	endanim
+; 0xd1075
--- a/gfx/pokemon/omanyte/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 08
-	frame 2, 22
-	frame 1, 08
-	endanim
-; 0xd1075
--- a/gfx/pokemon/omanyte/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1e03
--- /dev/null
+++ b/gfx/pokemon/omanyte/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1e03
--- /dev/null
+++ b/gfx/pokemon/omastar/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 10
+	frame 2, 40
+	frame 1, 06
+	endanim
+; 0xd107c
--- a/gfx/pokemon/omastar/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 10
-	frame 2, 40
-	frame 1, 06
-	endanim
-; 0xd107c
--- a/gfx/pokemon/omastar/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 11
-	frame 3, 11
-	dorepeat 1
-	endanim
-; 0xd1e0c
--- /dev/null
+++ b/gfx/pokemon/omastar/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 11
+	frame 3, 11
+	dorepeat 1
+	endanim
+; 0xd1e0c
--- /dev/null
+++ b/gfx/pokemon/onix/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 1, 12
+	frame 2, 12
+	frame 3, 12
+	dorepeat 1
+	frame 4, 12
+	frame 5, 12
+	frame 6, 12
+	endanim
+; 0xd0e08
--- a/gfx/pokemon/onix/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	dorepeat 1
-	frame 4, 12
-	frame 5, 12
-	frame 6, 12
-	endanim
-; 0xd0e08
--- a/gfx/pokemon/onix/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 7, 10
-	frame 8, 10
-	dorepeat 1
-	endanim
-; 0xd1c74
--- /dev/null
+++ b/gfx/pokemon/onix/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 10
+	frame 7, 10
+	frame 8, 10
+	dorepeat 1
+	endanim
+; 0xd1c74
--- /dev/null
+++ b/gfx/pokemon/paras/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 10
+	frame 1, 14
+	frame 2, 32
+	frame 1, 08
+	endanim
+; 0xd0b4f
--- a/gfx/pokemon/paras/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 10
-	frame 1, 14
-	frame 2, 32
-	frame 1, 08
-	endanim
-; 0xd0b4f
--- a/gfx/pokemon/paras/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1a8b
--- /dev/null
+++ b/gfx/pokemon/paras/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1a8b
--- /dev/null
+++ b/gfx/pokemon/parasect/anim.asm
@@ -1,0 +1,13 @@
+	setrepeat 2
+	frame 1, 08
+	frame 2, 10
+	frame 1, 08
+	frame 0, 10
+	dorepeat 1
+	frame 4, 20
+	setrepeat 3
+	frame 0, 04
+	frame 4, 04
+	dorepeat 8
+	endanim
+; 0xd0b66
--- a/gfx/pokemon/parasect/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	setrepeat 2
-	frame 1, 08
-	frame 2, 10
-	frame 1, 08
-	frame 0, 10
-	dorepeat 1
-	frame 4, 20
-	setrepeat 3
-	frame 0, 04
-	frame 4, 04
-	dorepeat 8
-	endanim
-; 0xd0b66
--- a/gfx/pokemon/parasect/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 5, 30
-	frame 0, 05
-	frame 4, 20
-	endanim
-; 0xd1a92
--- /dev/null
+++ b/gfx/pokemon/parasect/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 5, 30
+	frame 0, 05
+	frame 4, 20
+	endanim
+; 0xd1a92
--- /dev/null
+++ b/gfx/pokemon/persian/anim.asm
@@ -1,0 +1,10 @@
+	frame 4, 12
+	frame 1, 32
+	frame 0, 12
+	frame 2, 10
+	frame 3, 08
+	frame 2, 10
+	frame 3, 08
+	frame 2, 06
+	endanim
+; 0xd0bd0
--- a/gfx/pokemon/persian/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 4, 12
-	frame 1, 32
-	frame 0, 12
-	frame 2, 10
-	frame 3, 08
-	frame 2, 10
-	frame 3, 08
-	frame 2, 06
-	endanim
-; 0xd0bd0
--- a/gfx/pokemon/persian/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd1ad0
--- /dev/null
+++ b/gfx/pokemon/persian/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd1ad0
--- /dev/null
+++ b/gfx/pokemon/phanpy/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 10
+	frame 2, 10
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 3
+	endanim
+; 0xd157e
--- a/gfx/pokemon/phanpy/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 3
-	endanim
-; 0xd157e
--- a/gfx/pokemon/phanpy/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2160
--- /dev/null
+++ b/gfx/pokemon/phanpy/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2160
--- /dev/null
+++ b/gfx/pokemon/pichu/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 1, 22
+	frame 2, 12
+	frame 4, 08
+	endanim
+; 0xd1289
--- a/gfx/pokemon/pichu/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 1, 22
-	frame 2, 12
-	frame 4, 08
-	endanim
-; 0xd1289
--- a/gfx/pokemon/pichu/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1f5f
--- /dev/null
+++ b/gfx/pokemon/pichu/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 04
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1f5f
--- /dev/null
+++ b/gfx/pokemon/pidgeot/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	frame 1, 32
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	dorepeat 3
+	endanim
+; 0xd0987
--- a/gfx/pokemon/pidgeot/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	frame 1, 32
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	dorepeat 3
-	endanim
-; 0xd0987
--- a/gfx/pokemon/pidgeot/anim1.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	frame 2, 06
-	frame 0, 06
-	frame 2, 06
-	endanim
-; 0xd1961
--- /dev/null
+++ b/gfx/pokemon/pidgeot/anim_idle.asm
@@ -1,0 +1,9 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	frame 2, 06
+	frame 0, 06
+	frame 2, 06
+	endanim
+; 0xd1961
--- /dev/null
+++ b/gfx/pokemon/pidgeotto/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 07
+	frame 2, 07
+	frame 3, 07
+	frame 2, 30
+	setrepeat 2
+	frame 3, 06
+	frame 2, 06
+	dorepeat 5
+	frame 2, 20
+	endanim
+; 0xd097a
--- a/gfx/pokemon/pidgeotto/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 07
-	frame 2, 07
-	frame 3, 07
-	frame 2, 30
-	setrepeat 2
-	frame 3, 06
-	frame 2, 06
-	dorepeat 5
-	frame 2, 20
-	endanim
-; 0xd097a
--- a/gfx/pokemon/pidgeotto/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd1952
--- /dev/null
+++ b/gfx/pokemon/pidgeotto/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd1952
--- /dev/null
+++ b/gfx/pokemon/pidgey/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 02
+	frame 3, 06
+	frame 0, 12
+	setrepeat 3
+	frame 0, 04
+	frame 1, 03
+	frame 2, 04
+	frame 1, 03
+	dorepeat 4
+	endanim
+; 0xd0967
--- a/gfx/pokemon/pidgey/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 02
-	frame 3, 06
-	frame 0, 12
-	setrepeat 3
-	frame 0, 04
-	frame 1, 03
-	frame 2, 04
-	frame 1, 03
-	dorepeat 4
-	endanim
-; 0xd0967
--- a/gfx/pokemon/pidgey/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 1, 04
-	frame 2, 06
-	frame 1, 04
-	dorepeat 1
-	endanim
-; 0xd1949
--- /dev/null
+++ b/gfx/pokemon/pidgey/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 08
+	frame 1, 04
+	frame 2, 06
+	frame 1, 04
+	dorepeat 1
+	endanim
+; 0xd1949
--- /dev/null
+++ b/gfx/pokemon/pikachu/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 07
+	setrepeat 2
+	frame 2, 07
+	frame 3, 07
+	dorepeat 2
+	frame 2, 26
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 7
+	endanim
+; 0xd0a02
--- a/gfx/pokemon/pikachu/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 07
-	setrepeat 2
-	frame 2, 07
-	frame 3, 07
-	dorepeat 2
-	frame 2, 26
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 7
-	endanim
-; 0xd0a02
--- a/gfx/pokemon/pikachu/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 3
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 5
-	endanim
-; 0xd19ba
--- /dev/null
+++ b/gfx/pokemon/pikachu/anim_idle.asm
@@ -1,0 +1,10 @@
+	setrepeat 3
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 5
+	endanim
+; 0xd19ba
--- /dev/null
+++ b/gfx/pokemon/piloswine/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 20
+	frame 2, 10
+	frame 3, 10
+	endanim
+; 0xd14f6
--- a/gfx/pokemon/piloswine/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 20
-	frame 2, 10
-	frame 3, 10
-	endanim
-; 0xd14f6
--- a/gfx/pokemon/piloswine/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 12
-	frame 3, 12
-	dorepeat 1
-	endanim
-; 0xd2102
--- /dev/null
+++ b/gfx/pokemon/piloswine/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 12
+	frame 3, 12
+	dorepeat 1
+	endanim
+; 0xd2102
--- /dev/null
+++ b/gfx/pokemon/pineco/anim.asm
@@ -1,0 +1,4 @@
+	frame 1, 06
+	frame 2, 18
+	endanim
+; 0xd1421
--- a/gfx/pokemon/pineco/anim0.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 1, 06
-	frame 2, 18
-	endanim
-; 0xd1421
--- a/gfx/pokemon/pineco/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd2077
--- /dev/null
+++ b/gfx/pokemon/pineco/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd2077
--- /dev/null
+++ b/gfx/pokemon/pinsir/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 12
+	frame 2, 08
+	setrepeat 2
+	frame 3, 12
+	frame 4, 12
+	dorepeat 3
+	endanim
+; 0xd0fe4
--- a/gfx/pokemon/pinsir/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 12
-	frame 2, 08
-	setrepeat 2
-	frame 3, 12
-	frame 4, 12
-	dorepeat 3
-	endanim
-; 0xd0fe4
--- a/gfx/pokemon/pinsir/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 1, 08
-	dorepeat 1
-	endanim
-; 0xd1d9c
--- /dev/null
+++ b/gfx/pokemon/pinsir/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 1, 08
+	dorepeat 1
+	endanim
+; 0xd1d9c
--- /dev/null
+++ b/gfx/pokemon/politoed/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 04
+	frame 1, 08
+	setrepeat 3
+	frame 2, 07
+	frame 3, 07
+	dorepeat 3
+	frame 1, 08
+	endanim
+; 0xd1345
--- a/gfx/pokemon/politoed/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 04
-	frame 1, 08
-	setrepeat 3
-	frame 2, 07
-	frame 3, 07
-	dorepeat 3
-	frame 1, 08
-	endanim
-; 0xd1345
--- a/gfx/pokemon/politoed/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd1fe5
--- /dev/null
+++ b/gfx/pokemon/politoed/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd1fe5
--- /dev/null
+++ b/gfx/pokemon/poliwag/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	frame 3, 24
+	setrepeat 2
+	frame 0, 08
+	frame 1, 08
+	dorepeat 3
+	endanim
+; 0xd0c33
--- a/gfx/pokemon/poliwag/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	frame 3, 24
-	setrepeat 2
-	frame 0, 08
-	frame 1, 08
-	dorepeat 3
-	endanim
-; 0xd0c33
--- a/gfx/pokemon/poliwag/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	setrepeat 2
-	frame 0, 10
-	frame 2, 10
-	dorepeat 5
-	endanim
-; 0xd1b1d
--- /dev/null
+++ b/gfx/pokemon/poliwag/anim_idle.asm
@@ -1,0 +1,10 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	setrepeat 2
+	frame 0, 10
+	frame 2, 10
+	dorepeat 5
+	endanim
+; 0xd1b1d
--- /dev/null
+++ b/gfx/pokemon/poliwhirl/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 07
+	frame 2, 05
+	setrepeat 2
+	frame 3, 10
+	frame 4, 10
+	dorepeat 3
+	frame 2, 16
+	endanim
+; 0xd0c42
--- a/gfx/pokemon/poliwhirl/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 07
-	frame 2, 05
-	setrepeat 2
-	frame 3, 10
-	frame 4, 10
-	dorepeat 3
-	frame 2, 16
-	endanim
-; 0xd0c42
--- a/gfx/pokemon/poliwhirl/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd1b26
--- /dev/null
+++ b/gfx/pokemon/poliwhirl/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd1b26
--- /dev/null
+++ b/gfx/pokemon/poliwrath/anim.asm
@@ -1,0 +1,8 @@
+	frame 3, 24
+	frame 0, 12
+	setrepeat 2
+	frame 1, 08
+	frame 2, 08
+	dorepeat 3
+	endanim
+; 0xd0c4f
--- a/gfx/pokemon/poliwrath/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 3, 24
-	frame 0, 12
-	setrepeat 2
-	frame 1, 08
-	frame 2, 08
-	dorepeat 3
-	endanim
-; 0xd0c4f
--- a/gfx/pokemon/poliwrath/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1b2f
--- /dev/null
+++ b/gfx/pokemon/poliwrath/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1b2f
--- /dev/null
+++ b/gfx/pokemon/ponyta/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 07
+	frame 2, 07
+	frame 1, 07
+	frame 2, 07
+	frame 0, 18
+	frame 3, 06
+	frame 0, 06
+	frame 3, 06
+	endanim
+; 0xd0d18
--- a/gfx/pokemon/ponyta/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 07
-	frame 2, 07
-	frame 1, 07
-	frame 2, 07
-	frame 0, 18
-	frame 3, 06
-	frame 0, 06
-	frame 3, 06
-	endanim
-; 0xd0d18
--- a/gfx/pokemon/ponyta/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 4, 06
-	frame 0, 06
-	frame 5, 06
-	endanim
-; 0xd1bc4
--- /dev/null
+++ b/gfx/pokemon/ponyta/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 4, 06
+	frame 0, 06
+	frame 5, 06
+	endanim
+; 0xd1bc4
--- /dev/null
+++ b/gfx/pokemon/porygon/anim.asm
@@ -1,0 +1,9 @@
+	setrepeat 3
+	frame 1, 03
+	frame 0, 03
+	dorepeat 1
+	frame 1, 25
+	frame 2, 06
+	frame 1, 06
+	endanim
+; 0xd106e
--- a/gfx/pokemon/porygon/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	setrepeat 3
-	frame 1, 03
-	frame 0, 03
-	dorepeat 1
-	frame 1, 25
-	frame 2, 06
-	frame 1, 06
-	endanim
-; 0xd106e
--- a/gfx/pokemon/porygon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd1dfa
--- /dev/null
+++ b/gfx/pokemon/porygon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd1dfa
--- /dev/null
+++ b/gfx/pokemon/porygon2/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 1, 06
+	frame 2, 08
+	frame 0, 06
+	dorepeat 1
+	endanim
+; 0xd1592
--- a/gfx/pokemon/porygon2/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 1, 06
-	frame 2, 08
-	frame 0, 06
-	dorepeat 1
-	endanim
-; 0xd1592
--- a/gfx/pokemon/porygon2/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 3, 30
-	endanim
-; 0xd216c
--- /dev/null
+++ b/gfx/pokemon/porygon2/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 3, 30
+	endanim
+; 0xd216c
--- /dev/null
+++ b/gfx/pokemon/primeape/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 5
+	frame 1, 08
+	frame 4, 08
+	dorepeat 1
+	frame 2, 05
+	frame 3, 25
+	endanim
+; 0xd0c0c
--- a/gfx/pokemon/primeape/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 5
-	frame 1, 08
-	frame 4, 08
-	dorepeat 1
-	frame 2, 05
-	frame 3, 25
-	endanim
-; 0xd0c0c
--- a/gfx/pokemon/primeape/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 2, 10
-	frame 0, 25
-	setrepeat 3
-	frame 2, 06
-	frame 3, 06
-	dorepeat 3
-	endanim
-; 0xd1af8
--- /dev/null
+++ b/gfx/pokemon/primeape/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 2, 10
+	frame 0, 25
+	setrepeat 3
+	frame 2, 06
+	frame 3, 06
+	dorepeat 3
+	endanim
+; 0xd1af8
--- /dev/null
+++ b/gfx/pokemon/psyduck/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 28
+	setrepeat 2
+	frame 0, 14
+	frame 2, 14
+	dorepeat 3
+	endanim
+; 0xd0bdd
--- a/gfx/pokemon/psyduck/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 28
-	setrepeat 2
-	frame 0, 14
-	frame 2, 14
-	dorepeat 3
-	endanim
-; 0xd0bdd
--- a/gfx/pokemon/psyduck/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	dorepeat 1
-	endanim
-; 0xd1ad9
--- /dev/null
+++ b/gfx/pokemon/psyduck/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	dorepeat 1
+	endanim
+; 0xd1ad9
--- /dev/null
+++ b/gfx/pokemon/pupitar/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 25
+	setrepeat 2
+	frame 0, 04
+	frame 1, 04
+	frame 2, 04
+	dorepeat 2
+	endanim
+; 0xd164a
--- a/gfx/pokemon/pupitar/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 25
-	setrepeat 2
-	frame 0, 04
-	frame 1, 04
-	frame 2, 04
-	dorepeat 2
-	endanim
-; 0xd164a
--- a/gfx/pokemon/pupitar/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 1, 04
-	frame 2, 04
-	dorepeat 1
-	endanim
-; 0xd21f6
--- /dev/null
+++ b/gfx/pokemon/pupitar/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 04
+	frame 1, 04
+	frame 2, 04
+	dorepeat 1
+	endanim
+; 0xd21f6
--- /dev/null
+++ b/gfx/pokemon/quagsire/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 09
+	frame 2, 12
+	frame 3, 09
+	frame 4, 09
+	endanim
+; 0xd13a0
--- a/gfx/pokemon/quagsire/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 09
-	frame 2, 12
-	frame 3, 09
-	frame 4, 09
-	endanim
-; 0xd13a0
--- a/gfx/pokemon/quagsire/anim1.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 2, 35
-	frame 1, 08
-	endanim
-; 0xd2034
--- /dev/null
+++ b/gfx/pokemon/quagsire/anim_idle.asm
@@ -1,0 +1,4 @@
+	frame 2, 35
+	frame 1, 08
+	endanim
+; 0xd2034
--- /dev/null
+++ b/gfx/pokemon/quilava/anim.asm
@@ -1,0 +1,9 @@
+	frame 4, 06
+	frame 0, 04
+	frame 1, 12
+	frame 2, 22
+	frame 4, 12
+	frame 0, 10
+	frame 4, 08
+	endanim
+; 0xd11a3
--- a/gfx/pokemon/quilava/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 4, 06
-	frame 0, 04
-	frame 1, 12
-	frame 2, 22
-	frame 4, 12
-	frame 0, 10
-	frame 4, 08
-	endanim
-; 0xd11a3
--- a/gfx/pokemon/quilava/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1ec3
--- /dev/null
+++ b/gfx/pokemon/quilava/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1ec3
--- /dev/null
+++ b/gfx/pokemon/qwilfish/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 05
+	frame 2, 20
+	setrepeat 2
+	frame 0, 11
+	frame 3, 11
+	dorepeat 3
+	endanim
+; 0xd147c
--- a/gfx/pokemon/qwilfish/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 05
-	frame 2, 20
-	setrepeat 2
-	frame 0, 11
-	frame 3, 11
-	dorepeat 3
-	endanim
-; 0xd147c
--- a/gfx/pokemon/qwilfish/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 13
-	frame 1, 13
-	dorepeat 1
-	endanim
-; 0xd20b0
--- /dev/null
+++ b/gfx/pokemon/qwilfish/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 13
+	frame 1, 13
+	dorepeat 1
+	endanim
+; 0xd20b0
--- /dev/null
+++ b/gfx/pokemon/raichu/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 06
+	frame 2, 06
+	frame 3, 28
+	frame 2, 10
+	frame 1, 08
+	endanim
+; 0xd0a0f
--- a/gfx/pokemon/raichu/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 06
-	frame 2, 06
-	frame 3, 28
-	frame 2, 10
-	frame 1, 08
-	endanim
-; 0xd0a0f
--- a/gfx/pokemon/raichu/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 4, 06
-	frame 0, 04
-	frame 4, 04
-	endanim
-; 0xd19c3
--- /dev/null
+++ b/gfx/pokemon/raichu/anim_idle.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 4, 06
+	frame 0, 04
+	frame 4, 04
+	endanim
+; 0xd19c3
--- /dev/null
+++ b/gfx/pokemon/raikou/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 06
+	setrepeat 5
+	frame 2, 03
+	frame 3, 03
+	dorepeat 2
+	frame 2, 35
+	endanim
+; 0xd1614
--- a/gfx/pokemon/raikou/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 06
-	setrepeat 5
-	frame 2, 03
-	frame 3, 03
-	dorepeat 2
-	frame 2, 35
-	endanim
-; 0xd1614
--- a/gfx/pokemon/raikou/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 4, 20
-	frame 5, 08
-	frame 6, 08
-	frame 4, 05
-	frame 6, 05
-	frame 4, 30
-	endanim
-; 0xd21ce
--- /dev/null
+++ b/gfx/pokemon/raikou/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 4, 20
+	frame 5, 08
+	frame 6, 08
+	frame 4, 05
+	frame 6, 05
+	frame 4, 30
+	endanim
+; 0xd21ce
--- /dev/null
+++ b/gfx/pokemon/rapidash/anim.asm
@@ -1,0 +1,14 @@
+	frame 0, 10
+	frame 2, 36
+	frame 0, 05
+	frame 1, 05
+	frame 2, 07
+	frame 0, 06
+	frame 1, 05
+	frame 0, 07
+	setrepeat 4
+	frame 2, 12
+	frame 3, 12
+	dorepeat 9
+	endanim
+; 0xd0d31
--- a/gfx/pokemon/rapidash/anim0.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-	frame 0, 10
-	frame 2, 36
-	frame 0, 05
-	frame 1, 05
-	frame 2, 07
-	frame 0, 06
-	frame 1, 05
-	frame 0, 07
-	setrepeat 4
-	frame 2, 12
-	frame 3, 12
-	dorepeat 9
-	endanim
-; 0xd0d31
--- a/gfx/pokemon/rapidash/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 4, 06
-	frame 0, 06
-	frame 4, 06
-	endanim
-; 0xd1bcd
--- /dev/null
+++ b/gfx/pokemon/rapidash/anim_idle.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 4, 06
+	frame 0, 06
+	frame 4, 06
+	endanim
+; 0xd1bcd
--- /dev/null
+++ b/gfx/pokemon/raticate/anim.asm
@@ -1,0 +1,7 @@
+	frame 2, 24
+	setrepeat 2
+	frame 0, 04
+	frame 1, 04
+	dorepeat 2
+	endanim
+; 0xd09a3
--- a/gfx/pokemon/raticate/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 2, 24
-	setrepeat 2
-	frame 0, 04
-	frame 1, 04
-	dorepeat 2
-	endanim
-; 0xd09a3
--- a/gfx/pokemon/raticate/anim1.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 3, 04
-	dorepeat 1
-	setrepeat 2
-	frame 0, 04
-	frame 1, 04
-	dorepeat 5
-	endanim
-; 0xd197b
--- /dev/null
+++ b/gfx/pokemon/raticate/anim_idle.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 0, 04
+	frame 3, 04
+	dorepeat 1
+	setrepeat 2
+	frame 0, 04
+	frame 1, 04
+	dorepeat 5
+	endanim
+; 0xd197b
--- /dev/null
+++ b/gfx/pokemon/rattata/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 02
+	frame 2, 02
+	frame 3, 12
+	frame 0, 10
+	setrepeat 3
+	frame 0, 05
+	frame 4, 05
+	dorepeat 5
+	endanim
+; 0xd0998
--- a/gfx/pokemon/rattata/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 02
-	frame 2, 02
-	frame 3, 12
-	frame 0, 10
-	setrepeat 3
-	frame 0, 05
-	frame 4, 05
-	dorepeat 5
-	endanim
-; 0xd0998
--- a/gfx/pokemon/rattata/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd196a
--- /dev/null
+++ b/gfx/pokemon/rattata/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd196a
--- /dev/null
+++ b/gfx/pokemon/remoraid/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 05
+	frame 2, 10
+	frame 3, 10
+	endanim
+; 0xd1508
--- a/gfx/pokemon/remoraid/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 05
-	frame 2, 10
-	frame 3, 10
-	endanim
-; 0xd1508
--- a/gfx/pokemon/remoraid/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 1, 07
-	frame 4, 07
-	dorepeat 1
-	endanim
-; 0xd2114
--- /dev/null
+++ b/gfx/pokemon/remoraid/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 1, 07
+	frame 4, 07
+	dorepeat 1
+	endanim
+; 0xd2114
--- /dev/null
+++ b/gfx/pokemon/rhydon/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 08
+	frame 1, 34
+	frame 4, 10
+	frame 2, 10
+	setrepeat 16
+	frame 3, 02
+	frame 2, 02
+	dorepeat 5
+	endanim
+; 0xd0f15
--- a/gfx/pokemon/rhydon/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 08
-	frame 1, 34
-	frame 4, 10
-	frame 2, 10
-	setrepeat 16
-	frame 3, 02
-	frame 2, 02
-	dorepeat 5
-	endanim
-; 0xd0f15
--- a/gfx/pokemon/rhydon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1d0d
--- /dev/null
+++ b/gfx/pokemon/rhydon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1d0d
--- /dev/null
+++ b/gfx/pokemon/rhyhorn/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 05
+	frame 2, 13
+	frame 1, 40
+	endanim
+; 0xd0f04
--- a/gfx/pokemon/rhyhorn/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 05
-	frame 2, 13
-	frame 1, 40
-	endanim
-; 0xd0f04
--- a/gfx/pokemon/rhyhorn/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 13
-	frame 3, 13
-	dorepeat 1
-	endanim
-; 0xd1d04
--- /dev/null
+++ b/gfx/pokemon/rhyhorn/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 13
+	frame 3, 13
+	dorepeat 1
+	endanim
+; 0xd1d04
--- /dev/null
+++ b/gfx/pokemon/sandshrew/anim.asm
@@ -1,0 +1,13 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	frame 0, 20
+	frame 1, 08
+	frame 2, 08
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 8
+	endanim
+; 0xd0a26
--- a/gfx/pokemon/sandshrew/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	frame 0, 20
-	frame 1, 08
-	frame 2, 08
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 8
-	endanim
-; 0xd0a26
--- a/gfx/pokemon/sandshrew/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 5, 07
-	dorepeat 1
-	frame 4, 13
-	endanim
-; 0xd19ce
--- /dev/null
+++ b/gfx/pokemon/sandshrew/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 3
+	frame 0, 07
+	frame 5, 07
+	dorepeat 1
+	frame 4, 13
+	endanim
+; 0xd19ce
--- /dev/null
+++ b/gfx/pokemon/sandslash/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 06
+	frame 1, 14
+	frame 0, 12
+	frame 4, 07
+	frame 2, 08
+	frame 0, 12
+	frame 4, 07
+	frame 2, 08
+	endanim
+; 0xd0a37
--- a/gfx/pokemon/sandslash/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 06
-	frame 1, 14
-	frame 0, 12
-	frame 4, 07
-	frame 2, 08
-	frame 0, 12
-	frame 4, 07
-	frame 2, 08
-	endanim
-; 0xd0a37
--- a/gfx/pokemon/sandslash/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 08
-	frame 3, 06
-	frame 0, 04
-	frame 3, 04
-	endanim
-; 0xd19d7
--- /dev/null
+++ b/gfx/pokemon/sandslash/anim_idle.asm
@@ -1,0 +1,6 @@
+	frame 0, 08
+	frame 3, 06
+	frame 0, 04
+	frame 3, 04
+	endanim
+; 0xd19d7
--- /dev/null
+++ b/gfx/pokemon/scizor/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 06
+	frame 5, 22
+	setrepeat 3
+	frame 2, 06
+	frame 1, 06
+	frame 3, 06
+	dorepeat 3
+	frame 6, 18
+	endanim
+; 0xd148d
--- a/gfx/pokemon/scizor/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 06
-	frame 5, 22
-	setrepeat 3
-	frame 2, 06
-	frame 1, 06
-	frame 3, 06
-	dorepeat 3
-	frame 6, 18
-	endanim
-; 0xd148d
--- a/gfx/pokemon/scizor/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd20b9
--- /dev/null
+++ b/gfx/pokemon/scizor/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd20b9
--- /dev/null
+++ b/gfx/pokemon/scyther/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 05
+	frame 2, 18
+	frame 3, 06
+	setrepeat 7
+	frame 4, 04
+	frame 5, 04
+	dorepeat 4
+	endanim
+; 0xd0fa8
--- a/gfx/pokemon/scyther/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 05
-	frame 2, 18
-	frame 3, 06
-	setrepeat 7
-	frame 4, 04
-	frame 5, 04
-	dorepeat 4
-	endanim
-; 0xd0fa8
--- a/gfx/pokemon/scyther/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 8
-	frame 0, 04
-	frame 6, 04
-	dorepeat 1
-	endanim
-; 0xd1d78
--- /dev/null
+++ b/gfx/pokemon/scyther/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 8
+	frame 0, 04
+	frame 6, 04
+	dorepeat 1
+	endanim
+; 0xd1d78
--- /dev/null
+++ b/gfx/pokemon/seadra/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	frame 2, 10
+	dorepeat 1
+	endanim
+; 0xd0f54
--- a/gfx/pokemon/seadra/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	frame 2, 10
-	dorepeat 1
-	endanim
-; 0xd0f54
--- a/gfx/pokemon/seadra/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	frame 3, 10
-	dorepeat 1
-	endanim
-; 0xd1d40
--- /dev/null
+++ b/gfx/pokemon/seadra/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	frame 3, 10
+	dorepeat 1
+	endanim
+; 0xd1d40
--- /dev/null
+++ b/gfx/pokemon/seaking/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 3
+	frame 0, 12
+	frame 1, 12
+	frame 2, 12
+	dorepeat 1
+	endanim
+; 0xd0f6c
--- a/gfx/pokemon/seaking/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 3
-	frame 0, 12
-	frame 1, 12
-	frame 2, 12
-	dorepeat 1
-	endanim
-; 0xd0f6c
--- a/gfx/pokemon/seaking/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 15
-	frame 3, 15
-	frame 4, 15
-	dorepeat 1
-	endanim
-; 0xd1d54
--- /dev/null
+++ b/gfx/pokemon/seaking/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 15
+	frame 3, 15
+	frame 4, 15
+	dorepeat 1
+	endanim
+; 0xd1d54
--- /dev/null
+++ b/gfx/pokemon/seel/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 06
+	frame 2, 32
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	dorepeat 3
+	endanim
+; 0xd0d9f
--- a/gfx/pokemon/seel/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 06
-	frame 2, 32
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	dorepeat 3
-	endanim
-; 0xd0d9f
--- a/gfx/pokemon/seel/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 2, 12
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 2
-	endanim
-; 0xd1c1b
--- /dev/null
+++ b/gfx/pokemon/seel/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 2, 12
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 2
+	endanim
+; 0xd1c1b
--- /dev/null
+++ b/gfx/pokemon/sentret/anim.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 15
+	frame 1, 15
+	dorepeat 1
+	endanim
+; 0xd11e6
--- a/gfx/pokemon/sentret/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 15
-	frame 1, 15
-	dorepeat 1
-	endanim
-; 0xd11e6
--- a/gfx/pokemon/sentret/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 2, 07
-	dorepeat 1
-	endanim
-; 0xd1ef2
--- /dev/null
+++ b/gfx/pokemon/sentret/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 2, 07
+	dorepeat 1
+	endanim
+; 0xd1ef2
--- /dev/null
+++ b/gfx/pokemon/shellder/anim.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd0dc5
--- a/gfx/pokemon/shellder/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd0dc5
--- a/gfx/pokemon/shellder/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 2, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1c49
--- /dev/null
+++ b/gfx/pokemon/shellder/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 2, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1c49
--- /dev/null
+++ b/gfx/pokemon/shuckle/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 07
+	frame 2, 07
+	frame 3, 12
+	frame 1, 07
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 5
+	endanim
+; 0xd149e
--- a/gfx/pokemon/shuckle/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 07
-	frame 2, 07
-	frame 3, 12
-	frame 1, 07
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 5
-	endanim
-; 0xd149e
--- a/gfx/pokemon/shuckle/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd20c2
--- /dev/null
+++ b/gfx/pokemon/shuckle/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd20c2
--- /dev/null
+++ b/gfx/pokemon/skarmory/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 3
+	frame 1, 09
+	frame 2, 09
+	dorepeat 1
+	frame 1, 08
+	endanim
+; 0xd1544
--- a/gfx/pokemon/skarmory/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 3
-	frame 1, 09
-	frame 2, 09
-	dorepeat 1
-	frame 1, 08
-	endanim
-; 0xd1544
--- a/gfx/pokemon/skarmory/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd2138
--- /dev/null
+++ b/gfx/pokemon/skarmory/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd2138
--- /dev/null
+++ b/gfx/pokemon/skiploom/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 04
+	frame 1, 10
+	frame 2, 14
+	frame 3, 14
+	endanim
+; 0xd1357
--- a/gfx/pokemon/skiploom/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 04
-	frame 1, 10
-	frame 2, 14
-	frame 3, 14
-	endanim
-; 0xd1357
--- a/gfx/pokemon/skiploom/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1ff9
--- /dev/null
+++ b/gfx/pokemon/skiploom/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1ff9
--- /dev/null
+++ b/gfx/pokemon/slowbro/anim.asm
@@ -1,0 +1,13 @@
+	frame 0, 04
+	frame 1, 08
+	frame 0, 28
+	frame 1, 12
+	setrepeat 2
+	frame 2, 10
+	frame 3, 10
+	dorepeat 5
+	frame 2, 24
+	frame 0, 10
+	frame 4, 10
+	endanim
+; 0xd0d4f
--- a/gfx/pokemon/slowbro/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 0, 04
-	frame 1, 08
-	frame 0, 28
-	frame 1, 12
-	setrepeat 2
-	frame 2, 10
-	frame 3, 10
-	dorepeat 5
-	frame 2, 24
-	frame 0, 10
-	frame 4, 10
-	endanim
-; 0xd0d4f
--- a/gfx/pokemon/slowbro/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1bd9
--- /dev/null
+++ b/gfx/pokemon/slowbro/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1bd9
--- /dev/null
+++ b/gfx/pokemon/slowking/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 07
+	frame 2, 25
+	frame 3, 35
+	frame 1, 07
+	frame 2, 25
+	setrepeat 2
+	frame 0, 06
+	frame 1, 06
+	dorepeat 6
+	endanim
+; 0xd13e2
--- a/gfx/pokemon/slowking/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 07
-	frame 2, 25
-	frame 3, 35
-	frame 1, 07
-	frame 2, 25
-	setrepeat 2
-	frame 0, 06
-	frame 1, 06
-	dorepeat 6
-	endanim
-; 0xd13e2
--- a/gfx/pokemon/slowking/anim1.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 1, 07
-	frame 2, 50
-	endanim
-; 0xd2054
--- /dev/null
+++ b/gfx/pokemon/slowking/anim_idle.asm
@@ -1,0 +1,4 @@
+	frame 1, 07
+	frame 2, 50
+	endanim
+; 0xd2054
--- /dev/null
+++ b/gfx/pokemon/slowpoke/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 05
+	frame 2, 28
+	frame 1, 10
+	endanim
+; 0xd0d38
--- a/gfx/pokemon/slowpoke/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 05
-	frame 2, 28
-	frame 1, 10
-	endanim
-; 0xd0d38
--- a/gfx/pokemon/slowpoke/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 3, 20
-	endanim
-; 0xd1bd0
--- /dev/null
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 3, 20
+	endanim
+; 0xd1bd0
--- /dev/null
+++ b/gfx/pokemon/slugma/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 12
+	frame 2, 10
+	frame 3, 06
+	frame 4, 14
+	frame 6, 12
+	frame 7, 10
+	frame 8, 06
+	frame 0, 14
+	endanim
+; 0xd14d9
--- a/gfx/pokemon/slugma/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 12
-	frame 2, 10
-	frame 3, 06
-	frame 4, 14
-	frame 6, 12
-	frame 7, 10
-	frame 8, 06
-	frame 0, 14
-	endanim
-; 0xd14d9
--- a/gfx/pokemon/slugma/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd20ed
--- /dev/null
+++ b/gfx/pokemon/slugma/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd20ed
--- /dev/null
+++ b/gfx/pokemon/smeargle/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 07
+	frame 2, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd15ac
--- a/gfx/pokemon/smeargle/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 2, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd15ac
--- a/gfx/pokemon/smeargle/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd217e
--- /dev/null
+++ b/gfx/pokemon/smeargle/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd217e
--- /dev/null
+++ b/gfx/pokemon/smoochum/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 06
+	frame 2, 08
+	frame 3, 24
+	endanim
+; 0xd15cd
--- a/gfx/pokemon/smoochum/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 06
-	frame 2, 08
-	frame 3, 24
-	endanim
-; 0xd15cd
--- a/gfx/pokemon/smoochum/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 1, 06
-	dorepeat 1
-	endanim
-; 0xd219b
--- /dev/null
+++ b/gfx/pokemon/smoochum/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 1, 06
+	dorepeat 1
+	endanim
+; 0xd219b
--- /dev/null
+++ b/gfx/pokemon/sneasel/anim.asm
@@ -1,0 +1,4 @@
+	frame 1, 04
+	frame 2, 30
+	endanim
+; 0xd14aa
--- a/gfx/pokemon/sneasel/anim0.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 1, 04
-	frame 2, 30
-	endanim
-; 0xd14aa
--- a/gfx/pokemon/sneasel/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 3, 24
-	frame 0, 09
-	frame 4, 08
-	endanim
-; 0xd20d2
--- /dev/null
+++ b/gfx/pokemon/sneasel/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 3, 24
+	frame 0, 09
+	frame 4, 08
+	endanim
+; 0xd20d2
--- /dev/null
+++ b/gfx/pokemon/snorlax/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 10
+	frame 2, 43
+	frame 1, 10
+	frame 0, 15
+	setrepeat 2
+	frame 0, 09
+	frame 3, 09
+	dorepeat 5
+	endanim
+; 0xd10b2
--- a/gfx/pokemon/snorlax/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 10
-	frame 2, 43
-	frame 1, 10
-	frame 0, 15
-	setrepeat 2
-	frame 0, 09
-	frame 3, 09
-	dorepeat 5
-	endanim
-; 0xd10b2
--- a/gfx/pokemon/snorlax/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 3, 10
-	dorepeat 1
-	endanim
-; 0xd1e34
--- /dev/null
+++ b/gfx/pokemon/snorlax/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 10
+	frame 3, 10
+	dorepeat 1
+	endanim
+; 0xd1e34
--- /dev/null
+++ b/gfx/pokemon/snubbull/anim.asm
@@ -1,0 +1,11 @@
+	setrepeat 2
+	frame 1, 07
+	frame 2, 09
+	frame 3, 09
+	dorepeat 1
+	setrepeat 3
+	frame 4, 08
+	frame 0, 08
+	dorepeat 6
+	endanim
+; 0xd1462
--- a/gfx/pokemon/snubbull/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	setrepeat 2
-	frame 1, 07
-	frame 2, 09
-	frame 3, 09
-	dorepeat 1
-	setrepeat 3
-	frame 4, 08
-	frame 0, 08
-	dorepeat 6
-	endanim
-; 0xd1462
--- a/gfx/pokemon/snubbull/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 4, 12
-	frame 5, 12
-	dorepeat 1
-	endanim
-; 0xd209e
--- /dev/null
+++ b/gfx/pokemon/snubbull/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 4, 12
+	frame 5, 12
+	dorepeat 1
+	endanim
+; 0xd209e
--- /dev/null
+++ b/gfx/pokemon/spearow/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 06
+	frame 2, 09
+	frame 1, 25
+	frame 0, 25
+	frame 3, 10
+	setrepeat 4
+	frame 3, 04
+	frame 4, 04
+	dorepeat 6
+	endanim
+; 0xd09b6
--- a/gfx/pokemon/spearow/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 06
-	frame 2, 09
-	frame 1, 25
-	frame 0, 25
-	frame 3, 10
-	setrepeat 4
-	frame 3, 04
-	frame 4, 04
-	dorepeat 6
-	endanim
-; 0xd09b6
--- a/gfx/pokemon/spearow/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 3
-	frame 1, 06
-	frame 5, 06
-	dorepeat 1
-	frame 6, 07
-	endanim
-; 0xd1986
--- /dev/null
+++ b/gfx/pokemon/spearow/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 3
+	frame 1, 06
+	frame 5, 06
+	dorepeat 1
+	frame 6, 07
+	endanim
+; 0xd1986
--- /dev/null
+++ b/gfx/pokemon/spinarak/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 07
+	frame 2, 12
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 3
+	endanim
+; 0xd1240
--- a/gfx/pokemon/spinarak/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 07
-	frame 2, 12
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 3
-	endanim
-; 0xd1240
--- a/gfx/pokemon/spinarak/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1f2e
--- /dev/null
+++ b/gfx/pokemon/spinarak/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1f2e
--- /dev/null
+++ b/gfx/pokemon/squirtle/anim.asm
@@ -1,0 +1,10 @@
+	frame 3, 10
+	setrepeat 2
+	frame 1, 09
+	frame 2, 05
+	dorepeat 2
+	frame 1, 10
+	frame 3, 15
+	frame 4, 05
+	endanim
+; 0xd08f2
--- a/gfx/pokemon/squirtle/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 3, 10
-	setrepeat 2
-	frame 1, 09
-	frame 2, 05
-	dorepeat 2
-	frame 1, 10
-	frame 3, 15
-	frame 4, 05
-	endanim
-; 0xd08f2
--- a/gfx/pokemon/squirtle/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd18de
--- /dev/null
+++ b/gfx/pokemon/squirtle/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd18de
--- /dev/null
+++ b/gfx/pokemon/stantler/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 14
+	frame 0, 12
+	frame 1, 14
+	frame 0, 22
+	frame 2, 08
+	frame 0, 08
+	frame 2, 08
+	endanim
+; 0xd15a1
--- a/gfx/pokemon/stantler/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 14
-	frame 0, 12
-	frame 1, 14
-	frame 0, 22
-	frame 2, 08
-	frame 0, 08
-	frame 2, 08
-	endanim
-; 0xd15a1
--- a/gfx/pokemon/stantler/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd2175
--- /dev/null
+++ b/gfx/pokemon/stantler/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd2175
--- /dev/null
+++ b/gfx/pokemon/starmie/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 5
+	frame 0, 06
+	frame 1, 06
+	dorepeat 1
+	frame 2, 07
+	frame 3, 07
+	endanim
+; 0xd0f86
--- a/gfx/pokemon/starmie/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 5
-	frame 0, 06
-	frame 1, 06
-	dorepeat 1
-	frame 2, 07
-	frame 3, 07
-	endanim
-; 0xd0f86
--- a/gfx/pokemon/starmie/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 2, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1d66
--- /dev/null
+++ b/gfx/pokemon/starmie/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 2, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1d66
--- /dev/null
+++ b/gfx/pokemon/staryu/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 24
+	frame 0, 08
+	frame 1, 12
+	frame 2, 04
+	frame 3, 04
+	frame 2, 04
+	endanim
+; 0xd0f79
--- a/gfx/pokemon/staryu/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 24
-	frame 0, 08
-	frame 1, 12
-	frame 2, 04
-	frame 3, 04
-	frame 2, 04
-	endanim
-; 0xd0f79
--- a/gfx/pokemon/staryu/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 2, 04
-	frame 3, 04
-	dorepeat 1
-	endanim
-; 0xd1d5f
--- /dev/null
+++ b/gfx/pokemon/staryu/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 04
+	frame 2, 04
+	frame 3, 04
+	dorepeat 1
+	endanim
+; 0xd1d5f
--- /dev/null
+++ b/gfx/pokemon/steelix/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 14
+	frame 2, 18
+	frame 3, 28
+	frame 2, 08
+	frame 1, 06
+	endanim
+; 0xd144f
--- a/gfx/pokemon/steelix/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 14
-	frame 2, 18
-	frame 3, 28
-	frame 2, 08
-	frame 1, 06
-	endanim
-; 0xd144f
--- a/gfx/pokemon/steelix/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd2095
--- /dev/null
+++ b/gfx/pokemon/steelix/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd2095
--- /dev/null
+++ b/gfx/pokemon/sudowoodo/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 10
+	frame 2, 10
+	frame 1, 10
+	dorepeat 1
+	endanim
+; 0xd1336
--- a/gfx/pokemon/sudowoodo/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 10
-	frame 2, 10
-	frame 1, 10
-	dorepeat 1
-	endanim
-; 0xd1336
--- a/gfx/pokemon/sudowoodo/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 09
-	frame 3, 09
-	dorepeat 1
-	endanim
-; 0xd1fdc
--- /dev/null
+++ b/gfx/pokemon/sudowoodo/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 09
+	frame 3, 09
+	dorepeat 1
+	endanim
+; 0xd1fdc
--- /dev/null
+++ b/gfx/pokemon/suicune/anim.asm
@@ -1,0 +1,13 @@
+	frame 1, 10
+	frame 2, 10
+	frame 3, 10
+	frame 4, 10
+	frame 5, 10
+	setrepeat 2
+	frame 6, 03
+	frame 7, 03
+	frame 8, 03
+	frame 0, 03
+	dorepeat 6
+	endanim
+; 0xd1634
--- a/gfx/pokemon/suicune/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 1, 10
-	frame 2, 10
-	frame 3, 10
-	frame 4, 10
-	frame 5, 10
-	setrepeat 2
-	frame 6, 03
-	frame 7, 03
-	frame 8, 03
-	frame 0, 03
-	dorepeat 6
-	endanim
-; 0xd1634
--- a/gfx/pokemon/suicune/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 9, 35
-	setrepeat 2
-	frame 0, 06
-	frame 9, 06
-	dorepeat 2
-	endanim
-; 0xd21e2
--- /dev/null
+++ b/gfx/pokemon/suicune/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 9, 35
+	setrepeat 2
+	frame 0, 06
+	frame 9, 06
+	dorepeat 2
+	endanim
+; 0xd21e2
--- /dev/null
+++ b/gfx/pokemon/sunflora/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 12
+	frame 2, 06
+	frame 3, 16
+	endanim
+; 0xd137b
--- a/gfx/pokemon/sunflora/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 12
-	frame 2, 06
-	frame 3, 16
-	endanim
-; 0xd137b
--- a/gfx/pokemon/sunflora/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd201d
--- /dev/null
+++ b/gfx/pokemon/sunflora/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd201d
--- /dev/null
+++ b/gfx/pokemon/sunkern/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 24
+	setrepeat 3
+	frame 0, 04
+	frame 2, 04
+	dorepeat 2
+	endanim
+; 0xd1374
--- a/gfx/pokemon/sunkern/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 24
-	setrepeat 3
-	frame 0, 04
-	frame 2, 04
-	dorepeat 2
-	endanim
-; 0xd1374
--- a/gfx/pokemon/sunkern/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd2014
--- /dev/null
+++ b/gfx/pokemon/sunkern/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd2014
--- /dev/null
+++ b/gfx/pokemon/swinub/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 24
+	setrepeat 2
+	frame 0, 09
+	frame 2, 09
+	dorepeat 2
+	endanim
+; 0xd14ef
--- a/gfx/pokemon/swinub/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 24
-	setrepeat 2
-	frame 0, 09
-	frame 2, 09
-	dorepeat 2
-	endanim
-; 0xd14ef
--- a/gfx/pokemon/swinub/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd20f9
--- /dev/null
+++ b/gfx/pokemon/swinub/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd20f9
--- /dev/null
+++ b/gfx/pokemon/tangela/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 36
+	frame 0, 24
+	frame 2, 10
+	endanim
+; 0xd0f2d
--- a/gfx/pokemon/tangela/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 36
-	frame 0, 24
-	frame 2, 10
-	endanim
-; 0xd0f2d
--- a/gfx/pokemon/tangela/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	dorepeat 1
-	endanim
-; 0xd1d1f
--- /dev/null
+++ b/gfx/pokemon/tangela/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	dorepeat 1
+	endanim
+; 0xd1d1f
--- /dev/null
+++ b/gfx/pokemon/tauros/anim.asm
@@ -1,0 +1,11 @@
+	frame 0, 08
+	frame 3, 10
+	frame 1, 28
+	frame 0, 12
+	setrepeat 3
+	frame 2, 11
+	frame 3, 11
+	dorepeat 5
+	frame 1, 07
+	endanim
+; 0xd0ff7
--- a/gfx/pokemon/tauros/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 0, 08
-	frame 3, 10
-	frame 1, 28
-	frame 0, 12
-	setrepeat 3
-	frame 2, 11
-	frame 3, 11
-	dorepeat 5
-	frame 1, 07
-	endanim
-; 0xd0ff7
--- a/gfx/pokemon/tauros/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd1da5
--- /dev/null
+++ b/gfx/pokemon/tauros/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd1da5
--- /dev/null
+++ b/gfx/pokemon/teddiursa/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 08
+	frame 2, 28
+	frame 0, 24
+	setrepeat 3
+	frame 0, 10
+	frame 3, 10
+	dorepeat 4
+	endanim
+; 0xd14b9
--- a/gfx/pokemon/teddiursa/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 08
-	frame 2, 28
-	frame 0, 24
-	setrepeat 3
-	frame 0, 10
-	frame 3, 10
-	dorepeat 4
-	endanim
-; 0xd14b9
--- a/gfx/pokemon/teddiursa/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 4, 06
-	dorepeat 1
-	endanim
-; 0xd20db
--- /dev/null
+++ b/gfx/pokemon/teddiursa/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 4, 06
+	dorepeat 1
+	endanim
+; 0xd20db
--- /dev/null
+++ b/gfx/pokemon/tentacool/anim.asm
@@ -1,0 +1,6 @@
+	frame 1, 09
+	frame 2, 05
+	frame 4, 10
+	frame 5, 16
+	endanim
+; 0xd0cd3
--- a/gfx/pokemon/tentacool/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 09
-	frame 2, 05
-	frame 4, 10
-	frame 5, 16
-	endanim
-; 0xd0cd3
--- a/gfx/pokemon/tentacool/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	endanim
-; 0xd1b95
--- /dev/null
+++ b/gfx/pokemon/tentacool/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	endanim
+; 0xd1b95
--- /dev/null
+++ b/gfx/pokemon/tentacruel/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 2, 15
+	frame 1, 23
+	dorepeat 1
+	frame 2, 08
+	endanim
+; 0xd0cde
--- a/gfx/pokemon/tentacruel/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 2, 15
-	frame 1, 23
-	dorepeat 1
-	frame 2, 08
-	endanim
-; 0xd0cde
--- a/gfx/pokemon/tentacruel/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 2, 20
-	setrepeat 7
-	frame 2, 03
-	frame 3, 03
-	dorepeat 2
-	endanim
-; 0xd1ba0
--- /dev/null
+++ b/gfx/pokemon/tentacruel/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 2, 20
+	setrepeat 7
+	frame 2, 03
+	frame 3, 03
+	dorepeat 2
+	endanim
+; 0xd1ba0
--- /dev/null
+++ b/gfx/pokemon/togepi/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 12
+	dorepeat 1
+	frame 0, 06
+	frame 2, 06
+	endanim
+; 0xd12a6
--- a/gfx/pokemon/togepi/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 12
-	dorepeat 1
-	frame 0, 06
-	frame 2, 06
-	endanim
-; 0xd12a6
--- a/gfx/pokemon/togepi/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 2, 06
-	dorepeat 1
-	endanim
-; 0xd1f7a
--- /dev/null
+++ b/gfx/pokemon/togepi/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 2, 06
+	dorepeat 1
+	endanim
+; 0xd1f7a
--- /dev/null
+++ b/gfx/pokemon/togetic/anim.asm
@@ -1,0 +1,8 @@
+	frame 2, 09
+	frame 1, 09
+	setrepeat 2
+	frame 5, 09
+	frame 4, 09
+	dorepeat 3
+	endanim
+; 0xd12b3
--- a/gfx/pokemon/togetic/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 2, 09
-	frame 1, 09
-	setrepeat 2
-	frame 5, 09
-	frame 4, 09
-	dorepeat 3
-	endanim
-; 0xd12b3
--- a/gfx/pokemon/togetic/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1f83
--- /dev/null
+++ b/gfx/pokemon/togetic/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1f83
--- /dev/null
+++ b/gfx/pokemon/totodile/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 3
+	frame 1, 10
+	frame 2, 10
+	dorepeat 1
+	setrepeat 3
+	frame 0, 10
+	frame 2, 10
+	dorepeat 5
+	endanim
+; 0xd11c7
--- a/gfx/pokemon/totodile/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 3
-	frame 1, 10
-	frame 2, 10
-	dorepeat 1
-	setrepeat 3
-	frame 0, 10
-	frame 2, 10
-	dorepeat 5
-	endanim
-; 0xd11c7
--- a/gfx/pokemon/totodile/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 35
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 2
-	endanim
-; 0xd1ed7
--- /dev/null
+++ b/gfx/pokemon/totodile/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 1, 35
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 2
+	endanim
+; 0xd1ed7
--- /dev/null
+++ b/gfx/pokemon/typhlosion/anim.asm
@@ -1,0 +1,11 @@
+	frame 1, 08
+	setrepeat 6
+	frame 2, 04
+	frame 3, 04
+	dorepeat 2
+	setrepeat 2
+	frame 5, 03
+	frame 1, 03
+	dorepeat 6
+	endanim
+; 0xd11b6
--- a/gfx/pokemon/typhlosion/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 1, 08
-	setrepeat 6
-	frame 2, 04
-	frame 3, 04
-	dorepeat 2
-	setrepeat 2
-	frame 5, 03
-	frame 1, 03
-	dorepeat 6
-	endanim
-; 0xd11b6
--- a/gfx/pokemon/typhlosion/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 08
-	dorepeat 1
-	endanim
-; 0xd1ecc
--- /dev/null
+++ b/gfx/pokemon/typhlosion/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 08
+	dorepeat 1
+	endanim
+; 0xd1ecc
--- /dev/null
+++ b/gfx/pokemon/tyranitar/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 14
+	frame 2, 16
+	frame 3, 16
+	frame 1, 14
+	frame 4, 16
+	frame 0, 16
+	frame 4, 16
+	endanim
+; 0xd1659
--- a/gfx/pokemon/tyranitar/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 14
-	frame 2, 16
-	frame 3, 16
-	frame 1, 14
-	frame 4, 16
-	frame 0, 16
-	frame 4, 16
-	endanim
-; 0xd1659
--- a/gfx/pokemon/tyranitar/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 5, 08
-	dorepeat 1
-	endanim
-; 0xd21ff
--- /dev/null
+++ b/gfx/pokemon/tyranitar/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 08
+	frame 5, 08
+	dorepeat 1
+	endanim
+; 0xd21ff
--- /dev/null
+++ b/gfx/pokemon/tyrogue/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 08
+	setrepeat 4
+	frame 2, 05
+	frame 3, 06
+	dorepeat 2
+	endanim
+; 0xd15b7
--- a/gfx/pokemon/tyrogue/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 08
-	setrepeat 4
-	frame 2, 05
-	frame 3, 06
-	dorepeat 2
-	endanim
-; 0xd15b7
--- a/gfx/pokemon/tyrogue/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd2187
--- /dev/null
+++ b/gfx/pokemon/tyrogue/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd2187
--- /dev/null
+++ b/gfx/pokemon/umbreon/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 07
+	frame 2, 30
+	setrepeat 2
+	frame 2, 08
+	frame 3, 08
+	dorepeat 3
+	frame 2, 30
+	endanim
+; 0xd13be
--- a/gfx/pokemon/umbreon/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 07
-	frame 2, 30
-	setrepeat 2
-	frame 2, 08
-	frame 3, 08
-	dorepeat 3
-	frame 2, 30
-	endanim
-; 0xd13be
--- a/gfx/pokemon/umbreon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 04
-	frame 4, 04
-	dorepeat 1
-	endanim
-; 0xd2046
--- /dev/null
+++ b/gfx/pokemon/umbreon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 04
+	frame 4, 04
+	dorepeat 1
+	endanim
+; 0xd2046
--- /dev/null
+++ b/gfx/pokemon/unown/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 05
+	frame 2, 05
+	frame 3, 05
+	frame 4, 05
+	frame 5, 05
+	frame 6, 05
+	frame 7, 05
+	frame 8, 05
+	frame 9, 05
+	frame 10, 05
+	endanim
+; 0xd13fe
--- a/gfx/pokemon/unown/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 05
-	frame 2, 05
-	frame 3, 05
-	frame 4, 05
-	frame 5, 05
-	frame 6, 05
-	frame 7, 05
-	frame 8, 05
-	frame 9, 05
-	frame 10, 05
-	endanim
-; 0xd13fe
--- a/gfx/pokemon/unown/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 11, 05
-	dorepeat 1
-	endanim
-; 0xd2066
--- /dev/null
+++ b/gfx/pokemon/unown/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 11, 05
+	dorepeat 1
+	endanim
+; 0xd2066
--- /dev/null
+++ b/gfx/pokemon/unown_a/anim.asm
@@ -1,0 +1,13 @@
+	frame 0, 08
+	frame 1, 08
+	frame 2, 24
+	frame 1, 08
+	frame 0, 08
+	setrepeat 2
+	frame 3, 07
+	frame 0, 07
+	frame 4, 07
+	frame 0, 07
+	dorepeat 6
+	endanim
+; 0xd2274
--- a/gfx/pokemon/unown_a/anim0.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-	frame 0, 08
-	frame 1, 08
-	frame 2, 24
-	frame 1, 08
-	frame 0, 08
-	setrepeat 2
-	frame 3, 07
-	frame 0, 07
-	frame 4, 07
-	frame 0, 07
-	dorepeat 6
-	endanim
-; 0xd2274
--- a/gfx/pokemon/unown_a/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 5, 06
-	dorepeat 1
-	endanim
-; 0xd240e
--- /dev/null
+++ b/gfx/pokemon/unown_a/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 5, 06
+	dorepeat 1
+	endanim
+; 0xd240e
--- 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"
--- /dev/null
+++ b/gfx/pokemon/unown_b/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 08
+	frame 2, 18
+	frame 3, 06
+	setrepeat 3
+	frame 4, 04
+	frame 5, 04
+	dorepeat 4
+	endanim
+; 0xd2283
--- a/gfx/pokemon/unown_b/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 08
-	frame 2, 18
-	frame 3, 06
-	setrepeat 3
-	frame 4, 04
-	frame 5, 04
-	dorepeat 4
-	endanim
-; 0xd2283
--- a/gfx/pokemon/unown_b/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 03
-	frame 6, 04
-	dorepeat 1
-	endanim
-; 0xd2417
--- /dev/null
+++ b/gfx/pokemon/unown_b/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 03
+	frame 6, 04
+	dorepeat 1
+	endanim
+; 0xd2417
--- /dev/null
+++ b/gfx/pokemon/unown_c/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 05
+	frame 1, 05
+	frame 2, 05
+	setrepeat 2
+	frame 3, 04
+	frame 2, 04
+	dorepeat 4
+	endanim
+; 0xd2292
--- a/gfx/pokemon/unown_c/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 05
-	frame 1, 05
-	frame 2, 05
-	setrepeat 2
-	frame 3, 04
-	frame 2, 04
-	dorepeat 4
-	endanim
-; 0xd2292
--- a/gfx/pokemon/unown_c/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd2420
--- /dev/null
+++ b/gfx/pokemon/unown_c/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd2420
--- /dev/null
+++ b/gfx/pokemon/unown_d/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 2, 10
+	frame 0, 08
+	frame 1, 10
+	frame 0, 08
+	dorepeat 1
+	endanim
+; 0xd229f
--- a/gfx/pokemon/unown_d/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 2, 10
-	frame 0, 08
-	frame 1, 10
-	frame 0, 08
-	dorepeat 1
-	endanim
-; 0xd229f
--- a/gfx/pokemon/unown_d/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2429
--- /dev/null
+++ b/gfx/pokemon/unown_d/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2429
--- /dev/null
+++ b/gfx/pokemon/unown_e/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 05
+	frame 1, 06
+	frame 0, 05
+	setrepeat 2
+	frame 2, 03
+	frame 0, 02
+	dorepeat 4
+	endanim
+; 0xd22ae
--- a/gfx/pokemon/unown_e/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 05
-	frame 1, 06
-	frame 0, 05
-	setrepeat 2
-	frame 2, 03
-	frame 0, 02
-	dorepeat 4
-	endanim
-; 0xd22ae
--- a/gfx/pokemon/unown_e/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2432
--- /dev/null
+++ b/gfx/pokemon/unown_e/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2432
--- a/gfx/pokemon/unown_extra_pointers.asm
+++ /dev/null
@@ -1,27 +1,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
--- a/gfx/pokemon/unown_extras.asm
+++ /dev/null
@@ -1,26 +1,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"
--- /dev/null
+++ b/gfx/pokemon/unown_f/anim.asm
@@ -1,0 +1,10 @@
+	setrepeat 2
+	frame 1, 11
+	frame 2, 11
+	dorepeat 1
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 5
+	endanim
+; 0xd22bf
--- a/gfx/pokemon/unown_f/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	setrepeat 2
-	frame 1, 11
-	frame 2, 11
-	dorepeat 1
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 5
-	endanim
-; 0xd22bf
--- a/gfx/pokemon/unown_f/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd243b
--- /dev/null
+++ b/gfx/pokemon/unown_f/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd243b
--- /dev/null
+++ b/gfx/pokemon/unown_g/anim.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 1, 06
+	frame 2, 06
+	frame 0, 06
+	dorepeat 1
+	endanim
+; 0xd22ca
--- a/gfx/pokemon/unown_g/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 1, 06
-	frame 2, 06
-	frame 0, 06
-	dorepeat 1
-	endanim
-; 0xd22ca
--- a/gfx/pokemon/unown_g/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2444
--- /dev/null
+++ b/gfx/pokemon/unown_g/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2444
--- /dev/null
+++ b/gfx/pokemon/unown_h/anim.asm
@@ -1,0 +1,11 @@
+	frame 5, 12
+	frame 1, 06
+	frame 2, 04
+	frame 3, 03
+	frame 4, 02
+	frame 1, 02
+	frame 2, 02
+	frame 3, 02
+	frame 4, 02
+	endanim
+; 0xd22dd
--- a/gfx/pokemon/unown_h/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	frame 5, 12
-	frame 1, 06
-	frame 2, 04
-	frame 3, 03
-	frame 4, 02
-	frame 1, 02
-	frame 2, 02
-	frame 3, 02
-	frame 4, 02
-	endanim
-; 0xd22dd
--- a/gfx/pokemon/unown_h/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd244d
--- /dev/null
+++ b/gfx/pokemon/unown_h/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd244d
--- /dev/null
+++ b/gfx/pokemon/unown_i/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 06
+	frame 0, 05
+	frame 2, 06
+	frame 0, 05
+	dorepeat 1
+	endanim
+; 0xd22ea
--- a/gfx/pokemon/unown_i/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 06
-	frame 0, 05
-	frame 2, 06
-	frame 0, 05
-	dorepeat 1
-	endanim
-; 0xd22ea
--- a/gfx/pokemon/unown_i/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2456
--- /dev/null
+++ b/gfx/pokemon/unown_i/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2456
--- /dev/null
+++ b/gfx/pokemon/unown_idle_pointers.asm
@@ -1,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
--- /dev/null
+++ b/gfx/pokemon/unown_idles.asm
@@ -1,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"
--- /dev/null
+++ b/gfx/pokemon/unown_j/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 03
+	frame 1, 05
+	frame 2, 07
+	frame 1, 05
+	dorepeat 1
+	endanim
+; 0xd22f7
--- a/gfx/pokemon/unown_j/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 03
-	frame 1, 05
-	frame 2, 07
-	frame 1, 05
-	dorepeat 1
-	endanim
-; 0xd22f7
--- a/gfx/pokemon/unown_j/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd245f
--- /dev/null
+++ b/gfx/pokemon/unown_j/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd245f
--- /dev/null
+++ b/gfx/pokemon/unown_k/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 07
+	frame 1, 07
+	frame 2, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd2304
--- a/gfx/pokemon/unown_k/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 1, 07
-	frame 2, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd2304
--- a/gfx/pokemon/unown_k/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2468
--- /dev/null
+++ b/gfx/pokemon/unown_k/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2468
--- /dev/null
+++ b/gfx/pokemon/unown_l/anim.asm
@@ -1,0 +1,12 @@
+	setrepeat 2
+	frame 0, 05
+	frame 1, 06
+	frame 2, 07
+	frame 1, 06
+	dorepeat 1
+	frame 0, 10
+	frame 3, 11
+	frame 4, 12
+	frame 3, 11
+	endanim
+; 0xd2319
--- a/gfx/pokemon/unown_l/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 1, 06
-	frame 2, 07
-	frame 1, 06
-	dorepeat 1
-	frame 0, 10
-	frame 3, 11
-	frame 4, 12
-	frame 3, 11
-	endanim
-; 0xd2319
--- a/gfx/pokemon/unown_l/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd2471
--- /dev/null
+++ b/gfx/pokemon/unown_l/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd2471
--- /dev/null
+++ b/gfx/pokemon/unown_m/anim.asm
@@ -1,0 +1,12 @@
+	frame 1, 06
+	frame 2, 06
+	frame 1, 03
+	frame 0, 03
+	setrepeat 2
+	frame 0, 02
+	frame 1, 02
+	frame 2, 02
+	frame 1, 02
+	dorepeat 5
+	endanim
+; 0xd232e
--- a/gfx/pokemon/unown_m/anim0.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	frame 1, 06
-	frame 2, 06
-	frame 1, 03
-	frame 0, 03
-	setrepeat 2
-	frame 0, 02
-	frame 1, 02
-	frame 2, 02
-	frame 1, 02
-	dorepeat 5
-	endanim
-; 0xd232e
--- a/gfx/pokemon/unown_m/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd247a
--- /dev/null
+++ b/gfx/pokemon/unown_m/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd247a
--- /dev/null
+++ b/gfx/pokemon/unown_n/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 06
+	frame 1, 06
+	frame 2, 20
+	frame 1, 06
+	frame 0, 16
+	frame 1, 03
+	frame 2, 04
+	frame 1, 03
+	endanim
+; 0xd233f
--- a/gfx/pokemon/unown_n/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 06
-	frame 1, 06
-	frame 2, 20
-	frame 1, 06
-	frame 0, 16
-	frame 1, 03
-	frame 2, 04
-	frame 1, 03
-	endanim
-; 0xd233f
--- a/gfx/pokemon/unown_n/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2483
--- /dev/null
+++ b/gfx/pokemon/unown_n/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2483
--- /dev/null
+++ b/gfx/pokemon/unown_o/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 06
+	frame 3, 06
+	frame 1, 12
+	frame 2, 32
+	frame 1, 10
+	frame 3, 04
+	endanim
+; 0xd234c
--- a/gfx/pokemon/unown_o/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 06
-	frame 3, 06
-	frame 1, 12
-	frame 2, 32
-	frame 1, 10
-	frame 3, 04
-	endanim
-; 0xd234c
--- a/gfx/pokemon/unown_o/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd248c
--- /dev/null
+++ b/gfx/pokemon/unown_o/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd248c
--- /dev/null
+++ b/gfx/pokemon/unown_p/anim.asm
@@ -1,0 +1,5 @@
+	frame 1, 10
+	frame 2, 36
+	frame 1, 06
+	endanim
+; 0xd2353
--- a/gfx/pokemon/unown_p/anim0.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 10
-	frame 2, 36
-	frame 1, 06
-	endanim
-; 0xd2353
--- a/gfx/pokemon/unown_p/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd2495
--- /dev/null
+++ b/gfx/pokemon/unown_p/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd2495
--- /dev/null
+++ b/gfx/pokemon/unown_q/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 05
+	frame 1, 05
+	frame 2, 05
+	frame 1, 05
+	dorepeat 1
+	endanim
+; 0xd2360
--- a/gfx/pokemon/unown_q/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 1, 05
-	frame 2, 05
-	frame 1, 05
-	dorepeat 1
-	endanim
-; 0xd2360
--- a/gfx/pokemon/unown_q/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd249e
--- /dev/null
+++ b/gfx/pokemon/unown_q/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd249e
--- /dev/null
+++ b/gfx/pokemon/unown_r/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 07
+	frame 1, 07
+	frame 2, 07
+	frame 1, 07
+	dorepeat 1
+	endanim
+; 0xd236d
--- a/gfx/pokemon/unown_r/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 1, 07
-	frame 2, 07
-	frame 1, 07
-	dorepeat 1
-	endanim
-; 0xd236d
--- a/gfx/pokemon/unown_r/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24a7
--- /dev/null
+++ b/gfx/pokemon/unown_r/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24a7
--- /dev/null
+++ b/gfx/pokemon/unown_s/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 12
+	frame 0, 10
+	frame 2, 12
+	frame 0, 24
+	setrepeat 2
+	frame 1, 03
+	frame 2, 03
+	dorepeat 5
+	endanim
+; 0xd237e
--- a/gfx/pokemon/unown_s/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 12
-	frame 0, 10
-	frame 2, 12
-	frame 0, 24
-	setrepeat 2
-	frame 1, 03
-	frame 2, 03
-	dorepeat 5
-	endanim
-; 0xd237e
--- a/gfx/pokemon/unown_s/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24b0
--- /dev/null
+++ b/gfx/pokemon/unown_s/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24b0
--- /dev/null
+++ b/gfx/pokemon/unown_t/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 05
+	frame 0, 05
+	frame 2, 05
+	frame 0, 05
+	dorepeat 1
+	endanim
+; 0xd238b
--- a/gfx/pokemon/unown_t/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 05
-	frame 0, 05
-	frame 2, 05
-	frame 0, 05
-	dorepeat 1
-	endanim
-; 0xd238b
--- a/gfx/pokemon/unown_t/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24b9
--- /dev/null
+++ b/gfx/pokemon/unown_t/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24b9
--- /dev/null
+++ b/gfx/pokemon/unown_u/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 1, 12
+	frame 2, 14
+	frame 1, 12
+	endanim
+; 0xd2394
--- a/gfx/pokemon/unown_u/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 1, 12
-	frame 2, 14
-	frame 1, 12
-	endanim
-; 0xd2394
--- a/gfx/pokemon/unown_u/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24c2
--- /dev/null
+++ b/gfx/pokemon/unown_u/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24c2
--- /dev/null
+++ b/gfx/pokemon/unown_v/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 10
+	frame 1, 10
+	frame 2, 10
+	frame 1, 10
+	endanim
+; 0xd239d
--- a/gfx/pokemon/unown_v/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 10
-	frame 1, 10
-	frame 2, 10
-	frame 1, 10
-	endanim
-; 0xd239d
--- a/gfx/pokemon/unown_v/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24cb
--- /dev/null
+++ b/gfx/pokemon/unown_v/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24cb
--- /dev/null
+++ b/gfx/pokemon/unown_w/anim.asm
@@ -1,0 +1,6 @@
+	frame 0, 06
+	frame 1, 18
+	frame 0, 06
+	frame 2, 12
+	endanim
+; 0xd23a6
--- a/gfx/pokemon/unown_w/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 0, 06
-	frame 1, 18
-	frame 0, 06
-	frame 2, 12
-	endanim
-; 0xd23a6
--- a/gfx/pokemon/unown_w/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24d4
--- /dev/null
+++ b/gfx/pokemon/unown_w/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24d4
--- /dev/null
+++ b/gfx/pokemon/unown_x/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 03
+	frame 1, 06
+	frame 0, 03
+	frame 2, 06
+	dorepeat 1
+	endanim
+; 0xd23b3
--- a/gfx/pokemon/unown_x/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 03
-	frame 1, 06
-	frame 0, 03
-	frame 2, 06
-	dorepeat 1
-	endanim
-; 0xd23b3
--- a/gfx/pokemon/unown_x/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	endanim
-; 0xd24dd
--- /dev/null
+++ b/gfx/pokemon/unown_x/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	endanim
+; 0xd24dd
--- /dev/null
+++ b/gfx/pokemon/unown_y/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 06
+	frame 3, 24
+	frame 0, 06
+	setrepeat 3
+	frame 1, 05
+	frame 2, 05
+	dorepeat 4
+	endanim
+; 0xd23c2
--- a/gfx/pokemon/unown_y/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 06
-	frame 3, 24
-	frame 0, 06
-	setrepeat 3
-	frame 1, 05
-	frame 2, 05
-	dorepeat 4
-	endanim
-; 0xd23c2
--- a/gfx/pokemon/unown_y/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd24e6
--- /dev/null
+++ b/gfx/pokemon/unown_y/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd24e6
--- /dev/null
+++ b/gfx/pokemon/unown_z/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 06
+	frame 2, 10
+	frame 1, 03
+	frame 0, 03
+	frame 3, 03
+	frame 0, 03
+	frame 3, 03
+	endanim
+; 0xd23d1
--- a/gfx/pokemon/unown_z/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 06
-	frame 2, 10
-	frame 1, 03
-	frame 0, 03
-	frame 3, 03
-	frame 0, 03
-	frame 3, 03
-	endanim
-; 0xd23d1
--- a/gfx/pokemon/unown_z/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 4, 05
-	dorepeat 1
-	endanim
-; 0xd24ef
--- /dev/null
+++ b/gfx/pokemon/unown_z/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 05
+	frame 4, 05
+	dorepeat 1
+	endanim
+; 0xd24ef
--- /dev/null
+++ b/gfx/pokemon/ursaring/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 13
+	frame 4, 10
+	setrepeat 4
+	frame 2, 09
+	frame 3, 09
+	dorepeat 3
+	frame 1, 10
+	endanim
+; 0xd14c8
--- a/gfx/pokemon/ursaring/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 13
-	frame 4, 10
-	setrepeat 4
-	frame 2, 09
-	frame 3, 09
-	dorepeat 3
-	frame 1, 10
-	endanim
-; 0xd14c8
--- a/gfx/pokemon/ursaring/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 5
-	frame 0, 09
-	frame 5, 09
-	dorepeat 1
-	endanim
-; 0xd20e4
--- /dev/null
+++ b/gfx/pokemon/ursaring/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 5
+	frame 0, 09
+	frame 5, 09
+	dorepeat 1
+	endanim
+; 0xd20e4
--- /dev/null
+++ b/gfx/pokemon/vaporeon/anim.asm
@@ -1,0 +1,7 @@
+	frame 0, 04
+	setrepeat 3
+	frame 1, 10
+	frame 2, 10
+	dorepeat 2
+	endanim
+; 0xd1043
--- a/gfx/pokemon/vaporeon/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 0, 04
-	setrepeat 3
-	frame 1, 10
-	frame 2, 10
-	dorepeat 2
-	endanim
-; 0xd1043
--- a/gfx/pokemon/vaporeon/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1ddf
--- /dev/null
+++ b/gfx/pokemon/vaporeon/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1ddf
--- /dev/null
+++ b/gfx/pokemon/venomoth/anim.asm
@@ -1,0 +1,6 @@
+	setrepeat 6
+	frame 0, 06
+	frame 1, 06
+	dorepeat 1
+	endanim
+; 0xd0b8c
--- a/gfx/pokemon/venomoth/anim0.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 6
-	frame 0, 06
-	frame 1, 06
-	dorepeat 1
-	endanim
-; 0xd0b8c
--- a/gfx/pokemon/venomoth/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 04
-	frame 2, 04
-	dorepeat 1
-	endanim
-; 0xd1aa4
--- /dev/null
+++ b/gfx/pokemon/venomoth/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 04
+	frame 2, 04
+	dorepeat 1
+	endanim
+; 0xd1aa4
--- /dev/null
+++ b/gfx/pokemon/venonat/anim.asm
@@ -1,0 +1,16 @@
+	frame 2, 10
+	frame 0, 10
+	frame 2, 10
+	frame 0, 06
+	frame 1, 06
+	frame 0, 06
+	setrepeat 3
+	frame 1, 04
+	frame 0, 04
+	dorepeat 7
+	setrepeat 2
+	frame 1, 02
+	frame 0, 02
+	dorepeat 11
+	endanim
+; 0xd0b83
--- a/gfx/pokemon/venonat/anim0.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-	frame 2, 10
-	frame 0, 10
-	frame 2, 10
-	frame 0, 06
-	frame 1, 06
-	frame 0, 06
-	setrepeat 3
-	frame 1, 04
-	frame 0, 04
-	dorepeat 7
-	setrepeat 2
-	frame 1, 02
-	frame 0, 02
-	dorepeat 11
-	endanim
-; 0xd0b83
--- a/gfx/pokemon/venonat/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 12
-	frame 2, 16
-	dorepeat 1
-	endanim
-; 0xd1a9b
--- /dev/null
+++ b/gfx/pokemon/venonat/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 12
+	frame 2, 16
+	dorepeat 1
+	endanim
+; 0xd1a9b
--- /dev/null
+++ b/gfx/pokemon/venusaur/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 10
+	frame 2, 35
+	frame 3, 08
+	frame 4, 08
+	setrepeat 2
+	frame 0, 10
+	frame 5, 10
+	dorepeat 5
+	endanim
+; 0xd08b6
--- a/gfx/pokemon/venusaur/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 10
-	frame 2, 35
-	frame 3, 08
-	frame 4, 08
-	setrepeat 2
-	frame 0, 10
-	frame 5, 10
-	dorepeat 5
-	endanim
-; 0xd08b6
--- a/gfx/pokemon/venusaur/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	frame 1, 35
-	frame 0, 13
-	frame 6, 13
-	frame 7, 13
-	endanim
-; 0xd18b6
--- /dev/null
+++ b/gfx/pokemon/venusaur/anim_idle.asm
@@ -1,0 +1,6 @@
+	frame 1, 35
+	frame 0, 13
+	frame 6, 13
+	frame 7, 13
+	endanim
+; 0xd18b6
--- /dev/null
+++ b/gfx/pokemon/victreebel/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	frame 2, 25
+	frame 3, 10
+	frame 4, 10
+	frame 5, 10
+	endanim
+; 0xd0cca
--- a/gfx/pokemon/victreebel/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	frame 2, 25
-	frame 3, 10
-	frame 4, 10
-	frame 5, 10
-	endanim
-; 0xd0cca
--- a/gfx/pokemon/victreebel/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 4, 06
-	frame 5, 05
-	dorepeat 1
-	endanim
-; 0xd1b8c
--- /dev/null
+++ b/gfx/pokemon/victreebel/anim_idle.asm
@@ -1,0 +1,7 @@
+	setrepeat 2
+	frame 0, 06
+	frame 4, 06
+	frame 5, 05
+	dorepeat 1
+	endanim
+; 0xd1b8c
--- /dev/null
+++ b/gfx/pokemon/vileplume/anim.asm
@@ -1,0 +1,10 @@
+	frame 1, 07
+	frame 2, 25
+	frame 3, 05
+	frame 1, 05
+	frame 0, 05
+	frame 1, 05
+	frame 0, 07
+	frame 1, 07
+	endanim
+; 0xd0b46
--- a/gfx/pokemon/vileplume/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 1, 07
-	frame 2, 25
-	frame 3, 05
-	frame 1, 05
-	frame 0, 05
-	frame 1, 05
-	frame 0, 07
-	frame 1, 07
-	endanim
-; 0xd0b46
--- a/gfx/pokemon/vileplume/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	dorepeat 1
-	frame 0, 12
-	frame 3, 07
-	endanim
-; 0xd1a82
--- /dev/null
+++ b/gfx/pokemon/vileplume/anim_idle.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	dorepeat 1
+	frame 0, 12
+	frame 3, 07
+	endanim
+; 0xd1a82
--- /dev/null
+++ b/gfx/pokemon/voltorb/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 08
+	frame 1, 08
+	setrepeat 2
+	frame 0, 06
+	frame 1, 04
+	dorepeat 3
+	endanim
+; 0xd0e57
--- a/gfx/pokemon/voltorb/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 08
-	frame 1, 08
-	setrepeat 2
-	frame 0, 06
-	frame 1, 04
-	dorepeat 3
-	endanim
-; 0xd0e57
--- a/gfx/pokemon/voltorb/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 04
-	setrepeat 2
-	frame 2, 08
-	frame 0, 08
-	dorepeat 2
-	endanim
-; 0xd1ca5
--- /dev/null
+++ b/gfx/pokemon/voltorb/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 1, 04
+	setrepeat 2
+	frame 2, 08
+	frame 0, 08
+	dorepeat 2
+	endanim
+; 0xd1ca5
--- /dev/null
+++ b/gfx/pokemon/vulpix/anim.asm
@@ -1,0 +1,11 @@
+	setrepeat 2
+	frame 0, 10
+	frame 1, 05
+	frame 2, 05
+	dorepeat 1
+	setrepeat 2
+	frame 0, 04
+	frame 3, 05
+	dorepeat 6
+	endanim
+; 0xd0aba
--- a/gfx/pokemon/vulpix/anim0.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	setrepeat 2
-	frame 0, 10
-	frame 1, 05
-	frame 2, 05
-	dorepeat 1
-	setrepeat 2
-	frame 0, 04
-	frame 3, 05
-	dorepeat 6
-	endanim
-; 0xd0aba
--- a/gfx/pokemon/vulpix/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 4, 10
-	frame 3, 10
-	frame 4, 10
-	frame 0, 05
-	frame 3, 05
-	endanim
-; 0xd1a34
--- /dev/null
+++ b/gfx/pokemon/vulpix/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 4, 10
+	frame 3, 10
+	frame 4, 10
+	frame 0, 05
+	frame 3, 05
+	endanim
+; 0xd1a34
--- /dev/null
+++ b/gfx/pokemon/wartortle/anim.asm
@@ -1,0 +1,8 @@
+	frame 0, 04
+	frame 2, 34
+	setrepeat 3
+	frame 0, 09
+	frame 1, 09
+	dorepeat 3
+	endanim
+; 0xd08ff
--- a/gfx/pokemon/wartortle/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 04
-	frame 2, 34
-	setrepeat 3
-	frame 0, 09
-	frame 1, 09
-	dorepeat 3
-	endanim
-; 0xd08ff
--- a/gfx/pokemon/wartortle/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd18e7
--- /dev/null
+++ b/gfx/pokemon/wartortle/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd18e7
--- /dev/null
+++ b/gfx/pokemon/weedle/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 06
+	frame 1, 18
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	frame 4, 06
+	frame 3, 06
+	dorepeat 3
+	endanim
+; 0xd093a
--- a/gfx/pokemon/weedle/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 06
-	frame 1, 18
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	frame 4, 06
-	frame 3, 06
-	dorepeat 3
-	endanim
-; 0xd093a
--- a/gfx/pokemon/weedle/anim1.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 2, 04
-	dorepeat 1
-	setrepeat 2
-	frame 0, 05
-	frame 3, 05
-	frame 4, 05
-	frame 3, 05
-	dorepeat 5
-	endanim
-; 0xd1922
--- /dev/null
+++ b/gfx/pokemon/weedle/anim_idle.asm
@@ -1,0 +1,12 @@
+	setrepeat 2
+	frame 0, 04
+	frame 2, 04
+	dorepeat 1
+	setrepeat 2
+	frame 0, 05
+	frame 3, 05
+	frame 4, 05
+	frame 3, 05
+	dorepeat 5
+	endanim
+; 0xd1922
--- /dev/null
+++ b/gfx/pokemon/weepinbell/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 0, 05
+	frame 1, 05
+	frame 2, 05
+	dorepeat 1
+	frame 3, 12
+	endanim
+; 0xd0cbf
--- a/gfx/pokemon/weepinbell/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 0, 05
-	frame 1, 05
-	frame 2, 05
-	dorepeat 1
-	frame 3, 12
-	endanim
-; 0xd0cbf
--- a/gfx/pokemon/weepinbell/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 07
-	frame 3, 07
-	dorepeat 1
-	endanim
-; 0xd1b81
--- /dev/null
+++ b/gfx/pokemon/weepinbell/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 07
+	frame 3, 07
+	dorepeat 1
+	endanim
+; 0xd1b81
--- /dev/null
+++ b/gfx/pokemon/weezing/anim.asm
@@ -1,0 +1,8 @@
+	frame 1, 15
+	setrepeat 2
+	frame 2, 10
+	frame 3, 10
+	frame 4, 10
+	dorepeat 2
+	endanim
+; 0xd0efd
--- a/gfx/pokemon/weezing/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 1, 15
-	setrepeat 2
-	frame 2, 10
-	frame 3, 10
-	frame 4, 10
-	dorepeat 2
-	endanim
-; 0xd0efd
--- a/gfx/pokemon/weezing/anim1.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	frame 0, 12
-	setrepeat 3
-	frame 1, 08
-	frame 5, 08
-	dorepeat 2
-	frame 1, 12
-	endanim
-; 0xd1cfb
--- /dev/null
+++ b/gfx/pokemon/weezing/anim_idle.asm
@@ -1,0 +1,8 @@
+	frame 0, 12
+	setrepeat 3
+	frame 1, 08
+	frame 5, 08
+	dorepeat 2
+	frame 1, 12
+	endanim
+; 0xd1cfb
--- /dev/null
+++ b/gfx/pokemon/wigglytuff/anim.asm
@@ -1,0 +1,9 @@
+	frame 0, 04
+	frame 1, 20
+	frame 2, 08
+	frame 0, 08
+	frame 2, 06
+	frame 0, 06
+	frame 2, 04
+	endanim
+; 0xd0aed
--- a/gfx/pokemon/wigglytuff/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 0, 04
-	frame 1, 20
-	frame 2, 08
-	frame 0, 08
-	frame 2, 06
-	frame 0, 06
-	frame 2, 04
-	endanim
-; 0xd0aed
--- a/gfx/pokemon/wigglytuff/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 3
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd1a4f
--- /dev/null
+++ b/gfx/pokemon/wigglytuff/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 3
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd1a4f
--- /dev/null
+++ b/gfx/pokemon/wobbuffet/anim.asm
@@ -1,0 +1,4 @@
+	frame 1, 07
+	frame 2, 30
+	endanim
+; 0xd1403
--- a/gfx/pokemon/wobbuffet/anim0.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-	frame 1, 07
-	frame 2, 30
-	endanim
-; 0xd1403
--- a/gfx/pokemon/wobbuffet/anim1.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-	frame 0, 30
-	endanim
-; 0xd2069
--- /dev/null
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
@@ -1,0 +1,3 @@
+	frame 0, 30
+	endanim
+; 0xd2069
--- /dev/null
+++ b/gfx/pokemon/wooper/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 2
+	frame 1, 08
+	frame 2, 08
+	dorepeat 1
+	frame 0, 08
+	frame 4, 08
+	endanim
+; 0xd1397
--- a/gfx/pokemon/wooper/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 2
-	frame 1, 08
-	frame 2, 08
-	dorepeat 1
-	frame 0, 08
-	frame 4, 08
-	endanim
-; 0xd1397
--- a/gfx/pokemon/wooper/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 06
-	frame 3, 06
-	dorepeat 1
-	endanim
-; 0xd202f
--- /dev/null
+++ b/gfx/pokemon/wooper/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	dorepeat 1
+	endanim
+; 0xd202f
--- /dev/null
+++ b/gfx/pokemon/xatu/anim.asm
@@ -1,0 +1,10 @@
+	frame 0, 04
+	frame 3, 12
+	frame 2, 12
+	frame 1, 12
+	setrepeat 2
+	frame 0, 12
+	frame 4, 12
+	dorepeat 5
+	endanim
+; 0xd12cd
--- a/gfx/pokemon/xatu/anim0.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-	frame 0, 04
-	frame 3, 12
-	frame 2, 12
-	frame 1, 12
-	setrepeat 2
-	frame 0, 12
-	frame 4, 12
-	dorepeat 5
-	endanim
-; 0xd12cd
--- a/gfx/pokemon/xatu/anim1.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-	setrepeat 2
-	frame 0, 08
-	frame 3, 08
-	dorepeat 1
-	frame 0, 18
-	setrepeat 2
-	frame 1, 08
-	frame 2, 08
-	dorepeat 6
-	endanim
-; 0xd1f99
--- /dev/null
+++ b/gfx/pokemon/xatu/anim_idle.asm
@@ -1,0 +1,11 @@
+	setrepeat 2
+	frame 0, 08
+	frame 3, 08
+	dorepeat 1
+	frame 0, 18
+	setrepeat 2
+	frame 1, 08
+	frame 2, 08
+	dorepeat 6
+	endanim
+; 0xd1f99
--- /dev/null
+++ b/gfx/pokemon/yanma/anim.asm
@@ -1,0 +1,9 @@
+	frame 1, 10
+	frame 0, 05
+	frame 3, 05
+	setrepeat 5
+	frame 0, 03
+	frame 2, 03
+	dorepeat 4
+	endanim
+; 0xd138a
--- a/gfx/pokemon/yanma/anim0.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-	frame 1, 10
-	frame 0, 05
-	frame 3, 05
-	setrepeat 5
-	frame 0, 03
-	frame 2, 03
-	dorepeat 4
-	endanim
-; 0xd138a
--- a/gfx/pokemon/yanma/anim1.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-	setrepeat 2
-	frame 0, 04
-	frame 3, 04
-	dorepeat 1
-	endanim
-; 0xd2026
--- /dev/null
+++ b/gfx/pokemon/yanma/anim_idle.asm
@@ -1,0 +1,6 @@
+	setrepeat 2
+	frame 0, 04
+	frame 3, 04
+	dorepeat 1
+	endanim
+; 0xd2026
--- /dev/null
+++ b/gfx/pokemon/zapdos/anim.asm
@@ -1,0 +1,7 @@
+	frame 1, 10
+	setrepeat 3
+	frame 2, 10
+	frame 3, 10
+	dorepeat 2
+	endanim
+; 0xd10cc
--- a/gfx/pokemon/zapdos/anim0.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 1, 10
-	setrepeat 3
-	frame 2, 10
-	frame 3, 10
-	dorepeat 2
-	endanim
-; 0xd10cc
--- a/gfx/pokemon/zapdos/anim1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-	frame 1, 08
-	frame 2, 50
-	frame 1, 06
-	endanim
-; 0xd1e48
--- /dev/null
+++ b/gfx/pokemon/zapdos/anim_idle.asm
@@ -1,0 +1,5 @@
+	frame 1, 08
+	frame 2, 50
+	frame 1, 06
+	endanim
+; 0xd1e48
--- /dev/null
+++ b/gfx/pokemon/zubat/anim.asm
@@ -1,0 +1,8 @@
+	setrepeat 4
+	frame 1, 07
+	frame 2, 07
+	dorepeat 1
+	frame 3, 07
+	frame 0, 07
+	endanim
+; 0xd0afa
--- a/gfx/pokemon/zubat/anim0.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-	setrepeat 4
-	frame 1, 07
-	frame 2, 07
-	dorepeat 1
-	frame 3, 07
-	frame 0, 07
-	endanim
-; 0xd0afa
--- a/gfx/pokemon/zubat/anim1.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-	frame 2, 35
-	setrepeat 2
-	frame 0, 12
-	frame 3, 12
-	dorepeat 2
-	endanim
-; 0xd1a5a
--- /dev/null
+++ b/gfx/pokemon/zubat/anim_idle.asm
@@ -1,0 +1,7 @@
+	frame 2, 35
+	setrepeat 2
+	frame 0, 12
+	frame 3, 12
+	dorepeat 2
+	endanim
+; 0xd1a5a
--- a/main.asm
+++ b/main.asm
@@ -416,12 +416,12 @@
 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"
--- a/wram.asm
+++ b/wram.asm
@@ -2794,7 +2794,7 @@
 wPokeAnimCoord:: dw
 wPokeAnimFrontpicHeight:: db
 ; PokeAnim Data
-wPokeAnimExtraFlag:: db
+wPokeAnimIdleFlag:: db
 wPokeAnimSpeed:: db
 wPokeAnimPointerBank:: db
 wPokeAnimPointerAddr:: dw
--