diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index ec429eb17..a4ce5f775 100644
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -1,260 +1,516 @@
 ; Pics are defined in gfx/pics.asm
 
 PokemonPicPointers::
-; entries correspond to Pokémon species
+; entries correspond to Pokémon species, two apiece
 	table_width 3 * 2
-	dba_pics BulbasaurFrontpic, BulbasaurBackpic
-	dba_pics IvysaurFrontpic, IvysaurBackpic
-	dba_pics VenusaurFrontpic, VenusaurBackpic
-	dba_pics CharmanderFrontpic, CharmanderBackpic
-	dba_pics CharmeleonFrontpic, CharmeleonBackpic
-	dba_pics CharizardFrontpic, CharizardBackpic
-	dba_pics SquirtleFrontpic, SquirtleBackpic
-	dba_pics WartortleFrontpic, WartortleBackpic
-	dba_pics BlastoiseFrontpic, BlastoiseBackpic
-	dba_pics CaterpieFrontpic, CaterpieBackpic
-	dba_pics MetapodFrontpic, MetapodBackpic
-	dba_pics ButterfreeFrontpic, ButterfreeBackpic
-	dba_pics WeedleFrontpic, WeedleBackpic
-	dba_pics KakunaFrontpic, KakunaBackpic
-	dba_pics BeedrillFrontpic, BeedrillBackpic
-	dba_pics PidgeyFrontpic, PidgeyBackpic
-	dba_pics PidgeottoFrontpic, PidgeottoBackpic
-	dba_pics PidgeotFrontpic, PidgeotBackpic
-	dba_pics RattataFrontpic, RattataBackpic
-	dba_pics RaticateFrontpic, RaticateBackpic
-	dba_pics SpearowFrontpic, SpearowBackpic
-	dba_pics FearowFrontpic, FearowBackpic
-	dba_pics EkansFrontpic, EkansBackpic
-	dba_pics ArbokFrontpic, ArbokBackpic
-	dba_pics PikachuFrontpic, PikachuBackpic
-	dba_pics RaichuFrontpic, RaichuBackpic
-	dba_pics SandshrewFrontpic, SandshrewBackpic
-	dba_pics SandslashFrontpic, SandslashBackpic
-	dba_pics NidoranFFrontpic, NidoranFBackpic
-	dba_pics NidorinaFrontpic, NidorinaBackpic
-	dba_pics NidoqueenFrontpic, NidoqueenBackpic
-	dba_pics NidoranMFrontpic, NidoranMBackpic
-	dba_pics NidorinoFrontpic, NidorinoBackpic
-	dba_pics NidokingFrontpic, NidokingBackpic
-	dba_pics ClefairyFrontpic, ClefairyBackpic
-	dba_pics ClefableFrontpic, ClefableBackpic
-	dba_pics VulpixFrontpic, VulpixBackpic
-	dba_pics NinetalesFrontpic, NinetalesBackpic
-	dba_pics JigglypuffFrontpic, JigglypuffBackpic
-	dba_pics WigglytuffFrontpic, WigglytuffBackpic
-	dba_pics ZubatFrontpic, ZubatBackpic
-	dba_pics GolbatFrontpic, GolbatBackpic
-	dba_pics OddishFrontpic, OddishBackpic
-	dba_pics GloomFrontpic, GloomBackpic
-	dba_pics VileplumeFrontpic, VileplumeBackpic
-	dba_pics ParasFrontpic, ParasBackpic
-	dba_pics ParasectFrontpic, ParasectBackpic
-	dba_pics VenonatFrontpic, VenonatBackpic
-	dba_pics VenomothFrontpic, VenomothBackpic
-	dba_pics DiglettFrontpic, DiglettBackpic
-	dba_pics DugtrioFrontpic, DugtrioBackpic
-	dba_pics MeowthFrontpic, MeowthBackpic
-	dba_pics PersianFrontpic, PersianBackpic
-	dba_pics PsyduckFrontpic, PsyduckBackpic
-	dba_pics GolduckFrontpic, GolduckBackpic
-	dba_pics MankeyFrontpic, MankeyBackpic
-	dba_pics PrimeapeFrontpic, PrimeapeBackpic
-	dba_pics GrowlitheFrontpic, GrowlitheBackpic
-	dba_pics ArcanineFrontpic, ArcanineBackpic
-	dba_pics PoliwagFrontpic, PoliwagBackpic
-	dba_pics PoliwhirlFrontpic, PoliwhirlBackpic
-	dba_pics PoliwrathFrontpic, PoliwrathBackpic
-	dba_pics AbraFrontpic, AbraBackpic
-	dba_pics KadabraFrontpic, KadabraBackpic
-	dba_pics AlakazamFrontpic, AlakazamBackpic
-	dba_pics MachopFrontpic, MachopBackpic
-	dba_pics MachokeFrontpic, MachokeBackpic
-	dba_pics MachampFrontpic, MachampBackpic
-	dba_pics BellsproutFrontpic, BellsproutBackpic
-	dba_pics WeepinbellFrontpic, WeepinbellBackpic
-	dba_pics VictreebelFrontpic, VictreebelBackpic
-	dba_pics TentacoolFrontpic, TentacoolBackpic
-	dba_pics TentacruelFrontpic, TentacruelBackpic
-	dba_pics GeodudeFrontpic, GeodudeBackpic
-	dba_pics GravelerFrontpic, GravelerBackpic
-	dba_pics GolemFrontpic, GolemBackpic
-	dba_pics PonytaFrontpic, PonytaBackpic
-	dba_pics RapidashFrontpic, RapidashBackpic
-	dba_pics SlowpokeFrontpic, SlowpokeBackpic
-	dba_pics SlowbroFrontpic, SlowbroBackpic
-	dba_pics MagnemiteFrontpic, MagnemiteBackpic
-	dba_pics MagnetonFrontpic, MagnetonBackpic
-	dba_pics FarfetchDFrontpic, FarfetchDBackpic
-	dba_pics DoduoFrontpic, DoduoBackpic
-	dba_pics DodrioFrontpic, DodrioBackpic
-	dba_pics SeelFrontpic, SeelBackpic
-	dba_pics DewgongFrontpic, DewgongBackpic
-	dba_pics GrimerFrontpic, GrimerBackpic
-	dba_pics MukFrontpic, MukBackpic
-	dba_pics ShellderFrontpic, ShellderBackpic
-	dba_pics CloysterFrontpic, CloysterBackpic
-	dba_pics GastlyFrontpic, GastlyBackpic
-	dba_pics HaunterFrontpic, HaunterBackpic
-	dba_pics GengarFrontpic, GengarBackpic
-	dba_pics OnixFrontpic, OnixBackpic
-	dba_pics DrowzeeFrontpic, DrowzeeBackpic
-	dba_pics HypnoFrontpic, HypnoBackpic
-	dba_pics KrabbyFrontpic, KrabbyBackpic
-	dba_pics KinglerFrontpic, KinglerBackpic
-	dba_pics VoltorbFrontpic, VoltorbBackpic
-	dba_pics ElectrodeFrontpic, ElectrodeBackpic
-	dba_pics ExeggcuteFrontpic, ExeggcuteBackpic
-	dba_pics ExeggutorFrontpic, ExeggutorBackpic
-	dba_pics CuboneFrontpic, CuboneBackpic
-	dba_pics MarowakFrontpic, MarowakBackpic
-	dba_pics HitmonleeFrontpic, HitmonleeBackpic
-	dba_pics HitmonchanFrontpic, HitmonchanBackpic
-	dba_pics LickitungFrontpic, LickitungBackpic
-	dba_pics KoffingFrontpic, KoffingBackpic
-	dba_pics WeezingFrontpic, WeezingBackpic
-	dba_pics RhyhornFrontpic, RhyhornBackpic
-	dba_pics RhydonFrontpic, RhydonBackpic
-	dba_pics ChanseyFrontpic, ChanseyBackpic
-	dba_pics TangelaFrontpic, TangelaBackpic
-	dba_pics KangaskhanFrontpic, KangaskhanBackpic
-	dba_pics HorseaFrontpic, HorseaBackpic
-	dba_pics SeadraFrontpic, SeadraBackpic
-	dba_pics GoldeenFrontpic, GoldeenBackpic
-	dba_pics SeakingFrontpic, SeakingBackpic
-	dba_pics StaryuFrontpic, StaryuBackpic
-	dba_pics StarmieFrontpic, StarmieBackpic
-	dba_pics MrMimeFrontpic, MrMimeBackpic
-	dba_pics ScytherFrontpic, ScytherBackpic
-	dba_pics JynxFrontpic, JynxBackpic
-	dba_pics ElectabuzzFrontpic, ElectabuzzBackpic
-	dba_pics MagmarFrontpic, MagmarBackpic
-	dba_pics PinsirFrontpic, PinsirBackpic
-	dba_pics TaurosFrontpic, TaurosBackpic
-	dba_pics MagikarpFrontpic, MagikarpBackpic
-	dba_pics GyaradosFrontpic, GyaradosBackpic
-	dba_pics LaprasFrontpic, LaprasBackpic
-	dba_pics DittoFrontpic, DittoBackpic
-	dba_pics EeveeFrontpic, EeveeBackpic
-	dba_pics VaporeonFrontpic, VaporeonBackpic
-	dba_pics JolteonFrontpic, JolteonBackpic
-	dba_pics FlareonFrontpic, FlareonBackpic
-	dba_pics PorygonFrontpic, PorygonBackpic
-	dba_pics OmanyteFrontpic, OmanyteBackpic
-	dba_pics OmastarFrontpic, OmastarBackpic
-	dba_pics KabutoFrontpic, KabutoBackpic
-	dba_pics KabutopsFrontpic, KabutopsBackpic
-	dba_pics AerodactylFrontpic, AerodactylBackpic
-	dba_pics SnorlaxFrontpic, SnorlaxBackpic
-	dba_pics ArticunoFrontpic, ArticunoBackpic
-	dba_pics ZapdosFrontpic, ZapdosBackpic
-	dba_pics MoltresFrontpic, MoltresBackpic
-	dba_pics DratiniFrontpic, DratiniBackpic
-	dba_pics DragonairFrontpic, DragonairBackpic
-	dba_pics DragoniteFrontpic, DragoniteBackpic
-	dba_pics MewtwoFrontpic, MewtwoBackpic
-	dba_pics MewFrontpic, MewBackpic
-	dba_pics ChikoritaFrontpic, ChikoritaBackpic
-	dba_pics BayleefFrontpic, BayleefBackpic
-	dba_pics MeganiumFrontpic, MeganiumBackpic
-	dba_pics CyndaquilFrontpic, CyndaquilBackpic
-	dba_pics QuilavaFrontpic, QuilavaBackpic
-	dba_pics TyphlosionFrontpic, TyphlosionBackpic
-	dba_pics TotodileFrontpic, TotodileBackpic
-	dba_pics CroconawFrontpic, CroconawBackpic
-	dba_pics FeraligatrFrontpic, FeraligatrBackpic
-	dba_pics SentretFrontpic, SentretBackpic
-	dba_pics FurretFrontpic, FurretBackpic
-	dba_pics HoothootFrontpic, HoothootBackpic
-	dba_pics NoctowlFrontpic, NoctowlBackpic
-	dba_pics LedybaFrontpic, LedybaBackpic
-	dba_pics LedianFrontpic, LedianBackpic
-	dba_pics SpinarakFrontpic, SpinarakBackpic
-	dba_pics AriadosFrontpic, AriadosBackpic
-	dba_pics CrobatFrontpic, CrobatBackpic
-	dba_pics ChinchouFrontpic, ChinchouBackpic
-	dba_pics LanturnFrontpic, LanturnBackpic
-	dba_pics PichuFrontpic, PichuBackpic
-	dba_pics CleffaFrontpic, CleffaBackpic
-	dba_pics IgglybuffFrontpic, IgglybuffBackpic
-	dba_pics TogepiFrontpic, TogepiBackpic
-	dba_pics TogeticFrontpic, TogeticBackpic
-	dba_pics NatuFrontpic, NatuBackpic
-	dba_pics XatuFrontpic, XatuBackpic
-	dba_pics MareepFrontpic, MareepBackpic
-	dba_pics FlaaffyFrontpic, FlaaffyBackpic
-	dba_pics AmpharosFrontpic, AmpharosBackpic
-	dba_pics BellossomFrontpic, BellossomBackpic
-	dba_pics MarillFrontpic, MarillBackpic
-	dba_pics AzumarillFrontpic, AzumarillBackpic
-	dba_pics SudowoodoFrontpic, SudowoodoBackpic
-	dba_pics PolitoedFrontpic, PolitoedBackpic
-	dba_pics HoppipFrontpic, HoppipBackpic
-	dba_pics SkiploomFrontpic, SkiploomBackpic
-	dba_pics JumpluffFrontpic, JumpluffBackpic
-	dba_pics AipomFrontpic, AipomBackpic
-	dba_pics SunkernFrontpic, SunkernBackpic
-	dba_pics SunfloraFrontpic, SunfloraBackpic
-	dba_pics YanmaFrontpic, YanmaBackpic
-	dba_pics WooperFrontpic, WooperBackpic
-	dba_pics QuagsireFrontpic, QuagsireBackpic
-	dba_pics EspeonFrontpic, EspeonBackpic
-	dba_pics UmbreonFrontpic, UmbreonBackpic
-	dba_pics MurkrowFrontpic, MurkrowBackpic
-	dba_pics SlowkingFrontpic, SlowkingBackpic
-	dba_pics MisdreavusFrontpic, MisdreavusBackpic
-	dba_pics ; Unown pics have their own table (see data/pokemon/unown_pic_pointers.asm)
-	dba_pics WobbuffetFrontpic, WobbuffetBackpic
-	dba_pics GirafarigFrontpic, GirafarigBackpic
-	dba_pics PinecoFrontpic, PinecoBackpic
-	dba_pics ForretressFrontpic, ForretressBackpic
-	dba_pics DunsparceFrontpic, DunsparceBackpic
-	dba_pics GligarFrontpic, GligarBackpic
-	dba_pics SteelixFrontpic, SteelixBackpic
-	dba_pics SnubbullFrontpic, SnubbullBackpic
-	dba_pics GranbullFrontpic, GranbullBackpic
-	dba_pics QwilfishFrontpic, QwilfishBackpic
-	dba_pics ScizorFrontpic, ScizorBackpic
-	dba_pics ShuckleFrontpic, ShuckleBackpic
-	dba_pics HeracrossFrontpic, HeracrossBackpic
-	dba_pics SneaselFrontpic, SneaselBackpic
-	dba_pics TeddiursaFrontpic, TeddiursaBackpic
-	dba_pics UrsaringFrontpic, UrsaringBackpic
-	dba_pics SlugmaFrontpic, SlugmaBackpic
-	dba_pics MagcargoFrontpic, MagcargoBackpic
-	dba_pics SwinubFrontpic, SwinubBackpic
-	dba_pics PiloswineFrontpic, PiloswineBackpic
-	dba_pics CorsolaFrontpic, CorsolaBackpic
-	dba_pics RemoraidFrontpic, RemoraidBackpic
-	dba_pics OctilleryFrontpic, OctilleryBackpic
-	dba_pics DelibirdFrontpic, DelibirdBackpic
-	dba_pics MantineFrontpic, MantineBackpic
-	dba_pics SkarmoryFrontpic, SkarmoryBackpic
-	dba_pics HoundourFrontpic, HoundourBackpic
-	dba_pics HoundoomFrontpic, HoundoomBackpic
-	dba_pics KingdraFrontpic, KingdraBackpic
-	dba_pics PhanpyFrontpic, PhanpyBackpic
-	dba_pics DonphanFrontpic, DonphanBackpic
-	dba_pics Porygon2Frontpic, Porygon2Backpic
-	dba_pics StantlerFrontpic, StantlerBackpic
-	dba_pics SmeargleFrontpic, SmeargleBackpic
-	dba_pics TyrogueFrontpic, TyrogueBackpic
-	dba_pics HitmontopFrontpic, HitmontopBackpic
-	dba_pics SmoochumFrontpic, SmoochumBackpic
-	dba_pics ElekidFrontpic, ElekidBackpic
-	dba_pics MagbyFrontpic, MagbyBackpic
-	dba_pics MiltankFrontpic, MiltankBackpic
-	dba_pics BlisseyFrontpic, BlisseyBackpic
-	dba_pics RaikouFrontpic, RaikouBackpic
-	dba_pics EnteiFrontpic, EnteiBackpic
-	dba_pics SuicuneFrontpic, SuicuneBackpic
-	dba_pics LarvitarFrontpic, LarvitarBackpic
-	dba_pics PupitarFrontpic, PupitarBackpic
-	dba_pics TyranitarFrontpic, TyranitarBackpic
-	dba_pics LugiaFrontpic, LugiaBackpic
-	dba_pics HoOhFrontpic, HoOhBackpic
-	dba_pics CelebiFrontpic, CelebiBackpic
+	dba BulbasaurFrontpic
+	dba BulbasaurBackpic
+	dba IvysaurFrontpic
+	dba IvysaurBackpic
+	dba VenusaurFrontpic
+	dba VenusaurBackpic
+	dba CharmanderFrontpic
+	dba CharmanderBackpic
+	dba CharmeleonFrontpic
+	dba CharmeleonBackpic
+	dba CharizardFrontpic
+	dba CharizardBackpic
+	dba SquirtleFrontpic
+	dba SquirtleBackpic
+	dba WartortleFrontpic
+	dba WartortleBackpic
+	dba BlastoiseFrontpic
+	dba BlastoiseBackpic
+	dba CaterpieFrontpic
+	dba CaterpieBackpic
+	dba MetapodFrontpic
+	dba MetapodBackpic
+	dba ButterfreeFrontpic
+	dba ButterfreeBackpic
+	dba WeedleFrontpic
+	dba WeedleBackpic
+	dba KakunaFrontpic
+	dba KakunaBackpic
+	dba BeedrillFrontpic
+	dba BeedrillBackpic
+	dba PidgeyFrontpic
+	dba PidgeyBackpic
+	dba PidgeottoFrontpic
+	dba PidgeottoBackpic
+	dba PidgeotFrontpic
+	dba PidgeotBackpic
+	dba RattataFrontpic
+	dba RattataBackpic
+	dba RaticateFrontpic
+	dba RaticateBackpic
+	dba SpearowFrontpic
+	dba SpearowBackpic
+	dba FearowFrontpic
+	dba FearowBackpic
+	dba EkansFrontpic
+	dba EkansBackpic
+	dba ArbokFrontpic
+	dba ArbokBackpic
+	dba PikachuFrontpic
+	dba PikachuBackpic
+	dba RaichuFrontpic
+	dba RaichuBackpic
+	dba SandshrewFrontpic
+	dba SandshrewBackpic
+	dba SandslashFrontpic
+	dba SandslashBackpic
+	dba NidoranFFrontpic
+	dba NidoranFBackpic
+	dba NidorinaFrontpic
+	dba NidorinaBackpic
+	dba NidoqueenFrontpic
+	dba NidoqueenBackpic
+	dba NidoranMFrontpic
+	dba NidoranMBackpic
+	dba NidorinoFrontpic
+	dba NidorinoBackpic
+	dba NidokingFrontpic
+	dba NidokingBackpic
+	dba ClefairyFrontpic
+	dba ClefairyBackpic
+	dba ClefableFrontpic
+	dba ClefableBackpic
+	dba VulpixFrontpic
+	dba VulpixBackpic
+	dba NinetalesFrontpic
+	dba NinetalesBackpic
+	dba JigglypuffFrontpic
+	dba JigglypuffBackpic
+	dba WigglytuffFrontpic
+	dba WigglytuffBackpic
+	dba ZubatFrontpic
+	dba ZubatBackpic
+	dba GolbatFrontpic
+	dba GolbatBackpic
+	dba OddishFrontpic
+	dba OddishBackpic
+	dba GloomFrontpic
+	dba GloomBackpic
+	dba VileplumeFrontpic
+	dba VileplumeBackpic
+	dba ParasFrontpic
+	dba ParasBackpic
+	dba ParasectFrontpic
+	dba ParasectBackpic
+	dba VenonatFrontpic
+	dba VenonatBackpic
+	dba VenomothFrontpic
+	dba VenomothBackpic
+	dba DiglettFrontpic
+	dba DiglettBackpic
+	dba DugtrioFrontpic
+	dba DugtrioBackpic
+	dba MeowthFrontpic
+	dba MeowthBackpic
+	dba PersianFrontpic
+	dba PersianBackpic
+	dba PsyduckFrontpic
+	dba PsyduckBackpic
+	dba GolduckFrontpic
+	dba GolduckBackpic
+	dba MankeyFrontpic
+	dba MankeyBackpic
+	dba PrimeapeFrontpic
+	dba PrimeapeBackpic
+	dba GrowlitheFrontpic
+	dba GrowlitheBackpic
+	dba ArcanineFrontpic
+	dba ArcanineBackpic
+	dba PoliwagFrontpic
+	dba PoliwagBackpic
+	dba PoliwhirlFrontpic
+	dba PoliwhirlBackpic
+	dba PoliwrathFrontpic
+	dba PoliwrathBackpic
+	dba AbraFrontpic
+	dba AbraBackpic
+	dba KadabraFrontpic
+	dba KadabraBackpic
+	dba AlakazamFrontpic
+	dba AlakazamBackpic
+	dba MachopFrontpic
+	dba MachopBackpic
+	dba MachokeFrontpic
+	dba MachokeBackpic
+	dba MachampFrontpic
+	dba MachampBackpic
+	dba BellsproutFrontpic
+	dba BellsproutBackpic
+	dba WeepinbellFrontpic
+	dba WeepinbellBackpic
+	dba VictreebelFrontpic
+	dba VictreebelBackpic
+	dba TentacoolFrontpic
+	dba TentacoolBackpic
+	dba TentacruelFrontpic
+	dba TentacruelBackpic
+	dba GeodudeFrontpic
+	dba GeodudeBackpic
+	dba GravelerFrontpic
+	dba GravelerBackpic
+	dba GolemFrontpic
+	dba GolemBackpic
+	dba PonytaFrontpic
+	dba PonytaBackpic
+	dba RapidashFrontpic
+	dba RapidashBackpic
+	dba SlowpokeFrontpic
+	dba SlowpokeBackpic
+	dba SlowbroFrontpic
+	dba SlowbroBackpic
+	dba MagnemiteFrontpic
+	dba MagnemiteBackpic
+	dba MagnetonFrontpic
+	dba MagnetonBackpic
+	dba FarfetchDFrontpic
+	dba FarfetchDBackpic
+	dba DoduoFrontpic
+	dba DoduoBackpic
+	dba DodrioFrontpic
+	dba DodrioBackpic
+	dba SeelFrontpic
+	dba SeelBackpic
+	dba DewgongFrontpic
+	dba DewgongBackpic
+	dba GrimerFrontpic
+	dba GrimerBackpic
+	dba MukFrontpic
+	dba MukBackpic
+	dba ShellderFrontpic
+	dba ShellderBackpic
+	dba CloysterFrontpic
+	dba CloysterBackpic
+	dba GastlyFrontpic
+	dba GastlyBackpic
+	dba HaunterFrontpic
+	dba HaunterBackpic
+	dba GengarFrontpic
+	dba GengarBackpic
+	dba OnixFrontpic
+	dba OnixBackpic
+	dba DrowzeeFrontpic
+	dba DrowzeeBackpic
+	dba HypnoFrontpic
+	dba HypnoBackpic
+	dba KrabbyFrontpic
+	dba KrabbyBackpic
+	dba KinglerFrontpic
+	dba KinglerBackpic
+	dba VoltorbFrontpic
+	dba VoltorbBackpic
+	dba ElectrodeFrontpic
+	dba ElectrodeBackpic
+	dba ExeggcuteFrontpic
+	dba ExeggcuteBackpic
+	dba ExeggutorFrontpic
+	dba ExeggutorBackpic
+	dba CuboneFrontpic
+	dba CuboneBackpic
+	dba MarowakFrontpic
+	dba MarowakBackpic
+	dba HitmonleeFrontpic
+	dba HitmonleeBackpic
+	dba HitmonchanFrontpic
+	dba HitmonchanBackpic
+	dba LickitungFrontpic
+	dba LickitungBackpic
+	dba KoffingFrontpic
+	dba KoffingBackpic
+	dba WeezingFrontpic
+	dba WeezingBackpic
+	dba RhyhornFrontpic
+	dba RhyhornBackpic
+	dba RhydonFrontpic
+	dba RhydonBackpic
+	dba ChanseyFrontpic
+	dba ChanseyBackpic
+	dba TangelaFrontpic
+	dba TangelaBackpic
+	dba KangaskhanFrontpic
+	dba KangaskhanBackpic
+	dba HorseaFrontpic
+	dba HorseaBackpic
+	dba SeadraFrontpic
+	dba SeadraBackpic
+	dba GoldeenFrontpic
+	dba GoldeenBackpic
+	dba SeakingFrontpic
+	dba SeakingBackpic
+	dba StaryuFrontpic
+	dba StaryuBackpic
+	dba StarmieFrontpic
+	dba StarmieBackpic
+	dba MrMimeFrontpic
+	dba MrMimeBackpic
+	dba ScytherFrontpic
+	dba ScytherBackpic
+	dba JynxFrontpic
+	dba JynxBackpic
+	dba ElectabuzzFrontpic
+	dba ElectabuzzBackpic
+	dba MagmarFrontpic
+	dba MagmarBackpic
+	dba PinsirFrontpic
+	dba PinsirBackpic
+	dba TaurosFrontpic
+	dba TaurosBackpic
+	dba MagikarpFrontpic
+	dba MagikarpBackpic
+	dba GyaradosFrontpic
+	dba GyaradosBackpic
+	dba LaprasFrontpic
+	dba LaprasBackpic
+	dba DittoFrontpic
+	dba DittoBackpic
+	dba EeveeFrontpic
+	dba EeveeBackpic
+	dba VaporeonFrontpic
+	dba VaporeonBackpic
+	dba JolteonFrontpic
+	dba JolteonBackpic
+	dba FlareonFrontpic
+	dba FlareonBackpic
+	dba PorygonFrontpic
+	dba PorygonBackpic
+	dba OmanyteFrontpic
+	dba OmanyteBackpic
+	dba OmastarFrontpic
+	dba OmastarBackpic
+	dba KabutoFrontpic
+	dba KabutoBackpic
+	dba KabutopsFrontpic
+	dba KabutopsBackpic
+	dba AerodactylFrontpic
+	dba AerodactylBackpic
+	dba SnorlaxFrontpic
+	dba SnorlaxBackpic
+	dba ArticunoFrontpic
+	dba ArticunoBackpic
+	dba ZapdosFrontpic
+	dba ZapdosBackpic
+	dba MoltresFrontpic
+	dba MoltresBackpic
+	dba DratiniFrontpic
+	dba DratiniBackpic
+	dba DragonairFrontpic
+	dba DragonairBackpic
+	dba DragoniteFrontpic
+	dba DragoniteBackpic
+	dba MewtwoFrontpic
+	dba MewtwoBackpic
+	dba MewFrontpic
+	dba MewBackpic
+	dba ChikoritaFrontpic
+	dba ChikoritaBackpic
+	dba BayleefFrontpic
+	dba BayleefBackpic
+	dba MeganiumFrontpic
+	dba MeganiumBackpic
+	dba CyndaquilFrontpic
+	dba CyndaquilBackpic
+	dba QuilavaFrontpic
+	dba QuilavaBackpic
+	dba TyphlosionFrontpic
+	dba TyphlosionBackpic
+	dba TotodileFrontpic
+	dba TotodileBackpic
+	dba CroconawFrontpic
+	dba CroconawBackpic
+	dba FeraligatrFrontpic
+	dba FeraligatrBackpic
+	dba SentretFrontpic
+	dba SentretBackpic
+	dba FurretFrontpic
+	dba FurretBackpic
+	dba HoothootFrontpic
+	dba HoothootBackpic
+	dba NoctowlFrontpic
+	dba NoctowlBackpic
+	dba LedybaFrontpic
+	dba LedybaBackpic
+	dba LedianFrontpic
+	dba LedianBackpic
+	dba SpinarakFrontpic
+	dba SpinarakBackpic
+	dba AriadosFrontpic
+	dba AriadosBackpic
+	dba CrobatFrontpic
+	dba CrobatBackpic
+	dba ChinchouFrontpic
+	dba ChinchouBackpic
+	dba LanturnFrontpic
+	dba LanturnBackpic
+	dba PichuFrontpic
+	dba PichuBackpic
+	dba CleffaFrontpic
+	dba CleffaBackpic
+	dba IgglybuffFrontpic
+	dba IgglybuffBackpic
+	dba TogepiFrontpic
+	dba TogepiBackpic
+	dba TogeticFrontpic
+	dba TogeticBackpic
+	dba NatuFrontpic
+	dba NatuBackpic
+	dba XatuFrontpic
+	dba XatuBackpic
+	dba MareepFrontpic
+	dba MareepBackpic
+	dba FlaaffyFrontpic
+	dba FlaaffyBackpic
+	dba AmpharosFrontpic
+	dba AmpharosBackpic
+	dba BellossomFrontpic
+	dba BellossomBackpic
+	dba MarillFrontpic
+	dba MarillBackpic
+	dba AzumarillFrontpic
+	dba AzumarillBackpic
+	dba SudowoodoFrontpic
+	dba SudowoodoBackpic
+	dba PolitoedFrontpic
+	dba PolitoedBackpic
+	dba HoppipFrontpic
+	dba HoppipBackpic
+	dba SkiploomFrontpic
+	dba SkiploomBackpic
+	dba JumpluffFrontpic
+	dba JumpluffBackpic
+	dba AipomFrontpic
+	dba AipomBackpic
+	dba SunkernFrontpic
+	dba SunkernBackpic
+	dba SunfloraFrontpic
+	dba SunfloraBackpic
+	dba YanmaFrontpic
+	dba YanmaBackpic
+	dba WooperFrontpic
+	dba WooperBackpic
+	dba QuagsireFrontpic
+	dba QuagsireBackpic
+	dba EspeonFrontpic
+	dba EspeonBackpic
+	dba UmbreonFrontpic
+	dba UmbreonBackpic
+	dba MurkrowFrontpic
+	dba MurkrowBackpic
+	dba SlowkingFrontpic
+	dba SlowkingBackpic
+	dba MisdreavusFrontpic
+	dba MisdreavusBackpic
+
+	; Unown pics have their own table. See UnownPicPointers
+	dbw -1, -1
+	dbw -1, -1
+
+	dba WobbuffetFrontpic
+	dba WobbuffetBackpic
+	dba GirafarigFrontpic
+	dba GirafarigBackpic
+	dba PinecoFrontpic
+	dba PinecoBackpic
+	dba ForretressFrontpic
+	dba ForretressBackpic
+	dba DunsparceFrontpic
+	dba DunsparceBackpic
+	dba GligarFrontpic
+	dba GligarBackpic
+	dba SteelixFrontpic
+	dba SteelixBackpic
+	dba SnubbullFrontpic
+	dba SnubbullBackpic
+	dba GranbullFrontpic
+	dba GranbullBackpic
+	dba QwilfishFrontpic
+	dba QwilfishBackpic
+	dba ScizorFrontpic
+	dba ScizorBackpic
+	dba ShuckleFrontpic
+	dba ShuckleBackpic
+	dba HeracrossFrontpic
+	dba HeracrossBackpic
+	dba SneaselFrontpic
+	dba SneaselBackpic
+	dba TeddiursaFrontpic
+	dba TeddiursaBackpic
+	dba UrsaringFrontpic
+	dba UrsaringBackpic
+	dba SlugmaFrontpic
+	dba SlugmaBackpic
+	dba MagcargoFrontpic
+	dba MagcargoBackpic
+	dba SwinubFrontpic
+	dba SwinubBackpic
+	dba PiloswineFrontpic
+	dba PiloswineBackpic
+	dba CorsolaFrontpic
+	dba CorsolaBackpic
+	dba RemoraidFrontpic
+	dba RemoraidBackpic
+	dba OctilleryFrontpic
+	dba OctilleryBackpic
+	dba DelibirdFrontpic
+	dba DelibirdBackpic
+	dba MantineFrontpic
+	dba MantineBackpic
+	dba SkarmoryFrontpic
+	dba SkarmoryBackpic
+	dba HoundourFrontpic
+	dba HoundourBackpic
+	dba HoundoomFrontpic
+	dba HoundoomBackpic
+	dba KingdraFrontpic
+	dba KingdraBackpic
+	dba PhanpyFrontpic
+	dba PhanpyBackpic
+	dba DonphanFrontpic
+	dba DonphanBackpic
+	dba Porygon2Frontpic
+	dba Porygon2Backpic
+	dba StantlerFrontpic
+	dba StantlerBackpic
+	dba SmeargleFrontpic
+	dba SmeargleBackpic
+	dba TyrogueFrontpic
+	dba TyrogueBackpic
+	dba HitmontopFrontpic
+	dba HitmontopBackpic
+	dba SmoochumFrontpic
+	dba SmoochumBackpic
+	dba ElekidFrontpic
+	dba ElekidBackpic
+	dba MagbyFrontpic
+	dba MagbyBackpic
+	dba MiltankFrontpic
+	dba MiltankBackpic
+	dba BlisseyFrontpic
+	dba BlisseyBackpic
+	dba RaikouFrontpic
+	dba RaikouBackpic
+	dba EnteiFrontpic
+	dba EnteiBackpic
+	dba SuicuneFrontpic
+	dba SuicuneBackpic
+	dba LarvitarFrontpic
+	dba LarvitarBackpic
+	dba PupitarFrontpic
+	dba PupitarBackpic
+	dba TyranitarFrontpic
+	dba TyranitarBackpic
+	dba LugiaFrontpic
+	dba LugiaBackpic
+	dba HoOhFrontpic
+	dba HoOhBackpic
+	dba CelebiFrontpic
+	dba CelebiBackpic
 	assert_table_length NUM_POKEMON
