Reorganize macros

4 files changed, 630 insertions, 636 deletions

diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm
index aa32fbe94..2f348fbfb 100644
--- a/gfx/pics/animation.asm
+++ b/gfx/pics/animation.asm
@@ -1,6 +1,5 @@
 ; Pic animation arrangement.
 
-
 AnimateMon_Slow_Normal: ; d0000
 	hlcoord 12, 0
 	ld a, [wBattleMode]
@@ -53,23 +52,18 @@ AnimateMon_Unused: ; d003a
 	ret
 ; d0042
 
-
-POKEANIM: MACRO
+pokeanim: MACRO
 	rept _NARG
-
 ; Workaround for a bug where macro args can't come after the start of a symbol
 if !def(\1_POKEANIM)
 \1_POKEANIM equs "PokeAnim_\1_"
 endc
-
 	db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
 	shift
 	endr
-
 	db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
 ENDM
 
-
 PokeAnims: ; d0042
 	dw .Slow
 	dw .Normal
@@ -81,15 +75,15 @@ PokeAnims: ; d0042
 	dw .Egg1
 	dw .Egg2
 
-.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
-.Egg1:   POKEANIM Setup, Play
-.Egg2:   POKEANIM Extra, Play
+.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
+.Egg1:   pokeanim Setup, Play
+.Egg2:   pokeanim Extra, Play
 
 
 AnimateFrontpic: ; d008e
diff --git a/gfx/pics/pic_pointers.asm b/gfx/pics/pic_pointers.asm
index 2a6a2699a..58631e09a 100644
--- a/gfx/pics/pic_pointers.asm
+++ b/gfx/pics/pic_pointers.asm
@@ -1,511 +1,511 @@
 PicPointers::
 ; entries correspond to constants/pokemon_constants.asm, two apiece
