From bef51133f817e29b81144e7dd7314713e854dab2 Mon Sep 17 00:00:00 2001
From: aaaaaa123456789 <aaaaaa123456789@acidch.at>
Date: Thu, 18 Jul 2019 07:31:18 -0300
Subject: [PATCH] QoL #1: pic banks

Co-Authored-By: aaaaaa123456789 <aaaaaa123456789@acidch.at>
---
 data/pokemon/pic_pointers.asm       | 1002 +++++++++++++--------------
 data/pokemon/unown_pic_pointers.asm |  104 +--
 data/trainers/pic_pointers.asm      |  134 ++--
 engine/gfx/load_pics.asm            |   48 --
 gfx/pics.asm                        |   14 -
 layout.link                         |    5 -
 macros/data.asm                     |    5 -
 7 files changed, 620 insertions(+), 692 deletions(-)

diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index a57c63d83..88f7b2155 100644
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -3,514 +3,514 @@
 PokemonPicPointers::
 ; entries correspond to Pokémon species, two apiece
 	table_width 3 * 2, PokemonPicPointers
-	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
+	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_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
+	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
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
-	dba_pic EggPic
+	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 6ecfb4e62..3617ddf71 100644
--- a/data/pokemon/unown_pic_pointers.asm
+++ b/data/pokemon/unown_pic_pointers.asm
@@ -1,56 +1,56 @@
 UnownPicPointers::
 ; entries correspond to Unown letters, two apiece
 	table_width 3 * 2, UnownPicPointers
-	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
+	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 31740ea3d..c22072c2e 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, TrainerPicPointers
-	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 c4b869783..8b282ae69 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,50 +242,6 @@ GetMonBackpic:
 	ldh [rSVBK], a
 	ret
 
-FixPicBank:
-; This is a thing for some reason.
-
-DEF PICS_FIX EQU $36
-EXPORT PICS_FIX
-
-	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
@@ -297,7 +251,6 @@ GSIntro_GetMonFrontpic: ; unreferenced
 	call AddNTimes
 	ld a, BANK(PokemonPicPointers)
 	call GetFarByte
-	call FixPicBank
 	push af
 	inc hl
 	ld a, BANK(PokemonPicPointers)
@@ -328,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 a268b6db4..45b84cb5f 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -776,17 +776,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 0692ac895..833ca307f 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 c2686c9f4..4240352dd 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -81,11 +81,6 @@ MACRO dab ; dwb address, bank
 	endr
 ENDM
 
-MACRO dba_pic ; dbw bank, address
-	db BANK(\1) - PICS_FIX
-	dw \1
-ENDM
-
 MACRO bcd
 	rept _NARG
 		dn ((\1) % 100) / 10, (\1) % 10