shithub: pokered

Download patch

ref: cdd34eb45b5093e595455b4f4556bed643cceafa
parent: 64da5118dfdd24732082d600fc64266b0539fad4
author: yenatch <yenatch@gmail.com>
date: Sat May 24 17:01:59 EDT 2014

Use global labels for pics.

--- a/main.asm
+++ b/main.asm
@@ -10277,11 +10277,8 @@
 	ld a, $7
 	jp Predef ; indirect jump to HealParty (f6a5 (3:76a5))
 
-MewPicFront: ; 4112 (1:4112)
-	INCBIN "pic/bmon/mew.pic"
-MewPicBack: ; 4205 (1:4205)
-	INCBIN "pic/monback/mewb.pic"
-
+MewPicFront:: INCBIN "pic/bmon/mew.pic"
+MewPicBack::  INCBIN "pic/monback/mewb.pic"
 INCLUDE "data/baseStats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
@@ -15914,9 +15911,9 @@
 INCLUDE "engine/menu/status_screen.asm"
 INCLUDE "engine/menu/party_menu.asm"
 
-RedPicFront: INCBIN "pic/trainer/red.pic"
-ShrinkPic1:  INCBIN "pic/trainer/shrink1.pic"
-ShrinkPic2:  INCBIN "pic/trainer/shrink2.pic"
+RedPicFront:: INCBIN "pic/trainer/red.pic"
+ShrinkPic1::  INCBIN "pic/trainer/shrink1.pic"
+ShrinkPic2::  INCBIN "pic/trainer/shrink2.pic"
 
 INCLUDE "engine/turn_sprite.asm"
 
@@ -16242,64 +16239,64 @@
 
 SECTION "bank9",ROMX,BANK[$9]
 
-RhydonPicFront:      INCBIN "pic/bmon/rhydon.pic"
-RhydonPicBack:       INCBIN "pic/monback/rhydonb.pic"
-KangaskhanPicFront:  INCBIN "pic/bmon/kangaskhan.pic"
-KangaskhanPicBack:   INCBIN "pic/monback/kangaskhanb.pic"
-NidoranMPicFront:    INCBIN "pic/bmon/nidoranm.pic"
-NidoranMPicBack:     INCBIN "pic/monback/nidoranmb.pic"
-ClefairyPicFront:    INCBIN "pic/bmon/clefairy.pic"
-ClefairyPicBack:     INCBIN "pic/monback/clefairyb.pic"
-SpearowPicFront:     INCBIN "pic/bmon/spearow.pic"
-SpearowPicBack:      INCBIN "pic/monback/spearowb.pic"
-VoltorbPicFront:     INCBIN "pic/bmon/voltorb.pic"
-VoltorbPicBack:      INCBIN "pic/monback/voltorbb.pic"
-NidokingPicFront:    INCBIN "pic/bmon/nidoking.pic"
-NidokingPicBack:     INCBIN "pic/monback/nidokingb.pic"
-SlowbroPicFront:     INCBIN "pic/bmon/slowbro.pic"
-SlowbroPicBack:      INCBIN "pic/monback/slowbrob.pic"
-IvysaurPicFront:     INCBIN "pic/bmon/ivysaur.pic"
-IvysaurPicBack:      INCBIN "pic/monback/ivysaurb.pic"
-ExeggutorPicFront:   INCBIN "pic/bmon/exeggutor.pic"
-ExeggutorPicBack:    INCBIN "pic/monback/exeggutorb.pic"
-LickitungPicFront:   INCBIN "pic/bmon/lickitung.pic"
-LickitungPicBack:    INCBIN "pic/monback/lickitungb.pic"
-ExeggcutePicFront:   INCBIN "pic/bmon/exeggcute.pic"
-ExeggcutePicBack:    INCBIN "pic/monback/exeggcuteb.pic"
-GrimerPicFront:      INCBIN "pic/bmon/grimer.pic"
-GrimerPicBack:       INCBIN "pic/monback/grimerb.pic"
-GengarPicFront:      INCBIN "pic/bmon/gengar.pic"
-GengarPicBack:       INCBIN "pic/monback/gengarb.pic"
-NidoranFPicFront:    INCBIN "pic/bmon/nidoranf.pic"
-NidoranFPicBack:     INCBIN "pic/monback/nidoranfb.pic"
-NidoqueenPicFront:   INCBIN "pic/bmon/nidoqueen.pic"
-NidoqueenPicBack:    INCBIN "pic/monback/nidoqueenb.pic"
-CubonePicFront:      INCBIN "pic/bmon/cubone.pic"
-CubonePicBack:       INCBIN "pic/monback/cuboneb.pic"
-RhyhornPicFront:     INCBIN "pic/bmon/rhyhorn.pic"
-RhyhornPicBack:      INCBIN "pic/monback/rhyhornb.pic"
-LaprasPicFront:      INCBIN "pic/bmon/lapras.pic"
-LaprasPicBack:       INCBIN "pic/monback/laprasb.pic"
-ArcaninePicFront:    INCBIN "pic/bmon/arcanine.pic"
-ArcaninePicBack:     INCBIN "pic/monback/arcanineb.pic"
-GyaradosPicFront:    INCBIN "pic/bmon/gyarados.pic"
-GyaradosPicBack:     INCBIN "pic/monback/gyaradosb.pic"
-ShellderPicFront:    INCBIN "pic/bmon/shellder.pic"
-ShellderPicBack:     INCBIN "pic/monback/shellderb.pic"
-TentacoolPicFront:   INCBIN "pic/bmon/tentacool.pic"
-TentacoolPicBack:    INCBIN "pic/monback/tentacoolb.pic"
-GastlyPicFront:      INCBIN "pic/bmon/gastly.pic"
-GastlyPicBack:       INCBIN "pic/monback/gastlyb.pic"
-ScytherPicFront:     INCBIN "pic/bmon/scyther.pic"
-ScytherPicBack:      INCBIN "pic/monback/scytherb.pic"
-StaryuPicFront:      INCBIN "pic/bmon/staryu.pic"
-StaryuPicBack:       INCBIN "pic/monback/staryub.pic"
-BlastoisePicFront:   INCBIN "pic/bmon/blastoise.pic"
-BlastoisePicBack:    INCBIN "pic/monback/blastoiseb.pic"
-PinsirPicFront:      INCBIN "pic/bmon/pinsir.pic"
-PinsirPicBack:       INCBIN "pic/monback/pinsirb.pic"
-TangelaPicFront:     INCBIN "pic/bmon/tangela.pic"
-TangelaPicBack:      INCBIN "pic/monback/tangelab.pic"
+RhydonPicFront::      INCBIN "pic/bmon/rhydon.pic"
+RhydonPicBack::       INCBIN "pic/monback/rhydonb.pic"
+KangaskhanPicFront::  INCBIN "pic/bmon/kangaskhan.pic"
+KangaskhanPicBack::   INCBIN "pic/monback/kangaskhanb.pic"
+NidoranMPicFront::    INCBIN "pic/bmon/nidoranm.pic"
+NidoranMPicBack::     INCBIN "pic/monback/nidoranmb.pic"
+ClefairyPicFront::    INCBIN "pic/bmon/clefairy.pic"
+ClefairyPicBack::     INCBIN "pic/monback/clefairyb.pic"
+SpearowPicFront::     INCBIN "pic/bmon/spearow.pic"
+SpearowPicBack::      INCBIN "pic/monback/spearowb.pic"
+VoltorbPicFront::     INCBIN "pic/bmon/voltorb.pic"
+VoltorbPicBack::      INCBIN "pic/monback/voltorbb.pic"
+NidokingPicFront::    INCBIN "pic/bmon/nidoking.pic"
+NidokingPicBack::     INCBIN "pic/monback/nidokingb.pic"
+SlowbroPicFront::     INCBIN "pic/bmon/slowbro.pic"
+SlowbroPicBack::      INCBIN "pic/monback/slowbrob.pic"
+IvysaurPicFront::     INCBIN "pic/bmon/ivysaur.pic"
+IvysaurPicBack::      INCBIN "pic/monback/ivysaurb.pic"
+ExeggutorPicFront::   INCBIN "pic/bmon/exeggutor.pic"
+ExeggutorPicBack::    INCBIN "pic/monback/exeggutorb.pic"
+LickitungPicFront::   INCBIN "pic/bmon/lickitung.pic"
+LickitungPicBack::    INCBIN "pic/monback/lickitungb.pic"
+ExeggcutePicFront::   INCBIN "pic/bmon/exeggcute.pic"
+ExeggcutePicBack::    INCBIN "pic/monback/exeggcuteb.pic"
+GrimerPicFront::      INCBIN "pic/bmon/grimer.pic"
+GrimerPicBack::       INCBIN "pic/monback/grimerb.pic"
+GengarPicFront::      INCBIN "pic/bmon/gengar.pic"
+GengarPicBack::       INCBIN "pic/monback/gengarb.pic"
+NidoranFPicFront::    INCBIN "pic/bmon/nidoranf.pic"
+NidoranFPicBack::     INCBIN "pic/monback/nidoranfb.pic"
+NidoqueenPicFront::   INCBIN "pic/bmon/nidoqueen.pic"
+NidoqueenPicBack::    INCBIN "pic/monback/nidoqueenb.pic"
+CubonePicFront::      INCBIN "pic/bmon/cubone.pic"
+CubonePicBack::       INCBIN "pic/monback/cuboneb.pic"
+RhyhornPicFront::     INCBIN "pic/bmon/rhyhorn.pic"
+RhyhornPicBack::      INCBIN "pic/monback/rhyhornb.pic"
+LaprasPicFront::      INCBIN "pic/bmon/lapras.pic"
+LaprasPicBack::       INCBIN "pic/monback/laprasb.pic"
+ArcaninePicFront::    INCBIN "pic/bmon/arcanine.pic"
+ArcaninePicBack::     INCBIN "pic/monback/arcanineb.pic"
+GyaradosPicFront::    INCBIN "pic/bmon/gyarados.pic"
+GyaradosPicBack::     INCBIN "pic/monback/gyaradosb.pic"
+ShellderPicFront::    INCBIN "pic/bmon/shellder.pic"
+ShellderPicBack::     INCBIN "pic/monback/shellderb.pic"
+TentacoolPicFront::   INCBIN "pic/bmon/tentacool.pic"
+TentacoolPicBack::    INCBIN "pic/monback/tentacoolb.pic"
+GastlyPicFront::      INCBIN "pic/bmon/gastly.pic"
+GastlyPicBack::       INCBIN "pic/monback/gastlyb.pic"
+ScytherPicFront::     INCBIN "pic/bmon/scyther.pic"
+ScytherPicBack::      INCBIN "pic/monback/scytherb.pic"
+StaryuPicFront::      INCBIN "pic/bmon/staryu.pic"
+StaryuPicBack::       INCBIN "pic/monback/staryub.pic"
+BlastoisePicFront::   INCBIN "pic/bmon/blastoise.pic"
+BlastoisePicBack::    INCBIN "pic/monback/blastoiseb.pic"
+PinsirPicFront::      INCBIN "pic/bmon/pinsir.pic"
+PinsirPicBack::       INCBIN "pic/monback/pinsirb.pic"
+TangelaPicFront::     INCBIN "pic/bmon/tangela.pic"
+TangelaPicBack::      INCBIN "pic/monback/tangelab.pic"
 
 INCLUDE "engine/battle/9.asm"
 
