From 64da1f5d6bf96ff7f35165476ecc8d623f76060d Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 3 Jul 2020 17:32:21 -0400 Subject: Move graphics-only object file sources into gfx/ Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes. It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated"). --- Makefile | 45 ++++-- gfx/pics.asm | 376 ++++++++++++++++++++++++++++++++++++++++++++ gfx/sprites.asm | 73 +++++++++ gfx/tilesets.asm | 63 ++++++++ pics.asm | 376 -------------------------------------------- scripts/CeladonMart3F.asm | 2 +- scripts/CeruleanCaveB1F.asm | 2 +- scripts/PowerPlant.asm | 2 +- sprites.asm | 73 --------- tilesets.asm | 63 -------- 10 files changed, 545 insertions(+), 530 deletions(-) create mode 100644 gfx/pics.asm create mode 100644 gfx/sprites.asm create mode 100644 gfx/tilesets.asm delete mode 100644 pics.asm delete mode 100644 sprites.asm delete mode 100644 tilesets.asm diff --git a/Makefile b/Makefile index 9475c377..684d665e 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ audio.o \ home.o \ main.o \ maps.o \ -pics.o \ -sprites.o \ text.o \ -tilesets.o \ wram.o \ +gfx/pics.o \ +gfx/sprites.o \ +gfx/tilesets.o pokered_obj := $(rom_obj:.o=_red.o) pokeblue_obj := $(rom_obj:.o=_blue.o) @@ -35,7 +35,7 @@ RGBLINK ?= $(RGBDS)rgblink .PHONY: all red blue clean tidy compare tools all: $(roms) -red: pokered.gbc +red: pokered.gbc blue: pokeblue.gbc # For contributors to make sure a change didn't affect the contents of the rom. @@ -44,7 +44,7 @@ compare: $(roms) clean: rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) - find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + + find gfx \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -delete $(MAKE) clean -C tools/ tidy: @@ -55,28 +55,43 @@ tools: $(MAKE) -C tools/ +RGBASMFLAGS = -h -Weverything +# Create a sym/map for debug purposes if `make` run with `DEBUG=1` +ifeq ($(DEBUG),1) +RGBASMFLAGS += -E +endif + +$(pokered_obj): RGBASMFLAGS += -D _RED +$(pokeblue_obj): RGBASMFLAGS += -D _BLUE + +# The dep rules have to be explicit or else missing files won't be reported. +# As a side effect, they're evaluated immediately instead of when the rule is invoked. +# It doesn't look like $(shell) can be deferred so there might not be a better way. +define DEP +$1: $2 $$(shell tools/scan_includes $2) + $$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$< +endef + # Build tools when building the rom. # This has to happen before the rules are processed, since that's when scan_includes is run. ifeq (,$(filter clean tools,$(MAKECMDGOALS))) + $(info $(shell $(MAKE) -C tools)) -endif +# Dependencies for objects (drop _red and _blue from asm file basenames) +$(foreach obj, $(pokered_obj), $(eval $(call DEP,$(obj),$(obj:_red.o=.asm)))) +$(foreach obj, $(pokeblue_obj), $(eval $(call DEP,$(obj),$(obj:_blue.o=.asm)))) -%.asm: ; +endif -%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) -$(pokered_obj): %_red.o: %.asm $$(dep) - $(RGBASM) -D _RED -h -o $@ $*.asm -%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) -$(pokeblue_obj): %_blue.o: %.asm $$(dep) - $(RGBASM) -D _BLUE -h -o $@ $*.asm +%.asm: ; pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" -%.gbc: $$(%_obj) - $(RGBLINK) -d -m $*.map -n $*.sym -l layout.link -o $@ $^ +%.gbc: $$(%_obj) layout.link + $(RGBLINK) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^) $(RGBFIX) $($*_opt) $@ diff --git a/gfx/pics.asm b/gfx/pics.asm new file mode 100644 index 00000000..0e2adc24 --- /dev/null +++ b/gfx/pics.asm @@ -0,0 +1,376 @@ +SECTION "Pics 1", ROMX + +RhydonPicFront:: INCBIN "gfx/pokemon/front/rhydon.pic" +RhydonPicBack:: INCBIN "gfx/pokemon/back/rhydonb.pic" +KangaskhanPicFront:: INCBIN "gfx/pokemon/front/kangaskhan.pic" +KangaskhanPicBack:: INCBIN "gfx/pokemon/back/kangaskhanb.pic" +NidoranMPicFront:: INCBIN "gfx/pokemon/front/nidoranm.pic" +NidoranMPicBack:: INCBIN "gfx/pokemon/back/nidoranmb.pic" +ClefairyPicFront:: INCBIN "gfx/pokemon/front/clefairy.pic" +ClefairyPicBack:: INCBIN "gfx/pokemon/back/clefairyb.pic" +SpearowPicFront:: INCBIN "gfx/pokemon/front/spearow.pic" +SpearowPicBack:: INCBIN "gfx/pokemon/back/spearowb.pic" +VoltorbPicFront:: INCBIN "gfx/pokemon/front/voltorb.pic" +VoltorbPicBack:: INCBIN "gfx/pokemon/back/voltorbb.pic" +NidokingPicFront:: INCBIN "gfx/pokemon/front/nidoking.pic" +NidokingPicBack:: INCBIN "gfx/pokemon/back/nidokingb.pic" +SlowbroPicFront:: INCBIN "gfx/pokemon/front/slowbro.pic" +SlowbroPicBack:: INCBIN "gfx/pokemon/back/slowbrob.pic" +IvysaurPicFront:: INCBIN "gfx/pokemon/front/ivysaur.pic" +IvysaurPicBack:: INCBIN "gfx/pokemon/back/ivysaurb.pic" +ExeggutorPicFront:: INCBIN "gfx/pokemon/front/exeggutor.pic" +ExeggutorPicBack:: INCBIN "gfx/pokemon/back/exeggutorb.pic" +LickitungPicFront:: INCBIN "gfx/pokemon/front/lickitung.pic" +LickitungPicBack:: INCBIN "gfx/pokemon/back/lickitungb.pic" +ExeggcutePicFront:: INCBIN "gfx/pokemon/front/exeggcute.pic" +ExeggcutePicBack:: INCBIN "gfx/pokemon/back/exeggcuteb.pic" +GrimerPicFront:: INCBIN "gfx/pokemon/front/grimer.pic" +GrimerPicBack:: INCBIN "gfx/pokemon/back/grimerb.pic" +GengarPicFront:: INCBIN "gfx/pokemon/front/gengar.pic" +GengarPicBack:: INCBIN "gfx/pokemon/back/gengarb.pic" +NidoranFPicFront:: INCBIN "gfx/pokemon/front/nidoranf.pic" +NidoranFPicBack:: INCBIN "gfx/pokemon/back/nidoranfb.pic" +NidoqueenPicFront:: INCBIN "gfx/pokemon/front/nidoqueen.pic" +NidoqueenPicBack:: INCBIN "gfx/pokemon/back/nidoqueenb.pic" +CubonePicFront:: INCBIN "gfx/pokemon/front/cubone.pic" +CubonePicBack:: INCBIN "gfx/pokemon/back/cuboneb.pic" +RhyhornPicFront:: INCBIN "gfx/pokemon/front/rhyhorn.pic" +RhyhornPicBack:: INCBIN "gfx/pokemon/back/rhyhornb.pic" +LaprasPicFront:: INCBIN "gfx/pokemon/front/lapras.pic" +LaprasPicBack:: INCBIN "gfx/pokemon/back/laprasb.pic" +ArcaninePicFront:: INCBIN "gfx/pokemon/front/arcanine.pic" +ArcaninePicBack:: INCBIN "gfx/pokemon/back/arcanineb.pic" +GyaradosPicFront:: INCBIN "gfx/pokemon/front/gyarados.pic" +GyaradosPicBack:: INCBIN "gfx/pokemon/back/gyaradosb.pic" +ShellderPicFront:: INCBIN "gfx/pokemon/front/shellder.pic" +ShellderPicBack:: INCBIN "gfx/pokemon/back/shellderb.pic" +TentacoolPicFront:: INCBIN "gfx/pokemon/front/tentacool.pic" +TentacoolPicBack:: INCBIN "gfx/pokemon/back/tentacoolb.pic" +GastlyPicFront:: INCBIN "gfx/pokemon/front/gastly.pic" +GastlyPicBack:: INCBIN "gfx/pokemon/back/gastlyb.pic" +ScytherPicFront:: INCBIN "gfx/pokemon/front/scyther.pic" +ScytherPicBack:: INCBIN "gfx/pokemon/back/scytherb.pic" +StaryuPicFront:: INCBIN "gfx/pokemon/front/staryu.pic" +StaryuPicBack:: INCBIN "gfx/pokemon/back/staryub.pic" +BlastoisePicFront:: INCBIN "gfx/pokemon/front/blastoise.pic" +BlastoisePicBack:: INCBIN "gfx/pokemon/back/blastoiseb.pic" +PinsirPicFront:: INCBIN "gfx/pokemon/front/pinsir.pic" +PinsirPicBack:: INCBIN "gfx/pokemon/back/pinsirb.pic" +TangelaPicFront:: INCBIN "gfx/pokemon/front/tangela.pic" +TangelaPicBack:: INCBIN "gfx/pokemon/back/tangelab.pic" + + +SECTION "Pics 2", ROMX + +GrowlithePicFront:: INCBIN "gfx/pokemon/front/growlithe.pic" +GrowlithePicBack:: INCBIN "gfx/pokemon/back/growlitheb.pic" +OnixPicFront:: INCBIN "gfx/pokemon/front/onix.pic" +OnixPicBack:: INCBIN "gfx/pokemon/back/onixb.pic" +FearowPicFront:: INCBIN "gfx/pokemon/front/fearow.pic" +FearowPicBack:: INCBIN "gfx/pokemon/back/fearowb.pic" +PidgeyPicFront:: INCBIN "gfx/pokemon/front/pidgey.pic" +PidgeyPicBack:: INCBIN "gfx/pokemon/back/pidgeyb.pic" +SlowpokePicFront:: INCBIN "gfx/pokemon/front/slowpoke.pic" +SlowpokePicBack:: INCBIN "gfx/pokemon/back/slowpokeb.pic" +KadabraPicFront:: INCBIN "gfx/pokemon/front/kadabra.pic" +KadabraPicBack:: INCBIN "gfx/pokemon/back/kadabrab.pic" +GravelerPicFront:: INCBIN "gfx/pokemon/front/graveler.pic" +GravelerPicBack:: INCBIN "gfx/pokemon/back/gravelerb.pic" +ChanseyPicFront:: INCBIN "gfx/pokemon/front/chansey.pic" +ChanseyPicBack:: INCBIN "gfx/pokemon/back/chanseyb.pic" +MachokePicFront:: INCBIN "gfx/pokemon/front/machoke.pic" +MachokePicBack:: INCBIN "gfx/pokemon/back/machokeb.pic" +MrMimePicFront:: INCBIN "gfx/pokemon/front/mr.mime.pic" +MrMimePicBack:: INCBIN "gfx/pokemon/back/mr.mimeb.pic" +HitmonleePicFront:: INCBIN "gfx/pokemon/front/hitmonlee.pic" +HitmonleePicBack:: INCBIN "gfx/pokemon/back/hitmonleeb.pic" +HitmonchanPicFront:: INCBIN "gfx/pokemon/front/hitmonchan.pic" +HitmonchanPicBack:: INCBIN "gfx/pokemon/back/hitmonchanb.pic" +ArbokPicFront:: INCBIN "gfx/pokemon/front/arbok.pic" +ArbokPicBack:: INCBIN "gfx/pokemon/back/arbokb.pic" +ParasectPicFront:: INCBIN "gfx/pokemon/front/parasect.pic" +ParasectPicBack:: INCBIN "gfx/pokemon/back/parasectb.pic" +PsyduckPicFront:: INCBIN "gfx/pokemon/front/psyduck.pic" +PsyduckPicBack:: INCBIN "gfx/pokemon/back/psyduckb.pic" +DrowzeePicFront:: INCBIN "gfx/pokemon/front/drowzee.pic" +DrowzeePicBack:: INCBIN "gfx/pokemon/back/drowzeeb.pic" +GolemPicFront:: INCBIN "gfx/pokemon/front/golem.pic" +GolemPicBack:: INCBIN "gfx/pokemon/back/golemb.pic" +MagmarPicFront:: INCBIN "gfx/pokemon/front/magmar.pic" +MagmarPicBack:: INCBIN "gfx/pokemon/back/magmarb.pic" +ElectabuzzPicFront:: INCBIN "gfx/pokemon/front/electabuzz.pic" +ElectabuzzPicBack:: INCBIN "gfx/pokemon/back/electabuzzb.pic" +MagnetonPicFront:: INCBIN "gfx/pokemon/front/magneton.pic" +MagnetonPicBack:: INCBIN "gfx/pokemon/back/magnetonb.pic" +KoffingPicFront:: INCBIN "gfx/pokemon/front/koffing.pic" +KoffingPicBack:: INCBIN "gfx/pokemon/back/koffingb.pic" +MankeyPicFront:: INCBIN "gfx/pokemon/front/mankey.pic" +MankeyPicBack:: INCBIN "gfx/pokemon/back/mankeyb.pic" +SeelPicFront:: INCBIN "gfx/pokemon/front/seel.pic" +SeelPicBack:: INCBIN "gfx/pokemon/back/seelb.pic" +DiglettPicFront:: INCBIN "gfx/pokemon/front/diglett.pic" +DiglettPicBack:: INCBIN "gfx/pokemon/back/diglettb.pic" +TaurosPicFront:: INCBIN "gfx/pokemon/front/tauros.pic" +TaurosPicBack:: INCBIN "gfx/pokemon/back/taurosb.pic" +FarfetchdPicFront:: INCBIN "gfx/pokemon/front/farfetchd.pic" +FarfetchdPicBack:: INCBIN "gfx/pokemon/back/farfetchdb.pic" +VenonatPicFront:: INCBIN "gfx/pokemon/front/venonat.pic" +VenonatPicBack:: INCBIN "gfx/pokemon/back/venonatb.pic" +DragonitePicFront:: INCBIN "gfx/pokemon/front/dragonite.pic" +DragonitePicBack:: INCBIN "gfx/pokemon/back/dragoniteb.pic" +DoduoPicFront:: INCBIN "gfx/pokemon/front/doduo.pic" +DoduoPicBack:: INCBIN "gfx/pokemon/back/doduob.pic" +PoliwagPicFront:: INCBIN "gfx/pokemon/front/poliwag.pic" +PoliwagPicBack:: INCBIN "gfx/pokemon/back/poliwagb.pic" +JynxPicFront:: INCBIN "gfx/pokemon/front/jynx.pic" +JynxPicBack:: INCBIN "gfx/pokemon/back/jynxb.pic" +MoltresPicFront:: INCBIN "gfx/pokemon/front/moltres.pic" +MoltresPicBack:: INCBIN "gfx/pokemon/back/moltresb.pic" + + +SECTION "Pics 3", ROMX + +ArticunoPicFront:: INCBIN "gfx/pokemon/front/articuno.pic" +ArticunoPicBack:: INCBIN "gfx/pokemon/back/articunob.pic" +ZapdosPicFront:: INCBIN "gfx/pokemon/front/zapdos.pic" +ZapdosPicBack:: INCBIN "gfx/pokemon/back/zapdosb.pic" +DittoPicFront:: INCBIN "gfx/pokemon/front/ditto.pic" +DittoPicBack:: INCBIN "gfx/pokemon/back/dittob.pic" +MeowthPicFront:: INCBIN "gfx/pokemon/front/meowth.pic" +MeowthPicBack:: INCBIN "gfx/pokemon/back/meowthb.pic" +KrabbyPicFront:: INCBIN "gfx/pokemon/front/krabby.pic" +KrabbyPicBack:: INCBIN "gfx/pokemon/back/krabbyb.pic" +VulpixPicFront:: INCBIN "gfx/pokemon/front/vulpix.pic" +VulpixPicBack:: INCBIN "gfx/pokemon/back/vulpixb.pic" +NinetalesPicFront:: INCBIN "gfx/pokemon/front/ninetales.pic" +NinetalesPicBack:: INCBIN "gfx/pokemon/back/ninetalesb.pic" +PikachuPicFront:: INCBIN "gfx/pokemon/front/pikachu.pic" +PikachuPicBack:: INCBIN "gfx/pokemon/back/pikachub.pic" +RaichuPicFront:: INCBIN "gfx/pokemon/front/raichu.pic" +RaichuPicBack:: INCBIN "gfx/pokemon/back/raichub.pic" +DratiniPicFront:: INCBIN "gfx/pokemon/front/dratini.pic" +DratiniPicBack:: INCBIN "gfx/pokemon/back/dratinib.pic" +DragonairPicFront:: INCBIN "gfx/pokemon/front/dragonair.pic" +DragonairPicBack:: INCBIN "gfx/pokemon/back/dragonairb.pic" +KabutoPicFront:: INCBIN "gfx/pokemon/front/kabuto.pic" +KabutoPicBack:: INCBIN "gfx/pokemon/back/kabutob.pic" +KabutopsPicFront:: INCBIN "gfx/pokemon/front/kabutops.pic" +KabutopsPicBack:: INCBIN "gfx/pokemon/back/kabutopsb.pic" +HorseaPicFront:: INCBIN "gfx/pokemon/front/horsea.pic" +HorseaPicBack:: INCBIN "gfx/pokemon/back/horseab.pic" +SeadraPicFront:: INCBIN "gfx/pokemon/front/seadra.pic" +SeadraPicBack:: INCBIN "gfx/pokemon/back/seadrab.pic" +SandshrewPicFront:: INCBIN "gfx/pokemon/front/sandshrew.pic" +SandshrewPicBack:: INCBIN "gfx/pokemon/back/sandshrewb.pic" +SandslashPicFront:: INCBIN "gfx/pokemon/front/sandslash.pic" +SandslashPicBack:: INCBIN "gfx/pokemon/back/sandslashb.pic" +OmanytePicFront:: INCBIN "gfx/pokemon/front/omanyte.pic" +OmanytePicBack:: INCBIN "gfx/pokemon/back/omanyteb.pic" +OmastarPicFront:: INCBIN "gfx/pokemon/front/omastar.pic" +OmastarPicBack:: INCBIN "gfx/pokemon/back/omastarb.pic" +JigglypuffPicFront:: INCBIN "gfx/pokemon/front/jigglypuff.pic" +JigglypuffPicBack:: INCBIN "gfx/pokemon/back/jigglypuffb.pic" +WigglytuffPicFront:: INCBIN "gfx/pokemon/front/wigglytuff.pic" +WigglytuffPicBack:: INCBIN "gfx/pokemon/back/wigglytuffb.pic" +EeveePicFront:: INCBIN "gfx/pokemon/front/eevee.pic" +EeveePicBack:: INCBIN "gfx/pokemon/back/eeveeb.pic" +FlareonPicFront:: INCBIN "gfx/pokemon/front/flareon.pic" +FlareonPicBack:: INCBIN "gfx/pokemon/back/flareonb.pic" +JolteonPicFront:: INCBIN "gfx/pokemon/front/jolteon.pic" +JolteonPicBack:: INCBIN "gfx/pokemon/back/jolteonb.pic" +VaporeonPicFront:: INCBIN "gfx/pokemon/front/vaporeon.pic" +VaporeonPicBack:: INCBIN "gfx/pokemon/back/vaporeonb.pic" +MachopPicFront:: INCBIN "gfx/pokemon/front/machop.pic" +MachopPicBack:: INCBIN "gfx/pokemon/back/machopb.pic" +ZubatPicFront:: INCBIN "gfx/pokemon/front/zubat.pic" +ZubatPicBack:: INCBIN "gfx/pokemon/back/zubatb.pic" +EkansPicFront:: INCBIN "gfx/pokemon/front/ekans.pic" +EkansPicBack:: INCBIN "gfx/pokemon/back/ekansb.pic" +ParasPicFront:: INCBIN "gfx/pokemon/front/paras.pic" +ParasPicBack:: INCBIN "gfx/pokemon/back/parasb.pic" +PoliwhirlPicFront:: INCBIN "gfx/pokemon/front/poliwhirl.pic" +PoliwhirlPicBack:: INCBIN "gfx/pokemon/back/poliwhirlb.pic" +PoliwrathPicFront:: INCBIN "gfx/pokemon/front/poliwrath.pic" +PoliwrathPicBack:: INCBIN "gfx/pokemon/back/poliwrathb.pic" +WeedlePicFront:: INCBIN "gfx/pokemon/front/weedle.pic" +WeedlePicBack:: INCBIN "gfx/pokemon/back/weedleb.pic" +KakunaPicFront:: INCBIN "gfx/pokemon/front/kakuna.pic" +KakunaPicBack:: INCBIN "gfx/pokemon/back/kakunab.pic" +BeedrillPicFront:: INCBIN "gfx/pokemon/front/beedrill.pic" +BeedrillPicBack:: INCBIN "gfx/pokemon/back/beedrillb.pic" + +FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" + + +SECTION "Pics 4", ROMX + +DodrioPicFront:: INCBIN "gfx/pokemon/front/dodrio.pic" +DodrioPicBack:: INCBIN "gfx/pokemon/back/dodriob.pic" +PrimeapePicFront:: INCBIN "gfx/pokemon/front/primeape.pic" +PrimeapePicBack:: INCBIN "gfx/pokemon/back/primeapeb.pic" +DugtrioPicFront:: INCBIN "gfx/pokemon/front/dugtrio.pic" +DugtrioPicBack:: INCBIN "gfx/pokemon/back/dugtriob.pic" +VenomothPicFront:: INCBIN "gfx/pokemon/front/venomoth.pic" +VenomothPicBack:: INCBIN "gfx/pokemon/back/venomothb.pic" +DewgongPicFront:: INCBIN "gfx/pokemon/front/dewgong.pic" +DewgongPicBack:: INCBIN "gfx/pokemon/back/dewgongb.pic" +CaterpiePicFront:: INCBIN "gfx/pokemon/front/caterpie.pic" +CaterpiePicBack:: INCBIN "gfx/pokemon/back/caterpieb.pic" +MetapodPicFront:: INCBIN "gfx/pokemon/front/metapod.pic" +MetapodPicBack:: INCBIN "gfx/pokemon/back/metapodb.pic" +ButterfreePicFront:: INCBIN "gfx/pokemon/front/butterfree.pic" +ButterfreePicBack:: INCBIN "gfx/pokemon/back/butterfreeb.pic" +MachampPicFront:: INCBIN "gfx/pokemon/front/machamp.pic" +MachampPicBack:: INCBIN "gfx/pokemon/back/machampb.pic" +GolduckPicFront:: INCBIN "gfx/pokemon/front/golduck.pic" +GolduckPicBack:: INCBIN "gfx/pokemon/back/golduckb.pic" +HypnoPicFront:: INCBIN "gfx/pokemon/front/hypno.pic" +HypnoPicBack:: INCBIN "gfx/pokemon/back/hypnob.pic" +GolbatPicFront:: INCBIN "gfx/pokemon/front/golbat.pic" +GolbatPicBack:: INCBIN "gfx/pokemon/back/golbatb.pic" +MewtwoPicFront:: INCBIN "gfx/pokemon/front/mewtwo.pic" +MewtwoPicBack:: INCBIN "gfx/pokemon/back/mewtwob.pic" +SnorlaxPicFront:: INCBIN "gfx/pokemon/front/snorlax.pic" +SnorlaxPicBack:: INCBIN "gfx/pokemon/back/snorlaxb.pic" +MagikarpPicFront:: INCBIN "gfx/pokemon/front/magikarp.pic" +MagikarpPicBack:: INCBIN "gfx/pokemon/back/magikarpb.pic" +MukPicFront:: INCBIN "gfx/pokemon/front/muk.pic" +MukPicBack:: INCBIN "gfx/pokemon/back/mukb.pic" +KinglerPicFront:: INCBIN "gfx/pokemon/front/kingler.pic" +KinglerPicBack:: INCBIN "gfx/pokemon/back/kinglerb.pic" +CloysterPicFront:: INCBIN "gfx/pokemon/front/cloyster.pic" +CloysterPicBack:: INCBIN "gfx/pokemon/back/cloysterb.pic" +ElectrodePicFront:: INCBIN "gfx/pokemon/front/electrode.pic" +ElectrodePicBack:: INCBIN "gfx/pokemon/back/electrodeb.pic" +ClefablePicFront:: INCBIN "gfx/pokemon/front/clefable.pic" +ClefablePicBack:: INCBIN "gfx/pokemon/back/clefableb.pic" +WeezingPicFront:: INCBIN "gfx/pokemon/front/weezing.pic" +WeezingPicBack:: INCBIN "gfx/pokemon/back/weezingb.pic" +PersianPicFront:: INCBIN "gfx/pokemon/front/persian.pic" +PersianPicBack:: INCBIN "gfx/pokemon/back/persianb.pic" +MarowakPicFront:: INCBIN "gfx/pokemon/front/marowak.pic" +MarowakPicBack:: INCBIN "gfx/pokemon/back/marowakb.pic" +HaunterPicFront:: INCBIN "gfx/pokemon/front/haunter.pic" +HaunterPicBack:: INCBIN "gfx/pokemon/back/haunterb.pic" +AbraPicFront:: INCBIN "gfx/pokemon/front/abra.pic" +AbraPicBack:: INCBIN "gfx/pokemon/back/abrab.pic" +AlakazamPicFront:: INCBIN "gfx/pokemon/front/alakazam.pic" +AlakazamPicBack:: INCBIN "gfx/pokemon/back/alakazamb.pic" +PidgeottoPicFront:: INCBIN "gfx/pokemon/front/pidgeotto.pic" +PidgeottoPicBack:: INCBIN "gfx/pokemon/back/pidgeottob.pic" +PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" +PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" +StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" +StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" + +RedPicBack:: INCBIN "gfx/player/redb.pic" +OldManPic:: INCBIN "gfx/battle/oldman.pic" + + +SECTION "Pics 5", ROMX + +BulbasaurPicFront:: INCBIN "gfx/pokemon/front/bulbasaur.pic" +BulbasaurPicBack:: INCBIN "gfx/pokemon/back/bulbasaurb.pic" +VenusaurPicFront:: INCBIN "gfx/pokemon/front/venusaur.pic" +VenusaurPicBack:: INCBIN "gfx/pokemon/back/venusaurb.pic" +TentacruelPicFront:: INCBIN "gfx/pokemon/front/tentacruel.pic" +TentacruelPicBack:: INCBIN "gfx/pokemon/back/tentacruelb.pic" +GoldeenPicFront:: INCBIN "gfx/pokemon/front/goldeen.pic" +GoldeenPicBack:: INCBIN "gfx/pokemon/back/goldeenb.pic" +SeakingPicFront:: INCBIN "gfx/pokemon/front/seaking.pic" +SeakingPicBack:: INCBIN "gfx/pokemon/back/seakingb.pic" +PonytaPicFront:: INCBIN "gfx/pokemon/front/ponyta.pic" +RapidashPicFront:: INCBIN "gfx/pokemon/front/rapidash.pic" +PonytaPicBack:: INCBIN "gfx/pokemon/back/ponytab.pic" +RapidashPicBack:: INCBIN "gfx/pokemon/back/rapidashb.pic" +RattataPicFront:: INCBIN "gfx/pokemon/front/rattata.pic" +RattataPicBack:: INCBIN "gfx/pokemon/back/rattatab.pic" +RaticatePicFront:: INCBIN "gfx/pokemon/front/raticate.pic" +RaticatePicBack:: INCBIN "gfx/pokemon/back/raticateb.pic" +NidorinoPicFront:: INCBIN "gfx/pokemon/front/nidorino.pic" +NidorinoPicBack:: INCBIN "gfx/pokemon/back/nidorinob.pic" +NidorinaPicFront:: INCBIN "gfx/pokemon/front/nidorina.pic" +NidorinaPicBack:: INCBIN "gfx/pokemon/back/nidorinab.pic" +GeodudePicFront:: INCBIN "gfx/pokemon/front/geodude.pic" +GeodudePicBack:: INCBIN "gfx/pokemon/back/geodudeb.pic" +PorygonPicFront:: INCBIN "gfx/pokemon/front/porygon.pic" +PorygonPicBack:: INCBIN "gfx/pokemon/back/porygonb.pic" +AerodactylPicFront:: INCBIN "gfx/pokemon/front/aerodactyl.pic" +AerodactylPicBack:: INCBIN "gfx/pokemon/back/aerodactylb.pic" +MagnemitePicFront:: INCBIN "gfx/pokemon/front/magnemite.pic" +MagnemitePicBack:: INCBIN "gfx/pokemon/back/magnemiteb.pic" +CharmanderPicFront:: INCBIN "gfx/pokemon/front/charmander.pic" +CharmanderPicBack:: INCBIN "gfx/pokemon/back/charmanderb.pic" +SquirtlePicFront:: INCBIN "gfx/pokemon/front/squirtle.pic" +SquirtlePicBack:: INCBIN "gfx/pokemon/back/squirtleb.pic" +CharmeleonPicFront:: INCBIN "gfx/pokemon/front/charmeleon.pic" +CharmeleonPicBack:: INCBIN "gfx/pokemon/back/charmeleonb.pic" +WartortlePicFront:: INCBIN "gfx/pokemon/front/wartortle.pic" +WartortlePicBack:: INCBIN "gfx/pokemon/back/wartortleb.pic" +CharizardPicFront:: INCBIN "gfx/pokemon/front/charizard.pic" +CharizardPicBack:: INCBIN "gfx/pokemon/back/charizardb.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" +GhostPic:: INCBIN "gfx/battle/ghost.pic" +OddishPicFront:: INCBIN "gfx/pokemon/front/oddish.pic" +OddishPicBack:: INCBIN "gfx/pokemon/back/oddishb.pic" +GloomPicFront:: INCBIN "gfx/pokemon/front/gloom.pic" +GloomPicBack:: INCBIN "gfx/pokemon/back/gloomb.pic" +VileplumePicFront:: INCBIN "gfx/pokemon/front/vileplume.pic" +VileplumePicBack:: INCBIN "gfx/pokemon/back/vileplumeb.pic" +BellsproutPicFront:: INCBIN "gfx/pokemon/front/bellsprout.pic" +BellsproutPicBack:: INCBIN "gfx/pokemon/back/bellsproutb.pic" +WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" +WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" +VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" +VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" + + +SECTION "Pics 6", ROMX + +TrainerPics:: +YoungsterPic:: INCBIN "gfx/trainers/youngster.pic" +BugCatcherPic:: INCBIN "gfx/trainers/bugcatcher.pic" +LassPic:: INCBIN "gfx/trainers/lass.pic" +SailorPic:: INCBIN "gfx/trainers/sailor.pic" +JrTrainerMPic:: INCBIN "gfx/trainers/jr.trainerm.pic" +JrTrainerFPic:: INCBIN "gfx/trainers/jr.trainerf.pic" +PokemaniacPic:: INCBIN "gfx/trainers/pokemaniac.pic" +SuperNerdPic:: INCBIN "gfx/trainers/supernerd.pic" +HikerPic:: INCBIN "gfx/trainers/hiker.pic" +BikerPic:: INCBIN "gfx/trainers/biker.pic" +BurglarPic:: INCBIN "gfx/trainers/burglar.pic" +EngineerPic:: INCBIN "gfx/trainers/engineer.pic" +FisherPic:: INCBIN "gfx/trainers/fisher.pic" +SwimmerPic:: INCBIN "gfx/trainers/swimmer.pic" +CueBallPic:: INCBIN "gfx/trainers/cueball.pic" +GamblerPic:: INCBIN "gfx/trainers/gambler.pic" +BeautyPic:: INCBIN "gfx/trainers/beauty.pic" +PsychicPic:: INCBIN "gfx/trainers/psychic.pic" +RockerPic:: INCBIN "gfx/trainers/rocker.pic" +JugglerPic:: INCBIN "gfx/trainers/juggler.pic" +TamerPic:: INCBIN "gfx/trainers/tamer.pic" +BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic" +BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic" +Rival1Pic:: INCBIN "gfx/trainers/rival1.pic" +ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" +ChiefPic:: +ScientistPic:: INCBIN "gfx/trainers/scientist.pic" +GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic" +RocketPic:: INCBIN "gfx/trainers/rocket.pic" +CooltrainerMPic:: INCBIN "gfx/trainers/cooltrainerm.pic" +CooltrainerFPic:: INCBIN "gfx/trainers/cooltrainerf.pic" +BrunoPic:: INCBIN "gfx/trainers/bruno.pic" +BrockPic:: INCBIN "gfx/trainers/brock.pic" +MistyPic:: INCBIN "gfx/trainers/misty.pic" +LtSurgePic:: INCBIN "gfx/trainers/lt.surge.pic" +ErikaPic:: INCBIN "gfx/trainers/erika.pic" +KogaPic:: INCBIN "gfx/trainers/koga.pic" +BlainePic:: INCBIN "gfx/trainers/blaine.pic" +SabrinaPic:: INCBIN "gfx/trainers/sabrina.pic" +GentlemanPic:: INCBIN "gfx/trainers/gentleman.pic" +Rival2Pic:: INCBIN "gfx/trainers/rival2.pic" +Rival3Pic:: INCBIN "gfx/trainers/rival3.pic" +LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic" +ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" +AgathaPic:: INCBIN "gfx/trainers/agatha.pic" +LancePic:: INCBIN "gfx/trainers/lance.pic" diff --git a/gfx/sprites.asm b/gfx/sprites.asm new file mode 100644 index 00000000..4548bbe3 --- /dev/null +++ b/gfx/sprites.asm @@ -0,0 +1,73 @@ +SECTION "NPC Sprites 1", ROMX + +OakAideSprite:: INCBIN "gfx/sprites/oak_aide.2bpp" +RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp" +SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp" +WhitePlayerSprite:: INCBIN "gfx/sprites/white_player.2bpp" +GymHelperSprite:: INCBIN "gfx/sprites/gym_helper.2bpp" +OldPersonSprite:: INCBIN "gfx/sprites/old_person.2bpp" +MartGuySprite:: INCBIN "gfx/sprites/mart_guy.2bpp" +FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" +OldMediumWomanSprite:: INCBIN "gfx/sprites/old_medium_woman.2bpp" +NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" +CableClubWomanSprite:: INCBIN "gfx/sprites/cable_club_woman.2bpp" +MrMasterballSprite:: INCBIN "gfx/sprites/mr_masterball.2bpp" +LaprasGiverSprite:: INCBIN "gfx/sprites/lapras_giver.2bpp" +WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" +SsCaptainSprite:: INCBIN "gfx/sprites/ss_captain.2bpp" +Fisher2Sprite:: INCBIN "gfx/sprites/fisher2.2bpp" +BlackbeltSprite:: INCBIN "gfx/sprites/blackbelt.2bpp" +GuardSprite:: INCBIN "gfx/sprites/guard.2bpp" +BallSprite:: INCBIN "gfx/sprites/ball.2bpp" +OmanyteSprite:: INCBIN "gfx/sprites/omanyte.2bpp" +BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp" +PaperSheetSprite:: INCBIN "gfx/sprites/paper_sheet.2bpp" +BookMapDexSprite:: INCBIN "gfx/sprites/book_map_dex.2bpp" +ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp" +SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp" +OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp" +LyingOldManSprite:: INCBIN "gfx/sprites/lying_old_man.2bpp" + + +SECTION "NPC Sprites 2", ROMX + +RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp" +RedSprite:: INCBIN "gfx/sprites/red.2bpp" +BlueSprite:: INCBIN "gfx/sprites/blue.2bpp" +OakSprite:: INCBIN "gfx/sprites/oak.2bpp" +BugCatcherSprite:: INCBIN "gfx/sprites/bug_catcher.2bpp" +SlowbroSprite:: INCBIN "gfx/sprites/slowbro.2bpp" +LassSprite:: INCBIN "gfx/sprites/lass.2bpp" +BlackHairBoy1Sprite:: INCBIN "gfx/sprites/black_hair_boy_1.2bpp" +LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp" +BirdSprite:: INCBIN "gfx/sprites/bird.2bpp" +FatBaldGuySprite:: INCBIN "gfx/sprites/fat_bald_guy.2bpp" +GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp" +BlackHairBoy2Sprite:: INCBIN "gfx/sprites/black_hair_boy_2.2bpp" +GirlSprite:: INCBIN "gfx/sprites/girl.2bpp" +HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp" +FoulardWomanSprite:: INCBIN "gfx/sprites/foulard_woman.2bpp" +GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp" +DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp" +BikerSprite:: INCBIN "gfx/sprites/biker.2bpp" +SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp" +CookSprite:: INCBIN "gfx/sprites/cook.2bpp" +BikeShopGuySprite:: INCBIN "gfx/sprites/bike_shop_guy.2bpp" +MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp" +GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" +RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" +MediumSprite:: INCBIN "gfx/sprites/medium.2bpp" +WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" +ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" +MomGeishaSprite:: INCBIN "gfx/sprites/mom_geisha.2bpp" +BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" +LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" +MomSprite:: INCBIN "gfx/sprites/mom.2bpp" +BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp" +YoungBoySprite:: INCBIN "gfx/sprites/young_boy.2bpp" +GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp" +ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp" +AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp" +BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp" +LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp" +SeelSprite:: INCBIN "gfx/sprites/seel.2bpp" diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm new file mode 100644 index 00000000..f64dc20a --- /dev/null +++ b/gfx/tilesets.asm @@ -0,0 +1,63 @@ +SECTION "Tilesets 1", ROMX + +Overworld_GFX:: INCBIN "gfx/tilesets/overworld.2bpp" +Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst" + +RedsHouse1_GFX:: +RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp" +RedsHouse1_Block:: +RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst" + +House_GFX:: INCBIN "gfx/tilesets/house.2bpp" +House_Block:: INCBIN "gfx/blocksets/house.bst" +Mansion_GFX:: INCBIN "gfx/tilesets/mansion.2bpp" +Mansion_Block:: INCBIN "gfx/blocksets/mansion.bst" +ShipPort_GFX:: INCBIN "gfx/tilesets/ship_port.2bpp" +ShipPort_Block:: INCBIN "gfx/blocksets/ship_port.bst" +Interior_GFX:: INCBIN "gfx/tilesets/interior.2bpp" +Interior_Block:: INCBIN "gfx/blocksets/interior.bst" +Plateau_GFX:: INCBIN "gfx/tilesets/plateau.2bpp" +Plateau_Block:: INCBIN "gfx/blocksets/plateau.bst" + + +SECTION "Tilesets 2", ROMX + +Dojo_GFX:: +Gym_GFX:: INCBIN "gfx/tilesets/gym.2bpp" +Dojo_Block:: +Gym_Block:: INCBIN "gfx/blocksets/gym.bst" + +Mart_GFX:: +Pokecenter_GFX:: INCBIN "gfx/tilesets/pokecenter.2bpp" +Mart_Block:: +Pokecenter_Block:: INCBIN "gfx/blocksets/pokecenter.bst" + +ForestGate_GFX:: +Museum_GFX:: +Gate_GFX:: INCBIN "gfx/tilesets/gate.2bpp" +ForestGate_Block:: +Museum_Block:: +Gate_Block:: INCBIN "gfx/blocksets/gate.bst" + +Forest_GFX:: INCBIN "gfx/tilesets/forest.2bpp" +Forest_Block:: INCBIN "gfx/blocksets/forest.bst" +Facility_GFX:: INCBIN "gfx/tilesets/facility.2bpp" +Facility_Block:: INCBIN "gfx/blocksets/facility.bst" + + +SECTION "Tilesets 3", ROMX + +Cemetery_GFX:: INCBIN "gfx/tilesets/cemetery.2bpp" +Cemetery_Block:: INCBIN "gfx/blocksets/cemetery.bst" +Cavern_GFX:: INCBIN "gfx/tilesets/cavern.2bpp" +Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst" +Lobby_GFX:: INCBIN "gfx/tilesets/lobby.2bpp" +Lobby_Block:: INCBIN "gfx/blocksets/lobby.bst" +Ship_GFX:: INCBIN "gfx/tilesets/ship.2bpp" +Ship_Block:: INCBIN "gfx/blocksets/ship.bst" +Lab_GFX:: INCBIN "gfx/tilesets/lab.2bpp" +Lab_Block:: INCBIN "gfx/blocksets/lab.bst" +Club_GFX:: INCBIN "gfx/tilesets/club.2bpp" +Club_Block:: INCBIN "gfx/blocksets/club.bst" +Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp" +Underground_Block:: INCBIN "gfx/blocksets/underground.bst" diff --git a/pics.asm b/pics.asm deleted file mode 100644 index 0e2adc24..00000000 --- a/pics.asm +++ /dev/null @@ -1,376 +0,0 @@ -SECTION "Pics 1", ROMX - -RhydonPicFront:: INCBIN "gfx/pokemon/front/rhydon.pic" -RhydonPicBack:: INCBIN "gfx/pokemon/back/rhydonb.pic" -KangaskhanPicFront:: INCBIN "gfx/pokemon/front/kangaskhan.pic" -KangaskhanPicBack:: INCBIN "gfx/pokemon/back/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "gfx/pokemon/front/nidoranm.pic" -NidoranMPicBack:: INCBIN "gfx/pokemon/back/nidoranmb.pic" -ClefairyPicFront:: INCBIN "gfx/pokemon/front/clefairy.pic" -ClefairyPicBack:: INCBIN "gfx/pokemon/back/clefairyb.pic" -SpearowPicFront:: INCBIN "gfx/pokemon/front/spearow.pic" -SpearowPicBack:: INCBIN "gfx/pokemon/back/spearowb.pic" -VoltorbPicFront:: INCBIN "gfx/pokemon/front/voltorb.pic" -VoltorbPicBack:: INCBIN "gfx/pokemon/back/voltorbb.pic" -NidokingPicFront:: INCBIN "gfx/pokemon/front/nidoking.pic" -NidokingPicBack:: INCBIN "gfx/pokemon/back/nidokingb.pic" -SlowbroPicFront:: INCBIN "gfx/pokemon/front/slowbro.pic" -SlowbroPicBack:: INCBIN "gfx/pokemon/back/slowbrob.pic" -IvysaurPicFront:: INCBIN "gfx/pokemon/front/ivysaur.pic" -IvysaurPicBack:: INCBIN "gfx/pokemon/back/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "gfx/pokemon/front/exeggutor.pic" -ExeggutorPicBack:: INCBIN "gfx/pokemon/back/exeggutorb.pic" -LickitungPicFront:: INCBIN "gfx/pokemon/front/lickitung.pic" -LickitungPicBack:: INCBIN "gfx/pokemon/back/lickitungb.pic" -ExeggcutePicFront:: INCBIN "gfx/pokemon/front/exeggcute.pic" -ExeggcutePicBack:: INCBIN "gfx/pokemon/back/exeggcuteb.pic" -GrimerPicFront:: INCBIN "gfx/pokemon/front/grimer.pic" -GrimerPicBack:: INCBIN "gfx/pokemon/back/grimerb.pic" -GengarPicFront:: INCBIN "gfx/pokemon/front/gengar.pic" -GengarPicBack:: INCBIN "gfx/pokemon/back/gengarb.pic" -NidoranFPicFront:: INCBIN "gfx/pokemon/front/nidoranf.pic" -NidoranFPicBack:: INCBIN "gfx/pokemon/back/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "gfx/pokemon/front/nidoqueen.pic" -NidoqueenPicBack:: INCBIN "gfx/pokemon/back/nidoqueenb.pic" -CubonePicFront:: INCBIN "gfx/pokemon/front/cubone.pic" -CubonePicBack:: INCBIN "gfx/pokemon/back/cuboneb.pic" -RhyhornPicFront:: INCBIN "gfx/pokemon/front/rhyhorn.pic" -RhyhornPicBack:: INCBIN "gfx/pokemon/back/rhyhornb.pic" -LaprasPicFront:: INCBIN "gfx/pokemon/front/lapras.pic" -LaprasPicBack:: INCBIN "gfx/pokemon/back/laprasb.pic" -ArcaninePicFront:: INCBIN "gfx/pokemon/front/arcanine.pic" -ArcaninePicBack:: INCBIN "gfx/pokemon/back/arcanineb.pic" -GyaradosPicFront:: INCBIN "gfx/pokemon/front/gyarados.pic" -GyaradosPicBack:: INCBIN "gfx/pokemon/back/gyaradosb.pic" -ShellderPicFront:: INCBIN "gfx/pokemon/front/shellder.pic" -ShellderPicBack:: INCBIN "gfx/pokemon/back/shellderb.pic" -TentacoolPicFront:: INCBIN "gfx/pokemon/front/tentacool.pic" -TentacoolPicBack:: INCBIN "gfx/pokemon/back/tentacoolb.pic" -GastlyPicFront:: INCBIN "gfx/pokemon/front/gastly.pic" -GastlyPicBack:: INCBIN "gfx/pokemon/back/gastlyb.pic" -ScytherPicFront:: INCBIN "gfx/pokemon/front/scyther.pic" -ScytherPicBack:: INCBIN "gfx/pokemon/back/scytherb.pic" -StaryuPicFront:: INCBIN "gfx/pokemon/front/staryu.pic" -StaryuPicBack:: INCBIN "gfx/pokemon/back/staryub.pic" -BlastoisePicFront:: INCBIN "gfx/pokemon/front/blastoise.pic" -BlastoisePicBack:: INCBIN "gfx/pokemon/back/blastoiseb.pic" -PinsirPicFront:: INCBIN "gfx/pokemon/front/pinsir.pic" -PinsirPicBack:: INCBIN "gfx/pokemon/back/pinsirb.pic" -TangelaPicFront:: INCBIN "gfx/pokemon/front/tangela.pic" -TangelaPicBack:: INCBIN "gfx/pokemon/back/tangelab.pic" - - -SECTION "Pics 2", ROMX - -GrowlithePicFront:: INCBIN "gfx/pokemon/front/growlithe.pic" -GrowlithePicBack:: INCBIN "gfx/pokemon/back/growlitheb.pic" -OnixPicFront:: INCBIN "gfx/pokemon/front/onix.pic" -OnixPicBack:: INCBIN "gfx/pokemon/back/onixb.pic" -FearowPicFront:: INCBIN "gfx/pokemon/front/fearow.pic" -FearowPicBack:: INCBIN "gfx/pokemon/back/fearowb.pic" -PidgeyPicFront:: INCBIN "gfx/pokemon/front/pidgey.pic" -PidgeyPicBack:: INCBIN "gfx/pokemon/back/pidgeyb.pic" -SlowpokePicFront:: INCBIN "gfx/pokemon/front/slowpoke.pic" -SlowpokePicBack:: INCBIN "gfx/pokemon/back/slowpokeb.pic" -KadabraPicFront:: INCBIN "gfx/pokemon/front/kadabra.pic" -KadabraPicBack:: INCBIN "gfx/pokemon/back/kadabrab.pic" -GravelerPicFront:: INCBIN "gfx/pokemon/front/graveler.pic" -GravelerPicBack:: INCBIN "gfx/pokemon/back/gravelerb.pic" -ChanseyPicFront:: INCBIN "gfx/pokemon/front/chansey.pic" -ChanseyPicBack:: INCBIN "gfx/pokemon/back/chanseyb.pic" -MachokePicFront:: INCBIN "gfx/pokemon/front/machoke.pic" -MachokePicBack:: INCBIN "gfx/pokemon/back/machokeb.pic" -MrMimePicFront:: INCBIN "gfx/pokemon/front/mr.mime.pic" -MrMimePicBack:: INCBIN "gfx/pokemon/back/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "gfx/pokemon/front/hitmonlee.pic" -HitmonleePicBack:: INCBIN "gfx/pokemon/back/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "gfx/pokemon/front/hitmonchan.pic" -HitmonchanPicBack:: INCBIN "gfx/pokemon/back/hitmonchanb.pic" -ArbokPicFront:: INCBIN "gfx/pokemon/front/arbok.pic" -ArbokPicBack:: INCBIN "gfx/pokemon/back/arbokb.pic" -ParasectPicFront:: INCBIN "gfx/pokemon/front/parasect.pic" -ParasectPicBack:: INCBIN "gfx/pokemon/back/parasectb.pic" -PsyduckPicFront:: INCBIN "gfx/pokemon/front/psyduck.pic" -PsyduckPicBack:: INCBIN "gfx/pokemon/back/psyduckb.pic" -DrowzeePicFront:: INCBIN "gfx/pokemon/front/drowzee.pic" -DrowzeePicBack:: INCBIN "gfx/pokemon/back/drowzeeb.pic" -GolemPicFront:: INCBIN "gfx/pokemon/front/golem.pic" -GolemPicBack:: INCBIN "gfx/pokemon/back/golemb.pic" -MagmarPicFront:: INCBIN "gfx/pokemon/front/magmar.pic" -MagmarPicBack:: INCBIN "gfx/pokemon/back/magmarb.pic" -ElectabuzzPicFront:: INCBIN "gfx/pokemon/front/electabuzz.pic" -ElectabuzzPicBack:: INCBIN "gfx/pokemon/back/electabuzzb.pic" -MagnetonPicFront:: INCBIN "gfx/pokemon/front/magneton.pic" -MagnetonPicBack:: INCBIN "gfx/pokemon/back/magnetonb.pic" -KoffingPicFront:: INCBIN "gfx/pokemon/front/koffing.pic" -KoffingPicBack:: INCBIN "gfx/pokemon/back/koffingb.pic" -MankeyPicFront:: INCBIN "gfx/pokemon/front/mankey.pic" -MankeyPicBack:: INCBIN "gfx/pokemon/back/mankeyb.pic" -SeelPicFront:: INCBIN "gfx/pokemon/front/seel.pic" -SeelPicBack:: INCBIN "gfx/pokemon/back/seelb.pic" -DiglettPicFront:: INCBIN "gfx/pokemon/front/diglett.pic" -DiglettPicBack:: INCBIN "gfx/pokemon/back/diglettb.pic" -TaurosPicFront:: INCBIN "gfx/pokemon/front/tauros.pic" -TaurosPicBack:: INCBIN "gfx/pokemon/back/taurosb.pic" -FarfetchdPicFront:: INCBIN "gfx/pokemon/front/farfetchd.pic" -FarfetchdPicBack:: INCBIN "gfx/pokemon/back/farfetchdb.pic" -VenonatPicFront:: INCBIN "gfx/pokemon/front/venonat.pic" -VenonatPicBack:: INCBIN "gfx/pokemon/back/venonatb.pic" -DragonitePicFront:: INCBIN "gfx/pokemon/front/dragonite.pic" -DragonitePicBack:: INCBIN "gfx/pokemon/back/dragoniteb.pic" -DoduoPicFront:: INCBIN "gfx/pokemon/front/doduo.pic" -DoduoPicBack:: INCBIN "gfx/pokemon/back/doduob.pic" -PoliwagPicFront:: INCBIN "gfx/pokemon/front/poliwag.pic" -PoliwagPicBack:: INCBIN "gfx/pokemon/back/poliwagb.pic" -JynxPicFront:: INCBIN "gfx/pokemon/front/jynx.pic" -JynxPicBack:: INCBIN "gfx/pokemon/back/jynxb.pic" -MoltresPicFront:: INCBIN "gfx/pokemon/front/moltres.pic" -MoltresPicBack:: INCBIN "gfx/pokemon/back/moltresb.pic" - - -SECTION "Pics 3", ROMX - -ArticunoPicFront:: INCBIN "gfx/pokemon/front/articuno.pic" -ArticunoPicBack:: INCBIN "gfx/pokemon/back/articunob.pic" -ZapdosPicFront:: INCBIN "gfx/pokemon/front/zapdos.pic" -ZapdosPicBack:: INCBIN "gfx/pokemon/back/zapdosb.pic" -DittoPicFront:: INCBIN "gfx/pokemon/front/ditto.pic" -DittoPicBack:: INCBIN "gfx/pokemon/back/dittob.pic" -MeowthPicFront:: INCBIN "gfx/pokemon/front/meowth.pic" -MeowthPicBack:: INCBIN "gfx/pokemon/back/meowthb.pic" -KrabbyPicFront:: INCBIN "gfx/pokemon/front/krabby.pic" -KrabbyPicBack:: INCBIN "gfx/pokemon/back/krabbyb.pic" -VulpixPicFront:: INCBIN "gfx/pokemon/front/vulpix.pic" -VulpixPicBack:: INCBIN "gfx/pokemon/back/vulpixb.pic" -NinetalesPicFront:: INCBIN "gfx/pokemon/front/ninetales.pic" -NinetalesPicBack:: INCBIN "gfx/pokemon/back/ninetalesb.pic" -PikachuPicFront:: INCBIN "gfx/pokemon/front/pikachu.pic" -PikachuPicBack:: INCBIN "gfx/pokemon/back/pikachub.pic" -RaichuPicFront:: INCBIN "gfx/pokemon/front/raichu.pic" -RaichuPicBack:: INCBIN "gfx/pokemon/back/raichub.pic" -DratiniPicFront:: INCBIN "gfx/pokemon/front/dratini.pic" -DratiniPicBack:: INCBIN "gfx/pokemon/back/dratinib.pic" -DragonairPicFront:: INCBIN "gfx/pokemon/front/dragonair.pic" -DragonairPicBack:: INCBIN "gfx/pokemon/back/dragonairb.pic" -KabutoPicFront:: INCBIN "gfx/pokemon/front/kabuto.pic" -KabutoPicBack:: INCBIN "gfx/pokemon/back/kabutob.pic" -KabutopsPicFront:: INCBIN "gfx/pokemon/front/kabutops.pic" -KabutopsPicBack:: INCBIN "gfx/pokemon/back/kabutopsb.pic" -HorseaPicFront:: INCBIN "gfx/pokemon/front/horsea.pic" -HorseaPicBack:: INCBIN "gfx/pokemon/back/horseab.pic" -SeadraPicFront:: INCBIN "gfx/pokemon/front/seadra.pic" -SeadraPicBack:: INCBIN "gfx/pokemon/back/seadrab.pic" -SandshrewPicFront:: INCBIN "gfx/pokemon/front/sandshrew.pic" -SandshrewPicBack:: INCBIN "gfx/pokemon/back/sandshrewb.pic" -SandslashPicFront:: INCBIN "gfx/pokemon/front/sandslash.pic" -SandslashPicBack:: INCBIN "gfx/pokemon/back/sandslashb.pic" -OmanytePicFront:: INCBIN "gfx/pokemon/front/omanyte.pic" -OmanytePicBack:: INCBIN "gfx/pokemon/back/omanyteb.pic" -OmastarPicFront:: INCBIN "gfx/pokemon/front/omastar.pic" -OmastarPicBack:: INCBIN "gfx/pokemon/back/omastarb.pic" -JigglypuffPicFront:: INCBIN "gfx/pokemon/front/jigglypuff.pic" -JigglypuffPicBack:: INCBIN "gfx/pokemon/back/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "gfx/pokemon/front/wigglytuff.pic" -WigglytuffPicBack:: INCBIN "gfx/pokemon/back/wigglytuffb.pic" -EeveePicFront:: INCBIN "gfx/pokemon/front/eevee.pic" -EeveePicBack:: INCBIN "gfx/pokemon/back/eeveeb.pic" -FlareonPicFront:: INCBIN "gfx/pokemon/front/flareon.pic" -FlareonPicBack:: INCBIN "gfx/pokemon/back/flareonb.pic" -JolteonPicFront:: INCBIN "gfx/pokemon/front/jolteon.pic" -JolteonPicBack:: INCBIN "gfx/pokemon/back/jolteonb.pic" -VaporeonPicFront:: INCBIN "gfx/pokemon/front/vaporeon.pic" -VaporeonPicBack:: INCBIN "gfx/pokemon/back/vaporeonb.pic" -MachopPicFront:: INCBIN "gfx/pokemon/front/machop.pic" -MachopPicBack:: INCBIN "gfx/pokemon/back/machopb.pic" -ZubatPicFront:: INCBIN "gfx/pokemon/front/zubat.pic" -ZubatPicBack:: INCBIN "gfx/pokemon/back/zubatb.pic" -EkansPicFront:: INCBIN "gfx/pokemon/front/ekans.pic" -EkansPicBack:: INCBIN "gfx/pokemon/back/ekansb.pic" -ParasPicFront:: INCBIN "gfx/pokemon/front/paras.pic" -ParasPicBack:: INCBIN "gfx/pokemon/back/parasb.pic" -PoliwhirlPicFront:: INCBIN "gfx/pokemon/front/poliwhirl.pic" -PoliwhirlPicBack:: INCBIN "gfx/pokemon/back/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "gfx/pokemon/front/poliwrath.pic" -PoliwrathPicBack:: INCBIN "gfx/pokemon/back/poliwrathb.pic" -WeedlePicFront:: INCBIN "gfx/pokemon/front/weedle.pic" -WeedlePicBack:: INCBIN "gfx/pokemon/back/weedleb.pic" -KakunaPicFront:: INCBIN "gfx/pokemon/front/kakuna.pic" -KakunaPicBack:: INCBIN "gfx/pokemon/back/kakunab.pic" -BeedrillPicFront:: INCBIN "gfx/pokemon/front/beedrill.pic" -BeedrillPicBack:: INCBIN "gfx/pokemon/back/beedrillb.pic" - -FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" - - -SECTION "Pics 4", ROMX - -DodrioPicFront:: INCBIN "gfx/pokemon/front/dodrio.pic" -DodrioPicBack:: INCBIN "gfx/pokemon/back/dodriob.pic" -PrimeapePicFront:: INCBIN "gfx/pokemon/front/primeape.pic" -PrimeapePicBack:: INCBIN "gfx/pokemon/back/primeapeb.pic" -DugtrioPicFront:: INCBIN "gfx/pokemon/front/dugtrio.pic" -DugtrioPicBack:: INCBIN "gfx/pokemon/back/dugtriob.pic" -VenomothPicFront:: INCBIN "gfx/pokemon/front/venomoth.pic" -VenomothPicBack:: INCBIN "gfx/pokemon/back/venomothb.pic" -DewgongPicFront:: INCBIN "gfx/pokemon/front/dewgong.pic" -DewgongPicBack:: INCBIN "gfx/pokemon/back/dewgongb.pic" -CaterpiePicFront:: INCBIN "gfx/pokemon/front/caterpie.pic" -CaterpiePicBack:: INCBIN "gfx/pokemon/back/caterpieb.pic" -MetapodPicFront:: INCBIN "gfx/pokemon/front/metapod.pic" -MetapodPicBack:: INCBIN "gfx/pokemon/back/metapodb.pic" -ButterfreePicFront:: INCBIN "gfx/pokemon/front/butterfree.pic" -ButterfreePicBack:: INCBIN "gfx/pokemon/back/butterfreeb.pic" -MachampPicFront:: INCBIN "gfx/pokemon/front/machamp.pic" -MachampPicBack:: INCBIN "gfx/pokemon/back/machampb.pic" -GolduckPicFront:: INCBIN "gfx/pokemon/front/golduck.pic" -GolduckPicBack:: INCBIN "gfx/pokemon/back/golduckb.pic" -HypnoPicFront:: INCBIN "gfx/pokemon/front/hypno.pic" -HypnoPicBack:: INCBIN "gfx/pokemon/back/hypnob.pic" -GolbatPicFront:: INCBIN "gfx/pokemon/front/golbat.pic" -GolbatPicBack:: INCBIN "gfx/pokemon/back/golbatb.pic" -MewtwoPicFront:: INCBIN "gfx/pokemon/front/mewtwo.pic" -MewtwoPicBack:: INCBIN "gfx/pokemon/back/mewtwob.pic" -SnorlaxPicFront:: INCBIN "gfx/pokemon/front/snorlax.pic" -SnorlaxPicBack:: INCBIN "gfx/pokemon/back/snorlaxb.pic" -MagikarpPicFront:: INCBIN "gfx/pokemon/front/magikarp.pic" -MagikarpPicBack:: INCBIN "gfx/pokemon/back/magikarpb.pic" -MukPicFront:: INCBIN "gfx/pokemon/front/muk.pic" -MukPicBack:: INCBIN "gfx/pokemon/back/mukb.pic" -KinglerPicFront:: INCBIN "gfx/pokemon/front/kingler.pic" -KinglerPicBack:: INCBIN "gfx/pokemon/back/kinglerb.pic" -CloysterPicFront:: INCBIN "gfx/pokemon/front/cloyster.pic" -CloysterPicBack:: INCBIN "gfx/pokemon/back/cloysterb.pic" -ElectrodePicFront:: INCBIN "gfx/pokemon/front/electrode.pic" -ElectrodePicBack:: INCBIN "gfx/pokemon/back/electrodeb.pic" -ClefablePicFront:: INCBIN "gfx/pokemon/front/clefable.pic" -ClefablePicBack:: INCBIN "gfx/pokemon/back/clefableb.pic" -WeezingPicFront:: INCBIN "gfx/pokemon/front/weezing.pic" -WeezingPicBack:: INCBIN "gfx/pokemon/back/weezingb.pic" -PersianPicFront:: INCBIN "gfx/pokemon/front/persian.pic" -PersianPicBack:: INCBIN "gfx/pokemon/back/persianb.pic" -MarowakPicFront:: INCBIN "gfx/pokemon/front/marowak.pic" -MarowakPicBack:: INCBIN "gfx/pokemon/back/marowakb.pic" -HaunterPicFront:: INCBIN "gfx/pokemon/front/haunter.pic" -HaunterPicBack:: INCBIN "gfx/pokemon/back/haunterb.pic" -AbraPicFront:: INCBIN "gfx/pokemon/front/abra.pic" -AbraPicBack:: INCBIN "gfx/pokemon/back/abrab.pic" -AlakazamPicFront:: INCBIN "gfx/pokemon/front/alakazam.pic" -AlakazamPicBack:: INCBIN "gfx/pokemon/back/alakazamb.pic" -PidgeottoPicFront:: INCBIN "gfx/pokemon/front/pidgeotto.pic" -PidgeottoPicBack:: INCBIN "gfx/pokemon/back/pidgeottob.pic" -PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" -PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" -StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" -StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" - -RedPicBack:: INCBIN "gfx/player/redb.pic" -OldManPic:: INCBIN "gfx/battle/oldman.pic" - - -SECTION "Pics 5", ROMX - -BulbasaurPicFront:: INCBIN "gfx/pokemon/front/bulbasaur.pic" -BulbasaurPicBack:: INCBIN "gfx/pokemon/back/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "gfx/pokemon/front/venusaur.pic" -VenusaurPicBack:: INCBIN "gfx/pokemon/back/venusaurb.pic" -TentacruelPicFront:: INCBIN "gfx/pokemon/front/tentacruel.pic" -TentacruelPicBack:: INCBIN "gfx/pokemon/back/tentacruelb.pic" -GoldeenPicFront:: INCBIN "gfx/pokemon/front/goldeen.pic" -GoldeenPicBack:: INCBIN "gfx/pokemon/back/goldeenb.pic" -SeakingPicFront:: INCBIN "gfx/pokemon/front/seaking.pic" -SeakingPicBack:: INCBIN "gfx/pokemon/back/seakingb.pic" -PonytaPicFront:: INCBIN "gfx/pokemon/front/ponyta.pic" -RapidashPicFront:: INCBIN "gfx/pokemon/front/rapidash.pic" -PonytaPicBack:: INCBIN "gfx/pokemon/back/ponytab.pic" -RapidashPicBack:: INCBIN "gfx/pokemon/back/rapidashb.pic" -RattataPicFront:: INCBIN "gfx/pokemon/front/rattata.pic" -RattataPicBack:: INCBIN "gfx/pokemon/back/rattatab.pic" -RaticatePicFront:: INCBIN "gfx/pokemon/front/raticate.pic" -RaticatePicBack:: INCBIN "gfx/pokemon/back/raticateb.pic" -NidorinoPicFront:: INCBIN "gfx/pokemon/front/nidorino.pic" -NidorinoPicBack:: INCBIN "gfx/pokemon/back/nidorinob.pic" -NidorinaPicFront:: INCBIN "gfx/pokemon/front/nidorina.pic" -NidorinaPicBack:: INCBIN "gfx/pokemon/back/nidorinab.pic" -GeodudePicFront:: INCBIN "gfx/pokemon/front/geodude.pic" -GeodudePicBack:: INCBIN "gfx/pokemon/back/geodudeb.pic" -PorygonPicFront:: INCBIN "gfx/pokemon/front/porygon.pic" -PorygonPicBack:: INCBIN "gfx/pokemon/back/porygonb.pic" -AerodactylPicFront:: INCBIN "gfx/pokemon/front/aerodactyl.pic" -AerodactylPicBack:: INCBIN "gfx/pokemon/back/aerodactylb.pic" -MagnemitePicFront:: INCBIN "gfx/pokemon/front/magnemite.pic" -MagnemitePicBack:: INCBIN "gfx/pokemon/back/magnemiteb.pic" -CharmanderPicFront:: INCBIN "gfx/pokemon/front/charmander.pic" -CharmanderPicBack:: INCBIN "gfx/pokemon/back/charmanderb.pic" -SquirtlePicFront:: INCBIN "gfx/pokemon/front/squirtle.pic" -SquirtlePicBack:: INCBIN "gfx/pokemon/back/squirtleb.pic" -CharmeleonPicFront:: INCBIN "gfx/pokemon/front/charmeleon.pic" -CharmeleonPicBack:: INCBIN "gfx/pokemon/back/charmeleonb.pic" -WartortlePicFront:: INCBIN "gfx/pokemon/front/wartortle.pic" -WartortlePicBack:: INCBIN "gfx/pokemon/back/wartortleb.pic" -CharizardPicFront:: INCBIN "gfx/pokemon/front/charizard.pic" -CharizardPicBack:: INCBIN "gfx/pokemon/back/charizardb.pic" -FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" -GhostPic:: INCBIN "gfx/battle/ghost.pic" -OddishPicFront:: INCBIN "gfx/pokemon/front/oddish.pic" -OddishPicBack:: INCBIN "gfx/pokemon/back/oddishb.pic" -GloomPicFront:: INCBIN "gfx/pokemon/front/gloom.pic" -GloomPicBack:: INCBIN "gfx/pokemon/back/gloomb.pic" -VileplumePicFront:: INCBIN "gfx/pokemon/front/vileplume.pic" -VileplumePicBack:: INCBIN "gfx/pokemon/back/vileplumeb.pic" -BellsproutPicFront:: INCBIN "gfx/pokemon/front/bellsprout.pic" -BellsproutPicBack:: INCBIN "gfx/pokemon/back/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" -WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" -VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" -VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" - - -SECTION "Pics 6", ROMX - -TrainerPics:: -YoungsterPic:: INCBIN "gfx/trainers/youngster.pic" -BugCatcherPic:: INCBIN "gfx/trainers/bugcatcher.pic" -LassPic:: INCBIN "gfx/trainers/lass.pic" -SailorPic:: INCBIN "gfx/trainers/sailor.pic" -JrTrainerMPic:: INCBIN "gfx/trainers/jr.trainerm.pic" -JrTrainerFPic:: INCBIN "gfx/trainers/jr.trainerf.pic" -PokemaniacPic:: INCBIN "gfx/trainers/pokemaniac.pic" -SuperNerdPic:: INCBIN "gfx/trainers/supernerd.pic" -HikerPic:: INCBIN "gfx/trainers/hiker.pic" -BikerPic:: INCBIN "gfx/trainers/biker.pic" -BurglarPic:: INCBIN "gfx/trainers/burglar.pic" -EngineerPic:: INCBIN "gfx/trainers/engineer.pic" -FisherPic:: INCBIN "gfx/trainers/fisher.pic" -SwimmerPic:: INCBIN "gfx/trainers/swimmer.pic" -CueBallPic:: INCBIN "gfx/trainers/cueball.pic" -GamblerPic:: INCBIN "gfx/trainers/gambler.pic" -BeautyPic:: INCBIN "gfx/trainers/beauty.pic" -PsychicPic:: INCBIN "gfx/trainers/psychic.pic" -RockerPic:: INCBIN "gfx/trainers/rocker.pic" -JugglerPic:: INCBIN "gfx/trainers/juggler.pic" -TamerPic:: INCBIN "gfx/trainers/tamer.pic" -BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic" -BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic" -Rival1Pic:: INCBIN "gfx/trainers/rival1.pic" -ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" -ChiefPic:: -ScientistPic:: INCBIN "gfx/trainers/scientist.pic" -GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic" -RocketPic:: INCBIN "gfx/trainers/rocket.pic" -CooltrainerMPic:: INCBIN "gfx/trainers/cooltrainerm.pic" -CooltrainerFPic:: INCBIN "gfx/trainers/cooltrainerf.pic" -BrunoPic:: INCBIN "gfx/trainers/bruno.pic" -BrockPic:: INCBIN "gfx/trainers/brock.pic" -MistyPic:: INCBIN "gfx/trainers/misty.pic" -LtSurgePic:: INCBIN "gfx/trainers/lt.surge.pic" -ErikaPic:: INCBIN "gfx/trainers/erika.pic" -KogaPic:: INCBIN "gfx/trainers/koga.pic" -BlainePic:: INCBIN "gfx/trainers/blaine.pic" -SabrinaPic:: INCBIN "gfx/trainers/sabrina.pic" -GentlemanPic:: INCBIN "gfx/trainers/gentleman.pic" -Rival2Pic:: INCBIN "gfx/trainers/rival2.pic" -Rival3Pic:: INCBIN "gfx/trainers/rival3.pic" -LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic" -ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" -AgathaPic:: INCBIN "gfx/trainers/agatha.pic" -LancePic:: INCBIN "gfx/trainers/lance.pic" diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index e7e216d9..c8d8b509 100755 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -74,7 +74,7 @@ CeladonMart3Text5: TX_FAR _CeladonMart3Text5 db "@" -CeladonMart3Text12 +CeladonMart3Text12: CeladonMart3Text10: CeladonMart3Text8: CeladonMart3Text6: diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index a570ab18..9017bec3 100755 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -7,7 +7,7 @@ CeruleanCaveB1F_Script: ld [wCeruleanCaveB1FCurScript], a ret -CeruleanCaveB1F_ScriptPointers +CeruleanCaveB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm index 35b4893f..f720b6f8 100755 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm @@ -7,7 +7,7 @@ PowerPlant_Script: ld [wPowerPlantCurScript], a ret -PowerPlant_ScriptPointers +PowerPlant_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle diff --git a/sprites.asm b/sprites.asm deleted file mode 100644 index 4548bbe3..00000000 --- a/sprites.asm +++ /dev/null @@ -1,73 +0,0 @@ -SECTION "NPC Sprites 1", ROMX - -OakAideSprite:: INCBIN "gfx/sprites/oak_aide.2bpp" -RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp" -SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp" -WhitePlayerSprite:: INCBIN "gfx/sprites/white_player.2bpp" -GymHelperSprite:: INCBIN "gfx/sprites/gym_helper.2bpp" -OldPersonSprite:: INCBIN "gfx/sprites/old_person.2bpp" -MartGuySprite:: INCBIN "gfx/sprites/mart_guy.2bpp" -FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" -OldMediumWomanSprite:: INCBIN "gfx/sprites/old_medium_woman.2bpp" -NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" -CableClubWomanSprite:: INCBIN "gfx/sprites/cable_club_woman.2bpp" -MrMasterballSprite:: INCBIN "gfx/sprites/mr_masterball.2bpp" -LaprasGiverSprite:: INCBIN "gfx/sprites/lapras_giver.2bpp" -WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" -SsCaptainSprite:: INCBIN "gfx/sprites/ss_captain.2bpp" -Fisher2Sprite:: INCBIN "gfx/sprites/fisher2.2bpp" -BlackbeltSprite:: INCBIN "gfx/sprites/blackbelt.2bpp" -GuardSprite:: INCBIN "gfx/sprites/guard.2bpp" -BallSprite:: INCBIN "gfx/sprites/ball.2bpp" -OmanyteSprite:: INCBIN "gfx/sprites/omanyte.2bpp" -BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp" -PaperSheetSprite:: INCBIN "gfx/sprites/paper_sheet.2bpp" -BookMapDexSprite:: INCBIN "gfx/sprites/book_map_dex.2bpp" -ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp" -SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp" -OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp" -LyingOldManSprite:: INCBIN "gfx/sprites/lying_old_man.2bpp" - - -SECTION "NPC Sprites 2", ROMX - -RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp" -RedSprite:: INCBIN "gfx/sprites/red.2bpp" -BlueSprite:: INCBIN "gfx/sprites/blue.2bpp" -OakSprite:: INCBIN "gfx/sprites/oak.2bpp" -BugCatcherSprite:: INCBIN "gfx/sprites/bug_catcher.2bpp" -SlowbroSprite:: INCBIN "gfx/sprites/slowbro.2bpp" -LassSprite:: INCBIN "gfx/sprites/lass.2bpp" -BlackHairBoy1Sprite:: INCBIN "gfx/sprites/black_hair_boy_1.2bpp" -LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp" -BirdSprite:: INCBIN "gfx/sprites/bird.2bpp" -FatBaldGuySprite:: INCBIN "gfx/sprites/fat_bald_guy.2bpp" -GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp" -BlackHairBoy2Sprite:: INCBIN "gfx/sprites/black_hair_boy_2.2bpp" -GirlSprite:: INCBIN "gfx/sprites/girl.2bpp" -HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp" -FoulardWomanSprite:: INCBIN "gfx/sprites/foulard_woman.2bpp" -GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp" -DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp" -BikerSprite:: INCBIN "gfx/sprites/biker.2bpp" -SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp" -CookSprite:: INCBIN "gfx/sprites/cook.2bpp" -BikeShopGuySprite:: INCBIN "gfx/sprites/bike_shop_guy.2bpp" -MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp" -GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" -RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" -MediumSprite:: INCBIN "gfx/sprites/medium.2bpp" -WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" -ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" -MomGeishaSprite:: INCBIN "gfx/sprites/mom_geisha.2bpp" -BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" -LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" -MomSprite:: INCBIN "gfx/sprites/mom.2bpp" -BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp" -YoungBoySprite:: INCBIN "gfx/sprites/young_boy.2bpp" -GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp" -ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp" -AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp" -BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp" -LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp" -SeelSprite:: INCBIN "gfx/sprites/seel.2bpp" diff --git a/tilesets.asm b/tilesets.asm deleted file mode 100644 index f64dc20a..00000000 --- a/tilesets.asm +++ /dev/null @@ -1,63 +0,0 @@ -SECTION "Tilesets 1", ROMX - -Overworld_GFX:: INCBIN "gfx/tilesets/overworld.2bpp" -Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst" - -RedsHouse1_GFX:: -RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp" -RedsHouse1_Block:: -RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst" - -House_GFX:: INCBIN "gfx/tilesets/house.2bpp" -House_Block:: INCBIN "gfx/blocksets/house.bst" -Mansion_GFX:: INCBIN "gfx/tilesets/mansion.2bpp" -Mansion_Block:: INCBIN "gfx/blocksets/mansion.bst" -ShipPort_GFX:: INCBIN "gfx/tilesets/ship_port.2bpp" -ShipPort_Block:: INCBIN "gfx/blocksets/ship_port.bst" -Interior_GFX:: INCBIN "gfx/tilesets/interior.2bpp" -Interior_Block:: INCBIN "gfx/blocksets/interior.bst" -Plateau_GFX:: INCBIN "gfx/tilesets/plateau.2bpp" -Plateau_Block:: INCBIN "gfx/blocksets/plateau.bst" - - -SECTION "Tilesets 2", ROMX - -Dojo_GFX:: -Gym_GFX:: INCBIN "gfx/tilesets/gym.2bpp" -Dojo_Block:: -Gym_Block:: INCBIN "gfx/blocksets/gym.bst" - -Mart_GFX:: -Pokecenter_GFX:: INCBIN "gfx/tilesets/pokecenter.2bpp" -Mart_Block:: -Pokecenter_Block:: INCBIN "gfx/blocksets/pokecenter.bst" - -ForestGate_GFX:: -Museum_GFX:: -Gate_GFX:: INCBIN "gfx/tilesets/gate.2bpp" -ForestGate_Block:: -Museum_Block:: -Gate_Block:: INCBIN "gfx/blocksets/gate.bst" - -Forest_GFX:: INCBIN "gfx/tilesets/forest.2bpp" -Forest_Block:: INCBIN "gfx/blocksets/forest.bst" -Facility_GFX:: INCBIN "gfx/tilesets/facility.2bpp" -Facility_Block:: INCBIN "gfx/blocksets/facility.bst" - - -SECTION "Tilesets 3", ROMX - -Cemetery_GFX:: INCBIN "gfx/tilesets/cemetery.2bpp" -Cemetery_Block:: INCBIN "gfx/blocksets/cemetery.bst" -Cavern_GFX:: INCBIN "gfx/tilesets/cavern.2bpp" -Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst" -Lobby_GFX:: INCBIN "gfx/tilesets/lobby.2bpp" -Lobby_Block:: INCBIN "gfx/blocksets/lobby.bst" -Ship_GFX:: INCBIN "gfx/tilesets/ship.2bpp" -Ship_Block:: INCBIN "gfx/blocksets/ship.bst" -Lab_GFX:: INCBIN "gfx/tilesets/lab.2bpp" -Lab_Block:: INCBIN "gfx/blocksets/lab.bst" -Club_GFX:: INCBIN "gfx/tilesets/club.2bpp" -Club_Block:: INCBIN "gfx/blocksets/club.bst" -Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp" -Underground_Block:: INCBIN "gfx/blocksets/underground.bst" -- cgit v1.2.3