-	dba_pics ; unused
-	dba_pics EggPic ; Egg has no back sprite
+	dbw -1, -1 ; unused
+	dbw -1, -1 ; unused
+	dba EggPic
+	dbw -1, -1 ; unused
 	assert_table_length EGG
diff --git a/data/pokemon/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm
index 286d56794..f4234bb43 100644
--- a/data/pokemon/unown_pic_pointers.asm
+++ b/data/pokemon/unown_pic_pointers.asm
@@ -1,30 +1,56 @@
 UnownPicPointers::
-; entries correspond to Unown letters
+; entries correspond to Unown letters, two apiece
 	table_width 3 * 2
-	dba_pics UnownAFrontpic, UnownABackpic
-	dba_pics UnownBFrontpic, UnownBBackpic
-	dba_pics UnownCFrontpic, UnownCBackpic
-	dba_pics UnownDFrontpic, UnownDBackpic
-	dba_pics UnownEFrontpic, UnownEBackpic
-	dba_pics UnownFFrontpic, UnownFBackpic
-	dba_pics UnownGFrontpic, UnownGBackpic
-	dba_pics UnownHFrontpic, UnownHBackpic
-	dba_pics UnownIFrontpic, UnownIBackpic
-	dba_pics UnownJFrontpic, UnownJBackpic
-	dba_pics UnownKFrontpic, UnownKBackpic
-	dba_pics UnownLFrontpic, UnownLBackpic
-	dba_pics UnownMFrontpic, UnownMBackpic
-	dba_pics UnownNFrontpic, UnownNBackpic
-	dba_pics UnownOFrontpic, UnownOBackpic
-	dba_pics UnownPFrontpic, UnownPBackpic
-	dba_pics UnownQFrontpic, UnownQBackpic
-	dba_pics UnownRFrontpic, UnownRBackpic
-	dba_pics UnownSFrontpic, UnownSBackpic
-	dba_pics UnownTFrontpic, UnownTBackpic
-	dba_pics UnownUFrontpic, UnownUBackpic
-	dba_pics UnownVFrontpic, UnownVBackpic
-	dba_pics UnownWFrontpic, UnownWBackpic
-	dba_pics UnownXFrontpic, UnownXBackpic
-	dba_pics UnownYFrontpic, UnownYBackpic
-	dba_pics UnownZFrontpic, UnownZBackpic
+	dba UnownAFrontpic
+	dba UnownABackpic
+	dba UnownBFrontpic
+	dba UnownBBackpic
+	dba UnownCFrontpic
+	dba UnownCBackpic
+	dba UnownDFrontpic
+	dba UnownDBackpic
+	dba UnownEFrontpic
+	dba UnownEBackpic
+	dba UnownFFrontpic
+	dba UnownFBackpic
+	dba UnownGFrontpic
+	dba UnownGBackpic
+	dba UnownHFrontpic
+	dba UnownHBackpic
+	dba UnownIFrontpic
+	dba UnownIBackpic
+	dba UnownJFrontpic
+	dba UnownJBackpic
+	dba UnownKFrontpic
+	dba UnownKBackpic
+	dba UnownLFrontpic
+	dba UnownLBackpic
+	dba UnownMFrontpic
+	dba UnownMBackpic
+	dba UnownNFrontpic
+	dba UnownNBackpic
+	dba UnownOFrontpic
+	dba UnownOBackpic
+	dba UnownPFrontpic
+	dba UnownPBackpic
+	dba UnownQFrontpic
+	dba UnownQBackpic
+	dba UnownRFrontpic
+	dba UnownRBackpic
+	dba UnownSFrontpic
+	dba UnownSBackpic
+	dba UnownTFrontpic
+	dba UnownTBackpic
+	dba UnownUFrontpic
+	dba UnownUBackpic
+	dba UnownVFrontpic
+	dba UnownVBackpic
+	dba UnownWFrontpic
+	dba UnownWBackpic
+	dba UnownXFrontpic
+	dba UnownXBackpic
+	dba UnownYFrontpic
+	dba UnownYBackpic
+	dba UnownZFrontpic
+	dba UnownZBackpic
 	assert_table_length NUM_UNOWN
diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm
index cd6032566..b72394dc8 100644
--- a/data/trainers/pic_pointers.asm
+++ b/data/trainers/pic_pointers.asm
@@ -3,71 +3,71 @@
 TrainerPicPointers::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	table_width 3
-	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
+	dba FalknerPic
+	dba WhitneyPic
+	dba BugsyPic
+	dba MortyPic
+	dba PrycePic
+	dba JasminePic
+	dba ChuckPic
+	dba ClairPic
+	dba Rival1Pic
+	dba PokemonProfPic
+	dba WillPic
+	dba CalPic
+	dba BrunoPic
+	dba KarenPic
+	dba KogaPic
+	dba ChampionPic
+	dba BrockPic
+	dba MistyPic
+	dba LtSurgePic
+	dba ScientistPic
+	dba ErikaPic
+	dba YoungsterPic
+	dba SchoolboyPic
+	dba BirdKeeperPic
+	dba LassPic
+	dba JaninePic
+	dba CooltrainermPic
+	dba CooltrainerfPic
+	dba BeautyPic
+	dba PokemaniacPic
+	dba GruntmPic
+	dba GentlemanPic
+	dba SkierPic
+	dba TeacherPic
+	dba SabrinaPic
+	dba BugCatcherPic
+	dba FisherPic
+	dba SwimmermPic
+	dba SwimmerfPic
+	dba SailorPic
+	dba SuperNerdPic
+	dba Rival2Pic
+	dba GuitaristPic
+	dba HikerPic
+	dba BikerPic
+	dba BlainePic
+	dba BurglarPic
+	dba FirebreatherPic
+	dba JugglerPic
+	dba BlackbeltTPic
+	dba ExecutivemPic
+	dba PsychicTPic
+	dba PicnickerPic
+	dba CamperPic
+	dba ExecutivefPic
+	dba SagePic
+	dba MediumPic
+	dba BoarderPic
+	dba PokefanmPic
+	dba KimonoGirlPic
+	dba TwinsPic
+	dba PokefanfPic
+	dba RedPic
+	dba BluePic
+	dba OfficerPic
+	dba GruntfPic
+	dba MysticalmanPic
 	assert_table_length NUM_TRAINER_CLASSES
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 5766dae47..f546fb29f 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -121,7 +121,6 @@ GetFrontpicPointer:
 	call AddNTimes
 	ld a, d
 	call GetFarByte