-	add_pic BulbasaurFrontpic
-	add_pic BulbasaurBackpic
-	add_pic IvysaurFrontpic
-	add_pic IvysaurBackpic
-	add_pic VenusaurFrontpic
-	add_pic VenusaurBackpic
-	add_pic CharmanderFrontpic
-	add_pic CharmanderBackpic
-	add_pic CharmeleonFrontpic
-	add_pic CharmeleonBackpic
-	add_pic CharizardFrontpic
-	add_pic CharizardBackpic
-	add_pic SquirtleFrontpic
-	add_pic SquirtleBackpic
-	add_pic WartortleFrontpic
-	add_pic WartortleBackpic
-	add_pic BlastoiseFrontpic
-	add_pic BlastoiseBackpic
-	add_pic CaterpieFrontpic
-	add_pic CaterpieBackpic
-	add_pic MetapodFrontpic
-	add_pic MetapodBackpic
-	add_pic ButterfreeFrontpic
-	add_pic ButterfreeBackpic
-	add_pic WeedleFrontpic
-	add_pic WeedleBackpic
-	add_pic KakunaFrontpic
-	add_pic KakunaBackpic
-	add_pic BeedrillFrontpic
-	add_pic BeedrillBackpic
-	add_pic PidgeyFrontpic
-	add_pic PidgeyBackpic
-	add_pic PidgeottoFrontpic
-	add_pic PidgeottoBackpic
-	add_pic PidgeotFrontpic
-	add_pic PidgeotBackpic
-	add_pic RattataFrontpic
-	add_pic RattataBackpic
-	add_pic RaticateFrontpic
-	add_pic RaticateBackpic
-	add_pic SpearowFrontpic
-	add_pic SpearowBackpic
-	add_pic FearowFrontpic
-	add_pic FearowBackpic
-	add_pic EkansFrontpic
-	add_pic EkansBackpic
-	add_pic ArbokFrontpic
-	add_pic ArbokBackpic
-	add_pic PikachuFrontpic
-	add_pic PikachuBackpic
-	add_pic RaichuFrontpic
-	add_pic RaichuBackpic
-	add_pic SandshrewFrontpic
-	add_pic SandshrewBackpic
-	add_pic SandslashFrontpic
-	add_pic SandslashBackpic
-	add_pic NidoranFFrontpic
-	add_pic NidoranFBackpic
-	add_pic NidorinaFrontpic
-	add_pic NidorinaBackpic
-	add_pic NidoqueenFrontpic
-	add_pic NidoqueenBackpic
-	add_pic NidoranMFrontpic
-	add_pic NidoranMBackpic
-	add_pic NidorinoFrontpic
-	add_pic NidorinoBackpic
-	add_pic NidokingFrontpic
-	add_pic NidokingBackpic
-	add_pic ClefairyFrontpic
-	add_pic ClefairyBackpic
-	add_pic ClefableFrontpic
-	add_pic ClefableBackpic
-	add_pic VulpixFrontpic
-	add_pic VulpixBackpic
-	add_pic NinetalesFrontpic
-	add_pic NinetalesBackpic
-	add_pic JigglypuffFrontpic
-	add_pic JigglypuffBackpic
-	add_pic WigglytuffFrontpic
-	add_pic WigglytuffBackpic
-	add_pic ZubatFrontpic
-	add_pic ZubatBackpic
-	add_pic GolbatFrontpic
-	add_pic GolbatBackpic
-	add_pic OddishFrontpic
-	add_pic OddishBackpic
-	add_pic GloomFrontpic
-	add_pic GloomBackpic
-	add_pic VileplumeFrontpic
-	add_pic VileplumeBackpic
-	add_pic ParasFrontpic
-	add_pic ParasBackpic
-	add_pic ParasectFrontpic
-	add_pic ParasectBackpic
-	add_pic VenonatFrontpic
-	add_pic VenonatBackpic
-	add_pic VenomothFrontpic
-	add_pic VenomothBackpic
-	add_pic DiglettFrontpic
-	add_pic DiglettBackpic
-	add_pic DugtrioFrontpic
-	add_pic DugtrioBackpic
-	add_pic MeowthFrontpic
-	add_pic MeowthBackpic
-	add_pic PersianFrontpic
-	add_pic PersianBackpic
-	add_pic PsyduckFrontpic
-	add_pic PsyduckBackpic
-	add_pic GolduckFrontpic
-	add_pic GolduckBackpic
-	add_pic MankeyFrontpic
-	add_pic MankeyBackpic
-	add_pic PrimeapeFrontpic
-	add_pic PrimeapeBackpic
-	add_pic GrowlitheFrontpic
-	add_pic GrowlitheBackpic
-	add_pic ArcanineFrontpic
-	add_pic ArcanineBackpic
-	add_pic PoliwagFrontpic
-	add_pic PoliwagBackpic
-	add_pic PoliwhirlFrontpic
-	add_pic PoliwhirlBackpic
-	add_pic PoliwrathFrontpic
-	add_pic PoliwrathBackpic
-	add_pic AbraFrontpic
-	add_pic AbraBackpic
-	add_pic KadabraFrontpic
-	add_pic KadabraBackpic
-	add_pic AlakazamFrontpic
-	add_pic AlakazamBackpic
-	add_pic MachopFrontpic
-	add_pic MachopBackpic
-	add_pic MachokeFrontpic
-	add_pic MachokeBackpic
-	add_pic MachampFrontpic
-	add_pic MachampBackpic
-	add_pic BellsproutFrontpic
-	add_pic BellsproutBackpic
-	add_pic WeepinbellFrontpic
-	add_pic WeepinbellBackpic
-	add_pic VictreebelFrontpic
-	add_pic VictreebelBackpic
-	add_pic TentacoolFrontpic
-	add_pic TentacoolBackpic
-	add_pic TentacruelFrontpic
-	add_pic TentacruelBackpic
-	add_pic GeodudeFrontpic
-	add_pic GeodudeBackpic
-	add_pic GravelerFrontpic
-	add_pic GravelerBackpic
-	add_pic GolemFrontpic
-	add_pic GolemBackpic
-	add_pic PonytaFrontpic
-	add_pic PonytaBackpic
-	add_pic RapidashFrontpic
-	add_pic RapidashBackpic
-	add_pic SlowpokeFrontpic
-	add_pic SlowpokeBackpic
-	add_pic SlowbroFrontpic
-	add_pic SlowbroBackpic
-	add_pic MagnemiteFrontpic
-	add_pic MagnemiteBackpic
-	add_pic MagnetonFrontpic
-	add_pic MagnetonBackpic
-	add_pic FarfetchDFrontpic
-	add_pic FarfetchDBackpic
-	add_pic DoduoFrontpic
-	add_pic DoduoBackpic
-	add_pic DodrioFrontpic
-	add_pic DodrioBackpic
-	add_pic SeelFrontpic
-	add_pic SeelBackpic
-	add_pic DewgongFrontpic
-	add_pic DewgongBackpic
-	add_pic GrimerFrontpic
-	add_pic GrimerBackpic
-	add_pic MukFrontpic
-	add_pic MukBackpic
-	add_pic ShellderFrontpic
-	add_pic ShellderBackpic
-	add_pic CloysterFrontpic
-	add_pic CloysterBackpic
-	add_pic GastlyFrontpic
-	add_pic GastlyBackpic
-	add_pic HaunterFrontpic
-	add_pic HaunterBackpic
-	add_pic GengarFrontpic
-	add_pic GengarBackpic
-	add_pic OnixFrontpic
-	add_pic OnixBackpic
-	add_pic DrowzeeFrontpic
-	add_pic DrowzeeBackpic
-	add_pic HypnoFrontpic
-	add_pic HypnoBackpic
-	add_pic KrabbyFrontpic
-	add_pic KrabbyBackpic
-	add_pic KinglerFrontpic
-	add_pic KinglerBackpic
-	add_pic VoltorbFrontpic
-	add_pic VoltorbBackpic
-	add_pic ElectrodeFrontpic
-	add_pic ElectrodeBackpic
-	add_pic ExeggcuteFrontpic
-	add_pic ExeggcuteBackpic
-	add_pic ExeggutorFrontpic
-	add_pic ExeggutorBackpic
-	add_pic CuboneFrontpic
-	add_pic CuboneBackpic
-	add_pic MarowakFrontpic
-	add_pic MarowakBackpic
-	add_pic HitmonleeFrontpic
-	add_pic HitmonleeBackpic
-	add_pic HitmonchanFrontpic
-	add_pic HitmonchanBackpic
-	add_pic LickitungFrontpic
-	add_pic LickitungBackpic
-	add_pic KoffingFrontpic
-	add_pic KoffingBackpic
-	add_pic WeezingFrontpic
-	add_pic WeezingBackpic
-	add_pic RhyhornFrontpic
-	add_pic RhyhornBackpic
-	add_pic RhydonFrontpic
-	add_pic RhydonBackpic
-	add_pic ChanseyFrontpic
-	add_pic ChanseyBackpic
-	add_pic TangelaFrontpic
-	add_pic TangelaBackpic
-	add_pic KangaskhanFrontpic
-	add_pic KangaskhanBackpic
-	add_pic HorseaFrontpic
-	add_pic HorseaBackpic
-	add_pic SeadraFrontpic
-	add_pic SeadraBackpic
-	add_pic GoldeenFrontpic
-	add_pic GoldeenBackpic
-	add_pic SeakingFrontpic
-	add_pic SeakingBackpic
-	add_pic StaryuFrontpic
-	add_pic StaryuBackpic
-	add_pic StarmieFrontpic
-	add_pic StarmieBackpic
-	add_pic MrMimeFrontpic
-	add_pic MrMimeBackpic
-	add_pic ScytherFrontpic
-	add_pic ScytherBackpic
-	add_pic JynxFrontpic
-	add_pic JynxBackpic
-	add_pic ElectabuzzFrontpic
-	add_pic ElectabuzzBackpic
-	add_pic MagmarFrontpic
-	add_pic MagmarBackpic
-	add_pic PinsirFrontpic
-	add_pic PinsirBackpic
-	add_pic TaurosFrontpic
-	add_pic TaurosBackpic
-	add_pic MagikarpFrontpic
-	add_pic MagikarpBackpic
-	add_pic GyaradosFrontpic
-	add_pic GyaradosBackpic
-	add_pic LaprasFrontpic
-	add_pic LaprasBackpic
-	add_pic DittoFrontpic
-	add_pic DittoBackpic
-	add_pic EeveeFrontpic
-	add_pic EeveeBackpic
-	add_pic VaporeonFrontpic
-	add_pic VaporeonBackpic
-	add_pic JolteonFrontpic
-	add_pic JolteonBackpic
-	add_pic FlareonFrontpic
-	add_pic FlareonBackpic
-	add_pic PorygonFrontpic
-	add_pic PorygonBackpic
-	add_pic OmanyteFrontpic
-	add_pic OmanyteBackpic
-	add_pic OmastarFrontpic
-	add_pic OmastarBackpic
-	add_pic KabutoFrontpic
-	add_pic KabutoBackpic
-	add_pic KabutopsFrontpic
-	add_pic KabutopsBackpic
-	add_pic AerodactylFrontpic
-	add_pic AerodactylBackpic
-	add_pic SnorlaxFrontpic
-	add_pic SnorlaxBackpic
-	add_pic ArticunoFrontpic
-	add_pic ArticunoBackpic
-	add_pic ZapdosFrontpic
-	add_pic ZapdosBackpic
-	add_pic MoltresFrontpic
-	add_pic MoltresBackpic
-	add_pic DratiniFrontpic
-	add_pic DratiniBackpic
-	add_pic DragonairFrontpic
-	add_pic DragonairBackpic
-	add_pic DragoniteFrontpic
-	add_pic DragoniteBackpic
-	add_pic MewtwoFrontpic
-	add_pic MewtwoBackpic
-	add_pic MewFrontpic
-	add_pic MewBackpic
-	add_pic ChikoritaFrontpic
-	add_pic ChikoritaBackpic
-	add_pic BayleefFrontpic
-	add_pic BayleefBackpic
-	add_pic MeganiumFrontpic
-	add_pic MeganiumBackpic
-	add_pic CyndaquilFrontpic
-	add_pic CyndaquilBackpic
-	add_pic QuilavaFrontpic
-	add_pic QuilavaBackpic
-	add_pic TyphlosionFrontpic
-	add_pic TyphlosionBackpic
-	add_pic TotodileFrontpic
-	add_pic TotodileBackpic
-	add_pic CroconawFrontpic
-	add_pic CroconawBackpic
-	add_pic FeraligatrFrontpic
-	add_pic FeraligatrBackpic
-	add_pic SentretFrontpic
-	add_pic SentretBackpic
-	add_pic FurretFrontpic
-	add_pic FurretBackpic
-	add_pic HoothootFrontpic
-	add_pic HoothootBackpic
-	add_pic NoctowlFrontpic
-	add_pic NoctowlBackpic
-	add_pic LedybaFrontpic
-	add_pic LedybaBackpic
-	add_pic LedianFrontpic
-	add_pic LedianBackpic
-	add_pic SpinarakFrontpic
-	add_pic SpinarakBackpic
-	add_pic AriadosFrontpic
-	add_pic AriadosBackpic
-	add_pic CrobatFrontpic
-	add_pic CrobatBackpic
-	add_pic ChinchouFrontpic
-	add_pic ChinchouBackpic
-	add_pic LanturnFrontpic
-	add_pic LanturnBackpic
-	add_pic PichuFrontpic
-	add_pic PichuBackpic
-	add_pic CleffaFrontpic
-	add_pic CleffaBackpic
-	add_pic IgglybuffFrontpic
-	add_pic IgglybuffBackpic
-	add_pic TogepiFrontpic
-	add_pic TogepiBackpic
-	add_pic TogeticFrontpic
-	add_pic TogeticBackpic
-	add_pic NatuFrontpic
-	add_pic NatuBackpic
-	add_pic XatuFrontpic
-	add_pic XatuBackpic
-	add_pic MareepFrontpic
-	add_pic MareepBackpic
-	add_pic FlaaffyFrontpic
-	add_pic FlaaffyBackpic
-	add_pic AmpharosFrontpic
-	add_pic AmpharosBackpic
-	add_pic BellossomFrontpic
-	add_pic BellossomBackpic
-	add_pic MarillFrontpic
-	add_pic MarillBackpic
-	add_pic AzumarillFrontpic
-	add_pic AzumarillBackpic
-	add_pic SudowoodoFrontpic
-	add_pic SudowoodoBackpic
-	add_pic PolitoedFrontpic
-	add_pic PolitoedBackpic
-	add_pic HoppipFrontpic
-	add_pic HoppipBackpic
-	add_pic SkiploomFrontpic
-	add_pic SkiploomBackpic
-	add_pic JumpluffFrontpic
-	add_pic JumpluffBackpic
-	add_pic AipomFrontpic
-	add_pic AipomBackpic
-	add_pic SunkernFrontpic
-	add_pic SunkernBackpic
-	add_pic SunfloraFrontpic
-	add_pic SunfloraBackpic
-	add_pic YanmaFrontpic
-	add_pic YanmaBackpic
-	add_pic WooperFrontpic
-	add_pic WooperBackpic
-	add_pic QuagsireFrontpic
-	add_pic QuagsireBackpic
-	add_pic EspeonFrontpic
-	add_pic EspeonBackpic
-	add_pic UmbreonFrontpic
-	add_pic UmbreonBackpic
-	add_pic MurkrowFrontpic
-	add_pic MurkrowBackpic
-	add_pic SlowkingFrontpic
-	add_pic SlowkingBackpic
-	add_pic MisdreavusFrontpic
-	add_pic MisdreavusBackpic
+	dba_pic BulbasaurFrontpic
+	dba_pic BulbasaurBackpic
+	dba_pic IvysaurFrontpic
+	dba_pic IvysaurBackpic
+	dba_pic VenusaurFrontpic
+	dba_pic VenusaurBackpic
+	dba_pic CharmanderFrontpic
+	dba_pic CharmanderBackpic
+	dba_pic CharmeleonFrontpic
+	dba_pic CharmeleonBackpic
+	dba_pic CharizardFrontpic
+	dba_pic CharizardBackpic
+	dba_pic SquirtleFrontpic
+	dba_pic SquirtleBackpic
+	dba_pic WartortleFrontpic
+	dba_pic WartortleBackpic
+	dba_pic BlastoiseFrontpic
+	dba_pic BlastoiseBackpic
+	dba_pic CaterpieFrontpic
+	dba_pic CaterpieBackpic
+	dba_pic MetapodFrontpic
+	dba_pic MetapodBackpic
+	dba_pic ButterfreeFrontpic
+	dba_pic ButterfreeBackpic
+	dba_pic WeedleFrontpic
+	dba_pic WeedleBackpic
+	dba_pic KakunaFrontpic
+	dba_pic KakunaBackpic
+	dba_pic BeedrillFrontpic
+	dba_pic BeedrillBackpic
+	dba_pic PidgeyFrontpic
+	dba_pic PidgeyBackpic
+	dba_pic PidgeottoFrontpic
+	dba_pic PidgeottoBackpic
+	dba_pic PidgeotFrontpic
+	dba_pic PidgeotBackpic
+	dba_pic RattataFrontpic
+	dba_pic RattataBackpic
+	dba_pic RaticateFrontpic
+	dba_pic RaticateBackpic
+	dba_pic SpearowFrontpic
+	dba_pic SpearowBackpic
+	dba_pic FearowFrontpic
+	dba_pic FearowBackpic
+	dba_pic EkansFrontpic
+	dba_pic EkansBackpic
+	dba_pic ArbokFrontpic
+	dba_pic ArbokBackpic
+	dba_pic PikachuFrontpic
+	dba_pic PikachuBackpic
+	dba_pic RaichuFrontpic
+	dba_pic RaichuBackpic
+	dba_pic SandshrewFrontpic
+	dba_pic SandshrewBackpic
+	dba_pic SandslashFrontpic
+	dba_pic SandslashBackpic
+	dba_pic NidoranFFrontpic
+	dba_pic NidoranFBackpic
+	dba_pic NidorinaFrontpic
+	dba_pic NidorinaBackpic
+	dba_pic NidoqueenFrontpic
+	dba_pic NidoqueenBackpic
+	dba_pic NidoranMFrontpic
+	dba_pic NidoranMBackpic
+	dba_pic NidorinoFrontpic
+	dba_pic NidorinoBackpic
+	dba_pic NidokingFrontpic
+	dba_pic NidokingBackpic
+	dba_pic ClefairyFrontpic
+	dba_pic ClefairyBackpic
+	dba_pic ClefableFrontpic
+	dba_pic ClefableBackpic
+	dba_pic VulpixFrontpic
+	dba_pic VulpixBackpic
+	dba_pic NinetalesFrontpic
+	dba_pic NinetalesBackpic
+	dba_pic JigglypuffFrontpic
+	dba_pic JigglypuffBackpic
+	dba_pic WigglytuffFrontpic
+	dba_pic WigglytuffBackpic
+	dba_pic ZubatFrontpic
+	dba_pic ZubatBackpic
+	dba_pic GolbatFrontpic
+	dba_pic GolbatBackpic
+	dba_pic OddishFrontpic
+	dba_pic OddishBackpic
+	dba_pic GloomFrontpic
+	dba_pic GloomBackpic
+	dba_pic VileplumeFrontpic
+	dba_pic VileplumeBackpic
+	dba_pic ParasFrontpic
+	dba_pic ParasBackpic
+	dba_pic ParasectFrontpic
+	dba_pic ParasectBackpic
+	dba_pic VenonatFrontpic
+	dba_pic VenonatBackpic
+	dba_pic VenomothFrontpic
+	dba_pic VenomothBackpic
+	dba_pic DiglettFrontpic
+	dba_pic DiglettBackpic
+	dba_pic DugtrioFrontpic
+	dba_pic DugtrioBackpic
+	dba_pic MeowthFrontpic
+	dba_pic MeowthBackpic
+	dba_pic PersianFrontpic
+	dba_pic PersianBackpic
+	dba_pic PsyduckFrontpic
+	dba_pic PsyduckBackpic
+	dba_pic GolduckFrontpic
+	dba_pic GolduckBackpic
+	dba_pic MankeyFrontpic
+	dba_pic MankeyBackpic
+	dba_pic PrimeapeFrontpic
+	dba_pic PrimeapeBackpic
+	dba_pic GrowlitheFrontpic
+	dba_pic GrowlitheBackpic
+	dba_pic ArcanineFrontpic
+	dba_pic ArcanineBackpic
+	dba_pic PoliwagFrontpic
+	dba_pic PoliwagBackpic
+	dba_pic PoliwhirlFrontpic
+	dba_pic PoliwhirlBackpic
+	dba_pic PoliwrathFrontpic
+	dba_pic PoliwrathBackpic
+	dba_pic AbraFrontpic
+	dba_pic AbraBackpic
+	dba_pic KadabraFrontpic
+	dba_pic KadabraBackpic
+	dba_pic AlakazamFrontpic
+	dba_pic AlakazamBackpic
+	dba_pic MachopFrontpic
+	dba_pic MachopBackpic
+	dba_pic MachokeFrontpic
+	dba_pic MachokeBackpic
+	dba_pic MachampFrontpic
+	dba_pic MachampBackpic
+	dba_pic BellsproutFrontpic
+	dba_pic BellsproutBackpic
+	dba_pic WeepinbellFrontpic
+	dba_pic WeepinbellBackpic
+	dba_pic VictreebelFrontpic
+	dba_pic VictreebelBackpic
+	dba_pic TentacoolFrontpic
+	dba_pic TentacoolBackpic
+	dba_pic TentacruelFrontpic
+	dba_pic TentacruelBackpic
+	dba_pic GeodudeFrontpic
+	dba_pic GeodudeBackpic
+	dba_pic GravelerFrontpic
+	dba_pic GravelerBackpic
+	dba_pic GolemFrontpic
+	dba_pic GolemBackpic
+	dba_pic PonytaFrontpic
+	dba_pic PonytaBackpic
+	dba_pic RapidashFrontpic
+	dba_pic RapidashBackpic
+	dba_pic SlowpokeFrontpic
+	dba_pic SlowpokeBackpic
+	dba_pic SlowbroFrontpic
+	dba_pic SlowbroBackpic
+	dba_pic MagnemiteFrontpic
+	dba_pic MagnemiteBackpic
+	dba_pic MagnetonFrontpic
+	dba_pic MagnetonBackpic
+	dba_pic FarfetchDFrontpic
+	dba_pic FarfetchDBackpic
+	dba_pic DoduoFrontpic
+	dba_pic DoduoBackpic
+	dba_pic DodrioFrontpic
+	dba_pic DodrioBackpic
+	dba_pic SeelFrontpic
+	dba_pic SeelBackpic
+	dba_pic DewgongFrontpic
+	dba_pic DewgongBackpic
+	dba_pic GrimerFrontpic
+	dba_pic GrimerBackpic
+	dba_pic MukFrontpic
+	dba_pic MukBackpic
+	dba_pic ShellderFrontpic
+	dba_pic ShellderBackpic
+	dba_pic CloysterFrontpic
+	dba_pic CloysterBackpic
+	dba_pic GastlyFrontpic
+	dba_pic GastlyBackpic
+	dba_pic HaunterFrontpic
+	dba_pic HaunterBackpic
+	dba_pic GengarFrontpic
+	dba_pic GengarBackpic
+	dba_pic OnixFrontpic
+	dba_pic OnixBackpic
+	dba_pic DrowzeeFrontpic
+	dba_pic DrowzeeBackpic
+	dba_pic HypnoFrontpic
+	dba_pic HypnoBackpic
+	dba_pic KrabbyFrontpic
+	dba_pic KrabbyBackpic
+	dba_pic KinglerFrontpic
+	dba_pic KinglerBackpic
+	dba_pic VoltorbFrontpic
+	dba_pic VoltorbBackpic
+	dba_pic ElectrodeFrontpic
+	dba_pic ElectrodeBackpic
+	dba_pic ExeggcuteFrontpic
+	dba_pic ExeggcuteBackpic
+	dba_pic ExeggutorFrontpic
+	dba_pic ExeggutorBackpic
+	dba_pic CuboneFrontpic
+	dba_pic CuboneBackpic
+	dba_pic MarowakFrontpic
+	dba_pic MarowakBackpic
+	dba_pic HitmonleeFrontpic
+	dba_pic HitmonleeBackpic
+	dba_pic HitmonchanFrontpic
+	dba_pic HitmonchanBackpic
+	dba_pic LickitungFrontpic
+	dba_pic LickitungBackpic
+	dba_pic KoffingFrontpic
+	dba_pic KoffingBackpic
+	dba_pic WeezingFrontpic
+	dba_pic WeezingBackpic
+	dba_pic RhyhornFrontpic
+	dba_pic RhyhornBackpic
+	dba_pic RhydonFrontpic
+	dba_pic RhydonBackpic
+	dba_pic ChanseyFrontpic
+	dba_pic ChanseyBackpic
+	dba_pic TangelaFrontpic
+	dba_pic TangelaBackpic
+	dba_pic KangaskhanFrontpic
+	dba_pic KangaskhanBackpic
+	dba_pic HorseaFrontpic
+	dba_pic HorseaBackpic
+	dba_pic SeadraFrontpic
+	dba_pic SeadraBackpic
+	dba_pic GoldeenFrontpic
+	dba_pic GoldeenBackpic
+	dba_pic SeakingFrontpic
+	dba_pic SeakingBackpic
+	dba_pic StaryuFrontpic
+	dba_pic StaryuBackpic
+	dba_pic StarmieFrontpic
+	dba_pic StarmieBackpic
+	dba_pic MrMimeFrontpic
+	dba_pic MrMimeBackpic
+	dba_pic ScytherFrontpic
+	dba_pic ScytherBackpic
+	dba_pic JynxFrontpic
+	dba_pic JynxBackpic
+	dba_pic ElectabuzzFrontpic
+	dba_pic ElectabuzzBackpic
+	dba_pic MagmarFrontpic
+	dba_pic MagmarBackpic
+	dba_pic PinsirFrontpic
+	dba_pic PinsirBackpic
+	dba_pic TaurosFrontpic
+	dba_pic TaurosBackpic
+	dba_pic MagikarpFrontpic
+	dba_pic MagikarpBackpic
+	dba_pic GyaradosFrontpic
+	dba_pic GyaradosBackpic
+	dba_pic LaprasFrontpic
+	dba_pic LaprasBackpic
+	dba_pic DittoFrontpic
+	dba_pic DittoBackpic
+	dba_pic EeveeFrontpic
+	dba_pic EeveeBackpic
+	dba_pic VaporeonFrontpic
+	dba_pic VaporeonBackpic
+	dba_pic JolteonFrontpic
+	dba_pic JolteonBackpic
+	dba_pic FlareonFrontpic
+	dba_pic FlareonBackpic
+	dba_pic PorygonFrontpic
+	dba_pic PorygonBackpic
+	dba_pic OmanyteFrontpic
+	dba_pic OmanyteBackpic
+	dba_pic OmastarFrontpic
+	dba_pic OmastarBackpic
+	dba_pic KabutoFrontpic
+	dba_pic KabutoBackpic
+	dba_pic KabutopsFrontpic
+	dba_pic KabutopsBackpic
+	dba_pic AerodactylFrontpic
+	dba_pic AerodactylBackpic
+	dba_pic SnorlaxFrontpic
+	dba_pic SnorlaxBackpic
+	dba_pic ArticunoFrontpic
+	dba_pic ArticunoBackpic
+	dba_pic ZapdosFrontpic
+	dba_pic ZapdosBackpic
+	dba_pic MoltresFrontpic
+	dba_pic MoltresBackpic
+	dba_pic DratiniFrontpic
+	dba_pic DratiniBackpic
+	dba_pic DragonairFrontpic
+	dba_pic DragonairBackpic
+	dba_pic DragoniteFrontpic
+	dba_pic DragoniteBackpic
+	dba_pic MewtwoFrontpic
+	dba_pic MewtwoBackpic
+	dba_pic MewFrontpic
+	dba_pic MewBackpic
+	dba_pic ChikoritaFrontpic
+	dba_pic ChikoritaBackpic
+	dba_pic BayleefFrontpic
+	dba_pic BayleefBackpic
+	dba_pic MeganiumFrontpic
+	dba_pic MeganiumBackpic
+	dba_pic CyndaquilFrontpic
+	dba_pic CyndaquilBackpic
+	dba_pic QuilavaFrontpic
+	dba_pic QuilavaBackpic
+	dba_pic TyphlosionFrontpic
+	dba_pic TyphlosionBackpic
+	dba_pic TotodileFrontpic
+	dba_pic TotodileBackpic
+	dba_pic CroconawFrontpic
+	dba_pic CroconawBackpic
+	dba_pic FeraligatrFrontpic
+	dba_pic FeraligatrBackpic
+	dba_pic SentretFrontpic
+	dba_pic SentretBackpic
+	dba_pic FurretFrontpic
+	dba_pic FurretBackpic
+	dba_pic HoothootFrontpic
+	dba_pic HoothootBackpic
+	dba_pic NoctowlFrontpic
+	dba_pic NoctowlBackpic
+	dba_pic LedybaFrontpic
+	dba_pic LedybaBackpic
+	dba_pic LedianFrontpic
+	dba_pic LedianBackpic
+	dba_pic SpinarakFrontpic
+	dba_pic SpinarakBackpic
+	dba_pic AriadosFrontpic
+	dba_pic AriadosBackpic
+	dba_pic CrobatFrontpic
+	dba_pic CrobatBackpic
+	dba_pic ChinchouFrontpic
+	dba_pic ChinchouBackpic
+	dba_pic LanturnFrontpic
+	dba_pic LanturnBackpic
+	dba_pic PichuFrontpic
+	dba_pic PichuBackpic
+	dba_pic CleffaFrontpic
+	dba_pic CleffaBackpic
+	dba_pic IgglybuffFrontpic
+	dba_pic IgglybuffBackpic
+	dba_pic TogepiFrontpic
+	dba_pic TogepiBackpic
+	dba_pic TogeticFrontpic
+	dba_pic TogeticBackpic
+	dba_pic NatuFrontpic
+	dba_pic NatuBackpic
+	dba_pic XatuFrontpic
+	dba_pic XatuBackpic
+	dba_pic MareepFrontpic
+	dba_pic MareepBackpic
+	dba_pic FlaaffyFrontpic
+	dba_pic FlaaffyBackpic
+	dba_pic AmpharosFrontpic
+	dba_pic AmpharosBackpic
+	dba_pic BellossomFrontpic
+	dba_pic BellossomBackpic
+	dba_pic MarillFrontpic
+	dba_pic MarillBackpic
+	dba_pic AzumarillFrontpic
+	dba_pic AzumarillBackpic
+	dba_pic SudowoodoFrontpic
+	dba_pic SudowoodoBackpic
+	dba_pic PolitoedFrontpic
+	dba_pic PolitoedBackpic
+	dba_pic HoppipFrontpic
+	dba_pic HoppipBackpic
+	dba_pic SkiploomFrontpic
+	dba_pic SkiploomBackpic
+	dba_pic JumpluffFrontpic
+	dba_pic JumpluffBackpic
+	dba_pic AipomFrontpic
+	dba_pic AipomBackpic
+	dba_pic SunkernFrontpic
+	dba_pic SunkernBackpic
+	dba_pic SunfloraFrontpic
+	dba_pic SunfloraBackpic
+	dba_pic YanmaFrontpic
+	dba_pic YanmaBackpic
+	dba_pic WooperFrontpic
+	dba_pic WooperBackpic
+	dba_pic QuagsireFrontpic
+	dba_pic QuagsireBackpic
+	dba_pic EspeonFrontpic
+	dba_pic EspeonBackpic
+	dba_pic UmbreonFrontpic
+	dba_pic UmbreonBackpic
+	dba_pic MurkrowFrontpic
+	dba_pic MurkrowBackpic
+	dba_pic SlowkingFrontpic
+	dba_pic SlowkingBackpic
+	dba_pic MisdreavusFrontpic
+	dba_pic MisdreavusBackpic
 
 	; Unown pics have their own table. See UnownPicPointers
 	dbw -1, -1
 	dbw -1, -1
 