@@ -16306,70 +16303,70 @@
 
 SECTION "bankA",ROMX,BANK[$A]
 
-GrowlithePicFront:   INCBIN "pic/bmon/growlithe.pic"
-GrowlithePicBack:    INCBIN "pic/monback/growlitheb.pic"
-OnixPicFront:        INCBIN "pic/bmon/onix.pic"
-OnixPicBack:         INCBIN "pic/monback/onixb.pic"
-FearowPicFront:      INCBIN "pic/bmon/fearow.pic"
-FearowPicBack:       INCBIN "pic/monback/fearowb.pic"
-PidgeyPicFront:      INCBIN "pic/bmon/pidgey.pic"
-PidgeyPicBack:       INCBIN "pic/monback/pidgeyb.pic"
-SlowpokePicFront:    INCBIN "pic/bmon/slowpoke.pic"
-SlowpokePicBack:     INCBIN "pic/monback/slowpokeb.pic"
-KadabraPicFront:     INCBIN "pic/bmon/kadabra.pic"
-KadabraPicBack:      INCBIN "pic/monback/kadabrab.pic"
-GravelerPicFront:    INCBIN "pic/bmon/graveler.pic"
-GravelerPicBack:     INCBIN "pic/monback/gravelerb.pic"
-ChanseyPicFront:     INCBIN "pic/bmon/chansey.pic"
-ChanseyPicBack:      INCBIN "pic/monback/chanseyb.pic"
-MachokePicFront:     INCBIN "pic/bmon/machoke.pic"
-MachokePicBack:      INCBIN "pic/monback/machokeb.pic"
-MrMimePicFront:      INCBIN "pic/bmon/mr.mime.pic"
-MrMimePicBack:       INCBIN "pic/monback/mr.mimeb.pic"
-HitmonleePicFront:   INCBIN "pic/bmon/hitmonlee.pic"
-HitmonleePicBack:    INCBIN "pic/monback/hitmonleeb.pic"
-HitmonchanPicFront:  INCBIN "pic/bmon/hitmonchan.pic"
-HitmonchanPicBack:   INCBIN "pic/monback/hitmonchanb.pic"
-ArbokPicFront:       INCBIN "pic/bmon/arbok.pic"
-ArbokPicBack:        INCBIN "pic/monback/arbokb.pic"
-ParasectPicFront:    INCBIN "pic/bmon/parasect.pic"
-ParasectPicBack:     INCBIN "pic/monback/parasectb.pic"
-PsyduckPicFront:     INCBIN "pic/bmon/psyduck.pic"
-PsyduckPicBack:      INCBIN "pic/monback/psyduckb.pic"
-DrowzeePicFront:     INCBIN "pic/bmon/drowzee.pic"
-DrowzeePicBack:      INCBIN "pic/monback/drowzeeb.pic"
-GolemPicFront:       INCBIN "pic/bmon/golem.pic"
-GolemPicBack:        INCBIN "pic/monback/golemb.pic"
-MagmarPicFront:      INCBIN "pic/bmon/magmar.pic"
-MagmarPicBack:       INCBIN "pic/monback/magmarb.pic"
-ElectabuzzPicFront:  INCBIN "pic/bmon/electabuzz.pic"
-ElectabuzzPicBack:   INCBIN "pic/monback/electabuzzb.pic"
-MagnetonPicFront:    INCBIN "pic/bmon/magneton.pic"
-MagnetonPicBack:     INCBIN "pic/monback/magnetonb.pic"
-KoffingPicFront:     INCBIN "pic/bmon/koffing.pic"
-KoffingPicBack:      INCBIN "pic/monback/koffingb.pic"
-MankeyPicFront:      INCBIN "pic/bmon/mankey.pic"
-MankeyPicBack:       INCBIN "pic/monback/mankeyb.pic"
-SeelPicFront:        INCBIN "pic/bmon/seel.pic"
-SeelPicBack:         INCBIN "pic/monback/seelb.pic"
-DiglettPicFront:     INCBIN "pic/bmon/diglett.pic"
-DiglettPicBack:      INCBIN "pic/monback/diglettb.pic"
-TaurosPicFront:      INCBIN "pic/bmon/tauros.pic"
-TaurosPicBack:       INCBIN "pic/monback/taurosb.pic"
-FarfetchdPicFront:   INCBIN "pic/bmon/farfetchd.pic"
-FarfetchdPicBack:    INCBIN "pic/monback/farfetchdb.pic"
-VenonatPicFront:     INCBIN "pic/bmon/venonat.pic"
-VenonatPicBack:      INCBIN "pic/monback/venonatb.pic"
-DragonitePicFront:   INCBIN "pic/bmon/dragonite.pic"
-DragonitePicBack:    INCBIN "pic/monback/dragoniteb.pic"
-DoduoPicFront:       INCBIN "pic/bmon/doduo.pic"
-DoduoPicBack:        INCBIN "pic/monback/doduob.pic"
-PoliwagPicFront:     INCBIN "pic/bmon/poliwag.pic"
-PoliwagPicBack:      INCBIN "pic/monback/poliwagb.pic"
-JynxPicFront:        INCBIN "pic/bmon/jynx.pic"
-JynxPicBack:         INCBIN "pic/monback/jynxb.pic"
-MoltresPicFront:     INCBIN "pic/bmon/moltres.pic"
-MoltresPicBack:      INCBIN "pic/monback/moltresb.pic"
+GrowlithePicFront::   INCBIN "pic/bmon/growlithe.pic"
+GrowlithePicBack::    INCBIN "pic/monback/growlitheb.pic"
+OnixPicFront::        INCBIN "pic/bmon/onix.pic"
+OnixPicBack::         INCBIN "pic/monback/onixb.pic"
+FearowPicFront::      INCBIN "pic/bmon/fearow.pic"
+FearowPicBack::       INCBIN "pic/monback/fearowb.pic"
+PidgeyPicFront::      INCBIN "pic/bmon/pidgey.pic"
+PidgeyPicBack::       INCBIN "pic/monback/pidgeyb.pic"
+SlowpokePicFront::    INCBIN "pic/bmon/slowpoke.pic"
+SlowpokePicBack::     INCBIN "pic/monback/slowpokeb.pic"
+KadabraPicFront::     INCBIN "pic/bmon/kadabra.pic"
+KadabraPicBack::      INCBIN "pic/monback/kadabrab.pic"
+GravelerPicFront::    INCBIN "pic/bmon/graveler.pic"
+GravelerPicBack::     INCBIN "pic/monback/gravelerb.pic"
+ChanseyPicFront::     INCBIN "pic/bmon/chansey.pic"
+ChanseyPicBack::      INCBIN "pic/monback/chanseyb.pic"
+MachokePicFront::     INCBIN "pic/bmon/machoke.pic"
+MachokePicBack::      INCBIN "pic/monback/machokeb.pic"
+MrMimePicFront::      INCBIN "pic/bmon/mr.mime.pic"
+MrMimePicBack::       INCBIN "pic/monback/mr.mimeb.pic"
+HitmonleePicFront::   INCBIN "pic/bmon/hitmonlee.pic"
+HitmonleePicBack::    INCBIN "pic/monback/hitmonleeb.pic"
+HitmonchanPicFront::  INCBIN "pic/bmon/hitmonchan.pic"
+HitmonchanPicBack::   INCBIN "pic/monback/hitmonchanb.pic"
+ArbokPicFront::       INCBIN "pic/bmon/arbok.pic"
+ArbokPicBack::        INCBIN "pic/monback/arbokb.pic"
+ParasectPicFront::    INCBIN "pic/bmon/parasect.pic"
+ParasectPicBack::     INCBIN "pic/monback/parasectb.pic"
+PsyduckPicFront::     INCBIN "pic/bmon/psyduck.pic"
+PsyduckPicBack::      INCBIN "pic/monback/psyduckb.pic"
+DrowzeePicFront::     INCBIN "pic/bmon/drowzee.pic"
+DrowzeePicBack::      INCBIN "pic/monback/drowzeeb.pic"
+GolemPicFront::       INCBIN "pic/bmon/golem.pic"
+GolemPicBack::        INCBIN "pic/monback/golemb.pic"
+MagmarPicFront::      INCBIN "pic/bmon/magmar.pic"
+MagmarPicBack::       INCBIN "pic/monback/magmarb.pic"
+ElectabuzzPicFront::  INCBIN "pic/bmon/electabuzz.pic"
+ElectabuzzPicBack::   INCBIN "pic/monback/electabuzzb.pic"
+MagnetonPicFront::    INCBIN "pic/bmon/magneton.pic"
+MagnetonPicBack::     INCBIN "pic/monback/magnetonb.pic"
+KoffingPicFront::     INCBIN "pic/bmon/koffing.pic"
+KoffingPicBack::      INCBIN "pic/monback/koffingb.pic"
+MankeyPicFront::      INCBIN "pic/bmon/mankey.pic"
+MankeyPicBack::       INCBIN "pic/monback/mankeyb.pic"
+SeelPicFront::        INCBIN "pic/bmon/seel.pic"
+SeelPicBack::         INCBIN "pic/monback/seelb.pic"
+DiglettPicFront::     INCBIN "pic/bmon/diglett.pic"
+DiglettPicBack::      INCBIN "pic/monback/diglettb.pic"
+TaurosPicFront::      INCBIN "pic/bmon/tauros.pic"
+TaurosPicBack::       INCBIN "pic/monback/taurosb.pic"
+FarfetchdPicFront::   INCBIN "pic/bmon/farfetchd.pic"
+FarfetchdPicBack::    INCBIN "pic/monback/farfetchdb.pic"
+VenonatPicFront::     INCBIN "pic/bmon/venonat.pic"
+VenonatPicBack::      INCBIN "pic/monback/venonatb.pic"
+DragonitePicFront::   INCBIN "pic/bmon/dragonite.pic"
+DragonitePicBack::    INCBIN "pic/monback/dragoniteb.pic"
+DoduoPicFront::       INCBIN "pic/bmon/doduo.pic"
+DoduoPicBack::        INCBIN "pic/monback/doduob.pic"
+PoliwagPicFront::     INCBIN "pic/bmon/poliwag.pic"
+PoliwagPicBack::      INCBIN "pic/monback/poliwagb.pic"
+JynxPicFront::        INCBIN "pic/bmon/jynx.pic"
+JynxPicBack::         INCBIN "pic/monback/jynxb.pic"
+MoltresPicFront::     INCBIN "pic/bmon/moltres.pic"
+MoltresPicBack::      INCBIN "pic/monback/moltresb.pic"
 
 INCLUDE "engine/battle/a.asm"
 