-	call FixPicBank
 	push af
 	inc hl
 	ld a, d
@@ -224,7 +223,6 @@ GetMonBackpic:
 	add hl, bc
 	ld a, d
 	call GetFarByte
-	call FixPicBank
 	push af
 	inc hl
 	ld a, d
@@ -244,49 +242,6 @@ GetMonBackpic:
 	ldh [rWBK], a
 	ret
 
-FixPicBank:
-; This is a thing for some reason.
-
-EXPORT DEF PICS_FIX EQU $36
-
-	push hl
-	push bc
-	sub BANK("Pics 1") - PICS_FIX
-	ld c, a
-	ld b, 0
-	ld hl, .PicsBanks
-	add hl, bc
-	ld a, [hl]
-	pop bc
-	pop hl
-	ret
-
-.PicsBanks:
-	db BANK("Pics 1")  ; BANK("Pics 1") + 0
-	db BANK("Pics 2")  ; BANK("Pics 1") + 1
-	db BANK("Pics 3")  ; BANK("Pics 1") + 2
-	db BANK("Pics 4")  ; BANK("Pics 1") + 3
-	db BANK("Pics 5")  ; BANK("Pics 1") + 4
-	db BANK("Pics 6")  ; BANK("Pics 1") + 5
-	db BANK("Pics 7")  ; BANK("Pics 1") + 6
-	db BANK("Pics 8")  ; BANK("Pics 1") + 7
-	db BANK("Pics 9")  ; BANK("Pics 1") + 8
-	db BANK("Pics 10") ; BANK("Pics 1") + 9
-	db BANK("Pics 11") ; BANK("Pics 1") + 10
-	db BANK("Pics 12") ; BANK("Pics 1") + 11
-	db BANK("Pics 13") ; BANK("Pics 1") + 12
-	db BANK("Pics 14") ; BANK("Pics 1") + 13
-	db BANK("Pics 15") ; BANK("Pics 1") + 14
-	db BANK("Pics 16") ; BANK("Pics 1") + 15
-	db BANK("Pics 17") ; BANK("Pics 1") + 16
-	db BANK("Pics 18") ; BANK("Pics 1") + 17
-	db BANK("Pics 19") ; BANK("Pics 1") + 18
-	db BANK("Pics 20") ; BANK("Pics 1") + 19
-	db BANK("Pics 21") ; BANK("Pics 1") + 20
-	db BANK("Pics 22") ; BANK("Pics 1") + 21
-	db BANK("Pics 23") ; BANK("Pics 1") + 22
-	db BANK("Pics 24") ; BANK("Pics 1") + 23
-
 GSIntro_GetMonFrontpic: ; unreferenced
 	ld a, c
 	push de