-	add_pic WobbuffetFrontpic
-	add_pic WobbuffetBackpic
-	add_pic GirafarigFrontpic
-	add_pic GirafarigBackpic
-	add_pic PinecoFrontpic
-	add_pic PinecoBackpic
-	add_pic ForretressFrontpic
-	add_pic ForretressBackpic
-	add_pic DunsparceFrontpic
-	add_pic DunsparceBackpic
-	add_pic GligarFrontpic
-	add_pic GligarBackpic
-	add_pic SteelixFrontpic
-	add_pic SteelixBackpic
-	add_pic SnubbullFrontpic
-	add_pic SnubbullBackpic
-	add_pic GranbullFrontpic
-	add_pic GranbullBackpic
-	add_pic QwilfishFrontpic
-	add_pic QwilfishBackpic
-	add_pic ScizorFrontpic
-	add_pic ScizorBackpic
-	add_pic ShuckleFrontpic
-	add_pic ShuckleBackpic
-	add_pic HeracrossFrontpic
-	add_pic HeracrossBackpic
-	add_pic SneaselFrontpic
-	add_pic SneaselBackpic
-	add_pic TeddiursaFrontpic
-	add_pic TeddiursaBackpic
-	add_pic UrsaringFrontpic
-	add_pic UrsaringBackpic
-	add_pic SlugmaFrontpic
-	add_pic SlugmaBackpic
-	add_pic MagcargoFrontpic
-	add_pic MagcargoBackpic
-	add_pic SwinubFrontpic
-	add_pic SwinubBackpic
-	add_pic PiloswineFrontpic
-	add_pic PiloswineBackpic
-	add_pic CorsolaFrontpic
-	add_pic CorsolaBackpic
-	add_pic RemoraidFrontpic
-	add_pic RemoraidBackpic
-	add_pic OctilleryFrontpic
-	add_pic OctilleryBackpic
-	add_pic DelibirdFrontpic
-	add_pic DelibirdBackpic
-	add_pic MantineFrontpic
-	add_pic MantineBackpic
-	add_pic SkarmoryFrontpic
-	add_pic SkarmoryBackpic
-	add_pic HoundourFrontpic
-	add_pic HoundourBackpic
-	add_pic HoundoomFrontpic
-	add_pic HoundoomBackpic
-	add_pic KingdraFrontpic
-	add_pic KingdraBackpic
-	add_pic PhanpyFrontpic
-	add_pic PhanpyBackpic
-	add_pic DonphanFrontpic
-	add_pic DonphanBackpic
-	add_pic Porygon2Frontpic
-	add_pic Porygon2Backpic
-	add_pic StantlerFrontpic
-	add_pic StantlerBackpic
-	add_pic SmeargleFrontpic
-	add_pic SmeargleBackpic
-	add_pic TyrogueFrontpic
-	add_pic TyrogueBackpic
-	add_pic HitmontopFrontpic
-	add_pic HitmontopBackpic
-	add_pic SmoochumFrontpic
-	add_pic SmoochumBackpic
-	add_pic ElekidFrontpic
-	add_pic ElekidBackpic
-	add_pic MagbyFrontpic
-	add_pic MagbyBackpic
-	add_pic MiltankFrontpic
-	add_pic MiltankBackpic
-	add_pic BlisseyFrontpic
-	add_pic BlisseyBackpic
-	add_pic RaikouFrontpic
-	add_pic RaikouBackpic
-	add_pic EnteiFrontpic
-	add_pic EnteiBackpic
-	add_pic SuicuneFrontpic
-	add_pic SuicuneBackpic
-	add_pic LarvitarFrontpic
-	add_pic LarvitarBackpic
-	add_pic PupitarFrontpic
-	add_pic PupitarBackpic
-	add_pic TyranitarFrontpic
-	add_pic TyranitarBackpic
-	add_pic LugiaFrontpic
-	add_pic LugiaBackpic
-	add_pic HoOhFrontpic
-	add_pic HoOhBackpic
-	add_pic CelebiFrontpic
-	add_pic CelebiBackpic
+	dba_pic WobbuffetFrontpic
+	dba_pic WobbuffetBackpic
+	dba_pic GirafarigFrontpic
+	dba_pic GirafarigBackpic
+	dba_pic PinecoFrontpic
+	dba_pic PinecoBackpic
+	dba_pic ForretressFrontpic
+	dba_pic ForretressBackpic
+	dba_pic DunsparceFrontpic
+	dba_pic DunsparceBackpic
+	dba_pic GligarFrontpic
+	dba_pic GligarBackpic
+	dba_pic SteelixFrontpic
+	dba_pic SteelixBackpic
+	dba_pic SnubbullFrontpic
+	dba_pic SnubbullBackpic
+	dba_pic GranbullFrontpic
+	dba_pic GranbullBackpic
+	dba_pic QwilfishFrontpic
+	dba_pic QwilfishBackpic
+	dba_pic ScizorFrontpic
+	dba_pic ScizorBackpic
+	dba_pic ShuckleFrontpic
+	dba_pic ShuckleBackpic
+	dba_pic HeracrossFrontpic
+	dba_pic HeracrossBackpic
+	dba_pic SneaselFrontpic
+	dba_pic SneaselBackpic
+	dba_pic TeddiursaFrontpic
+	dba_pic TeddiursaBackpic
+	dba_pic UrsaringFrontpic
+	dba_pic UrsaringBackpic
+	dba_pic SlugmaFrontpic
+	dba_pic SlugmaBackpic
+	dba_pic MagcargoFrontpic
+	dba_pic MagcargoBackpic
+	dba_pic SwinubFrontpic
+	dba_pic SwinubBackpic
+	dba_pic PiloswineFrontpic
+	dba_pic PiloswineBackpic
+	dba_pic CorsolaFrontpic
+	dba_pic CorsolaBackpic
+	dba_pic RemoraidFrontpic
+	dba_pic RemoraidBackpic
+	dba_pic OctilleryFrontpic
+	dba_pic OctilleryBackpic
+	dba_pic DelibirdFrontpic
+	dba_pic DelibirdBackpic
+	dba_pic MantineFrontpic
+	dba_pic MantineBackpic
+	dba_pic SkarmoryFrontpic
+	dba_pic SkarmoryBackpic
+	dba_pic HoundourFrontpic
+	dba_pic HoundourBackpic
+	dba_pic HoundoomFrontpic
+	dba_pic HoundoomBackpic
+	dba_pic KingdraFrontpic
+	dba_pic KingdraBackpic
+	dba_pic PhanpyFrontpic
+	dba_pic PhanpyBackpic
+	dba_pic DonphanFrontpic
+	dba_pic DonphanBackpic
+	dba_pic Porygon2Frontpic
+	dba_pic Porygon2Backpic
+	dba_pic StantlerFrontpic
+	dba_pic StantlerBackpic
+	dba_pic SmeargleFrontpic
+	dba_pic SmeargleBackpic
+	dba_pic TyrogueFrontpic
+	dba_pic TyrogueBackpic
+	dba_pic HitmontopFrontpic
+	dba_pic HitmontopBackpic
+	dba_pic SmoochumFrontpic
+	dba_pic SmoochumBackpic
+	dba_pic ElekidFrontpic
+	dba_pic ElekidBackpic
+	dba_pic MagbyFrontpic
+	dba_pic MagbyBackpic
+	dba_pic MiltankFrontpic
+	dba_pic MiltankBackpic
+	dba_pic BlisseyFrontpic
+	dba_pic BlisseyBackpic
+	dba_pic RaikouFrontpic
+	dba_pic RaikouBackpic
+	dba_pic EnteiFrontpic
+	dba_pic EnteiBackpic
+	dba_pic SuicuneFrontpic
+	dba_pic SuicuneBackpic
+	dba_pic LarvitarFrontpic
+	dba_pic LarvitarBackpic
+	dba_pic PupitarFrontpic
+	dba_pic PupitarBackpic
+	dba_pic TyranitarFrontpic
+	dba_pic TyranitarBackpic
+	dba_pic LugiaFrontpic
+	dba_pic LugiaBackpic
+	dba_pic HoOhFrontpic
+	dba_pic HoOhBackpic
+	dba_pic CelebiFrontpic
+	dba_pic CelebiBackpic
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
-	add_pic EggPic
+	dba_pic EggPic
 	dbw -1, -1 ; unused