@@ -16376,76 +16373,76 @@
 
 SECTION "bankB",ROMX,BANK[$B]
 
-ArticunoPicFront:    INCBIN "pic/bmon/articuno.pic"
-ArticunoPicBack:     INCBIN "pic/monback/articunob.pic"
-ZapdosPicFront:      INCBIN "pic/bmon/zapdos.pic"
-ZapdosPicBack:       INCBIN "pic/monback/zapdosb.pic"
-DittoPicFront:       INCBIN "pic/bmon/ditto.pic"
-DittoPicBack:        INCBIN "pic/monback/dittob.pic"
-MeowthPicFront:      INCBIN "pic/bmon/meowth.pic"
-MeowthPicBack:       INCBIN "pic/monback/meowthb.pic"
-KrabbyPicFront:      INCBIN "pic/bmon/krabby.pic"
-KrabbyPicBack:       INCBIN "pic/monback/krabbyb.pic"
-VulpixPicFront:      INCBIN "pic/bmon/vulpix.pic"
-VulpixPicBack:       INCBIN "pic/monback/vulpixb.pic"
-NinetalesPicFront:   INCBIN "pic/bmon/ninetales.pic"
-NinetalesPicBack:    INCBIN "pic/monback/ninetalesb.pic"
-PikachuPicFront:     INCBIN "pic/bmon/pikachu.pic"
-PikachuPicBack:      INCBIN "pic/monback/pikachub.pic"
-RaichuPicFront:      INCBIN "pic/bmon/raichu.pic"
-RaichuPicBack:       INCBIN "pic/monback/raichub.pic"
-DratiniPicFront:     INCBIN "pic/bmon/dratini.pic"
-DratiniPicBack:      INCBIN "pic/monback/dratinib.pic"
-DragonairPicFront:   INCBIN "pic/bmon/dragonair.pic"
-DragonairPicBack:    INCBIN "pic/monback/dragonairb.pic"
-KabutoPicFront:      INCBIN "pic/bmon/kabuto.pic"
-KabutoPicBack:       INCBIN "pic/monback/kabutob.pic"
-KabutopsPicFront:    INCBIN "pic/bmon/kabutops.pic"
-KabutopsPicBack:     INCBIN "pic/monback/kabutopsb.pic"
-HorseaPicFront:      INCBIN "pic/bmon/horsea.pic"
-HorseaPicBack:       INCBIN "pic/monback/horseab.pic"
-SeadraPicFront:      INCBIN "pic/bmon/seadra.pic"
-SeadraPicBack:       INCBIN "pic/monback/seadrab.pic"
-SandshrewPicFront:   INCBIN "pic/bmon/sandshrew.pic"
-SandshrewPicBack:    INCBIN "pic/monback/sandshrewb.pic"
-SandslashPicFront:   INCBIN "pic/bmon/sandslash.pic"
-SandslashPicBack:    INCBIN "pic/monback/sandslashb.pic"
-OmanytePicFront:     INCBIN "pic/bmon/omanyte.pic"
-OmanytePicBack:      INCBIN "pic/monback/omanyteb.pic"
-OmastarPicFront:     INCBIN "pic/bmon/omastar.pic"
-OmastarPicBack:      INCBIN "pic/monback/omastarb.pic"
-JigglypuffPicFront:  INCBIN "pic/bmon/jigglypuff.pic"
-JigglypuffPicBack:   INCBIN "pic/monback/jigglypuffb.pic"
-WigglytuffPicFront:  INCBIN "pic/bmon/wigglytuff.pic"
-WigglytuffPicBack:   INCBIN "pic/monback/wigglytuffb.pic"
-EeveePicFront:       INCBIN "pic/bmon/eevee.pic"
-EeveePicBack:        INCBIN "pic/monback/eeveeb.pic"
-FlareonPicFront:     INCBIN "pic/bmon/flareon.pic"
-FlareonPicBack:      INCBIN "pic/monback/flareonb.pic"
-JolteonPicFront:     INCBIN "pic/bmon/jolteon.pic"
-JolteonPicBack:      INCBIN "pic/monback/jolteonb.pic"
-VaporeonPicFront:    INCBIN "pic/bmon/vaporeon.pic"
-VaporeonPicBack:     INCBIN "pic/monback/vaporeonb.pic"
-MachopPicFront:      INCBIN "pic/bmon/machop.pic"
-MachopPicBack:       INCBIN "pic/monback/machopb.pic"
-ZubatPicFront:       INCBIN "pic/bmon/zubat.pic"
-ZubatPicBack:        INCBIN "pic/monback/zubatb.pic"
-EkansPicFront:       INCBIN "pic/bmon/ekans.pic"
-EkansPicBack:        INCBIN "pic/monback/ekansb.pic"
-ParasPicFront:       INCBIN "pic/bmon/paras.pic"
-ParasPicBack:        INCBIN "pic/monback/parasb.pic"
-PoliwhirlPicFront:   INCBIN "pic/bmon/poliwhirl.pic"
-PoliwhirlPicBack:    INCBIN "pic/monback/poliwhirlb.pic"
-PoliwrathPicFront:   INCBIN "pic/bmon/poliwrath.pic"
-PoliwrathPicBack:    INCBIN "pic/monback/poliwrathb.pic"
-WeedlePicFront:      INCBIN "pic/bmon/weedle.pic"
-WeedlePicBack:       INCBIN "pic/monback/weedleb.pic"
-KakunaPicFront:      INCBIN "pic/bmon/kakuna.pic"
-KakunaPicBack:       INCBIN "pic/monback/kakunab.pic"
-BeedrillPicFront:    INCBIN "pic/bmon/beedrill.pic"
-BeedrillPicBack:     INCBIN "pic/monback/beedrillb.pic"
+ArticunoPicFront::    INCBIN "pic/bmon/articuno.pic"
+ArticunoPicBack::     INCBIN "pic/monback/articunob.pic"
+ZapdosPicFront::      INCBIN "pic/bmon/zapdos.pic"
+ZapdosPicBack::       INCBIN "pic/monback/zapdosb.pic"
+DittoPicFront::       INCBIN "pic/bmon/ditto.pic"
+DittoPicBack::        INCBIN "pic/monback/dittob.pic"
+MeowthPicFront::      INCBIN "pic/bmon/meowth.pic"
+MeowthPicBack::       INCBIN "pic/monback/meowthb.pic"
+KrabbyPicFront::      INCBIN "pic/bmon/krabby.pic"
+KrabbyPicBack::       INCBIN "pic/monback/krabbyb.pic"
+VulpixPicFront::      INCBIN "pic/bmon/vulpix.pic"
+VulpixPicBack::       INCBIN "pic/monback/vulpixb.pic"
+NinetalesPicFront::   INCBIN "pic/bmon/ninetales.pic"
+NinetalesPicBack::    INCBIN "pic/monback/ninetalesb.pic"
+PikachuPicFront::     INCBIN "pic/bmon/pikachu.pic"
+PikachuPicBack::      INCBIN "pic/monback/pikachub.pic"
+RaichuPicFront::      INCBIN "pic/bmon/raichu.pic"
+RaichuPicBack::       INCBIN "pic/monback/raichub.pic"
+DratiniPicFront::     INCBIN "pic/bmon/dratini.pic"
+DratiniPicBack::      INCBIN "pic/monback/dratinib.pic"
+DragonairPicFront::   INCBIN "pic/bmon/dragonair.pic"
+DragonairPicBack::    INCBIN "pic/monback/dragonairb.pic"
+KabutoPicFront::      INCBIN "pic/bmon/kabuto.pic"
+KabutoPicBack::       INCBIN "pic/monback/kabutob.pic"
+KabutopsPicFront::    INCBIN "pic/bmon/kabutops.pic"
+KabutopsPicBack::     INCBIN "pic/monback/kabutopsb.pic"
+HorseaPicFront::      INCBIN "pic/bmon/horsea.pic"
+HorseaPicBack::       INCBIN "pic/monback/horseab.pic"
+SeadraPicFront::      INCBIN "pic/bmon/seadra.pic"
+SeadraPicBack::       INCBIN "pic/monback/seadrab.pic"
+SandshrewPicFront::   INCBIN "pic/bmon/sandshrew.pic"
+SandshrewPicBack::    INCBIN "pic/monback/sandshrewb.pic"
+SandslashPicFront::   INCBIN "pic/bmon/sandslash.pic"
+SandslashPicBack::    INCBIN "pic/monback/sandslashb.pic"
+OmanytePicFront::     INCBIN "pic/bmon/omanyte.pic"
+OmanytePicBack::      INCBIN "pic/monback/omanyteb.pic"
+OmastarPicFront::     INCBIN "pic/bmon/omastar.pic"
+OmastarPicBack::      INCBIN "pic/monback/omastarb.pic"
+JigglypuffPicFront::  INCBIN "pic/bmon/jigglypuff.pic"
+JigglypuffPicBack::   INCBIN "pic/monback/jigglypuffb.pic"
+WigglytuffPicFront::  INCBIN "pic/bmon/wigglytuff.pic"
+WigglytuffPicBack::   INCBIN "pic/monback/wigglytuffb.pic"
+EeveePicFront::       INCBIN "pic/bmon/eevee.pic"
+EeveePicBack::        INCBIN "pic/monback/eeveeb.pic"
+FlareonPicFront::     INCBIN "pic/bmon/flareon.pic"
+FlareonPicBack::      INCBIN "pic/monback/flareonb.pic"
+JolteonPicFront::     INCBIN "pic/bmon/jolteon.pic"
+JolteonPicBack::      INCBIN "pic/monback/jolteonb.pic"
+VaporeonPicFront::    INCBIN "pic/bmon/vaporeon.pic"
+VaporeonPicBack::     INCBIN "pic/monback/vaporeonb.pic"
+MachopPicFront::      INCBIN "pic/bmon/machop.pic"
+MachopPicBack::       INCBIN "pic/monback/machopb.pic"
+ZubatPicFront::       INCBIN "pic/bmon/zubat.pic"
+ZubatPicBack::        INCBIN "pic/monback/zubatb.pic"
+EkansPicFront::       INCBIN "pic/bmon/ekans.pic"
+EkansPicBack::        INCBIN "pic/monback/ekansb.pic"
+ParasPicFront::       INCBIN "pic/bmon/paras.pic"
+ParasPicBack::        INCBIN "pic/monback/parasb.pic"
+PoliwhirlPicFront::   INCBIN "pic/bmon/poliwhirl.pic"
+PoliwhirlPicBack::    INCBIN "pic/monback/poliwhirlb.pic"
+PoliwrathPicFront::   INCBIN "pic/bmon/poliwrath.pic"
+PoliwrathPicBack::    INCBIN "pic/monback/poliwrathb.pic"
+WeedlePicFront::      INCBIN "pic/bmon/weedle.pic"
+WeedlePicBack::       INCBIN "pic/monback/weedleb.pic"
+KakunaPicFront::      INCBIN "pic/bmon/kakuna.pic"
+KakunaPicBack::       INCBIN "pic/monback/kakunab.pic"
+BeedrillPicFront::    INCBIN "pic/bmon/beedrill.pic"
+BeedrillPicBack::     INCBIN "pic/monback/beedrillb.pic"
 