@@ -296,7 +251,6 @@ GSIntro_GetMonFrontpic: ; unreferenced
 	call AddNTimes
 	ld a, BANK(PokemonPicPointers)
 	call GetFarByte
-	call FixPicBank
 	push af
 	inc hl
 	ld a, BANK(PokemonPicPointers)
@@ -327,7 +281,6 @@ GetTrainerPic:
 	push de
 	ld a, BANK(TrainerPicPointers)
 	call GetFarByte
-	call FixPicBank
 	push af
 	inc hl
 	ld a, BANK(TrainerPicPointers)
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 9264e2dd3..3b9a0d52b 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -773,17 +773,3 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
-
-
-; Sections "Pics 20" to "Pics 24" are not used for any graphics,
-; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm).
-
-SECTION "Pics 20", ROMX
-
-SECTION "Pics 21", ROMX
-
-SECTION "Pics 22", ROMX
-
-SECTION "Pics 23", ROMX
-
-SECTION "Pics 24", ROMX
diff --git a/layout.link b/layout.link
index eeff7219c..6fe5a43a8 100644
--- a/layout.link
+++ b/layout.link
@@ -236,22 +236,17 @@ ROMX $5a
 	"Pics 19"
 ROMX $5b
 	"bank5B"
-	"Pics 20"
 ROMX $5c
 	"mobile5C"