diff --git a/gfx/pics/unown_pic_pointers.asm b/gfx/pics/unown_pic_pointers.asm
index c5072c903..1ae0da6b6 100644
--- a/gfx/pics/unown_pic_pointers.asm
+++ b/gfx/pics/unown_pic_pointers.asm
@@ -1,54 +1,54 @@
 UnownPicPointers::
 ; entries correspond to Unown letters, two apiece
-	add_pic UnownAFrontpic
-	add_pic UnownABackpic
-	add_pic UnownBFrontpic
-	add_pic UnownBBackpic
-	add_pic UnownCFrontpic
-	add_pic UnownCBackpic
-	add_pic UnownDFrontpic
-	add_pic UnownDBackpic
-	add_pic UnownEFrontpic
-	add_pic UnownEBackpic
-	add_pic UnownFFrontpic
-	add_pic UnownFBackpic
-	add_pic UnownGFrontpic
-	add_pic UnownGBackpic
-	add_pic UnownHFrontpic
-	add_pic UnownHBackpic
-	add_pic UnownIFrontpic
-	add_pic UnownIBackpic
-	add_pic UnownJFrontpic
-	add_pic UnownJBackpic
-	add_pic UnownKFrontpic
-	add_pic UnownKBackpic
-	add_pic UnownLFrontpic
-	add_pic UnownLBackpic
-	add_pic UnownMFrontpic
-	add_pic UnownMBackpic
-	add_pic UnownNFrontpic
-	add_pic UnownNBackpic
-	add_pic UnownOFrontpic
-	add_pic UnownOBackpic
-	add_pic UnownPFrontpic
-	add_pic UnownPBackpic
-	add_pic UnownQFrontpic
-	add_pic UnownQBackpic
-	add_pic UnownRFrontpic
-	add_pic UnownRBackpic
-	add_pic UnownSFrontpic
-	add_pic UnownSBackpic
-	add_pic UnownTFrontpic
-	add_pic UnownTBackpic
-	add_pic UnownUFrontpic
-	add_pic UnownUBackpic
-	add_pic UnownVFrontpic
-	add_pic UnownVBackpic
-	add_pic UnownWFrontpic
-	add_pic UnownWBackpic
-	add_pic UnownXFrontpic
-	add_pic UnownXBackpic
-	add_pic UnownYFrontpic
-	add_pic UnownYBackpic
-	add_pic UnownZFrontpic
-	add_pic UnownZBackpic
+	dba_pic UnownAFrontpic
+	dba_pic UnownABackpic
+	dba_pic UnownBFrontpic
+	dba_pic UnownBBackpic
+	dba_pic UnownCFrontpic
+	dba_pic UnownCBackpic
+	dba_pic UnownDFrontpic
+	dba_pic UnownDBackpic
+	dba_pic UnownEFrontpic
+	dba_pic UnownEBackpic
+	dba_pic UnownFFrontpic
+	dba_pic UnownFBackpic
+	dba_pic UnownGFrontpic
+	dba_pic UnownGBackpic
+	dba_pic UnownHFrontpic
+	dba_pic UnownHBackpic
+	dba_pic UnownIFrontpic
+	dba_pic UnownIBackpic
+	dba_pic UnownJFrontpic
+	dba_pic UnownJBackpic
+	dba_pic UnownKFrontpic
+	dba_pic UnownKBackpic
+	dba_pic UnownLFrontpic
+	dba_pic UnownLBackpic
+	dba_pic UnownMFrontpic
+	dba_pic UnownMBackpic
+	dba_pic UnownNFrontpic
+	dba_pic UnownNBackpic
+	dba_pic UnownOFrontpic
+	dba_pic UnownOBackpic
+	dba_pic UnownPFrontpic
+	dba_pic UnownPBackpic
+	dba_pic UnownQFrontpic
+	dba_pic UnownQBackpic
+	dba_pic UnownRFrontpic
+	dba_pic UnownRBackpic
+	dba_pic UnownSFrontpic
+	dba_pic UnownSBackpic
+	dba_pic UnownTFrontpic
+	dba_pic UnownTBackpic
+	dba_pic UnownUFrontpic
+	dba_pic UnownUBackpic
+	dba_pic UnownVFrontpic
+	dba_pic UnownVBackpic
+	dba_pic UnownWFrontpic
+	dba_pic UnownWBackpic
+	dba_pic UnownXFrontpic
+	dba_pic UnownXBackpic
+	dba_pic UnownYFrontpic
+	dba_pic UnownYBackpic
+	dba_pic UnownZFrontpic
+	dba_pic UnownZBackpic
diff --git a/gfx/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm
index fb1fe0755..201b44200 100644
--- a/gfx/trainer_pic_pointers.asm
+++ b/gfx/trainer_pic_pointers.asm
@@ -1,69 +1,69 @@
 TrainerPicPointers::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	add_pic FalknerPic