-FossilKabutopsPic:   INCBIN "pic/bmon/fossilkabutops.pic"
+FossilKabutopsPic::   INCBIN "pic/bmon/fossilkabutops.pic"
 
 INCLUDE "engine/battle/b.asm"
 
@@ -16461,67 +16458,67 @@
 
 SECTION "bankC",ROMX,BANK[$C]
 
-DodrioPicFront:       INCBIN "pic/bmon/dodrio.pic"
-DodrioPicBack:        INCBIN "pic/monback/dodriob.pic"
-PrimeapePicFront:     INCBIN "pic/bmon/primeape.pic"
-PrimeapePicBack:      INCBIN "pic/monback/primeapeb.pic"
-DugtrioPicFront:      INCBIN "pic/bmon/dugtrio.pic"
-DugtrioPicBack:       INCBIN "pic/monback/dugtriob.pic"
-VenomothPicFront:     INCBIN "pic/bmon/venomoth.pic"
-VenomothPicBack:      INCBIN "pic/monback/venomothb.pic"
-DewgongPicFront:      INCBIN "pic/bmon/dewgong.pic"
-DewgongPicBack:       INCBIN "pic/monback/dewgongb.pic"
-CaterpiePicFront:     INCBIN "pic/bmon/caterpie.pic"
-CaterpiePicBack:      INCBIN "pic/monback/caterpieb.pic"
-MetapodPicFront:      INCBIN "pic/bmon/metapod.pic"
-MetapodPicBack:       INCBIN "pic/monback/metapodb.pic"
-ButterfreePicFront:   INCBIN "pic/bmon/butterfree.pic"
-ButterfreePicBack:    INCBIN "pic/monback/butterfreeb.pic"
-MachampPicFront:      INCBIN "pic/bmon/machamp.pic"
-MachampPicBack:       INCBIN "pic/monback/machampb.pic"
-GolduckPicFront:      INCBIN "pic/bmon/golduck.pic"
-GolduckPicBack:       INCBIN "pic/monback/golduckb.pic"
-HypnoPicFront:        INCBIN "pic/bmon/hypno.pic"
-HypnoPicBack:         INCBIN "pic/monback/hypnob.pic"
-GolbatPicFront:       INCBIN "pic/bmon/golbat.pic"
-GolbatPicBack:        INCBIN "pic/monback/golbatb.pic"
-MewtwoPicFront:       INCBIN "pic/bmon/mewtwo.pic"
-MewtwoPicBack:        INCBIN "pic/monback/mewtwob.pic"
-SnorlaxPicFront:      INCBIN "pic/bmon/snorlax.pic"
-SnorlaxPicBack:       INCBIN "pic/monback/snorlaxb.pic"
-MagikarpPicFront:     INCBIN "pic/bmon/magikarp.pic"
-MagikarpPicBack:      INCBIN "pic/monback/magikarpb.pic"
-MukPicFront:          INCBIN "pic/bmon/muk.pic"
-MukPicBack:           INCBIN "pic/monback/mukb.pic"
-KinglerPicFront:      INCBIN "pic/bmon/kingler.pic"
-KinglerPicBack:       INCBIN "pic/monback/kinglerb.pic"
-CloysterPicFront:     INCBIN "pic/bmon/cloyster.pic"
-CloysterPicBack:      INCBIN "pic/monback/cloysterb.pic"
-ElectrodePicFront:    INCBIN "pic/bmon/electrode.pic"
-ElectrodePicBack:     INCBIN "pic/monback/electrodeb.pic"
-ClefablePicFront:     INCBIN "pic/bmon/clefable.pic"
-ClefablePicBack:      INCBIN "pic/monback/clefableb.pic"
-WeezingPicFront:      INCBIN "pic/bmon/weezing.pic"
-WeezingPicBack:       INCBIN "pic/monback/weezingb.pic"
-PersianPicFront:      INCBIN "pic/bmon/persian.pic"
-PersianPicBack:       INCBIN "pic/monback/persianb.pic"
-MarowakPicFront:      INCBIN "pic/bmon/marowak.pic"
-MarowakPicBack:       INCBIN "pic/monback/marowakb.pic"
-HaunterPicFront:      INCBIN "pic/bmon/haunter.pic"
-HaunterPicBack:       INCBIN "pic/monback/haunterb.pic"
-AbraPicFront:         INCBIN "pic/bmon/abra.pic"
-AbraPicBack:          INCBIN "pic/monback/abrab.pic"
-AlakazamPicFront:     INCBIN "pic/bmon/alakazam.pic"
-AlakazamPicBack:      INCBIN "pic/monback/alakazamb.pic"
-PidgeottoPicFront:    INCBIN "pic/bmon/pidgeotto.pic"
-PidgeottoPicBack:     INCBIN "pic/monback/pidgeottob.pic"
-PidgeotPicFront:      INCBIN "pic/bmon/pidgeot.pic"
-PidgeotPicBack:       INCBIN "pic/monback/pidgeotb.pic"
-StarmiePicFront:      INCBIN "pic/bmon/starmie.pic"
-StarmiePicBack:       INCBIN "pic/monback/starmieb.pic"
+DodrioPicFront::       INCBIN "pic/bmon/dodrio.pic"
+DodrioPicBack::        INCBIN "pic/monback/dodriob.pic"
+PrimeapePicFront::     INCBIN "pic/bmon/primeape.pic"
+PrimeapePicBack::      INCBIN "pic/monback/primeapeb.pic"
+DugtrioPicFront::      INCBIN "pic/bmon/dugtrio.pic"
+DugtrioPicBack::       INCBIN "pic/monback/dugtriob.pic"
+VenomothPicFront::     INCBIN "pic/bmon/venomoth.pic"
+VenomothPicBack::      INCBIN "pic/monback/venomothb.pic"
+DewgongPicFront::      INCBIN "pic/bmon/dewgong.pic"
+DewgongPicBack::       INCBIN "pic/monback/dewgongb.pic"
+CaterpiePicFront::     INCBIN "pic/bmon/caterpie.pic"
+CaterpiePicBack::      INCBIN "pic/monback/caterpieb.pic"
+MetapodPicFront::      INCBIN "pic/bmon/metapod.pic"
+MetapodPicBack::       INCBIN "pic/monback/metapodb.pic"
+ButterfreePicFront::   INCBIN "pic/bmon/butterfree.pic"
+ButterfreePicBack::    INCBIN "pic/monback/butterfreeb.pic"
+MachampPicFront::      INCBIN "pic/bmon/machamp.pic"
+MachampPicBack::       INCBIN "pic/monback/machampb.pic"
+GolduckPicFront::      INCBIN "pic/bmon/golduck.pic"
+GolduckPicBack::       INCBIN "pic/monback/golduckb.pic"
+HypnoPicFront::        INCBIN "pic/bmon/hypno.pic"
+HypnoPicBack::         INCBIN "pic/monback/hypnob.pic"
+GolbatPicFront::       INCBIN "pic/bmon/golbat.pic"
+GolbatPicBack::        INCBIN "pic/monback/golbatb.pic"
+MewtwoPicFront::       INCBIN "pic/bmon/mewtwo.pic"
+MewtwoPicBack::        INCBIN "pic/monback/mewtwob.pic"
+SnorlaxPicFront::      INCBIN "pic/bmon/snorlax.pic"
+SnorlaxPicBack::       INCBIN "pic/monback/snorlaxb.pic"
+MagikarpPicFront::     INCBIN "pic/bmon/magikarp.pic"
+MagikarpPicBack::      INCBIN "pic/monback/magikarpb.pic"
+MukPicFront::          INCBIN "pic/bmon/muk.pic"
+MukPicBack::           INCBIN "pic/monback/mukb.pic"
+KinglerPicFront::      INCBIN "pic/bmon/kingler.pic"
+KinglerPicBack::       INCBIN "pic/monback/kinglerb.pic"
+CloysterPicFront::     INCBIN "pic/bmon/cloyster.pic"
+CloysterPicBack::      INCBIN "pic/monback/cloysterb.pic"
+ElectrodePicFront::    INCBIN "pic/bmon/electrode.pic"
+ElectrodePicBack::     INCBIN "pic/monback/electrodeb.pic"
+ClefablePicFront::     INCBIN "pic/bmon/clefable.pic"
+ClefablePicBack::      INCBIN "pic/monback/clefableb.pic"
+WeezingPicFront::      INCBIN "pic/bmon/weezing.pic"
+WeezingPicBack::       INCBIN "pic/monback/weezingb.pic"
+PersianPicFront::      INCBIN "pic/bmon/persian.pic"
+PersianPicBack::       INCBIN "pic/monback/persianb.pic"
+MarowakPicFront::      INCBIN "pic/bmon/marowak.pic"
+MarowakPicBack::       INCBIN "pic/monback/marowakb.pic"
+HaunterPicFront::      INCBIN "pic/bmon/haunter.pic"
+HaunterPicBack::       INCBIN "pic/monback/haunterb.pic"
+AbraPicFront::         INCBIN "pic/bmon/abra.pic"
+AbraPicBack::          INCBIN "pic/monback/abrab.pic"
+AlakazamPicFront::     INCBIN "pic/bmon/alakazam.pic"
+AlakazamPicBack::      INCBIN "pic/monback/alakazamb.pic"
+PidgeottoPicFront::    INCBIN "pic/bmon/pidgeotto.pic"
+PidgeottoPicBack::     INCBIN "pic/monback/pidgeottob.pic"
+PidgeotPicFront::      INCBIN "pic/bmon/pidgeot.pic"
+PidgeotPicBack::       INCBIN "pic/monback/pidgeotb.pic"
+StarmiePicFront::      INCBIN "pic/bmon/starmie.pic"
+StarmiePicBack::       INCBIN "pic/monback/starmieb.pic"
 