-	"Pics 21"
 ROMX $5d
 	"Crystal Phone Text 2"
-	"Pics 22"
 ROMX $5e
 	"UpdateBattleHUDs"
 	"Songs 5"
 	"Crystal Sound Effects"
 	"mobile5E"
-	"Pics 23"
 ROMX $5f
 	"mobile5F"
-	"Pics 24"
 ROMX $60
 	"Map Scripts 13"
 	"Pokedex Entries 001-064"
diff --git a/macros/data.asm b/macros/data.asm
index 6fcae9b12..f51c3d2c7 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -90,24 +90,6 @@ MACRO? dab ; dwb address, bank
 	endr
 ENDM
 
-MACRO? dba_pic ; dbw bank, address
-	db BANK(\1) - PICS_FIX
-	dw \1
-ENDM
-
-MACRO? dba_pics ; front, back
-	if _NARG == 2
-		dba_pic \1 ; front
-		dba_pic \2 ; back
-	elif _NARG == 1
-		dba_pic \1 ; front
-		dbw -1, -1 ; unused
-	else
-		dbw -1, -1 ; unused
-		dbw -1, -1 ; unused
-	endc
-ENDM
-
 MACRO? dname
 	if _NARG == 2
 		def n = \2
@@ -121,7 +103,7 @@ MACRO? dname
 ENDM
 
 MACRO? bcd
-	rept? _NARG
+	rept _NARG
 		dn ((\1) % 100) / 10, (\1) % 10
 		shift
 	endr