-	add_pic WhitneyPic
-	add_pic BugsyPic
-	add_pic MortyPic
-	add_pic PrycePic
-	add_pic JasminePic
-	add_pic ChuckPic
-	add_pic ClairPic
-	add_pic Rival1Pic
-	add_pic PokemonProfPic
-	add_pic WillPic
-	add_pic CalPic
-	add_pic BrunoPic
-	add_pic KarenPic
-	add_pic KogaPic
-	add_pic ChampionPic
-	add_pic BrockPic
-	add_pic MistyPic
-	add_pic LtSurgePic
-	add_pic ScientistPic
-	add_pic ErikaPic
-	add_pic YoungsterPic
-	add_pic SchoolboyPic
-	add_pic BirdKeeperPic
-	add_pic LassPic
-	add_pic JaninePic
-	add_pic CooltrainermPic
-	add_pic CooltrainerfPic
-	add_pic BeautyPic
-	add_pic PokemaniacPic
-	add_pic GruntmPic
-	add_pic GentlemanPic
-	add_pic SkierPic
-	add_pic TeacherPic
-	add_pic SabrinaPic
-	add_pic BugCatcherPic
-	add_pic FisherPic
-	add_pic SwimmermPic
-	add_pic SwimmerfPic
-	add_pic SailorPic
-	add_pic SuperNerdPic
-	add_pic Rival2Pic
-	add_pic GuitaristPic
-	add_pic HikerPic
-	add_pic BikerPic
-	add_pic BlainePic
-	add_pic BurglarPic
-	add_pic FirebreatherPic
-	add_pic JugglerPic
-	add_pic BlackbeltTPic
-	add_pic ExecutivemPic
-	add_pic PsychicTPic
-	add_pic PicnickerPic
-	add_pic CamperPic
-	add_pic ExecutivefPic
-	add_pic SagePic
-	add_pic MediumPic
-	add_pic BoarderPic
-	add_pic PokefanmPic
-	add_pic KimonoGirlPic
-	add_pic TwinsPic
-	add_pic PokefanfPic
-	add_pic RedPic
-	add_pic BluePic
-	add_pic OfficerPic
-	add_pic GruntfPic
-	add_pic MysticalmanPic
+	dba_pic FalknerPic
+	dba_pic WhitneyPic
+	dba_pic BugsyPic
+	dba_pic MortyPic
+	dba_pic PrycePic
+	dba_pic JasminePic
+	dba_pic ChuckPic
+	dba_pic ClairPic
+	dba_pic Rival1Pic
+	dba_pic PokemonProfPic
+	dba_pic WillPic
+	dba_pic CalPic
+	dba_pic BrunoPic
+	dba_pic KarenPic
+	dba_pic KogaPic
+	dba_pic ChampionPic
+	dba_pic BrockPic
+	dba_pic MistyPic
+	dba_pic LtSurgePic
+	dba_pic ScientistPic
+	dba_pic ErikaPic
+	dba_pic YoungsterPic
+	dba_pic SchoolboyPic
+	dba_pic BirdKeeperPic
+	dba_pic LassPic
+	dba_pic JaninePic
+	dba_pic CooltrainermPic
+	dba_pic CooltrainerfPic
+	dba_pic BeautyPic
+	dba_pic PokemaniacPic
+	dba_pic GruntmPic
+	dba_pic GentlemanPic
+	dba_pic SkierPic
+	dba_pic TeacherPic
+	dba_pic SabrinaPic
+	dba_pic BugCatcherPic
+	dba_pic FisherPic
+	dba_pic SwimmermPic
+	dba_pic SwimmerfPic
+	dba_pic SailorPic
+	dba_pic SuperNerdPic
+	dba_pic Rival2Pic
+	dba_pic GuitaristPic
+	dba_pic HikerPic
+	dba_pic BikerPic
+	dba_pic BlainePic
+	dba_pic BurglarPic
+	dba_pic FirebreatherPic
+	dba_pic JugglerPic
+	dba_pic BlackbeltTPic
+	dba_pic ExecutivemPic
+	dba_pic PsychicTPic
+	dba_pic PicnickerPic
+	dba_pic CamperPic
+	dba_pic ExecutivefPic
+	dba_pic SagePic
+	dba_pic MediumPic
+	dba_pic BoarderPic
+	dba_pic PokefanmPic
+	dba_pic KimonoGirlPic
+	dba_pic TwinsPic
+	dba_pic PokefanfPic
+	dba_pic RedPic
+	dba_pic BluePic
+	dba_pic OfficerPic
+	dba_pic GruntfPic
+	dba_pic MysticalmanPic