-RedPicBack:           INCBIN "pic/trainer/redb.pic"
-OldManPic:            INCBIN "pic/trainer/oldman.pic"
+RedPicBack::           INCBIN "pic/trainer/redb.pic"
+OldManPic::            INCBIN "pic/trainer/oldman.pic"
 
 INCLUDE "engine/battle/c.asm"
 
@@ -16528,60 +16525,60 @@
 
 SECTION "bankD",ROMX,BANK[$D]
 
-BulbasaurPicFront:    INCBIN "pic/bmon/bulbasaur.pic"
-BulbasaurPicBack:     INCBIN "pic/monback/bulbasaurb.pic"
-VenusaurPicFront:     INCBIN "pic/bmon/venusaur.pic"
-VenusaurPicBack:      INCBIN "pic/monback/venusaurb.pic"
-TentacruelPicFront:   INCBIN "pic/bmon/tentacruel.pic"
-TentacruelPicBack:    INCBIN "pic/monback/tentacruelb.pic"
-GoldeenPicFront:      INCBIN "pic/bmon/goldeen.pic"
-GoldeenPicBack:       INCBIN "pic/monback/goldeenb.pic"
-SeakingPicFront:      INCBIN "pic/bmon/seaking.pic"
-SeakingPicBack:       INCBIN "pic/monback/seakingb.pic"
-PonytaPicFront:       INCBIN "pic/bmon/ponyta.pic"
-RapidashPicFront:     INCBIN "pic/bmon/rapidash.pic"
-PonytaPicBack:        INCBIN "pic/monback/ponytab.pic"
-RapidashPicBack:      INCBIN "pic/monback/rapidashb.pic"
-RattataPicFront:      INCBIN "pic/bmon/rattata.pic"
-RattataPicBack:       INCBIN "pic/monback/rattatab.pic"
-RaticatePicFront:     INCBIN "pic/bmon/raticate.pic"
-RaticatePicBack:      INCBIN "pic/monback/raticateb.pic"
-NidorinoPicFront:     INCBIN "pic/bmon/nidorino.pic"
-NidorinoPicBack:      INCBIN "pic/monback/nidorinob.pic"
-NidorinaPicFront:     INCBIN "pic/bmon/nidorina.pic"
-NidorinaPicBack:      INCBIN "pic/monback/nidorinab.pic"
-GeodudePicFront:      INCBIN "pic/bmon/geodude.pic"
-GeodudePicBack:       INCBIN "pic/monback/geodudeb.pic"
-PorygonPicFront:      INCBIN "pic/bmon/porygon.pic"
-PorygonPicBack:       INCBIN "pic/monback/porygonb.pic"
-AerodactylPicFront:   INCBIN "pic/bmon/aerodactyl.pic"
-AerodactylPicBack:    INCBIN "pic/monback/aerodactylb.pic"
-MagnemitePicFront:    INCBIN "pic/bmon/magnemite.pic"
-MagnemitePicBack:     INCBIN "pic/monback/magnemiteb.pic"
-CharmanderPicFront:   INCBIN "pic/bmon/charmander.pic"
-CharmanderPicBack:    INCBIN "pic/monback/charmanderb.pic"
-SquirtlePicFront:     INCBIN "pic/bmon/squirtle.pic"
-SquirtlePicBack:      INCBIN "pic/monback/squirtleb.pic"
-CharmeleonPicFront:   INCBIN "pic/bmon/charmeleon.pic"
-CharmeleonPicBack:    INCBIN "pic/monback/charmeleonb.pic"
-WartortlePicFront:    INCBIN "pic/bmon/wartortle.pic"
-WartortlePicBack:     INCBIN "pic/monback/wartortleb.pic"
-CharizardPicFront:    INCBIN "pic/bmon/charizard.pic"
-CharizardPicBack:     INCBIN "pic/monback/charizardb.pic"
-FossilAerodactylPic:  INCBIN "pic/bmon/fossilaerodactyl.pic"
-GhostPic:             INCBIN "pic/other/ghost.pic"
-OddishPicFront:       INCBIN "pic/bmon/oddish.pic"
-OddishPicBack:        INCBIN "pic/monback/oddishb.pic"
-GloomPicFront:        INCBIN "pic/bmon/gloom.pic"
-GloomPicBack:         INCBIN "pic/monback/gloomb.pic"
-VileplumePicFront:    INCBIN "pic/bmon/vileplume.pic"
-VileplumePicBack:     INCBIN "pic/monback/vileplumeb.pic"
-BellsproutPicFront:   INCBIN "pic/bmon/bellsprout.pic"
-BellsproutPicBack:    INCBIN "pic/monback/bellsproutb.pic"
-WeepinbellPicFront:   INCBIN "pic/bmon/weepinbell.pic"
-WeepinbellPicBack:    INCBIN "pic/monback/weepinbellb.pic"
-VictreebelPicFront:   INCBIN "pic/bmon/victreebel.pic"
-VictreebelPicBack:    INCBIN "pic/monback/victreebelb.pic"
+BulbasaurPicFront::    INCBIN "pic/bmon/bulbasaur.pic"
+BulbasaurPicBack::     INCBIN "pic/monback/bulbasaurb.pic"
+VenusaurPicFront::     INCBIN "pic/bmon/venusaur.pic"
+VenusaurPicBack::      INCBIN "pic/monback/venusaurb.pic"
+TentacruelPicFront::   INCBIN "pic/bmon/tentacruel.pic"
+TentacruelPicBack::    INCBIN "pic/monback/tentacruelb.pic"
+GoldeenPicFront::      INCBIN "pic/bmon/goldeen.pic"
+GoldeenPicBack::       INCBIN "pic/monback/goldeenb.pic"
+SeakingPicFront::      INCBIN "pic/bmon/seaking.pic"
+SeakingPicBack::       INCBIN "pic/monback/seakingb.pic"
+PonytaPicFront::       INCBIN "pic/bmon/ponyta.pic"
+RapidashPicFront::     INCBIN "pic/bmon/rapidash.pic"
+PonytaPicBack::        INCBIN "pic/monback/ponytab.pic"
+RapidashPicBack::      INCBIN "pic/monback/rapidashb.pic"
+RattataPicFront::      INCBIN "pic/bmon/rattata.pic"
+RattataPicBack::       INCBIN "pic/monback/rattatab.pic"
+RaticatePicFront::     INCBIN "pic/bmon/raticate.pic"
+RaticatePicBack::      INCBIN "pic/monback/raticateb.pic"
+NidorinoPicFront::     INCBIN "pic/bmon/nidorino.pic"
+NidorinoPicBack::      INCBIN "pic/monback/nidorinob.pic"
+NidorinaPicFront::     INCBIN "pic/bmon/nidorina.pic"
+NidorinaPicBack::      INCBIN "pic/monback/nidorinab.pic"
+GeodudePicFront::      INCBIN "pic/bmon/geodude.pic"
+GeodudePicBack::       INCBIN "pic/monback/geodudeb.pic"
+PorygonPicFront::      INCBIN "pic/bmon/porygon.pic"
+PorygonPicBack::       INCBIN "pic/monback/porygonb.pic"
+AerodactylPicFront::   INCBIN "pic/bmon/aerodactyl.pic"
+AerodactylPicBack::    INCBIN "pic/monback/aerodactylb.pic"
+MagnemitePicFront::    INCBIN "pic/bmon/magnemite.pic"
+MagnemitePicBack::     INCBIN "pic/monback/magnemiteb.pic"
+CharmanderPicFront::   INCBIN "pic/bmon/charmander.pic"
+CharmanderPicBack::    INCBIN "pic/monback/charmanderb.pic"
+SquirtlePicFront::     INCBIN "pic/bmon/squirtle.pic"
+SquirtlePicBack::      INCBIN "pic/monback/squirtleb.pic"
+CharmeleonPicFront::   INCBIN "pic/bmon/charmeleon.pic"
+CharmeleonPicBack::    INCBIN "pic/monback/charmeleonb.pic"
+WartortlePicFront::    INCBIN "pic/bmon/wartortle.pic"
+WartortlePicBack::     INCBIN "pic/monback/wartortleb.pic"
+CharizardPicFront::    INCBIN "pic/bmon/charizard.pic"
+CharizardPicBack::     INCBIN "pic/monback/charizardb.pic"
+FossilAerodactylPic::  INCBIN "pic/bmon/fossilaerodactyl.pic"
+GhostPic::             INCBIN "pic/other/ghost.pic"
+OddishPicFront::       INCBIN "pic/bmon/oddish.pic"
+OddishPicBack::        INCBIN "pic/monback/oddishb.pic"
+GloomPicFront::        INCBIN "pic/bmon/gloom.pic"
+GloomPicBack::         INCBIN "pic/monback/gloomb.pic"
+VileplumePicFront::    INCBIN "pic/bmon/vileplume.pic"
+VileplumePicBack::     INCBIN "pic/monback/vileplumeb.pic"
+BellsproutPicFront::   INCBIN "pic/bmon/bellsprout.pic"
+BellsproutPicBack::    INCBIN "pic/monback/bellsproutb.pic"
+WeepinbellPicFront::   INCBIN "pic/bmon/weepinbell.pic"
+WeepinbellPicBack::    INCBIN "pic/monback/weepinbellb.pic"
+VictreebelPicFront::   INCBIN "pic/bmon/victreebel.pic"
+VictreebelPicBack::    INCBIN "pic/monback/victreebelb.pic"
 
 INCLUDE "engine/titlescreen2.asm"
 INCLUDE "engine/battle/d.asm"
@@ -16951,53 +16948,53 @@
 
 SECTION "bank13",ROMX,BANK[$13]
 
-TrainerPics:
-YoungsterPic:     INCBIN "pic/trainer/youngster.pic"
-BugCatcherPic:    INCBIN "pic/trainer/bugcatcher.pic"
-LassPic:          INCBIN "pic/trainer/lass.pic"
-SailorPic:        INCBIN "pic/trainer/sailor.pic"
-JrTrainerMPic:    INCBIN "pic/trainer/jr.trainerm.pic"
-JrTrainerFPic:    INCBIN "pic/trainer/jr.trainerf.pic"
-PokemaniacPic:    INCBIN "pic/trainer/pokemaniac.pic"
-SuperNerdPic:     INCBIN "pic/trainer/supernerd.pic"
-HikerPic:         INCBIN "pic/trainer/hiker.pic"
-BikerPic:         INCBIN "pic/trainer/biker.pic"
-BurglarPic:       INCBIN "pic/trainer/burglar.pic"
-EngineerPic:      INCBIN "pic/trainer/engineer.pic"
-FisherPic:        INCBIN "pic/trainer/fisher.pic"
-SwimmerPic:       INCBIN "pic/trainer/swimmer.pic"
-CueBallPic:       INCBIN "pic/trainer/cueball.pic"
-GamblerPic:       INCBIN "pic/trainer/gambler.pic"
-BeautyPic:        INCBIN "pic/trainer/beauty.pic"
-PsychicPic:       INCBIN "pic/trainer/psychic.pic"
-RockerPic:        INCBIN "pic/trainer/rocker.pic"
-JugglerPic:       INCBIN "pic/trainer/juggler.pic"
-TamerPic:         INCBIN "pic/trainer/tamer.pic"
-BirdKeeperPic:    INCBIN "pic/trainer/birdkeeper.pic"
-BlackbeltPic:     INCBIN "pic/trainer/blackbelt.pic"
-Rival1Pic:        INCBIN "pic/trainer/rival1.pic"
-ProfOakPic:       INCBIN "pic/trainer/prof.oak.pic"
-ChiefPic:
-ScientistPic:     INCBIN "pic/trainer/scientist.pic"
-GiovanniPic:      INCBIN "pic/trainer/giovanni.pic"
-RocketPic:        INCBIN "pic/trainer/rocket.pic"
-CooltrainerMPic:  INCBIN "pic/trainer/cooltrainerm.pic"
-CooltrainerFPic:  INCBIN "pic/trainer/cooltrainerf.pic"
-BrunoPic:         INCBIN "pic/trainer/bruno.pic"
-BrockPic:         INCBIN "pic/trainer/brock.pic"
-MistyPic:         INCBIN "pic/trainer/misty.pic"
-LtSurgePic:       INCBIN "pic/trainer/lt.surge.pic"
-ErikaPic:         INCBIN "pic/trainer/erika.pic"
-KogaPic:          INCBIN "pic/trainer/koga.pic"
-BlainePic:        INCBIN "pic/trainer/blaine.pic"
-SabrinaPic:       INCBIN "pic/trainer/sabrina.pic"
-GentlemanPic:     INCBIN "pic/trainer/gentleman.pic"
-Rival2Pic:        INCBIN "pic/trainer/rival2.pic"
-Rival3Pic:        INCBIN "pic/trainer/rival3.pic"
-LoreleiPic:       INCBIN "pic/trainer/lorelei.pic"
-ChannelerPic:     INCBIN "pic/trainer/channeler.pic"
-AgathaPic:        INCBIN "pic/trainer/agatha.pic"
-LancePic:         INCBIN "pic/trainer/lance.pic"
+TrainerPics::
+YoungsterPic::     INCBIN "pic/trainer/youngster.pic"
+BugCatcherPic::    INCBIN "pic/trainer/bugcatcher.pic"
+LassPic::          INCBIN "pic/trainer/lass.pic"
+SailorPic::        INCBIN "pic/trainer/sailor.pic"
+JrTrainerMPic::    INCBIN "pic/trainer/jr.trainerm.pic"
+JrTrainerFPic::    INCBIN "pic/trainer/jr.trainerf.pic"
+PokemaniacPic::    INCBIN "pic/trainer/pokemaniac.pic"
+SuperNerdPic::     INCBIN "pic/trainer/supernerd.pic"
+HikerPic::         INCBIN "pic/trainer/hiker.pic"
+BikerPic::         INCBIN "pic/trainer/biker.pic"
+BurglarPic::       INCBIN "pic/trainer/burglar.pic"
+EngineerPic::      INCBIN "pic/trainer/engineer.pic"
+FisherPic::        INCBIN "pic/trainer/fisher.pic"
+SwimmerPic::       INCBIN "pic/trainer/swimmer.pic"
+CueBallPic::       INCBIN "pic/trainer/cueball.pic"
+GamblerPic::       INCBIN "pic/trainer/gambler.pic"
+BeautyPic::        INCBIN "pic/trainer/beauty.pic"
+PsychicPic::       INCBIN "pic/trainer/psychic.pic"
+RockerPic::        INCBIN "pic/trainer/rocker.pic"
+JugglerPic::       INCBIN "pic/trainer/juggler.pic"
+TamerPic::         INCBIN "pic/trainer/tamer.pic"
+BirdKeeperPic::    INCBIN "pic/trainer/birdkeeper.pic"
+BlackbeltPic::     INCBIN "pic/trainer/blackbelt.pic"
+Rival1Pic::        INCBIN "pic/trainer/rival1.pic"
+ProfOakPic::       INCBIN "pic/trainer/prof.oak.pic"
+ChiefPic::
+ScientistPic::     INCBIN "pic/trainer/scientist.pic"
+GiovanniPic::      INCBIN "pic/trainer/giovanni.pic"
+RocketPic::        INCBIN "pic/trainer/rocket.pic"
+CooltrainerMPic::  INCBIN "pic/trainer/cooltrainerm.pic"
+CooltrainerFPic::  INCBIN "pic/trainer/cooltrainerf.pic"
+BrunoPic::         INCBIN "pic/trainer/bruno.pic"
+BrockPic::         INCBIN "pic/trainer/brock.pic"
+MistyPic::         INCBIN "pic/trainer/misty.pic"
+LtSurgePic::       INCBIN "pic/trainer/lt.surge.pic"
+ErikaPic::         INCBIN "pic/trainer/erika.pic"
+KogaPic::          INCBIN "pic/trainer/koga.pic"
+BlainePic::        INCBIN "pic/trainer/blaine.pic"
+SabrinaPic::       INCBIN "pic/trainer/sabrina.pic"
+GentlemanPic::     INCBIN "pic/trainer/gentleman.pic"
+Rival2Pic::        INCBIN "pic/trainer/rival2.pic"
+Rival3Pic::        INCBIN "pic/trainer/rival3.pic"
+LoreleiPic::       INCBIN "pic/trainer/lorelei.pic"
+ChannelerPic::     INCBIN "pic/trainer/channeler.pic"
+AgathaPic::        INCBIN "pic/trainer/agatha.pic"
+LancePic::         INCBIN "pic/trainer/lance.pic"
 
 INCLUDE "data/mapHeaders/battlecenterm.asm"
 INCLUDE "scripts/battlecenterm.asm"