summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile6
-rw-r--r--engine/title.asm4
-rw-r--r--gfx.asm520
-rw-r--r--gfx/pokemon/annon_pics.asm104
-rw-r--r--gfx/pokemon/egg.asm2
-rw-r--r--gfx/pokemon/pkmn_pics.asm1000
-rw-r--r--tools/Makefile3
-rw-r--r--tools/make_shim.c179
-rw-r--r--tools/make_shim.py38
-rw-r--r--tools/scan_includes.py6
11 files changed, 843 insertions, 1020 deletions
diff --git a/.gitignore b/.gitignore
index 0df1fa6..5b46e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ shim.asm
# build utilities
tools/scan_includes
tools/pkmncompress
-tools/make_shim
tools/gfx
*.exe
*.pyc
diff --git a/Makefile b/Makefile
index 4f05f0a..8888cb5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ RGBFIX := rgbfix
sort_sym := tools/sort_symfile.sh
#sort_sym := $(PYTHON3) tools/sort_sym.py
-RGBASMFLAGS := -h -E -DGOLD -DDEBUG=1
+RGBASMFLAGS := -h -E -i build/ -DGOLD -DDEBUG=1
tools/gfx :=
ROM := pokegold-spaceworld.gb
@@ -83,8 +83,8 @@ $(BASEROM):
@echo "Please obtain a copy of Gold_debug.sgb and put it in this directory as $@"
@exit 1
-$(BUILD)/shim.asm: tools/make_shim $(SHIM) | $$(dir $$@)
- tools/make_shim -w $(filter-out $<, $^) > $@
+$(BUILD)/shim.asm: tools/make_shim.py $(SHIM) | $$(dir $$@)
+ $(PYTHON3) tools/make_shim.py -w $(filter-out $<, $^) > $@
$(BUILD)/gfx.o: | $(GFX)
$(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@)
diff --git a/engine/title.asm b/engine/title.asm
index ad33d08..7f9d707 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -168,8 +168,8 @@ FirePositionTable::
dw $7CB0
dw $8800
-TitleFireGFX:: INCBIN "build/gfx/title/fire.2bpp" ; 5EB8-5F37
-TitleNotesGFX:: INCBIN "build/gfx/title/notes.2bpp" ; 5F38=5FB7
+TitleFireGFX:: INCBIN "gfx/title/fire.2bpp" ; 5EB8-5F37
+TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp" ; 5F38=5FB7
TitleScreenMain::
ld a, [wJumptableIndex]
diff --git a/gfx.asm b/gfx.asm
index 68bc539..33c37b9 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -2,26 +2,26 @@ INCLUDE "constants.asm"
SECTION "Mon Nest Icon", ROMX[$4A0F], BANK[$02]
PokedexNestIconGFX::
-INCBIN "build/gfx/pokegear/dexmap_nest_icon.1bpp"
+INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp"
SECTION "Bank 2 Misc GFX", ROMX[$44bf], BANK[$02]
-INCBIN "build/gfx/overworld/gfx_84bf.2bpp"
+INCBIN "gfx/overworld/gfx_84bf.2bpp"
JumpShadowGFX::
-INCBIN "build/gfx/overworld/shadow.2bpp"
+INCBIN "gfx/overworld/shadow.2bpp"
ShockEmoteGFX::
-INCBIN "build/gfx/overworld/shock.2bpp"
+INCBIN "gfx/overworld/shock.2bpp"
QuestionEmoteGFX::
-INCBIN "build/gfx/overworld/question.2bpp"
+INCBIN "gfx/overworld/question.2bpp"
HappyEmoteGFX::
-INCBIN "build/gfx/overworld/happy.2bpp"
+INCBIN "gfx/overworld/happy.2bpp"
SECTION "Pokegear GFX", ROMX[$4F32], BANK[$02]
PokegearGFX::
-INCBIN "build/gfx/pokegear/pokegear.2bpp"
+INCBIN "gfx/pokegear/pokegear.2bpp"
SECTION "Title Screen BG Decoration Border", ROMX[$51FB], BANK[$02]
TitleBGDecorationBorder::
-INCBIN "build/gfx/title/titlebgdecoration.2bpp"
+INCBIN "gfx/title/titlebgdecoration.2bpp"
SECTION "Super Palettes", ROMX[$5B4C], BANK[$02]
INCLUDE "data/pokemon/palettes.inc"
@@ -29,41 +29,41 @@ INCLUDE "data/super_palettes.inc"
SECTION "Unused SGB Border GFX", ROMX[$62CC], BANK[$02]
UnusedSGBBorderGFX::
-INCBIN "build/gfx/sgb/sgb_border_alt.2bpp"
+INCBIN "gfx/sgb/sgb_border_alt.2bpp"
SECTION "SGB Border GFX", ROMX[$6B1C], BANK[$02]
SGBBorderGFX::
if def(GOLD)
-INCBIN "build/gfx/sgb/sgb_border_gold.2bpp"
+INCBIN "gfx/sgb/sgb_border_gold.2bpp"
else
-INCBIN "build/gfx/sgb/sgb_border_silver.2bpp"
+INCBIN "gfx/sgb/sgb_border_silver.2bpp"
endc
SECTION "Title Screen GFX", ROMX[$47CF], BANK[$04]
if def(GOLD)
-TitleScreenGFX:: INCBIN "build/gfx/title/title.2bpp"
-TitleScreenVersionGFX:: INCBIN "build/gfx/title/title_gold_version.2bpp"
-TitleScreenHoOhGFX:: INCBIN "build/gfx/title/title_hooh.2bpp"
-TitleScreenLogoGFX:: INCBIN "build/gfx/title/title_logo.2bpp"
-TitleScreenGoldLogoGFX:: INCBIN "build/gfx/title/title_goldlogo.2bpp"
+TitleScreenGFX:: INCBIN "gfx/title/title.2bpp"
+TitleScreenVersionGFX:: INCBIN "gfx/title/title_gold_version.2bpp"
+TitleScreenHoOhGFX:: INCBIN "gfx/title/title_hooh.2bpp"
+TitleScreenLogoGFX:: INCBIN "gfx/title/title_logo.2bpp"
+TitleScreenGoldLogoGFX:: INCBIN "gfx/title/title_goldlogo.2bpp"
else
-TitleScreenGFX:: INCBIN "build/gfx/title/title.2bpp"
-TitleScreenVersionGFX:: INCBIN "build/gfx/title/title_silver_version.2bpp"
-TitleScreenHoOhGFX:: INCBIN "build/gfx/title/title_hooh.2bpp"
-TitleScreenLogoGFX:: INCBIN "build/gfx/title/title_logo.2bpp"
-TitleScreenGoldLogoGFX:: INCBIN "build/gfx/title/title_silverlogo.2bpp"
+TitleScreenGFX:: INCBIN "gfx/title/title.2bpp"
+TitleScreenVersionGFX:: INCBIN "gfx/title/title_silver_version.2bpp"
+TitleScreenHoOhGFX:: INCBIN "gfx/title/title_hooh.2bpp"
+TitleScreenLogoGFX:: INCBIN "gfx/title/title_logo.2bpp"
+TitleScreenGoldLogoGFX:: INCBIN "gfx/title/title_silverlogo.2bpp"
endc
SECTION "Mail Icon GFX", ROMX[$5BB1], BANK[$04]
MailIconGFX::
-INCBIN "build/gfx/icons/mail.2bpp"
+INCBIN "gfx/icons/mail.2bpp"
SECTION "Trainer Card GFX", ROMX[$7171], BANK[$04]
-TrainerCardGFX:: INCBIN "build/gfx/trainer_card/trainer_card.2bpp" ; 0x013171--0x013381
-TrainerCardColonGFX:: INCBIN "build/gfx/trainer_card/colon.2bpp" ; 0x013381--0x013391
-TrainerCardIDNoGFX:: INCBIN "build/gfx/trainer_card/id_no.2bpp" ; 0x013391--0x0133B1
+TrainerCardGFX:: INCBIN "gfx/trainer_card/trainer_card.2bpp" ; 0x013171--0x013381
+TrainerCardColonGFX:: INCBIN "gfx/trainer_card/colon.2bpp" ; 0x013381--0x013391
+TrainerCardIDNoGFX:: INCBIN "gfx/trainer_card/id_no.2bpp" ; 0x013391--0x0133B1
TrainerCardIDNoGFXEnd::
-TrainerCardLeadersGFX:: INCBIN "build/gfx/trainer_card/leaders.2bpp" ; 0x0133B1--0x133BA1
+TrainerCardLeadersGFX:: INCBIN "gfx/trainer_card/leaders.2bpp" ; 0x0133B1--0x133BA1
if DEBUG || def(GOLD)
db $18, $00 ; leftover of previous graphics
else
@@ -72,161 +72,161 @@ endc
if DEBUG
; Not sure how to parse this from the non-debug ROM, so I'll leave this be for now
-Unreferenced_UnusedLeaderNameGFX:: INCBIN "build/gfx/trainer_card/unused_leader_name.2bpp" ; 0x13ba3
+Unreferenced_UnusedLeaderNameGFX:: INCBIN "gfx/trainer_card/unused_leader_name.2bpp" ; 0x13ba3
endc
SECTION "Bank 6 Tilesets 00", ROMX[$4000], BANK[$06]
Tileset_00_GFX:
-INCBIN "build/gfx/tilesets/tileset_00.2bpp"
+INCBIN "gfx/tilesets/tileset_00.2bpp"
SECTION "Bank 6 Tilesets 01", ROMX[$5800], BANK[$06]
Tileset_01_GFX:
-INCBIN "build/gfx/tilesets/tileset_01.2bpp"
+INCBIN "gfx/tilesets/tileset_01.2bpp"
SECTION "Bank 6 Tilesets 02", ROMX[$6600], BANK[$06]
Tileset_02_GFX:
-INCBIN "build/gfx/tilesets/tileset_02.2bpp"
+INCBIN "gfx/tilesets/tileset_02.2bpp"
SECTION "Bank 6 Tilesets 09", ROMX[$7400], BANK[$06]
Tileset_09_GFX:
-INCBIN "build/gfx/tilesets/tileset_09.2bpp"
+INCBIN "gfx/tilesets/tileset_09.2bpp"
SECTION "Bank 7 Tilesets 13", ROMX[$4000], BANK[$07]
Tileset_13_GFX:
-INCBIN "build/gfx/tilesets/tileset_13.2bpp"
+INCBIN "gfx/tilesets/tileset_13.2bpp"
SECTION "Bank 7 Tilesets 0e", ROMX[$4B00], BANK[$07]
Tileset_0e_GFX:
-INCBIN "build/gfx/tilesets/tileset_0e.2bpp"
+INCBIN "gfx/tilesets/tileset_0e.2bpp"
SECTION "Bank 7 Tilesets 06", ROMX[$5600], BANK[$07]
Tileset_06_GFX:
-INCBIN "build/gfx/tilesets/tileset_06.2bpp"
+INCBIN "gfx/tilesets/tileset_06.2bpp"
SECTION "Bank 7 Tilesets 05", ROMX[$6400], BANK[$07]
Tileset_05_GFX:
-INCBIN "build/gfx/tilesets/tileset_05.2bpp"
+INCBIN "gfx/tilesets/tileset_05.2bpp"
SECTION "Bank 7 Tilesets 03", ROMX[$7200], BANK[$07]
Tileset_03_GFX:
-INCBIN "build/gfx/tilesets/tileset_03.2bpp"
+INCBIN "gfx/tilesets/tileset_03.2bpp"
SECTION "Bank 8 Tilesets 04", ROMX[$4000], BANK[$08]
Tileset_04_GFX:
-INCBIN "build/gfx/tilesets/tileset_04.2bpp"
+INCBIN "gfx/tilesets/tileset_04.2bpp"
SECTION "Bank 8 Tilesets 07", ROMX[$4E00], BANK[$08]
Tileset_07_GFX:
-INCBIN "build/gfx/tilesets/tileset_07.2bpp"
+INCBIN "gfx/tilesets/tileset_07.2bpp"
SECTION "Bank 8 Tilesets 08", ROMX[$5C00], BANK[$08]
Tileset_08_GFX:
-INCBIN "build/gfx/tilesets/tileset_08.2bpp"
+INCBIN "gfx/tilesets/tileset_08.2bpp"
SECTION "Bank 8 Tilesets 0f", ROMX[$6A00], BANK[$08]
Tileset_0f_GFX:
-INCBIN "build/gfx/tilesets/tileset_0f.2bpp"
+INCBIN "gfx/tilesets/tileset_0f.2bpp"
SECTION "Bank 8 Tilesets 11", ROMX[$7500], BANK[$08]
Tileset_11_GFX:
-INCBIN "build/gfx/tilesets/tileset_11.2bpp"
+INCBIN "gfx/tilesets/tileset_11.2bpp"
SECTION "Gameboy GFX", ROMX[$5641], BANK[$0A]
TradeGameBoyGFX::
-INCBIN "build/gfx/trade/gameboy.2bpp"
+INCBIN "gfx/trade/gameboy.2bpp"
SECTION "Bank C Tilesets 12", ROMX[$4000], BANK[$0C]
Tileset_12_GFX:
-INCBIN "build/gfx/tilesets/tileset_12.2bpp"
+INCBIN "gfx/tilesets/tileset_12.2bpp"
SECTION "Bank C Tilesets 0b", ROMX[$4B00], BANK[$0C]
Tileset_0b_GFX:
-INCBIN "build/gfx/tilesets/tileset_0b.2bpp"
+INCBIN "gfx/tilesets/tileset_0b.2bpp"
SECTION "Bank C Tilesets 0d", ROMX[$5600], BANK[$0C]
Tileset_0d_GFX:
-INCBIN "build/gfx/tilesets/tileset_0d.2bpp"
+INCBIN "gfx/tilesets/tileset_0d.2bpp"
SECTION "Bank C Tilesets 14", ROMX[$6100], BANK[$0C]
Tileset_14_GFX:
-INCBIN "build/gfx/tilesets/tileset_14.2bpp"
+INCBIN "gfx/tilesets/tileset_14.2bpp"
SECTION "Bank C Tilesets 0c", ROMX[$7100], BANK[$0C]
Tileset_0c_GFX:
-INCBIN "build/gfx/tilesets/tileset_0c.2bpp"
+INCBIN "gfx/tilesets/tileset_0c.2bpp"
SECTION "PokeBalls GFX", ROMX[$4494], BANK[$0E]
-PokeBallsGFX:: INCBIN "build/gfx/misc/poke_balls.2bpp" ; 0x038494--0x0384d4
+PokeBallsGFX:: INCBIN "gfx/misc/poke_balls.2bpp" ; 0x038494--0x0384d4
SECTION "Pokedex GFX", ROMX[$40D5], BANK[$11]
PokedexButtonsGFX::
-INCBIN "build/gfx/pokedex/buttons.2bpp"
+INCBIN "gfx/pokedex/buttons.2bpp"
PokedexPokeBallGFX::
-INCBIN "build/gfx/pokedex/poke_ball.2bpp"
+INCBIN "gfx/pokedex/poke_ball.2bpp"
PokedexCursorsGFX::
-INCBIN "build/gfx/pokedex/cursors.2bpp"
+INCBIN "gfx/pokedex/cursors.2bpp"
PokedexSearchGFX::
-INCBIN "build/gfx/pokedex/search.2bpp"
+INCBIN "gfx/pokedex/search.2bpp"
SECTION "Trainer Battle Sprites", ROMX[$4000], BANK[$12]
-HayatoPic:: INCBIN "build/gfx/trainer/hayato.pic"
-AkanePic:: INCBIN "build/gfx/trainer/akane.pic" ; Gen 1 Bug Catcher
-TsukushiPic:: INCBIN "build/gfx/trainer/tsukushi.pic"
-EnokiPic:: INCBIN "build/gfx/trainer/enoki.pic"
-OkeraPic:: INCBIN "build/gfx/trainer/okera.pic" ; Gen 1 Police Female
-MikanPic:: INCBIN "build/gfx/trainer/mikan.pic"
-BluePic:: INCBIN "build/gfx/trainer/blue.pic" ; Gen 1 Pokemaniac
-GamaPic:: INCBIN "build/gfx/trainer/gama.pic" ; Gen 1 Super Nerd
-RivalPic:: INCBIN "build/gfx/trainer/rival.pic"
-OakPic:: INCBIN "build/gfx/trainer/oak.pic"
-ProtagonistPic:: INCBIN "build/gfx/trainer/protagonist.pic"
-KurtPic:: INCBIN "build/gfx/trainer/kurt.pic"
-YoungsterPic:: INCBIN "build/gfx/trainer/youngster.pic"
-SchoolboyPic:: INCBIN "build/gfx/trainer/schoolboy.pic"
-FledglingPic:: INCBIN "build/gfx/trainer/fledgling.pic"
-LassPic:: INCBIN "build/gfx/trainer/lass.pic"
-ProfessionalMPic:: INCBIN "build/gfx/trainer/professional_m.pic"
-ProfessionalFPic:: INCBIN "build/gfx/trainer/professional_f.pic"
-BeautyPic:: INCBIN "build/gfx/trainer/beauty.pic"
-PokemaniacPic:: INCBIN "build/gfx/trainer/pokemaniac.pic"
-RocketMPic:: INCBIN "build/gfx/trainer/rocket_m.pic"
-TeacherMPic:: INCBIN "build/gfx/trainer/teacher_m.pic"
-TeacherFPic:: INCBIN "build/gfx/trainer/teacher_f.pic"
-BugCatcherBoyPic:: INCBIN "build/gfx/trainer/bug_catcher_boy.pic"
-FisherPic:: INCBIN "build/gfx/trainer/fisher.pic"
-SwimmerMPic:: INCBIN "build/gfx/trainer/swimmer_m.pic"
-SwimmerFPic:: INCBIN "build/gfx/trainer/swimmer_f.pic"
-SuperNerdPic:: INCBIN "build/gfx/trainer/supernerd.pic"
-EngineerPic:: INCBIN "build/gfx/trainer/engineer.pic"
-GreenPic:: INCBIN "build/gfx/trainer/green.pic" ; Gen 1 Green
-BikerPic:: INCBIN "build/gfx/trainer/biker.pic"
-BurglarPic:: INCBIN "build/gfx/trainer/burglar.pic"
-FirebreatherPic:: INCBIN "build/gfx/trainer/firebreather.pic"
-JugglerPic:: INCBIN "build/gfx/trainer/juggler.pic"
-BlackbeltPic:: INCBIN "build/gfx/trainer/blackbelt.pic"
-SportsmanPic:: INCBIN "build/gfx/trainer/sportsman.pic"
-MediumPic:: INCBIN "build/gfx/trainer/medium.pic"
-SoldierPic:: INCBIN "build/gfx/trainer/soldier.pic"
-KimonoGirlPic:: INCBIN "build/gfx/trainer/kimonogirl.pic"
-TwinsPic:: INCBIN "build/gfx/trainer/twins.pic"
+HayatoPic:: INCBIN "gfx/trainer/hayato.pic"
+AkanePic:: INCBIN "gfx/trainer/akane.pic" ; Gen 1 Bug Catcher
+TsukushiPic:: INCBIN "gfx/trainer/tsukushi.pic"
+EnokiPic:: INCBIN "gfx/trainer/enoki.pic"
+OkeraPic:: INCBIN "gfx/trainer/okera.pic" ; Gen 1 Police Female
+MikanPic:: INCBIN "gfx/trainer/mikan.pic"
+BluePic:: INCBIN "gfx/trainer/blue.pic" ; Gen 1 Pokemaniac
+GamaPic:: INCBIN "gfx/trainer/gama.pic" ; Gen 1 Super Nerd
+RivalPic:: INCBIN "gfx/trainer/rival.pic"
+OakPic:: INCBIN "gfx/trainer/oak.pic"
+ProtagonistPic:: INCBIN "/gfx/trainer/protagonist.pic"
+KurtPic:: INCBIN "/gfx/trainer/kurt.pic"
+YoungsterPic:: INCBIN "gfx/trainer/youngster.pic"
+SchoolboyPic:: INCBIN "gfx/trainer/schoolboy.pic"
+FledglingPic:: INCBIN "gfx/trainer/fledgling.pic"
+LassPic:: INCBIN "gfx/trainer/lass.pic"
+ProfessionalMPic:: INCBIN "gfx/trainer/professional_m.pic"
+ProfessionalFPic:: INCBIN "gfx/trainer/professional_f.pic"
+BeautyPic:: INCBIN "gfx/trainer/beauty.pic"
+PokemaniacPic:: INCBIN "gfx/trainer/pokemaniac.pic"
+RocketMPic:: INCBIN "gfx/trainer/rocket_m.pic"
+TeacherMPic:: INCBIN "gfx/trainer/teacher_m.pic"
+TeacherFPic:: INCBIN "gfx/trainer/teacher_f.pic"
+BugCatcherBoyPic:: INCBIN "gfx/trainer/bug_catcher_boy.pic"
+FisherPic:: INCBIN "gfx/trainer/fisher.pic"
+SwimmerMPic:: INCBIN "gfx/trainer/swimmer_m.pic"
+SwimmerFPic:: INCBIN "gfx/trainer/swimmer_f.pic"
+SuperNerdPic:: INCBIN "gfx/trainer/supernerd.pic"
+EngineerPic:: INCBIN "gfx/trainer/engineer.pic"
+GreenPic:: INCBIN "gfx/trainer/green.pic" ; Gen 1 Green
+BikerPic:: INCBIN "gfx/trainer/biker.pic"
+BurglarPic:: INCBIN "gfx/trainer/burglar.pic"
+FirebreatherPic:: INCBIN "gfx/trainer/firebreather.pic"
+JugglerPic:: INCBIN "gfx/trainer/juggler.pic"
+BlackbeltPic:: INCBIN "gfx/trainer/blackbelt.pic"
+SportsmanPic:: INCBIN "gfx/trainer/sportsman.pic"
+MediumPic:: INCBIN "gfx/trainer/medium.pic"
+SoldierPic:: INCBIN "gfx/trainer/soldier.pic"
+KimonoGirlPic:: INCBIN "gfx/trainer/kimonogirl.pic"
+TwinsPic:: INCBIN "gfx/trainer/twins.pic"
SECTION "Bank 13 Tilesets 0a", ROMX[$4000], BANK[$13]
Tileset_0a_GFX:
-INCBIN "build/gfx/tilesets/tileset_0a.2bpp"
+INCBIN "gfx/tilesets/tileset_0a.2bpp"
SECTION "Bank 13 Tilesets 16", ROMX[$4B00], BANK[$13]
Tileset_16_GFX:
-INCBIN "build/gfx/tilesets/tileset_16.2bpp"
+INCBIN "gfx/tilesets/tileset_16.2bpp"
SECTION "Bank 13 Tilesets 19", ROMX[$5B00], BANK[$13]
Tileset_19_GFX:
-INCBIN "build/gfx/tilesets/tileset_19.2bpp"
+INCBIN "gfx/tilesets/tileset_19.2bpp"
SECTION "Bank 13 Tilesets 1a", ROMX[$6900], BANK[$13]
Tileset_1a_GFX:
-INCBIN "build/gfx/tilesets/tileset_1a.2bpp"
+INCBIN "gfx/tilesets/tileset_1a.2bpp"
SECTION "PKMN Sprite Bank List", ROMX[$725C], BANK[$14]
INCLUDE "gfx/pokemon/pkmn_pic_banks.asm"
@@ -241,250 +241,250 @@ INCLUDE "gfx/pokemon/annon_pics.asm"
INCLUDE "gfx/pokemon/egg.asm"
SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21]
-INCBIN "build/gfx/battle_anims/attack_animations.2bpp"
+INCBIN "gfx/battle_anims/attack_animations.2bpp"
SECTION "Pokemon Party Sprites", ROMX[$60CC], BANK[$23]
-NyoromoIcon:: INCBIN "build/gfx/icons/nyoromo.2bpp"
-PurinIcon:: INCBIN "build/gfx/icons/purin.2bpp"
-DigdaIcon:: INCBIN "build/gfx/icons/digda.2bpp"
-PikachuIcon:: INCBIN "build/gfx/icons/pikachu.2bpp"
-HitodemanIcon:: INCBIN "build/gfx/icons/hitodeman.2bpp"
-KoikingIcon:: INCBIN "build/gfx/icons/koiking.2bpp"
-PoppoIcon:: INCBIN "build/gfx/icons/poppo.2bpp"
-SidonIcon:: INCBIN "build/gfx/icons/sidon.2bpp"
-PippiIcon:: INCBIN "build/gfx/icons/pippi.2bpp"
-NazonokusaIcon:: INCBIN "build/gfx/icons/nazonokusa.2bpp"
-MushiIcon:: INCBIN "build/gfx/icons/mushi.2bpp"
-GangarIcon:: INCBIN "build/gfx/icons/gangar.2bpp"
-LaplaceIcon:: INCBIN "build/gfx/icons/laplace.2bpp"
-BarrierdIcon:: INCBIN "build/gfx/icons/barrierd.2bpp"
-LokonIcon:: INCBIN "build/gfx/icons/lokon.2bpp"
-KentaurosIcon:: INCBIN "build/gfx/icons/kentauros.2bpp"
-ShellderIcon:: INCBIN "build/gfx/icons/shellder.2bpp"
-MetamonIcon:: INCBIN "build/gfx/icons/metamon.2bpp"
-IwarkIcon:: INCBIN "build/gfx/icons/iwark.2bpp"
-BiriridamaIcon:: INCBIN "build/gfx/icons/biriridama.2bpp"
-ZenigameIcon:: INCBIN "build/gfx/icons/zenigame.2bpp"
-FushigidaneIcon:: INCBIN "build/gfx/icons/fushigidane.2bpp"
-HitokageIcon:: INCBIN "build/gfx/icons/hitokage.2bpp"
-BeedleIcon:: INCBIN "build/gfx/icons/beedle.2bpp"
-AnnonIcon:: INCBIN "build/gfx/icons/annon.2bpp"
-IsitsubuteIcon:: INCBIN "build/gfx/icons/isitsubute.2bpp"
-WanrikyIcon:: INCBIN "build/gfx/icons/wanriky.2bpp"
-EggIcon:: INCBIN "build/gfx/icons/egg.2bpp"
-MenokurageIcon:: INCBIN "build/gfx/icons/menokurage.2bpp"
-ButterfreeIcon:: INCBIN "build/gfx/icons/butterfree.2bpp"
-ZubatIcon:: INCBIN "build/gfx/icons/zubat.2bpp"
-KabigonIcon:: INCBIN "build/gfx/icons/kabigon.2bpp"
+NyoromoIcon:: INCBIN "gfx/icons/nyoromo.2bpp"
+PurinIcon:: INCBIN "gfx/icons/purin.2bpp"
+DigdaIcon:: INCBIN "gfx/icons/digda.2bpp"
+PikachuIcon:: INCBIN "gfx/icons/pikachu.2bpp"
+HitodemanIcon:: INCBIN "gfx/icons/hitodeman.2bpp"
+KoikingIcon:: INCBIN "gfx/icons/koiking.2bpp"
+PoppoIcon:: INCBIN "gfx/icons/poppo.2bpp"
+SidonIcon:: INCBIN "gfx/icons/sidon.2bpp"
+PippiIcon:: INCBIN "gfx/icons/pippi.2bpp"
+NazonokusaIcon:: INCBIN "gfx/icons/nazonokusa.2bpp"
+MushiIcon:: INCBIN "gfx/icons/mushi.2bpp"
+GangarIcon:: INCBIN "gfx/icons/gangar.2bpp"
+LaplaceIcon:: INCBIN "gfx/icons/laplace.2bpp"
+BarrierdIcon:: INCBIN "gfx/icons/barrierd.2bpp"
+LokonIcon:: INCBIN "gfx/icons/lokon.2bpp"
+KentaurosIcon:: INCBIN "gfx/icons/kentauros.2bpp"
+ShellderIcon:: INCBIN "gfx/icons/shellder.2bpp"
+MetamonIcon:: INCBIN "gfx/icons/metamon.2bpp"
+IwarkIcon:: INCBIN "gfx/icons/iwark.2bpp"
+BiriridamaIcon:: INCBIN "gfx/icons/biriridama.2bpp"
+ZenigameIcon:: INCBIN "gfx/icons/zenigame.2bpp"
+FushigidaneIcon:: INCBIN "gfx/icons/fushigidane.2bpp"
+HitokageIcon:: INCBIN "gfx/icons/hitokage.2bpp"
+BeedleIcon:: INCBIN "gfx/icons/beedle.2bpp"
+AnnonIcon:: INCBIN "gfx/icons/annon.2bpp"
+IsitsubuteIcon:: INCBIN "gfx/icons/isitsubute.2bpp"
+WanrikyIcon:: INCBIN "gfx/icons/wanriky.2bpp"
+EggIcon:: INCBIN "gfx/icons/egg.2bpp"
+MenokurageIcon:: INCBIN "gfx/icons/menokurage.2bpp"
+ButterfreeIcon:: INCBIN "gfx/icons/butterfree.2bpp"
+ZubatIcon:: INCBIN "gfx/icons/zubat.2bpp"
+KabigonIcon:: INCBIN "gfx/icons/kabigon.2bpp"
SECTION "Slot Machine GFX", ROMX[$4FDB], BANK[$24]
SlotMachineGFX::
-INCBIN "build/gfx/minigames/slots.2bpp"
+INCBIN "gfx/minigames/slots.2bpp"
SlotMachine2GFX::
-INCBIN "build/gfx/minigames/slots_2.2bpp"
+INCBIN "gfx/minigames/slots_2.2bpp"
SECTION "Bank 30 Sprites 1", ROMX[$4000], BANK[$30]
-GoldSpriteGFX:: INCBIN "build/gfx/sprites/gold.2bpp" ; 30:4000
-GoldBikeSpriteGFX:: INCBIN "build/gfx/sprites/gold_bike.2bpp" ; 30:4180
-GoldSkateboardSpriteGFX:: INCBIN "build/gfx/sprites/gold_skateboard.2bpp" ; 30:4300
-SilverSpriteGFX:: INCBIN "build/gfx/sprites/silver.2bpp" ; 30:4480
-OkidoSpriteGFX:: INCBIN "build/gfx/sprites/okido.2bpp" ; 30:4600
-RedSpriteGFX:: INCBIN "build/gfx/sprites/red.2bpp" ; 30:4780
-BlueSpriteGFX:: INCBIN "build/gfx/sprites/blue.2bpp" ; 30:4900
-MasakiSpriteGFX:: INCBIN "build/gfx/sprites/masaki.2bpp" ; 30:4a80
-ElderSpriteGFX:: INCBIN "build/gfx/sprites/elder.2bpp" ; 30:4c00
-SakakiSpriteGFX:: INCBIN "build/gfx/sprites/sakaki.2bpp" ; 30:4d80
-GantetsuSpriteGFX:: INCBIN "build/gfx/sprites/gantetsu.2bpp" ; 30:4f00
-MomSpriteGFX:: INCBIN "build/gfx/sprites/mom.2bpp" ; 30:5080
-SilversMomSpriteGFX:: INCBIN "build/gfx/sprites/silvers_mom.2bpp" ; 30:5200
-RedsMomSpriteGFX:: INCBIN "build/gfx/sprites/reds_mom.2bpp" ; 30:5380
-NanamiSpriteGFX:: INCBIN "build/gfx/sprites/nanami.2bpp" ; 30:5500
-EvilOkidoSpriteGFX:: INCBIN "build/gfx/sprites/evil_okido.2bpp" ; 30:5680
-KikukoSpriteGFX:: INCBIN "build/gfx/sprites/kikuko.2bpp" ; 30:5800
-HayatoSpriteGFX:: INCBIN "build/gfx/sprites/hayato.2bpp" ; 30:5980
-TsukushiSpriteGFX:: INCBIN "build/gfx/sprites/tsukushi.2bpp" ; 30:5a40
-EnokiSpriteGFX:: INCBIN "build/gfx/sprites/enoki.2bpp" ; 30:5b00
-MikanSpriteGFX:: INCBIN "build/gfx/sprites/mikan.2bpp" ; 30:5bc0
-CooltrainerMSpriteGFX:: INCBIN "build/gfx/sprites/cooltrainer_m.2bpp" ; 30:5d40
-CooltrainerFSpriteGFX:: INCBIN "build/gfx/sprites/cooltrainer_f.2bpp" ; 30:5ec0
-BugCatcherBoySpriteGFX:: INCBIN "build/gfx/sprites/bug_catcher_boy.2bpp" ; 30:6040
-TwinSpriteGFX:: INCBIN "build/gfx/sprites/twin.2bpp" ; 30:61c0
-YoungsterSpriteGFX:: INCBIN "build/gfx/sprites/youngster.2bpp" ; 30:6340
-LassSpriteGFX:: INCBIN "build/gfx/sprites/lass.2bpp" ; 30:64c0
-TeacherSpriteGFX:: INCBIN "build/gfx/sprites/teacher.2bpp" ; 30:6640
-GirlSpriteGFX:: INCBIN "build/gfx/sprites/girl.2bpp" ; 30:67c0
-SuperNerdSpriteGFX:: INCBIN "build/gfx/sprites/super_nerd.2bpp" ; 30:6940
-RockerSpriteGFX:: INCBIN "build/gfx/sprites/rocker.2bpp" ; 30:6ac0
-PokefanMSpriteGFX:: INCBIN "build/gfx/sprites/pokefan_m.2bpp" ; 30:6c40
-PokefanFSpriteGFX:: INCBIN "build/gfx/sprites/pokefan_f.2bpp" ; 30:6dc0
-GrampsSpriteGFX:: INCBIN "build/gfx/sprites/gramps.2bpp" ; 30:6f40
-GrannySpriteGFX:: INCBIN "build/gfx/sprites/granny.2bpp" ; 30:70c0
-SwimmerMSpriteGFX:: INCBIN "build/gfx/sprites/swimmer_m.2bpp" ; 30:7240
-SwimmerFSpriteGFX:: INCBIN "build/gfx/sprites/swimmer_f.2bpp" ; 30:73c0
-RocketMSpriteGFX:: INCBIN "build/gfx/sprites/rocket_m.2bpp" ; 30:7540
-RocketFSpriteGFX:: INCBIN "build/gfx/sprites/rocket_f.2bpp" ; 30:76c0
-NurseSpriteGFX:: INCBIN "build/gfx/sprites/nurse.2bpp" ; 30:7840
-LinkReceptionistSpriteGFX:: INCBIN "build/gfx/sprites/link_receptionist.2bpp" ; 30:7900
-ClerkSpriteGFX:: INCBIN "build/gfx/sprites/clerk.2bpp" ; 30:79c0
-FisherSpriteGFX:: INCBIN "build/gfx/sprites/fisher.2bpp" ; 30:7b40
-FishingGuruSpriteGFX:: INCBIN "build/gfx/sprites/fishing_guru.2bpp" ; 30:7cc0
+GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp" ; 30:4000
+GoldBikeSpriteGFX:: INCBIN "gfx/sprites/gold_bike.2bpp" ; 30:4180
+GoldSkateboardSpriteGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp" ; 30:4300
+SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" ; 30:4480
+OkidoSpriteGFX:: INCBIN "gfx/sprites/okido.2bpp" ; 30:4600
+RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" ; 30:4780
+BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" ; 30:4900
+MasakiSpriteGFX:: INCBIN "gfx/sprites/masaki.2bpp" ; 30:4a80
+ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" ; 30:4c00
+SakakiSpriteGFX:: INCBIN "gfx/sprites/sakaki.2bpp" ; 30:4d80
+GantetsuSpriteGFX:: INCBIN "gfx/sprites/gantetsu.2bpp" ; 30:4f00
+MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" ; 30:5080
+SilversMomSpriteGFX:: INCBIN "gfx/sprites/silvers_mom.2bpp" ; 30:5200
+RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" ; 30:5380
+NanamiSpriteGFX:: INCBIN "gfx/sprites/nanami.2bpp" ; 30:5500
+EvilOkidoSpriteGFX:: INCBIN "gfx/sprites/evil_okido.2bpp" ; 30:5680
+KikukoSpriteGFX:: INCBIN "gfx/sprites/kikuko.2bpp" ; 30:5800
+HayatoSpriteGFX:: INCBIN "gfx/sprites/hayato.2bpp" ; 30:5980
+TsukushiSpriteGFX:: INCBIN "gfx/sprites/tsukushi.2bpp" ; 30:5a40
+EnokiSpriteGFX:: INCBIN "gfx/sprites/enoki.2bpp" ; 30:5b00
+MikanSpriteGFX:: INCBIN "gfx/sprites/mikan.2bpp" ; 30:5bc0
+CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; 30:5d40
+CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; 30:5ec0
+BugCatcherBoySpriteGFX:: INCBIN "gfx/sprites/bug_catcher_boy.2bpp" ; 30:6040
+TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" ; 30:61c0
+YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" ; 30:6340
+LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" ; 30:64c0
+TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" ; 30:6640
+GirlSpriteGFX:: INCBIN "gfx/sprites/girl.2bpp" ; 30:67c0
+SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" ; 30:6940
+RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" ; 30:6ac0
+PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" ; 30:6c40
+PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" ; 30:6dc0
+GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" ; 30:6f40
+GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" ; 30:70c0
+SwimmerMSpriteGFX:: INCBIN "gfx/sprites/swimmer_m.2bpp" ; 30:7240
+SwimmerFSpriteGFX:: INCBIN "gfx/sprites/swimmer_f.2bpp" ; 30:73c0
+RocketMSpriteGFX:: INCBIN "gfx/sprites/rocket_m.2bpp" ; 30:7540
+RocketFSpriteGFX:: INCBIN "gfx/sprites/rocket_f.2bpp" ; 30:76c0
+NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" ; 30:7840
+LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" ; 30:7900
+ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; 30:79c0
+FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; 30:7b40
+FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; 30:7cc0
SECTION "Bank 31 Sprites 2", ROMX[$4000], BANK[$31]
-ScientistSpriteGFX:: INCBIN "build/gfx/sprites/scientist.2bpp" ; 31:4000
-MediumSpriteGFX:: INCBIN "build/gfx/sprites/medium.2bpp" ; 31:4180
-SageSpriteGFX:: INCBIN "build/gfx/sprites/sage.2bpp" ; 31:4300
-FrowningManSpriteGFX:: INCBIN "build/gfx/sprites/frowning_man.2bpp" ; 31:4480
-GentlemanSpriteGFX:: INCBIN "build/gfx/sprites/gentleman.2bpp" ; 31:4600
-BlackbeltSpriteGFX:: INCBIN "build/gfx/sprites/blackbelt.2bpp" ; 31:4780
-ReceptionistSpriteGFX:: INCBIN "build/gfx/sprites/receptionist.2bpp" ; 31:4900
-OfficerSpriteGFX:: INCBIN "build/gfx/sprites/officer.2bpp" ; 31:4a80
-CaptainSpriteGFX:: INCBIN "build/gfx/sprites/captain.2bpp" ; 31:4c00
-MohawkSpriteGFX:: INCBIN "build/gfx/sprites/mohawk.2bpp" ; 31:4d80
-GymGuySpriteGFX:: INCBIN "build/gfx/sprites/gym_guy.2bpp" ; 31:4f00
-SailorSpriteGFX:: INCBIN "build/gfx/sprites/sailor.2bpp" ; 31:5080
-HelmetSpriteGFX:: INCBIN "build/gfx/sprites/helmet.2bpp" ; 31:5200
-BurglarSpriteGFX:: INCBIN "build/gfx/sprites/burglar.2bpp" ; 31:5380
-SidonSpriteGFX:: INCBIN "build/gfx/sprites/sidon.2bpp" ; 31:5500
-PippiSpriteGFX:: INCBIN "build/gfx/sprites/pippi.2bpp" ; 31:5680
-PoppoSpriteGFX:: INCBIN "build/gfx/sprites/poppo.2bpp" ; 31:5800
-LizardonSpriteGFX:: INCBIN "build/gfx/sprites/lizardon.2bpp" ; 31:5980
-KabigonSpriteGFX:: INCBIN "build/gfx/sprites/kabigon.2bpp" ; 31:5b00
-PawouSpriteGFX:: INCBIN "build/gfx/sprites/pawou.2bpp" ; 31:5c80
-NyorobonSpriteGFX:: INCBIN "build/gfx/sprites/nyorobon.2bpp" ; 31:5e00
-LaplaceSpriteGFX:: INCBIN "build/gfx/sprites/laplace.2bpp" ; 31:5f80
-PokeBallSpriteGFX:: INCBIN "build/gfx/sprites/poke_ball.2bpp" ; 31:6100
-PokedexSpriteGFX:: INCBIN "build/gfx/sprites/pokedex.2bpp" ; 31:6280
-PaperSpriteGFX:: INCBIN "build/gfx/sprites/paper.2bpp" ; 31:6400
-OldLinkReceptionistSpriteGFX:: INCBIN "build/gfx/sprites/old_link_receptionist.2bpp" ; 31:6580
-EggSpriteGFX:: INCBIN "build/gfx/sprites/egg.2bpp" ; 31:65c0
-BoulderSpriteGFX:: INCBIN "build/gfx/sprites/boulder.2bpp" ; 31:6600
+ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; 31:4000
+MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp" ; 31:4180
+SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; 31:4300
+FrowningManSpriteGFX:: INCBIN "gfx/sprites/frowning_man.2bpp" ; 31:4480
+GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" ; 31:4600
+BlackbeltSpriteGFX:: INCBIN "gfx/sprites/blackbelt.2bpp" ; 31:4780
+ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" ; 31:4900
+OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" ; 31:4a80
+CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" ; 31:4c00
+MohawkSpriteGFX:: INCBIN "gfx/sprites/mohawk.2bpp" ; 31:4d80
+GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" ; 31:4f00
+SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" ; 31:5080
+HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp" ; 31:5200
+BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp" ; 31:5380
+SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp" ; 31:5500
+PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp" ; 31:5680
+PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp" ; 31:5800
+LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp" ; 31:5980
+KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp" ; 31:5b00
+PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp" ; 31:5c80
+NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp" ; 31:5e00
+LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp" ; 31:5f80
+PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" ; 31:6100
+PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" ; 31:6280
+PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" ; 31:6400
+OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; 31:6580
+EggSpriteGFX:: INCBIN "gfx/sprites/egg.2bpp" ; 31:65c0
+BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; 31:6600
SECTION "Bank 37 Tilesets 10", ROMX[$4000], BANK[$37]
Tileset_10_GFX:
-INCBIN "build/gfx/tilesets/tileset_10.2bpp"
+INCBIN "gfx/tilesets/tileset_10.2bpp"
SECTION "Bank 37 Tilesets 15", ROMX[$4B00], BANK[$37]
Tileset_15_GFX:
-INCBIN "build/gfx/tilesets/tileset_15.2bpp"
+INCBIN "gfx/tilesets/tileset_15.2bpp"
SECTION "Bank 37 Tilesets 17", ROMX[$5B00], BANK[$37]
Tileset_17_GFX:
-INCBIN "build/gfx/tilesets/tileset_17.2bpp"
+INCBIN "gfx/tilesets/tileset_17.2bpp"
SECTION "Bank 37 Tilesets 18", ROMX[$6B00], BANK[$37]
Tileset_18_GFX:
-INCBIN "build/gfx/tilesets/tileset_18.2bpp"
+INCBIN "gfx/tilesets/tileset_18.2bpp"
SECTION "Poker GFX", ROMX[$5403], BANK[$38]
PokerGFX::
-INCBIN "build/gfx/minigames/poker.2bpp"
+INCBIN "gfx/minigames/poker.2bpp"
SECTION "15 Puzzle GFX", ROMX[$5F93], BANK[$38]
FifteenPuzzleGFX::
-INCBIN "build/gfx/minigames/15_puzzle.2bpp"
+INCBIN "gfx/minigames/15_puzzle.2bpp"
SECTION "Matches GFX", ROMX[$6606], BANK[$38]
MemoryGameGFX::
-INCBIN "build/gfx/minigames/matches.2bpp"
+INCBIN "gfx/minigames/matches.2bpp"
SECTION "Picross GFX", ROMX[$75B7], BANK[$38]
PicrossGFX::
-INCBIN "build/gfx/minigames/picross.2bpp"
+INCBIN "gfx/minigames/picross.2bpp"
PicrossCursorGFX::
-INCBIN "build/gfx/minigames/picross_cursor.2bpp"
+INCBIN "gfx/minigames/picross_cursor.2bpp"
SECTION "Gamefreak Logo GFX", ROMX[$41FF], BANK[$39]
GameFreakLogoGFX::
-INCBIN "build/gfx/splash/game_freak_logo.1bpp"
+INCBIN "gfx/splash/game_freak_logo.1bpp"
GameFreakLogoSparkleGFX::
-INCBIN "build/gfx/splash/game_freak_logo_oam.2bpp"
+INCBIN "gfx/splash/game_freak_logo_oam.2bpp"
SECTION "Intro Underwater GFX", ROMX[$4ADF], BANK[$39]
IntroUnderwaterGFX::
-INCBIN "build/gfx/intro/underwater.2bpp"
+INCBIN "gfx/intro/underwater.2bpp"
SECTION "Intro Water Mon and Forest GFX", ROMX[$55EF], BANK[$39]
IntroWaterPokemonGFX::
-INCBIN "build/gfx/intro/water_pokemon.2bpp"
+INCBIN "gfx/intro/water_pokemon.2bpp"
IntroForestGFX::
-INCBIN "build/gfx/intro/forest.2bpp"
+INCBIN "gfx/intro/forest.2bpp"
SECTION "Intro Mon", ROMX[$626F], BANK[$39]
IntroPurinPikachuGFX::
-INCBIN "build/gfx/intro/purin_pikachu.2bpp"
+INCBIN "gfx/intro/purin_pikachu.2bpp"
IntroLizardon1GFX::
-INCBIN "build/gfx/intro/lizardon_1.2bpp"
+INCBIN "gfx/intro/lizardon_1.2bpp"
IntroLizardon2GFX::
-INCBIN "build/gfx/intro/lizardon_2.2bpp"
+INCBIN "gfx/intro/lizardon_2.2bpp"
IntroLizardon3GFX::
-INCBIN "build/gfx/intro/lizardon_3.2bpp"
+INCBIN "gfx/intro/lizardon_3.2bpp"
IntroLizardonFlamesGFX::
-INCBIN "build/gfx/intro/lizardon_flames.2bpp"
+INCBIN "gfx/intro/lizardon_flames.2bpp"
IntroKamexGFX::
-INCBIN "build/gfx/intro/kamex.2bpp"
+INCBIN "gfx/intro/kamex.2bpp"
IntroFushigibanaGFX::
-INCBIN "build/gfx/intro/fushigibana.2bpp"
+INCBIN "gfx/intro/fushigibana.2bpp"
SECTION "Misc GFX", ROMX[$4162], BANK[$3E]
FontExtraGFX::
-FontExtraAB_GFX:: INCBIN "build/gfx/font/font_extra.ab.2bpp" ; 0x0f8162--0x0f8182
-FontExtraCDEFGHIVSLM_GFX:: INCBIN "build/gfx/font/font_extra.cdefghivslm.2bpp" ; 0x0f8182--0x0f8242
-FontSmallKanaPunctuationGFX:: INCBIN "build/gfx/font/small_kana_punctuation.2bpp" ; 0x0f8242--0x0f82f2
+FontExtraAB_GFX:: INCBIN "gfx/font/font_extra.ab.2bpp" ; 0x0f8162--0x0f8182
+FontExtraCDEFGHIVSLM_GFX:: INCBIN "gfx/font/font_extra.cdefghivslm.2bpp" ; 0x0f8182--0x0f8242
+FontSmallKanaPunctuationGFX:: INCBIN "gfx/font/small_kana_punctuation.2bpp" ; 0x0f8242--0x0f82f2
FontSmallKanaPunctuationGFXEnd::
-Unreferenced_DefaultFrame0GFX:: INCBIN "build/gfx/frames/1.2bpp" ; 0x0f82f2--0x0f8362
-FontGFX:: INCBIN "build/gfx/font/font.1bpp" ; 0x0f8362--0x0f8712 kana
+Unreferenced_DefaultFrame0GFX:: INCBIN "gfx/frames/1.2bpp" ; 0x0f82f2--0x0f8362
+FontGFX:: INCBIN "gfx/font/font.1bpp" ; 0x0f8362--0x0f8712 kana
FontGFXEnd:: ; 0x0f8712--0x0f8762 numbers
FontBattleExtraGFX::
-BattleHPBarGFX:: INCBIN "build/gfx/battle/hp_bar.2bpp" ; 0x0f8762--0x0f8822
+BattleHPBarGFX:: INCBIN "gfx/battle/hp_bar.2bpp" ; 0x0f8762--0x0f8822
BattleHPBarGFXEnd::
-HpExpBarParts0_2bppGFX:: INCBIN "build/gfx/battle/hp_exp_bar_parts0.2bpp" ; 0x0f8822--0x0f8862
-BattleMarkersGFX:: INCBIN "build/gfx/battle/markers.2bpp" ; 0x0f8862--0x0f8892
+HpExpBarParts0_2bppGFX:: INCBIN "gfx/battle/hp_exp_bar_parts0.2bpp" ; 0x0f8822--0x0f8862
+BattleMarkersGFX:: INCBIN "gfx/battle/markers.2bpp" ; 0x0f8862--0x0f8892
BattleMarkersGFXEnd::
-LevelUpGFX:: INCBIN "build/gfx/battle/levelup.2bpp" ; 0x0f8892--0x0f88f2
+LevelUpGFX:: INCBIN "gfx/battle/levelup.2bpp" ; 0x0f8892--0x0f88f2
LevelUpGFXEnd::
-Unreferenced_DefaultFrame1:: INCBIN "build/gfx/frames/1.2bpp" ; 0x0f88f2--0x0f8962
+Unreferenced_DefaultFrame1:: INCBIN "gfx/frames/1.2bpp" ; 0x0f88f2--0x0f8962
FrameGFX::
-FrameGFXFirstFrame:: INCBIN "build/gfx/frames/1.1bpp" ; 0x0f8962--0x0f8992
+FrameGFXFirstFrame:: INCBIN "gfx/frames/1.1bpp" ; 0x0f8962--0x0f8992
FrameGFXFirstFrameEnd::
- INCBIN "build/gfx/frames/2.1bpp" ; 0x0f8992--0x0f89c2
- INCBIN "build/gfx/frames/3.1bpp" ; 0x0f89c2--0x0f89f2
- INCBIN "build/gfx/frames/4.1bpp" ; 0x0f89f2--0x0f8a22
- INCBIN "build/gfx/frames/5.1bpp" ; 0x0f8a22--0x0f8a52
- INCBIN "build/gfx/frames/6.1bpp" ; 0x0f8a52--0x0f8a82
- INCBIN "build/gfx/frames/7.1bpp" ; 0x0f8a82--0x0f8ab2
- INCBIN "build/gfx/frames/8.1bpp" ; 0x0f8ab2--0x0f8ae2
- INCBIN "build/gfx/frames/9.1bpp" ; 0x0f8ae2--0x0f8b12
-StatsGFX:: INCBIN "build/gfx/stats/separator.2bpp" ; 0x0f8b12--0x0f8b22
- INCBIN "build/gfx/stats/stats.2bpp" ; 0x0f8b22--0x0f8c22
+ INCBIN "gfx/frames/2.1bpp" ; 0x0f8992--0x0f89c2
+ INCBIN "gfx/frames/3.1bpp" ; 0x0f89c2--0x0f89f2
+ INCBIN "gfx/frames/4.1bpp" ; 0x0f89f2--0x0f8a22
+ INCBIN "gfx/frames/5.1bpp" ; 0x0f8a22--0x0f8a52
+ INCBIN "gfx/frames/6.1bpp" ; 0x0f8a52--0x0f8a82
+ INCBIN "gfx/frames/7.1bpp" ; 0x0f8a82--0x0f8ab2
+ INCBIN "gfx/frames/8.1bpp" ; 0x0f8ab2--0x0f8ae2
+ INCBIN "gfx/frames/9.1bpp" ; 0x0f8ae2--0x0f8b12
+StatsGFX:: INCBIN "gfx/stats/separator.2bpp" ; 0x0f8b12--0x0f8b22
+ INCBIN "gfx/stats/stats.2bpp" ; 0x0f8b22--0x0f8c22
StatsGFXEnd::
-HpExpBarParts0GFX:: INCBIN "build/gfx/battle/hp_exp_bar_parts0.1bpp" ; 0x0f8c42--0x0f8c5a
+HpExpBarParts0GFX:: INCBIN "gfx/battle/hp_exp_bar_parts0.1bpp" ; 0x0f8c42--0x0f8c5a
HpExpBarParts0GFXEnd::
-HpExpBarParts1GFX:: INCBIN "build/gfx/battle/hp_exp_bar_parts1.1bpp" ; 0x0f8c42--0x0f8c5a
+HpExpBarParts1GFX:: INCBIN "gfx/battle/hp_exp_bar_parts1.1bpp" ; 0x0f8c42--0x0f8c5a
HpExpBarParts1GFXEnd::
-HpExpBarParts2GFX:: INCBIN "build/gfx/battle/hp_exp_bar_parts2.1bpp" ; 0x0f8c5a--0x0f8c6a
+HpExpBarParts2GFX:: INCBIN "gfx/battle/hp_exp_bar_parts2.1bpp" ; 0x0f8c5a--0x0f8c6a
HpExpBarParts2GFXEnd::
-HpExpBarParts3GFX:: INCBIN "build/gfx/battle/hp_exp_bar_parts3.1bpp" ; 0x0f8c6a--0x0f8c72
+HpExpBarParts3GFX:: INCBIN "gfx/battle/hp_exp_bar_parts3.1bpp" ; 0x0f8c6a--0x0f8c72
HpExpBarParts3GFXEnd::
-ExpBarGFX:: INCBIN "build/gfx/battle/exp_bar.2bpp" ; 0x0f8c72--0x0f8cf2
+ExpBarGFX:: INCBIN "gfx/battle/exp_bar.2bpp" ; 0x0f8c72--0x0f8cf2
ExpBarGFXEnd::
-PokedexGFX:: INCBIN "build/gfx/pokedex/pokedex.2bpp" ; 0x0f8cf2--0x0f8dc2
+PokedexGFX:: INCBIN "gfx/pokedex/pokedex.2bpp" ; 0x0f8cf2--0x0f8dc2
PokedexGFXEnd::
-PokedexLocationGFX:: INCBIN "build/gfx/pokedex/locations.2bpp" ; 0x0f8dc2--0x0f8e12
+PokedexLocationGFX:: INCBIN "gfx/pokedex/locations.2bpp" ; 0x0f8dc2--0x0f8e12
PokedexLocationGFXEnd::
-TownMapGFX:: INCBIN "build/gfx/pokegear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2
+TownMapGFX:: INCBIN "gfx/pokegear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2
TownMapGFXEnd::
-HUD_GFX:: INCBIN "build/gfx/hud/hud.2bpp" ; 0x0f8fc2--0x0f9052
+HUD_GFX:: INCBIN "gfx/hud/hud.2bpp" ; 0x0f8fc2--0x0f9052
HUD_GFXEnd::
-BoldAlphabetGFX:: INCBIN "build/gfx/font/alphabet.1bpp"
-AnnonAlphabetGFX:: INCBIN "build/gfx/font/annon_alphabet.1bpp"
-EmptyTile1bppGFX:: INCBIN "build/gfx/misc/empty_tile.1bpp" ; 0x0f9322--0x0f932a
+BoldAlphabetGFX:: INCBIN "gfx/font/alphabet.1bpp"
+AnnonAlphabetGFX:: INCBIN "gfx/font/annon_alphabet.1bpp"
+EmptyTile1bppGFX:: INCBIN "gfx/misc/empty_tile.1bpp" ; 0x0f9322--0x0f932a
EmptyTile1bppGFXEnd::
-BlackTileAndCursor1bppGFX:: INCBIN "build/gfx/misc/black_tile_cursor.1bpp" ; 0x0f932a--0x0f933a
+BlackTileAndCursor1bppGFX:: INCBIN "gfx/misc/black_tile_cursor.1bpp" ; 0x0f932a--0x0f933a
BlackTileAndCursor1bppGFXEnd::
-PackIconGFX:: INCBIN "build/gfx/pack/pack_icons.2bpp" ; 0x0f933a--0x0f941a
+PackIconGFX:: INCBIN "gfx/pack/pack_icons.2bpp" ; 0x0f933a--0x0f941a
PackIconGFXEnd::
SECTION "Town Map Cursor", ROMX[$506F], BANK[$3F]
TownMapCursorGFX::
-INCBIN "build/gfx/pokegear/town_map_cursor.2bpp"
+INCBIN "gfx/pokegear/town_map_cursor.2bpp"
diff --git a/gfx/pokemon/annon_pics.asm b/gfx/pokemon/annon_pics.asm
index 90eb923..4999071 100644
--- a/gfx/pokemon/annon_pics.asm
+++ b/gfx/pokemon/annon_pics.asm
@@ -1,53 +1,53 @@
AnnonPics::
-AnnonAPicFront:: INCBIN "build/gfx/pokemon/annon_a/front.pic" ; 0x07cdd2--0x07ce57
-AnnonAPicBack:: INCBIN "build/gfx/pokemon/annon_a/back.pic" ; 0x07ce57--0x07ced0
-AnnonBPicFront:: INCBIN "build/gfx/pokemon/annon_b/front.pic" ; 0x07ced0--0x07cf64
-AnnonBPicBack:: INCBIN "build/gfx/pokemon/annon_b/back.pic" ; 0x07cf64--0x07cfed
-AnnonCPicFront:: INCBIN "build/gfx/pokemon/annon_c/front.pic" ; 0x07cfed--0x07d0a1
-AnnonCPicBack:: INCBIN "build/gfx/pokemon/annon_c/back.pic" ; 0x07d0a1--0x07d147
-AnnonDPicFront:: INCBIN "build/gfx/pokemon/annon_d/front.pic" ; 0x07d147--0x07d1ec
-AnnonDPicBack:: INCBIN "build/gfx/pokemon/annon_d/back.pic" ; 0x07d1ec--0x07d285
-AnnonEPicFront:: INCBIN "build/gfx/pokemon/annon_e/front.pic" ; 0x07d285--0x07d30e
-AnnonEPicBack:: INCBIN "build/gfx/pokemon/annon_e/back.pic" ; 0x07d30e--0x07d38b
-AnnonFPicFront:: INCBIN "build/gfx/pokemon/annon_f/front.pic" ; 0x07d38b--0x07d425
-AnnonFPicBack:: INCBIN "build/gfx/pokemon/annon_f/back.pic" ; 0x07d425--0x07d4ae
-AnnonGPicFront:: INCBIN "build/gfx/pokemon/annon_g/front.pic" ; 0x07d4ae--0x07d53f
-AnnonGPicBack:: INCBIN "build/gfx/pokemon/annon_g/back.pic" ; 0x07d53f--0x07d5c4
-AnnonHPicFront:: INCBIN "build/gfx/pokemon/annon_h/front.pic" ; 0x07d5c4--0x07d693
-AnnonHPicBack:: INCBIN "build/gfx/pokemon/annon_h/back.pic" ; 0x07d693--0x07d757
-AnnonIPicFront:: INCBIN "build/gfx/pokemon/annon_i/front.pic" ; 0x07d757--0x07d7c0
-AnnonIPicBack:: INCBIN "build/gfx/pokemon/annon_i/back.pic" ; 0x07d7c0--0x07d81f
-AnnonJPicFront:: INCBIN "build/gfx/pokemon/annon_j/front.pic" ; 0x07d81f--0x07d89b
-AnnonJPicBack:: INCBIN "build/gfx/pokemon/annon_j/back.pic" ; 0x07d89b--0x07d909
-AnnonKPicFront:: INCBIN "build/gfx/pokemon/annon_k/front.pic" ; 0x07d909--0x07d98d
-AnnonKPicBack:: INCBIN "build/gfx/pokemon/annon_k/back.pic" ; 0x07d98d--0x07da06
-AnnonLPicFront:: INCBIN "build/gfx/pokemon/annon_l/front.pic" ; 0x07da06--0x07da7a
-AnnonLPicBack:: INCBIN "build/gfx/pokemon/annon_l/back.pic" ; 0x07da7a--0x07dade
-AnnonMPicFront:: INCBIN "build/gfx/pokemon/annon_m/front.pic" ; 0x07dade--0x07dba1
-AnnonMPicBack:: INCBIN "build/gfx/pokemon/annon_m/back.pic" ; 0x07dba1--0x07dc57
-AnnonNPicFront:: INCBIN "build/gfx/pokemon/annon_n/front.pic" ; 0x07dc57--0x07dcf4
-AnnonNPicBack:: INCBIN "build/gfx/pokemon/annon_n/back.pic" ; 0x07dcf4--0x07dd8b
-AnnonOPicFront:: INCBIN "build/gfx/pokemon/annon_o/front.pic" ; 0x07dd8b--0x07de55
-AnnonOPicBack:: INCBIN "build/gfx/pokemon/annon_o/back.pic" ; 0x07de55--0x07df15
-AnnonPPicFront:: INCBIN "build/gfx/pokemon/annon_p/front.pic" ; 0x07df15--0x07df7d
-AnnonPPicBack:: INCBIN "build/gfx/pokemon/annon_p/back.pic" ; 0x07df7d--0x07dfd6
-AnnonQPicFront:: INCBIN "build/gfx/pokemon/annon_q/front.pic" ; 0x07dfd6--0x07e03d
-AnnonQPicBack:: INCBIN "build/gfx/pokemon/annon_q/back.pic" ; 0x07e03d--0x07e099
-AnnonRPicFront:: INCBIN "build/gfx/pokemon/annon_r/front.pic" ; 0x07e099--0x07e0ff
-AnnonRPicBack:: INCBIN "build/gfx/pokemon/annon_r/back.pic" ; 0x07e0ff--0x07e159
-AnnonSPicFront:: INCBIN "build/gfx/pokemon/annon_s/front.pic" ; 0x07e159--0x07e1f0
-AnnonSPicBack:: INCBIN "build/gfx/pokemon/annon_s/back.pic" ; 0x07e1f0--0x07e27a
-AnnonTPicFront:: INCBIN "build/gfx/pokemon/annon_t/front.pic" ; 0x07e27a--0x07e2e8
-AnnonTPicBack:: INCBIN "build/gfx/pokemon/annon_t/back.pic" ; 0x07e2e8--0x07e348
-AnnonUPicFront:: INCBIN "build/gfx/pokemon/annon_u/front.pic" ; 0x07e348--0x07e3e7
-AnnonUPicBack:: INCBIN "build/gfx/pokemon/annon_u/back.pic" ; 0x07e3e7--0x07e47a
-AnnonVPicFront:: INCBIN "build/gfx/pokemon/annon_v/front.pic" ; 0x07e47a--0x07e50a
-AnnonVPicBack:: INCBIN "build/gfx/pokemon/annon_v/back.pic" ; 0x07e50a--0x07e589
-AnnonWPicFront:: INCBIN "build/gfx/pokemon/annon_w/front.pic" ; 0x07e589--0x07e60d
-AnnonWPicBack:: INCBIN "build/gfx/pokemon/annon_w/back.pic" ; 0x07e60d--0x07e681
-AnnonXPicFront:: INCBIN "build/gfx/pokemon/annon_x/front.pic" ; 0x07e681--0x07e705
-AnnonXPicBack:: INCBIN "build/gfx/pokemon/annon_x/back.pic" ; 0x07e705--0x07e77b
-AnnonYPicFront:: INCBIN "build/gfx/pokemon/annon_y/front.pic" ; 0x07e77b--0x07e801
-AnnonYPicBack:: INCBIN "build/gfx/pokemon/annon_y/back.pic" ; 0x07e801--0x07e87c
-AnnonZPicFront:: INCBIN "build/gfx/pokemon/annon_z/front.pic" ; 0x07e87c--0x07e8fa
-AnnonZPicBack:: INCBIN "build/gfx/pokemon/annon_z/back.pic" ; 0x07e8fa--0x07e96a
+AnnonAPicFront:: INCBIN "gfx/pokemon/annon_a/front.pic" ; 0x07cdd2--0x07ce57
+AnnonAPicBack:: INCBIN "gfx/pokemon/annon_a/back.pic" ; 0x07ce57--0x07ced0
+AnnonBPicFront:: INCBIN "gfx/pokemon/annon_b/front.pic" ; 0x07ced0--0x07cf64
+AnnonBPicBack:: INCBIN "gfx/pokemon/annon_b/back.pic" ; 0x07cf64--0x07cfed
+AnnonCPicFront:: INCBIN "gfx/pokemon/annon_c/front.pic" ; 0x07cfed--0x07d0a1
+AnnonCPicBack:: INCBIN "gfx/pokemon/annon_c/back.pic" ; 0x07d0a1--0x07d147
+AnnonDPicFront:: INCBIN "gfx/pokemon/annon_d/front.pic" ; 0x07d147--0x07d1ec
+AnnonDPicBack:: INCBIN "gfx/pokemon/annon_d/back.pic" ; 0x07d1ec--0x07d285
+AnnonEPicFront:: INCBIN "gfx/pokemon/annon_e/front.pic" ; 0x07d285--0x07d30e
+AnnonEPicBack:: INCBIN "gfx/pokemon/annon_e/back.pic" ; 0x07d30e--0x07d38b
+AnnonFPicFront:: INCBIN "gfx/pokemon/annon_f/front.pic" ; 0x07d38b--0x07d425
+AnnonFPicBack:: INCBIN "gfx/pokemon/annon_f/back.pic" ; 0x07d425--0x07d4ae
+AnnonGPicFront:: INCBIN "gfx/pokemon/annon_g/front.pic" ; 0x07d4ae--0x07d53f
+AnnonGPicBack:: INCBIN "gfx/pokemon/annon_g/back.pic" ; 0x07d53f--0x07d5c4
+AnnonHPicFront:: INCBIN "gfx/pokemon/annon_h/front.pic" ; 0x07d5c4--0x07d693
+AnnonHPicBack:: INCBIN "gfx/pokemon/annon_h/back.pic" ; 0x07d693--0x07d757
+AnnonIPicFront:: INCBIN "gfx/pokemon/annon_i/front.pic" ; 0x07d757--0x07d7c0
+AnnonIPicBack:: INCBIN "gfx/pokemon/annon_i/back.pic" ; 0x07d7c0--0x07d81f
+AnnonJPicFront:: INCBIN "gfx/pokemon/annon_j/front.pic" ; 0x07d81f--0x07d89b
+AnnonJPicBack:: INCBIN "gfx/pokemon/annon_j/back.pic" ; 0x07d89b--0x07d909
+AnnonKPicFront:: INCBIN "gfx/pokemon/annon_k/front.pic" ; 0x07d909--0x07d98d
+AnnonKPicBack:: INCBIN "gfx/pokemon/annon_k/back.pic" ; 0x07d98d--0x07da06
+AnnonLPicFront:: INCBIN "gfx/pokemon/annon_l/front.pic" ; 0x07da06--0x07da7a
+AnnonLPicBack:: INCBIN "gfx/pokemon/annon_l/back.pic" ; 0x07da7a--0x07dade
+AnnonMPicFront:: INCBIN "gfx/pokemon/annon_m/front.pic" ; 0x07dade--0x07dba1
+AnnonMPicBack:: INCBIN "gfx/pokemon/annon_m/back.pic" ; 0x07dba1--0x07dc57
+AnnonNPicFront:: INCBIN "gfx/pokemon/annon_n/front.pic" ; 0x07dc57--0x07dcf4
+AnnonNPicBack:: INCBIN "gfx/pokemon/annon_n/back.pic" ; 0x07dcf4--0x07dd8b
+AnnonOPicFront:: INCBIN "gfx/pokemon/annon_o/front.pic" ; 0x07dd8b--0x07de55
+AnnonOPicBack:: INCBIN "gfx/pokemon/annon_o/back.pic" ; 0x07de55--0x07df15
+AnnonPPicFront:: INCBIN "gfx/pokemon/annon_p/front.pic" ; 0x07df15--0x07df7d
+AnnonPPicBack:: INCBIN "gfx/pokemon/annon_p/back.pic" ; 0x07df7d--0x07dfd6
+AnnonQPicFront:: INCBIN "gfx/pokemon/annon_q/front.pic" ; 0x07dfd6--0x07e03d
+AnnonQPicBack:: INCBIN "gfx/pokemon/annon_q/back.pic" ; 0x07e03d--0x07e099
+AnnonRPicFront:: INCBIN "gfx/pokemon/annon_r/front.pic" ; 0x07e099--0x07e0ff
+AnnonRPicBack:: INCBIN "gfx/pokemon/annon_r/back.pic" ; 0x07e0ff--0x07e159
+AnnonSPicFront:: INCBIN "gfx/pokemon/annon_s/front.pic" ; 0x07e159--0x07e1f0
+AnnonSPicBack:: INCBIN "gfx/pokemon/annon_s/back.pic" ; 0x07e1f0--0x07e27a
+AnnonTPicFront:: INCBIN "gfx/pokemon/annon_t/front.pic" ; 0x07e27a--0x07e2e8
+AnnonTPicBack:: INCBIN "gfx/pokemon/annon_t/back.pic" ; 0x07e2e8--0x07e348
+AnnonUPicFront:: INCBIN "gfx/pokemon/annon_u/front.pic" ; 0x07e348--0x07e3e7
+AnnonUPicBack:: INCBIN "gfx/pokemon/annon_u/back.pic" ; 0x07e3e7--0x07e47a
+AnnonVPicFront:: INCBIN "gfx/pokemon/annon_v/front.pic" ; 0x07e47a--0x07e50a
+AnnonVPicBack:: INCBIN "gfx/pokemon/annon_v/back.pic" ; 0x07e50a--0x07e589
+AnnonWPicFront:: INCBIN "gfx/pokemon/annon_w/front.pic" ; 0x07e589--0x07e60d
+AnnonWPicBack:: INCBIN "gfx/pokemon/annon_w/back.pic" ; 0x07e60d--0x07e681
+AnnonXPicFront:: INCBIN "gfx/pokemon/annon_x/front.pic" ; 0x07e681--0x07e705
+AnnonXPicBack:: INCBIN "gfx/pokemon/annon_x/back.pic" ; 0x07e705--0x07e77b
+AnnonYPicFront:: INCBIN "gfx/pokemon/annon_y/front.pic" ; 0x07e77b--0x07e801
+AnnonYPicBack:: INCBIN "gfx/pokemon/annon_y/back.pic" ; 0x07e801--0x07e87c
+AnnonZPicFront:: INCBIN "gfx/pokemon/annon_z/front.pic" ; 0x07e87c--0x07e8fa
+AnnonZPicBack:: INCBIN "gfx/pokemon/annon_z/back.pic" ; 0x07e8fa--0x07e96a
diff --git a/gfx/pokemon/egg.asm b/gfx/pokemon/egg.asm
index 57a4bbf..ed41fed 100644
--- a/gfx/pokemon/egg.asm
+++ b/gfx/pokemon/egg.asm
@@ -1,2 +1,2 @@
SECTION "PKMN Egg Pic", ROMX[$696a], BANK[$1f]
-EggPicFront:: INCBIN "build/gfx/pokemon/egg/front.pic" ; 0x07e96a--0x07e9c9
+EggPicFront:: INCBIN "gfx/pokemon/egg/front.pic" ; 0x07e96a--0x07e9c9
diff --git a/gfx/pokemon/pkmn_pics.asm b/gfx/pokemon/pkmn_pics.asm
index 0d66ad2..83f6b6f 100644
--- a/gfx/pokemon/pkmn_pics.asm
+++ b/gfx/pokemon/pkmn_pics.asm
@@ -1,543 +1,543 @@
SECTION "PKMN Pics 1", ROMX[$4000], BANK[$15]
-FushigidanePicFront:: INCBIN "build/gfx/pokemon/fushigidane/front.pic" ; 0x054000--0x0540bc
-FushigidanePicBack:: INCBIN "build/gfx/pokemon/fushigidane/back.pic" ; 0x0540bc--0x0541ca
-FushigisouPicFront:: INCBIN "build/gfx/pokemon/fushigisou/front.pic" ; 0x0541ca--0x0542e7
-FushigisouPicBack:: INCBIN "build/gfx/pokemon/fushigisou/back.pic" ; 0x0542e7--0x05441a
-FushigibanaPicFront:: INCBIN "build/gfx/pokemon/fushigibana/front.pic" ; 0x05441a--0x05464f
-FushigibanaPicBack:: INCBIN "build/gfx/pokemon/fushigibana/back.pic" ; 0x05464f--0x0547d4
-HitokagePicFront:: INCBIN "build/gfx/pokemon/hitokage/front.pic" ; 0x0547d4--0x0548d6
-HitokagePicBack:: INCBIN "build/gfx/pokemon/hitokage/back.pic" ; 0x0548d6--0x0549d3
-LizardoPicFront:: INCBIN "build/gfx/pokemon/lizardo/front.pic" ; 0x0549d3--0x054b3a
-LizardoPicBack:: INCBIN "build/gfx/pokemon/lizardo/back.pic" ; 0x054b3a--0x054c4c
-LizardonPicFront:: INCBIN "build/gfx/pokemon/lizardon/front.pic" ; 0x054c4c--0x054e83
-LizardonPicBack:: INCBIN "build/gfx/pokemon/lizardon/back.pic" ; 0x054e83--0x054fe0
-ZenigamePicFront:: INCBIN "build/gfx/pokemon/zenigame/front.pic" ; 0x054fe0--0x0550c7
-ZenigamePicBack:: INCBIN "build/gfx/pokemon/zenigame/back.pic" ; 0x0550c7--0x0551f9
-KameilPicFront:: INCBIN "build/gfx/pokemon/kameil/front.pic" ; 0x0551f9--0x05536c
-KameilPicBack:: INCBIN "build/gfx/pokemon/kameil/back.pic" ; 0x05536c--0x0554ac
-KamexPicFront:: INCBIN "build/gfx/pokemon/kamex/front.pic" ; 0x0554ac--0x0556b6
-KamexPicBack:: INCBIN "build/gfx/pokemon/kamex/back.pic" ; 0x0556b6--0x0557f2
-CaterpiePicFront:: INCBIN "build/gfx/pokemon/caterpie/front.pic" ; 0x0557f2--0x05589f
-CaterpiePicBack:: INCBIN "build/gfx/pokemon/caterpie/back.pic" ; 0x05589f--0x05598b
-TranselPicFront:: INCBIN "build/gfx/pokemon/transel/front.pic" ; 0x05598b--0x055a41
-TranselPicBack:: INCBIN "build/gfx/pokemon/transel/back.pic" ; 0x055a41--0x055b17
-ButterfreePicFront:: INCBIN "build/gfx/pokemon/butterfree/front.pic" ; 0x055b17--0x055d0c
-ButterfreePicBack:: INCBIN "build/gfx/pokemon/butterfree/back.pic" ; 0x055d0c--0x055e7e
-BeedlePicFront:: INCBIN "build/gfx/pokemon/beedle/front.pic" ; 0x055e7e--0x055f46
-BeedlePicBack:: INCBIN "build/gfx/pokemon/beedle/back.pic" ; 0x055f46--0x055ffa
-CocoonPicFront:: INCBIN "build/gfx/pokemon/cocoon/front.pic" ; 0x055ffa--0x0560be
-CocoonPicBack:: INCBIN "build/gfx/pokemon/cocoon/back.pic" ; 0x0560be--0x0561ac
-SpearPicFront:: INCBIN "build/gfx/pokemon/spear/front.pic" ; 0x0561ac--0x05639b
-SpearPicBack:: INCBIN "build/gfx/pokemon/spear/back.pic" ; 0x05639b--0x056566
-PoppoPicFront:: INCBIN "build/gfx/pokemon/poppo/front.pic" ; 0x056566--0x056658
-PoppoPicBack:: INCBIN "build/gfx/pokemon/poppo/back.pic" ; 0x056658--0x0567b9
-PigeonPicFront:: INCBIN "build/gfx/pokemon/pigeon/front.pic" ; 0x0567b9--0x05690a
-PigeonPicBack:: INCBIN "build/gfx/pokemon/pigeon/back.pic" ; 0x05690a--0x05699d
-PigeotPicFront:: INCBIN "build/gfx/pokemon/pigeot/front.pic" ; 0x05699d--0x056b54
-PigeotPicBack:: INCBIN "build/gfx/pokemon/pigeot/back.pic" ; 0x056b54--0x056c3f
-KorattaPicFront:: INCBIN "build/gfx/pokemon/koratta/front.pic" ; 0x056c3f--0x056d1f
-KorattaPicBack:: INCBIN "build/gfx/pokemon/koratta/back.pic" ; 0x056d1f--0x056e52
-RattaPicFront:: INCBIN "build/gfx/pokemon/ratta/front.pic" ; 0x056e52--0x056fe5
-RattaPicBack:: INCBIN "build/gfx/pokemon/ratta/back.pic" ; 0x056fe5--0x057125
-OnisuzumePicFront:: INCBIN "build/gfx/pokemon/onisuzume/front.pic" ; 0x057125--0x057206
-OnisuzumePicBack:: INCBIN "build/gfx/pokemon/onisuzume/back.pic" ; 0x057206--0x0572f0
-OnidrillPicFront:: INCBIN "build/gfx/pokemon/onidrill/front.pic" ; 0x0572f0--0x057496
-OnidrillPicBack:: INCBIN "build/gfx/pokemon/onidrill/back.pic" ; 0x057496--0x057550
-ArboPicFront:: INCBIN "build/gfx/pokemon/arbo/front.pic" ; 0x057550--0x057651
-ArboPicBack:: INCBIN "build/gfx/pokemon/arbo/back.pic" ; 0x057651--0x05778b
-ArbokPicFront:: INCBIN "build/gfx/pokemon/arbok/front.pic" ; 0x05778b--0x0579e8
-ArbokPicBack:: INCBIN "build/gfx/pokemon/arbok/back.pic" ; 0x0579e8--0x057abd
-PikachuPicFront:: INCBIN "build/gfx/pokemon/pikachu/front.pic" ; 0x057abd--0x057b9d
-PikachuPicBack:: INCBIN "build/gfx/pokemon/pikachu/back.pic" ; 0x057b9d--0x057cc3
-RaichuPicFront:: INCBIN "build/gfx/pokemon/raichu/front.pic" ; 0x057cc3--0x057e7e
-RaichuPicBack:: INCBIN "build/gfx/pokemon/raichu/back.pic" ; 0x057e7e--0x057f9f
+FushigidanePicFront:: INCBIN "gfx/pokemon/fushigidane/front.pic" ; 0x054000--0x0540bc
+FushigidanePicBack:: INCBIN "gfx/pokemon/fushigidane/back.pic" ; 0x0540bc--0x0541ca
+FushigisouPicFront:: INCBIN "gfx/pokemon/fushigisou/front.pic" ; 0x0541ca--0x0542e7
+FushigisouPicBack:: INCBIN "gfx/pokemon/fushigisou/back.pic" ; 0x0542e7--0x05441a
+FushigibanaPicFront:: INCBIN "gfx/pokemon/fushigibana/front.pic" ; 0x05441a--0x05464f
+FushigibanaPicBack:: INCBIN "gfx/pokemon/fushigibana/back.pic" ; 0x05464f--0x0547d4
+HitokagePicFront:: INCBIN "gfx/pokemon/hitokage/front.pic" ; 0x0547d4--0x0548d6
+HitokagePicBack:: INCBIN "gfx/pokemon/hitokage/back.pic" ; 0x0548d6--0x0549d3
+LizardoPicFront:: INCBIN "gfx/pokemon/lizardo/front.pic" ; 0x0549d3--0x054b3a
+LizardoPicBack:: INCBIN "gfx/pokemon/lizardo/back.pic" ; 0x054b3a--0x054c4c
+LizardonPicFront:: INCBIN "gfx/pokemon/lizardon/front.pic" ; 0x054c4c--0x054e83
+LizardonPicBack:: INCBIN "gfx/pokemon/lizardon/back.pic" ; 0x054e83--0x054fe0
+ZenigamePicFront:: INCBIN "gfx/pokemon/zenigame/front.pic" ; 0x054fe0--0x0550c7
+ZenigamePicBack:: INCBIN "gfx/pokemon/zenigame/back.pic" ; 0x0550c7--0x0551f9
+KameilPicFront:: INCBIN "gfx/pokemon/kameil/front.pic" ; 0x0551f9--0x05536c
+KameilPicBack:: INCBIN "gfx/pokemon/kameil/back.pic" ; 0x05536c--0x0554ac
+KamexPicFront:: INCBIN "gfx/pokemon/kamex/front.pic" ; 0x0554ac--0x0556b6
+KamexPicBack:: INCBIN "gfx/pokemon/kamex/back.pic" ; 0x0556b6--0x0557f2
+CaterpiePicFront:: INCBIN "gfx/pokemon/caterpie/front.pic" ; 0x0557f2--0x05589f
+CaterpiePicBack:: INCBIN "gfx/pokemon/caterpie/back.pic" ; 0x05589f--0x05598b
+TranselPicFront:: INCBIN "gfx/pokemon/transel/front.pic" ; 0x05598b--0x055a41
+TranselPicBack:: INCBIN "gfx/pokemon/transel/back.pic" ; 0x055a41--0x055b17
+ButterfreePicFront:: INCBIN "gfx/pokemon/butterfree/front.pic" ; 0x055b17--0x055d0c
+ButterfreePicBack:: INCBIN "gfx/pokemon/butterfree/back.pic" ; 0x055d0c--0x055e7e
+BeedlePicFront:: INCBIN "gfx/pokemon/beedle/front.pic" ; 0x055e7e--0x055f46
+BeedlePicBack:: INCBIN "gfx/pokemon/beedle/back.pic" ; 0x055f46--0x055ffa
+CocoonPicFront:: INCBIN "gfx/pokemon/cocoon/front.pic" ; 0x055ffa--0x0560be
+CocoonPicBack:: INCBIN "gfx/pokemon/cocoon/back.pic" ; 0x0560be--0x0561ac
+SpearPicFront:: INCBIN "gfx/pokemon/spear/front.pic" ; 0x0561ac--0x05639b
+SpearPicBack:: INCBIN "gfx/pokemon/spear/back.pic" ; 0x05639b--0x056566
+PoppoPicFront:: INCBIN "gfx/pokemon/poppo/front.pic" ; 0x056566--0x056658
+PoppoPicBack:: INCBIN "gfx/pokemon/poppo/back.pic" ; 0x056658--0x0567b9
+PigeonPicFront:: INCBIN "gfx/pokemon/pigeon/front.pic" ; 0x0567b9--0x05690a
+PigeonPicBack:: INCBIN "gfx/pokemon/pigeon/back.pic" ; 0x05690a--0x05699d
+PigeotPicFront:: INCBIN "gfx/pokemon/pigeot/front.pic" ; 0x05699d--0x056b54
+PigeotPicBack:: INCBIN "gfx/pokemon/pigeot/back.pic" ; 0x056b54--0x056c3f
+KorattaPicFront:: INCBIN "gfx/pokemon/koratta/front.pic" ; 0x056c3f--0x056d1f
+KorattaPicBack:: INCBIN "gfx/pokemon/koratta/back.pic" ; 0x056d1f--0x056e52
+RattaPicFront:: INCBIN "gfx/pokemon/ratta/front.pic" ; 0x056e52--0x056fe5
+RattaPicBack:: INCBIN "gfx/pokemon/ratta/back.pic" ; 0x056fe5--0x057125
+OnisuzumePicFront:: INCBIN "gfx/pokemon/onisuzume/front.pic" ; 0x057125--0x057206
+OnisuzumePicBack:: INCBIN "gfx/pokemon/onisuzume/back.pic" ; 0x057206--0x0572f0
+OnidrillPicFront:: INCBIN "gfx/pokemon/onidrill/front.pic" ; 0x0572f0--0x057496
+OnidrillPicBack:: INCBIN "gfx/pokemon/onidrill/back.pic" ; 0x057496--0x057550
+ArboPicFront:: INCBIN "gfx/pokemon/arbo/front.pic" ; 0x057550--0x057651
+ArboPicBack:: INCBIN "gfx/pokemon/arbo/back.pic" ; 0x057651--0x05778b
+ArbokPicFront:: INCBIN "gfx/pokemon/arbok/front.pic" ; 0x05778b--0x0579e8
+ArbokPicBack:: INCBIN "gfx/pokemon/arbok/back.pic" ; 0x0579e8--0x057abd
+PikachuPicFront:: INCBIN "gfx/pokemon/pikachu/front.pic" ; 0x057abd--0x057b9d
+PikachuPicBack:: INCBIN "gfx/pokemon/pikachu/back.pic" ; 0x057b9d--0x057cc3
+RaichuPicFront:: INCBIN "gfx/pokemon/raichu/front.pic" ; 0x057cc3--0x057e7e
+RaichuPicBack:: INCBIN "gfx/pokemon/raichu/back.pic" ; 0x057e7e--0x057f9f
SECTION "PKMN Pics 2", ROMX[$4000], BANK[$16]
-SandPicFront:: INCBIN "build/gfx/pokemon/sand/front.pic" ; 0x058000--0x058103
-SandPicBack:: INCBIN "build/gfx/pokemon/sand/back.pic" ; 0x058103--0x058238
-SandpanPicFront:: INCBIN "build/gfx/pokemon/sandpan/front.pic" ; 0x058238--0x0583d4
-SandpanPicBack:: INCBIN "build/gfx/pokemon/sandpan/back.pic" ; 0x0583d4--0x058545
-Nidoran_FPicFront:: INCBIN "build/gfx/pokemon/nidoran_f/front.pic" ; 0x058545--0x0585fe
-Nidoran_FPicBack:: INCBIN "build/gfx/pokemon/nidoran_f/back.pic" ; 0x0585fe--0x0586d0
-NidorinaPicFront:: INCBIN "build/gfx/pokemon/nidorina/front.pic" ; 0x0586d0--0x05880d
-NidorinaPicBack:: INCBIN "build/gfx/pokemon/nidorina/back.pic" ; 0x05880d--0x05893c
-NidoqueenPicFront:: INCBIN "build/gfx/pokemon/nidoqueen/front.pic" ; 0x05893c--0x058b22
-NidoqueenPicBack:: INCBIN "build/gfx/pokemon/nidoqueen/back.pic" ; 0x058b22--0x058c65
-Nidoran_MPicFront:: INCBIN "build/gfx/pokemon/nidoran_m/front.pic" ; 0x058c65--0x058d4c
-Nidoran_MPicBack:: INCBIN "build/gfx/pokemon/nidoran_m/back.pic" ; 0x058d4c--0x058e28
-NidorinoPicFront:: INCBIN "build/gfx/pokemon/nidorino/front.pic" ; 0x058e28--0x058f96
-NidorinoPicBack:: INCBIN "build/gfx/pokemon/nidorino/back.pic" ; 0x058f96--0x0590d4
-NidokingPicFront:: INCBIN "build/gfx/pokemon/nidoking/front.pic" ; 0x0590d4--0x05933c
-NidokingPicBack:: INCBIN "build/gfx/pokemon/nidoking/back.pic" ; 0x05933c--0x0594a9
-PippiPicFront:: INCBIN "build/gfx/pokemon/pippi/front.pic" ; 0x0594a9--0x059589
-PippiPicBack:: INCBIN "build/gfx/pokemon/pippi/back.pic" ; 0x059589--0x0596db
-PixyPicFront:: INCBIN "build/gfx/pokemon/pixy/front.pic" ; 0x0596db--0x05982c
-PixyPicBack:: INCBIN "build/gfx/pokemon/pixy/back.pic" ; 0x05982c--0x059980
-RokonPicFront:: INCBIN "build/gfx/pokemon/rokon/front.pic" ; 0x059980--0x059afb
-RokonPicBack:: INCBIN "build/gfx/pokemon/rokon/back.pic" ; 0x059afb--0x059c46
-KyukonPicFront:: INCBIN "build/gfx/pokemon/kyukon/front.pic" ; 0x059c46--0x059e65
-KyukonPicBack:: INCBIN "build/gfx/pokemon/kyukon/back.pic" ; 0x059e65--0x059fad
-PurinPicFront:: INCBIN "build/gfx/pokemon/purin/front.pic" ; 0x059fad--0x05a097
-PurinPicBack:: INCBIN "build/gfx/pokemon/purin/back.pic" ; 0x05a097--0x05a156
-PukurinPicFront:: INCBIN "build/gfx/pokemon/pukurin/front.pic" ; 0x05a156--0x05a2af
-PukurinPicBack:: INCBIN "build/gfx/pokemon/pukurin/back.pic" ; 0x05a2af--0x05a397
-ZubatPicFront:: INCBIN "build/gfx/pokemon/zubat/front.pic" ; 0x05a397--0x05a49e
-ZubatPicBack:: INCBIN "build/gfx/pokemon/zubat/back.pic" ; 0x05a49e--0x05a5c9
-GolbatPicFront:: INCBIN "build/gfx/pokemon/golbat/front.pic" ; 0x05a5c9--0x05a774
-GolbatPicBack:: INCBIN "build/gfx/pokemon/golbat/back.pic" ; 0x05a774--0x05a7f6
-NazonokusaPicFront:: INCBIN "build/gfx/pokemon/nazonokusa/front.pic" ; 0x05a7f6--0x05a8a3
-NazonokusaPicBack:: INCBIN "build/gfx/pokemon/nazonokusa/back.pic" ; 0x05a8a3--0x05a973
-KusaihanaPicFront:: INCBIN "build/gfx/pokemon/kusaihana/front.pic" ; 0x05a973--0x05aacb
-KusaihanaPicBack:: INCBIN "build/gfx/pokemon/kusaihana/back.pic" ; 0x05aacb--0x05abdd
-RuffresiaPicFront:: INCBIN "build/gfx/pokemon/ruffresia/front.pic" ; 0x05abdd--0x05ad51
-RuffresiaPicBack:: INCBIN "build/gfx/pokemon/ruffresia/back.pic" ; 0x05ad51--0x05ae8a
-ParasPicFront:: INCBIN "build/gfx/pokemon/paras/front.pic" ; 0x05ae8a--0x05af4d
-ParasPicBack:: INCBIN "build/gfx/pokemon/paras/back.pic" ; 0x05af4d--0x05b03c
-ParasectPicFront:: INCBIN "build/gfx/pokemon/parasect/front.pic" ; 0x05b03c--0x05b1b3
-ParasectPicBack:: INCBIN "build/gfx/pokemon/parasect/back.pic" ; 0x05b1b3--0x05b2e7
-KongpangPicFront:: INCBIN "build/gfx/pokemon/kongpang/front.pic" ; 0x05b2e7--0x05b404
-KongpangPicBack:: INCBIN "build/gfx/pokemon/kongpang/back.pic" ; 0x05b404--0x05b4c6
-MorphonPicFront:: INCBIN "build/gfx/pokemon/morphon/front.pic" ; 0x05b4c6--0x05b6b6
-MorphonPicBack:: INCBIN "build/gfx/pokemon/morphon/back.pic" ; 0x05b6b6--0x05b7f7
-DigdaPicFront:: INCBIN "build/gfx/pokemon/digda/front.pic" ; 0x05b7f7--0x05b8e1
-DigdaPicBack:: INCBIN "build/gfx/pokemon/digda/back.pic" ; 0x05b8e1--0x05b9fc
-DugtrioPicFront:: INCBIN "build/gfx/pokemon/dugtrio/front.pic" ; 0x05b9fc--0x05bc2d
-DugtrioPicBack:: INCBIN "build/gfx/pokemon/dugtrio/back.pic" ; 0x05bc2d--0x05bda8
+SandPicFront:: INCBIN "gfx/pokemon/sand/front.pic" ; 0x058000--0x058103
+SandPicBack:: INCBIN "gfx/pokemon/sand/back.pic" ; 0x058103--0x058238
+SandpanPicFront:: INCBIN "gfx/pokemon/sandpan/front.pic" ; 0x058238--0x0583d4
+SandpanPicBack:: INCBIN "gfx/pokemon/sandpan/back.pic" ; 0x0583d4--0x058545
+Nidoran_FPicFront:: INCBIN "gfx/pokemon/nidoran_f/front.pic" ; 0x058545--0x0585fe
+Nidoran_FPicBack:: INCBIN "gfx/pokemon/nidoran_f/back.pic" ; 0x0585fe--0x0586d0
+NidorinaPicFront:: INCBIN "gfx/pokemon/nidorina/front.pic" ; 0x0586d0--0x05880d
+NidorinaPicBack:: INCBIN "gfx/pokemon/nidorina/back.pic" ; 0x05880d--0x05893c
+NidoqueenPicFront:: INCBIN "gfx/pokemon/nidoqueen/front.pic" ; 0x05893c--0x058b22
+NidoqueenPicBack:: INCBIN "gfx/pokemon/nidoqueen/back.pic" ; 0x058b22--0x058c65
+Nidoran_MPicFront:: INCBIN "gfx/pokemon/nidoran_m/front.pic" ; 0x058c65--0x058d4c
+Nidoran_MPicBack:: INCBIN "gfx/pokemon/nidoran_m/back.pic" ; 0x058d4c--0x058e28
+NidorinoPicFront:: INCBIN "gfx/pokemon/nidorino/front.pic" ; 0x058e28--0x058f96
+NidorinoPicBack:: INCBIN "gfx/pokemon/nidorino/back.pic" ; 0x058f96--0x0590d4
+NidokingPicFront:: INCBIN "gfx/pokemon/nidoking/front.pic" ; 0x0590d4--0x05933c
+NidokingPicBack:: INCBIN "gfx/pokemon/nidoking/back.pic" ; 0x05933c--0x0594a9
+PippiPicFront:: INCBIN "gfx/pokemon/pippi/front.pic" ; 0x0594a9--0x059589
+PippiPicBack:: INCBIN "gfx/pokemon/pippi/back.pic" ; 0x059589--0x0596db
+PixyPicFront:: INCBIN "gfx/pokemon/pixy/front.pic" ; 0x0596db--0x05982c
+PixyPicBack:: INCBIN "gfx/pokemon/pixy/back.pic" ; 0x05982c--0x059980
+RokonPicFront:: INCBIN "gfx/pokemon/rokon/front.pic" ; 0x059980--0x059afb
+RokonPicBack:: INCBIN "gfx/pokemon/rokon/back.pic" ; 0x059afb--0x059c46
+KyukonPicFront:: INCBIN "gfx/pokemon/kyukon/front.pic" ; 0x059c46--0x059e65
+KyukonPicBack:: INCBIN "gfx/pokemon/kyukon/back.pic" ; 0x059e65--0x059fad
+PurinPicFront:: INCBIN "gfx/pokemon/purin/front.pic" ; 0x059fad--0x05a097
+PurinPicBack:: INCBIN "gfx/pokemon/purin/back.pic" ; 0x05a097--0x05a156
+PukurinPicFront:: INCBIN "gfx/pokemon/pukurin/front.pic" ; 0x05a156--0x05a2af
+PukurinPicBack:: INCBIN "gfx/pokemon/pukurin/back.pic" ; 0x05a2af--0x05a397
+ZubatPicFront:: INCBIN "gfx/pokemon/zubat/front.pic" ; 0x05a397--0x05a49e
+ZubatPicBack:: INCBIN "gfx/pokemon/zubat/back.pic" ; 0x05a49e--0x05a5c9
+GolbatPicFront:: INCBIN "gfx/pokemon/golbat/front.pic" ; 0x05a5c9--0x05a774
+GolbatPicBack:: INCBIN "gfx/pokemon/golbat/back.pic" ; 0x05a774--0x05a7f6
+NazonokusaPicFront:: INCBIN "gfx/pokemon/nazonokusa/front.pic" ; 0x05a7f6--0x05a8a3
+NazonokusaPicBack:: INCBIN "gfx/pokemon/nazonokusa/back.pic" ; 0x05a8a3--0x05a973
+KusaihanaPicFront:: INCBIN "gfx/pokemon/kusaihana/front.pic" ; 0x05a973--0x05aacb
+KusaihanaPicBack:: INCBIN "gfx/pokemon/kusaihana/back.pic" ; 0x05aacb--0x05abdd
+RuffresiaPicFront:: INCBIN "gfx/pokemon/ruffresia/front.pic" ; 0x05abdd--0x05ad51
+RuffresiaPicBack:: INCBIN "gfx/pokemon/ruffresia/back.pic" ; 0x05ad51--0x05ae8a
+ParasPicFront:: INCBIN "gfx/pokemon/paras/front.pic" ; 0x05ae8a--0x05af4d
+ParasPicBack:: INCBIN "gfx/pokemon/paras/back.pic" ; 0x05af4d--0x05b03c
+ParasectPicFront:: INCBIN "gfx/pokemon/parasect/front.pic" ; 0x05b03c--0x05b1b3
+ParasectPicBack:: INCBIN "gfx/pokemon/parasect/back.pic" ; 0x05b1b3--0x05b2e7
+KongpangPicFront:: INCBIN "gfx/pokemon/kongpang/front.pic" ; 0x05b2e7--0x05b404
+KongpangPicBack:: INCBIN "gfx/pokemon/kongpang/back.pic" ; 0x05b404--0x05b4c6
+MorphonPicFront:: INCBIN "gfx/pokemon/morphon/front.pic" ; 0x05b4c6--0x05b6b6
+MorphonPicBack:: INCBIN "gfx/pokemon/morphon/back.pic" ; 0x05b6b6--0x05b7f7
+DigdaPicFront:: INCBIN "gfx/pokemon/digda/front.pic" ; 0x05b7f7--0x05b8e1
+DigdaPicBack:: INCBIN "gfx/pokemon/digda/back.pic" ; 0x05b8e1--0x05b9fc
+DugtrioPicFront:: INCBIN "gfx/pokemon/dugtrio/front.pic" ; 0x05b9fc--0x05bc2d
+DugtrioPicBack:: INCBIN "gfx/pokemon/dugtrio/back.pic" ; 0x05bc2d--0x05bda8
SECTION "PKMN Pics 3", ROMX[$4000], BANK[$17]
-NyarthPicFront:: INCBIN "build/gfx/pokemon/nyarth/front.pic" ; 0x05c000--0x05c12f
-NyarthPicBack:: INCBIN "build/gfx/pokemon/nyarth/back.pic" ; 0x05c12f--0x05c272
-PersianPicFront:: INCBIN "build/gfx/pokemon/persian/front.pic" ; 0x05c272--0x05c438
-PersianPicBack:: INCBIN "build/gfx/pokemon/persian/back.pic" ; 0x05c438--0x05c552
-KoduckPicFront:: INCBIN "build/gfx/pokemon/koduck/front.pic" ; 0x05c552--0x05c660
-KoduckPicBack:: INCBIN "build/gfx/pokemon/koduck/back.pic" ; 0x05c660--0x05c742
-GolduckPicFront:: INCBIN "build/gfx/pokemon/golduck/front.pic" ; 0x05c742--0x05c91c
-GolduckPicBack:: INCBIN "build/gfx/pokemon/golduck/back.pic" ; 0x05c91c--0x05ca29
-MankeyPicFront:: INCBIN "build/gfx/pokemon/mankey/front.pic" ; 0x05ca29--0x05cb3c
-MankeyPicBack:: INCBIN "build/gfx/pokemon/mankey/back.pic" ; 0x05cb3c--0x05cc86
-OkorizaruPicFront:: INCBIN "build/gfx/pokemon/okorizaru/front.pic" ; 0x05cc86--0x05ce52
-OkorizaruPicBack:: INCBIN "build/gfx/pokemon/okorizaru/back.pic" ; 0x05ce52--0x05cf7a
-GardiePicFront:: INCBIN "build/gfx/pokemon/gardie/front.pic" ; 0x05cf7a--0x05d063
-GardiePicBack:: INCBIN "build/gfx/pokemon/gardie/back.pic" ; 0x05d063--0x05d151
-WindiePicFront:: INCBIN "build/gfx/pokemon/windie/front.pic" ; 0x05d151--0x05d32e
-WindiePicBack:: INCBIN "build/gfx/pokemon/windie/back.pic" ; 0x05d32e--0x05d45f
-NyoromoPicFront:: INCBIN "build/gfx/pokemon/nyoromo/front.pic" ; 0x05d45f--0x05d548
-NyoromoPicBack:: INCBIN "build/gfx/pokemon/nyoromo/back.pic" ; 0x05d548--0x05d613
-NyorozoPicFront:: INCBIN "build/gfx/pokemon/nyorozo/front.pic" ; 0x05d613--0x05d770
-NyorozoPicBack:: INCBIN "build/gfx/pokemon/nyorozo/back.pic" ; 0x05d770--0x05d852
-NyorobonPicFront:: INCBIN "build/gfx/pokemon/nyorobon/front.pic" ; 0x05d852--0x05da00
-NyorobonPicBack:: INCBIN "build/gfx/pokemon/nyorobon/back.pic" ; 0x05da00--0x05dacb
-CaseyPicFront:: INCBIN "build/gfx/pokemon/casey/front.pic" ; 0x05dacb--0x05dbce
-CaseyPicBack:: INCBIN "build/gfx/pokemon/casey/back.pic" ; 0x05dbce--0x05dcff
-YungererPicFront:: INCBIN "build/gfx/pokemon/yungerer/front.pic" ; 0x05dcff--0x05de88
-YungererPicBack:: INCBIN "build/gfx/pokemon/yungerer/back.pic" ; 0x05de88--0x05df92
-FoodinPicFront:: INCBIN "build/gfx/pokemon/foodin/front.pic" ; 0x05df92--0x05e1b1
-FoodinPicBack:: INCBIN "build/gfx/pokemon/foodin/back.pic" ; 0x05e1b1--0x05e30c
-WanrikyPicFront:: INCBIN "build/gfx/pokemon/wanriky/front.pic" ; 0x05e30c--0x05e414
-WanrikyPicBack:: INCBIN "build/gfx/pokemon/wanriky/back.pic" ; 0x05e414--0x05e52d
-GorikyPicFront:: INCBIN "build/gfx/pokemon/goriky/front.pic" ; 0x05e52d--0x05e72e
-GorikyPicBack:: INCBIN "build/gfx/pokemon/goriky/back.pic" ; 0x05e72e--0x05e860
-KairikyPicFront:: INCBIN "build/gfx/pokemon/kairiky/front.pic" ; 0x05e860--0x05ea59
-KairikyPicBack:: INCBIN "build/gfx/pokemon/kairiky/back.pic" ; 0x05ea59--0x05ebc0
-MadatsubomiPicFront:: INCBIN "build/gfx/pokemon/madatsubomi/front.pic" ; 0x05ebc0--0x05ecb0
-MadatsubomiPicBack:: INCBIN "build/gfx/pokemon/madatsubomi/back.pic" ; 0x05ecb0--0x05ed8e
-UtsudonPicFront:: INCBIN "build/gfx/pokemon/utsudon/front.pic" ; 0x05ed8e--0x05eed2
-UtsudonPicBack:: INCBIN "build/gfx/pokemon/utsudon/back.pic" ; 0x05eed2--0x05f00c
-UtsubotPicFront:: INCBIN "build/gfx/pokemon/utsubot/front.pic" ; 0x05f00c--0x05f1e6
-UtsubotPicBack:: INCBIN "build/gfx/pokemon/utsubot/back.pic" ; 0x05f1e6--0x05f2b8
-MenokuragePicFront:: INCBIN "build/gfx/pokemon/menokurage/front.pic" ; 0x05f2b8--0x05f3a2
-MenokuragePicBack:: INCBIN "build/gfx/pokemon/menokurage/back.pic" ; 0x05f3a2--0x05f4ae
-DokukuragePicFront:: INCBIN "build/gfx/pokemon/dokukurage/front.pic" ; 0x05f4ae--0x05f61c
-DokukuragePicBack:: INCBIN "build/gfx/pokemon/dokukurage/back.pic" ; 0x05f61c--0x05f747
-IsitsubutePicFront:: INCBIN "build/gfx/pokemon/isitsubute/front.pic" ; 0x05f747--0x05f821
-IsitsubutePicBack:: INCBIN "build/gfx/pokemon/isitsubute/back.pic" ; 0x05f821--0x05f919
-GolonePicFront:: INCBIN "build/gfx/pokemon/golone/front.pic" ; 0x05f919--0x05fa9c
-GolonePicBack:: INCBIN "build/gfx/pokemon/golone/back.pic" ; 0x05fa9c--0x05fbee
+NyarthPicFront:: INCBIN "gfx/pokemon/nyarth/front.pic" ; 0x05c000--0x05c12f
+NyarthPicBack:: INCBIN "gfx/pokemon/nyarth/back.pic" ; 0x05c12f--0x05c272
+PersianPicFront:: INCBIN "gfx/pokemon/persian/front.pic" ; 0x05c272--0x05c438
+PersianPicBack:: INCBIN "gfx/pokemon/persian/back.pic" ; 0x05c438--0x05c552
+KoduckPicFront:: INCBIN "gfx/pokemon/koduck/front.pic" ; 0x05c552--0x05c660
+KoduckPicBack:: INCBIN "gfx/pokemon/koduck/back.pic" ; 0x05c660--0x05c742
+GolduckPicFront:: INCBIN "gfx/pokemon/golduck/front.pic" ; 0x05c742--0x05c91c
+GolduckPicBack:: INCBIN "gfx/pokemon/golduck/back.pic" ; 0x05c91c--0x05ca29
+MankeyPicFront:: INCBIN "gfx/pokemon/mankey/front.pic" ; 0x05ca29--0x05cb3c
+MankeyPicBack:: INCBIN "gfx/pokemon/mankey/back.pic" ; 0x05cb3c--0x05cc86
+OkorizaruPicFront:: INCBIN "gfx/pokemon/okorizaru/front.pic" ; 0x05cc86--0x05ce52
+OkorizaruPicBack:: INCBIN "gfx/pokemon/okorizaru/back.pic" ; 0x05ce52--0x05cf7a
+GardiePicFront:: INCBIN "gfx/pokemon/gardie/front.pic" ; 0x05cf7a--0x05d063
+GardiePicBack:: INCBIN "gfx/pokemon/gardie/back.pic" ; 0x05d063--0x05d151
+WindiePicFront:: INCBIN "gfx/pokemon/windie/front.pic" ; 0x05d151--0x05d32e
+WindiePicBack:: INCBIN "gfx/pokemon/windie/back.pic" ; 0x05d32e--0x05d45f
+NyoromoPicFront:: INCBIN "gfx/pokemon/nyoromo/front.pic" ; 0x05d45f--0x05d548
+NyoromoPicBack:: INCBIN "gfx/pokemon/nyoromo/back.pic" ; 0x05d548--0x05d613
+NyorozoPicFront:: INCBIN "gfx/pokemon/nyorozo/front.pic" ; 0x05d613--0x05d770
+NyorozoPicBack:: INCBIN "gfx/pokemon/nyorozo/back.pic" ; 0x05d770--0x05d852
+NyorobonPicFront:: INCBIN "gfx/pokemon/nyorobon/front.pic" ; 0x05d852--0x05da00
+NyorobonPicBack:: INCBIN "gfx/pokemon/nyorobon/back.pic" ; 0x05da00--0x05dacb
+CaseyPicFront:: INCBIN "gfx/pokemon/casey/front.pic" ; 0x05dacb--0x05dbce
+CaseyPicBack:: INCBIN "gfx/pokemon/casey/back.pic" ; 0x05dbce--0x05dcff
+YungererPicFront:: INCBIN "gfx/pokemon/yungerer/front.pic" ; 0x05dcff--0x05de88
+YungererPicBack:: INCBIN "gfx/pokemon/yungerer/back.pic" ; 0x05de88--0x05df92
+FoodinPicFront:: INCBIN "gfx/pokemon/foodin/front.pic" ; 0x05df92--0x05e1b1
+FoodinPicBack:: INCBIN "gfx/pokemon/foodin/back.pic" ; 0x05e1b1--0x05e30c
+WanrikyPicFront:: INCBIN "gfx/pokemon/wanriky/front.pic" ; 0x05e30c--0x05e414
+WanrikyPicBack:: INCBIN "gfx/pokemon/wanriky/back.pic" ; 0x05e414--0x05e52d
+GorikyPicFront:: INCBIN "gfx/pokemon/goriky/front.pic" ; 0x05e52d--0x05e72e
+GorikyPicBack:: INCBIN "gfx/pokemon/goriky/back.pic" ; 0x05e72e--0x05e860
+KairikyPicFront:: INCBIN "gfx/pokemon/kairiky/front.pic" ; 0x05e860--0x05ea59
+KairikyPicBack:: INCBIN "gfx/pokemon/kairiky/back.pic" ; 0x05ea59--0x05ebc0
+MadatsubomiPicFront:: INCBIN "gfx/pokemon/madatsubomi/front.pic" ; 0x05ebc0--0x05ecb0
+MadatsubomiPicBack:: INCBIN "gfx/pokemon/madatsubomi/back.pic" ; 0x05ecb0--0x05ed8e
+UtsudonPicFront:: INCBIN "gfx/pokemon/utsudon/front.pic" ; 0x05ed8e--0x05eed2
+UtsudonPicBack:: INCBIN "gfx/pokemon/utsudon/back.pic" ; 0x05eed2--0x05f00c
+UtsubotPicFront:: INCBIN "gfx/pokemon/utsubot/front.pic" ; 0x05f00c--0x05f1e6
+UtsubotPicBack:: INCBIN "gfx/pokemon/utsubot/back.pic" ; 0x05f1e6--0x05f2b8
+MenokuragePicFront:: INCBIN "gfx/pokemon/menokurage/front.pic" ; 0x05f2b8--0x05f3a2
+MenokuragePicBack:: INCBIN "gfx/pokemon/menokurage/back.pic" ; 0x05f3a2--0x05f4ae
+DokukuragePicFront:: INCBIN "gfx/pokemon/dokukurage/front.pic" ; 0x05f4ae--0x05f61c
+DokukuragePicBack:: INCBIN "gfx/pokemon/dokukurage/back.pic" ; 0x05f61c--0x05f747
+IsitsubutePicFront:: INCBIN "gfx/pokemon/isitsubute/front.pic" ; 0x05f747--0x05f821
+IsitsubutePicBack:: INCBIN "gfx/pokemon/isitsubute/back.pic" ; 0x05f821--0x05f919
+GolonePicFront:: INCBIN "gfx/pokemon/golone/front.pic" ; 0x05f919--0x05fa9c
+GolonePicBack:: INCBIN "gfx/pokemon/golone/back.pic" ; 0x05fa9c--0x05fbee
SECTION "PKMN Pics 4", ROMX[$4000], BANK[$18]
-GolonyaPicFront:: INCBIN "build/gfx/pokemon/golonya/front.pic" ; 0x060000--0x06017e
-GolonyaPicBack:: INCBIN "build/gfx/pokemon/golonya/back.pic" ; 0x06017e--0x060279
-PonytaPicFront:: INCBIN "build/gfx/pokemon/ponyta/front.pic" ; 0x060279--0x0603c5
-PonytaPicBack:: INCBIN "build/gfx/pokemon/ponyta/back.pic" ; 0x0603c5--0x060536
-GallopPicFront:: INCBIN "build/gfx/pokemon/gallop/front.pic" ; 0x060536--0x060718
-GallopPicBack:: INCBIN "build/gfx/pokemon/gallop/back.pic" ; 0x060718--0x06081a
-YadonPicFront:: INCBIN "build/gfx/pokemon/yadon/front.pic" ; 0x06081a--0x060929
-YadonPicBack:: INCBIN "build/gfx/pokemon/yadon/back.pic" ; 0x060929--0x060a3c
-YadoranPicFront:: INCBIN "build/gfx/pokemon/yadoran/front.pic" ; 0x060a3c--0x060c33
-YadoranPicBack:: INCBIN "build/gfx/pokemon/yadoran/back.pic" ; 0x060c33--0x060d48
-CoilPicFront:: INCBIN "build/gfx/pokemon/coil/front.pic" ; 0x060d48--0x060dce
-CoilPicBack:: INCBIN "build/gfx/pokemon/coil/back.pic" ; 0x060dce--0x060e55
-RarecoilPicFront:: INCBIN "build/gfx/pokemon/rarecoil/front.pic" ; 0x060e55--0x060fe7
-RarecoilPicBack:: INCBIN "build/gfx/pokemon/rarecoil/back.pic" ; 0x060fe7--0x061128
-KamonegiPicFront:: INCBIN "build/gfx/pokemon/kamonegi/front.pic" ; 0x061128--0x0612b3
-KamonegiPicBack:: INCBIN "build/gfx/pokemon/kamonegi/back.pic" ; 0x0612b3--0x0613d1
-DodoPicFront:: INCBIN "build/gfx/pokemon/dodo/front.pic" ; 0x0613d1--0x0614da
-DodoPicBack:: INCBIN "build/gfx/pokemon/dodo/back.pic" ; 0x0614da--0x061615
-DodorioPicFront:: INCBIN "build/gfx/pokemon/dodorio/front.pic" ; 0x061615--0x061814
-DodorioPicBack:: INCBIN "build/gfx/pokemon/dodorio/back.pic" ; 0x061814--0x06195c
-PawouPicFront:: INCBIN "build/gfx/pokemon/pawou/front.pic" ; 0x06195c--0x061aa7
-PawouPicBack:: INCBIN "build/gfx/pokemon/pawou/back.pic" ; 0x061aa7--0x061b9b
-JugonPicFront:: INCBIN "build/gfx/pokemon/jugon/front.pic" ; 0x061b9b--0x061d51
-JugonPicBack:: INCBIN "build/gfx/pokemon/jugon/back.pic" ; 0x061d51--0x061e2d
-BetbeterPicFront:: INCBIN "build/gfx/pokemon/betbeter/front.pic" ; 0x061e2d--0x061f5d
-BetbeterPicBack:: INCBIN "build/gfx/pokemon/betbeter/back.pic" ; 0x061f5d--0x0620f0
-BetbetonPicFront:: INCBIN "build/gfx/pokemon/betbeton/front.pic" ; 0x0620f0--0x0622c5
-BetbetonPicBack:: INCBIN "build/gfx/pokemon/betbeton/back.pic" ; 0x0622c5--0x0623b0
-ShellderPicFront:: INCBIN "build/gfx/pokemon/shellder/front.pic" ; 0x0623b0--0x0624ba
-ShellderPicBack:: INCBIN "build/gfx/pokemon/shellder/back.pic" ; 0x0624ba--0x0625d7
-ParshenPicFront:: INCBIN "build/gfx/pokemon/parshen/front.pic" ; 0x0625d7--0x0627ae
-ParshenPicBack:: INCBIN "build/gfx/pokemon/parshen/back.pic" ; 0x0627ae--0x062928
-GhosPicFront:: INCBIN "build/gfx/pokemon/ghos/front.pic" ; 0x062928--0x062a76
-GhosPicBack:: INCBIN "build/gfx/pokemon/ghos/back.pic" ; 0x062a76--0x062bcd
-GhostPicFront:: INCBIN "build/gfx/pokemon/ghost/front.pic" ; 0x062bcd--0x062d40
-GhostPicBack:: INCBIN "build/gfx/pokemon/ghost/back.pic" ; 0x062d40--0x062ea1
-GangarPicFront:: INCBIN "build/gfx/pokemon/gangar/front.pic" ; 0x062ea1--0x062fd2
-GangarPicBack:: INCBIN "build/gfx/pokemon/gangar/back.pic" ; 0x062fd2--0x06309b
-IwarkPicFront:: INCBIN "build/gfx/pokemon/iwark/front.pic" ; 0x06309b--0x063237
-IwarkPicBack:: INCBIN "build/gfx/pokemon/iwark/back.pic" ; 0x063237--0x063361
-SleepePicFront:: INCBIN "build/gfx/pokemon/sleepe/front.pic" ; 0x063361--0x0634bd
-SleepePicBack:: INCBIN "build/gfx/pokemon/sleepe/back.pic" ; 0x0634bd--0x0635d8
-SleeperPicFront:: INCBIN "build/gfx/pokemon/sleeper/front.pic" ; 0x0635d8--0x063798
-SleeperPicBack:: INCBIN "build/gfx/pokemon/sleeper/back.pic" ; 0x063798--0x0638ae
-CrabPicFront:: INCBIN "build/gfx/pokemon/crab/front.pic" ; 0x0638ae--0x0639e7
-CrabPicBack:: INCBIN "build/gfx/pokemon/crab/back.pic" ; 0x0639e7--0x063b57
+GolonyaPicFront:: INCBIN "gfx/pokemon/golonya/front.pic" ; 0x060000--0x06017e
+GolonyaPicBack:: INCBIN "gfx/pokemon/golonya/back.pic" ; 0x06017e--0x060279
+PonytaPicFront:: INCBIN "gfx/pokemon/ponyta/front.pic" ; 0x060279--0x0603c5
+PonytaPicBack:: INCBIN "gfx/pokemon/ponyta/back.pic" ; 0x0603c5--0x060536
+GallopPicFront:: INCBIN "gfx/pokemon/gallop/front.pic" ; 0x060536--0x060718
+GallopPicBack:: INCBIN "gfx/pokemon/gallop/back.pic" ; 0x060718--0x06081a
+YadonPicFront:: INCBIN "gfx/pokemon/yadon/front.pic" ; 0x06081a--0x060929
+YadonPicBack:: INCBIN "gfx/pokemon/yadon/back.pic" ; 0x060929--0x060a3c
+YadoranPicFront:: INCBIN "gfx/pokemon/yadoran/front.pic" ; 0x060a3c--0x060c33
+YadoranPicBack:: INCBIN "gfx/pokemon/yadoran/back.pic" ; 0x060c33--0x060d48
+CoilPicFront:: INCBIN "gfx/pokemon/coil/front.pic" ; 0x060d48--0x060dce
+CoilPicBack:: INCBIN "gfx/pokemon/coil/back.pic" ; 0x060dce--0x060e55
+RarecoilPicFront:: INCBIN "gfx/pokemon/rarecoil/front.pic" ; 0x060e55--0x060fe7
+RarecoilPicBack:: INCBIN "gfx/pokemon/rarecoil/back.pic" ; 0x060fe7--0x061128
+KamonegiPicFront:: INCBIN "gfx/pokemon/kamonegi/front.pic" ; 0x061128--0x0612b3
+KamonegiPicBack:: INCBIN "gfx/pokemon/kamonegi/back.pic" ; 0x0612b3--0x0613d1
+DodoPicFront:: INCBIN "gfx/pokemon/dodo/front.pic" ; 0x0613d1--0x0614da
+DodoPicBack:: INCBIN "gfx/pokemon/dodo/back.pic" ; 0x0614da--0x061615
+DodorioPicFront:: INCBIN "gfx/pokemon/dodorio/front.pic" ; 0x061615--0x061814
+DodorioPicBack:: INCBIN "gfx/pokemon/dodorio/back.pic" ; 0x061814--0x06195c
+PawouPicFront:: INCBIN "gfx/pokemon/pawou/front.pic" ; 0x06195c--0x061aa7
+PawouPicBack:: INCBIN "gfx/pokemon/pawou/back.pic" ; 0x061aa7--0x061b9b
+JugonPicFront:: INCBIN "gfx/pokemon/jugon/front.pic" ; 0x061b9b--0x061d51
+JugonPicBack:: INCBIN "gfx/pokemon/jugon/back.pic" ; 0x061d51--0x061e2d
+BetbeterPicFront:: INCBIN "gfx/pokemon/betbeter/front.pic" ; 0x061e2d--0x061f5d
+BetbeterPicBack:: INCBIN "gfx/pokemon/betbeter/back.pic" ; 0x061f5d--0x0620f0
+BetbetonPicFront:: INCBIN "gfx/pokemon/betbeton/front.pic" ; 0x0620f0--0x0622c5
+BetbetonPicBack:: INCBIN "gfx/pokemon/betbeton/back.pic" ; 0x0622c5--0x0623b0
+ShellderPicFront:: INCBIN "gfx/pokemon/shellder/front.pic" ; 0x0623b0--0x0624ba
+ShellderPicBack:: INCBIN "gfx/pokemon/shellder/back.pic" ; 0x0624ba--0x0625d7
+ParshenPicFront:: INCBIN "gfx/pokemon/parshen/front.pic" ; 0x0625d7--0x0627ae
+ParshenPicBack:: INCBIN "gfx/pokemon/parshen/back.pic" ; 0x0627ae--0x062928
+GhosPicFront:: INCBIN "gfx/pokemon/ghos/front.pic" ; 0x062928--0x062a76
+GhosPicBack:: INCBIN "gfx/pokemon/ghos/back.pic" ; 0x062a76--0x062bcd
+GhostPicFront:: INCBIN "gfx/pokemon/ghost/front.pic" ; 0x062bcd--0x062d40
+GhostPicBack:: INCBIN "gfx/pokemon/ghost/back.pic" ; 0x062d40--0x062ea1
+GangarPicFront:: INCBIN "gfx/pokemon/gangar/front.pic" ; 0x062ea1--0x062fd2
+GangarPicBack:: INCBIN "gfx/pokemon/gangar/back.pic" ; 0x062fd2--0x06309b
+IwarkPicFront:: INCBIN "gfx/pokemon/iwark/front.pic" ; 0x06309b--0x063237
+IwarkPicBack:: INCBIN "gfx/pokemon/iwark/back.pic" ; 0x063237--0x063361
+SleepePicFront:: INCBIN "gfx/pokemon/sleepe/front.pic" ; 0x063361--0x0634bd
+SleepePicBack:: INCBIN "gfx/pokemon/sleepe/back.pic" ; 0x0634bd--0x0635d8
+SleeperPicFront:: INCBIN "gfx/pokemon/sleeper/front.pic" ; 0x0635d8--0x063798
+SleeperPicBack:: INCBIN "gfx/pokemon/sleeper/back.pic" ; 0x063798--0x0638ae
+CrabPicFront:: INCBIN "gfx/pokemon/crab/front.pic" ; 0x0638ae--0x0639e7
+CrabPicBack:: INCBIN "gfx/pokemon/crab/back.pic" ; 0x0639e7--0x063b57
SECTION "PKMN Pics 5", ROMX[$4000], BANK[$19]
-KinglerPicFront:: INCBIN "build/gfx/pokemon/kingler/front.pic" ; 0x064000--0x0641f2
-KinglerPicBack:: INCBIN "build/gfx/pokemon/kingler/back.pic" ; 0x0641f2--0x06433d
-BiriridamaPicFront:: INCBIN "build/gfx/pokemon/biriridama/front.pic" ; 0x06433d--0x0643c6
-BiriridamaPicBack:: INCBIN "build/gfx/pokemon/biriridama/back.pic" ; 0x0643c6--0x064467
-MaruminePicFront:: INCBIN "build/gfx/pokemon/marumine/front.pic" ; 0x064467--0x06452e
-MaruminePicBack:: INCBIN "build/gfx/pokemon/marumine/back.pic" ; 0x06452e--0x0645ed
-TamatamaPicFront:: INCBIN "build/gfx/pokemon/tamatama/front.pic" ; 0x0645ed--0x064806
-TamatamaPicBack:: INCBIN "build/gfx/pokemon/tamatama/back.pic" ; 0x064806--0x064924
-NassyPicFront:: INCBIN "build/gfx/pokemon/nassy/front.pic" ; 0x064924--0x064ae7
-NassyPicBack:: INCBIN "build/gfx/pokemon/nassy/back.pic" ; 0x064ae7--0x064c6d
-KarakaraPicFront:: INCBIN "build/gfx/pokemon/karakara/front.pic" ; 0x064c6d--0x064d5b
-KarakaraPicBack:: INCBIN "build/gfx/pokemon/karakara/back.pic" ; 0x064d5b--0x064eaf
-GaragaraPicFront:: INCBIN "build/gfx/pokemon/garagara/front.pic" ; 0x064eaf--0x065021
-GaragaraPicBack:: INCBIN "build/gfx/pokemon/garagara/back.pic" ; 0x065021--0x065153
-SawamularPicFront:: INCBIN "build/gfx/pokemon/sawamular/front.pic" ; 0x065153--0x0652f2
-SawamularPicBack:: INCBIN "build/gfx/pokemon/sawamular/back.pic" ; 0x0652f2--0x065443
-EbiwalarPicFront:: INCBIN "build/gfx/pokemon/ebiwalar/front.pic" ; 0x065443--0x0655ca
-EbiwalarPicBack:: INCBIN "build/gfx/pokemon/ebiwalar/back.pic" ; 0x0655ca--0x065712
-BeroringaPicFront:: INCBIN "build/gfx/pokemon/beroringa/front.pic" ; 0x065712--0x06589c
-BeroringaPicBack:: INCBIN "build/gfx/pokemon/beroringa/back.pic" ; 0x06589c--0x065980
-DogarsPicFront:: INCBIN "build/gfx/pokemon/dogars/front.pic" ; 0x065980--0x065acf
-DogarsPicBack:: INCBIN "build/gfx/pokemon/dogars/back.pic" ; 0x065acf--0x065c0f
-MatadogasPicFront:: INCBIN "build/gfx/pokemon/matadogas/front.pic" ; 0x065c0f--0x065e09
-MatadogasPicBack:: INCBIN "build/gfx/pokemon/matadogas/back.pic" ; 0x065e09--0x065f88
-SihornPicFront:: INCBIN "build/gfx/pokemon/sihorn/front.pic" ; 0x065f88--0x06618f
-SihornPicBack:: INCBIN "build/gfx/pokemon/sihorn/back.pic" ; 0x06618f--0x0662a1
-SidonPicFront:: INCBIN "build/gfx/pokemon/sidon/front.pic" ; 0x0662a1--0x0664a3
-SidonPicBack:: INCBIN "build/gfx/pokemon/sidon/back.pic" ; 0x0664a3--0x0665f9
-LuckyPicFront:: INCBIN "build/gfx/pokemon/lucky/front.pic" ; 0x0665f9--0x06674a
-LuckyPicBack:: INCBIN "build/gfx/pokemon/lucky/back.pic" ; 0x06674a--0x066844
-MonjaraPicFront:: INCBIN "build/gfx/pokemon/monjara/front.pic" ; 0x066844--0x0669f2
-MonjaraPicBack:: INCBIN "build/gfx/pokemon/monjara/back.pic" ; 0x0669f2--0x066afd
-GaruraPicFront:: INCBIN "build/gfx/pokemon/garura/front.pic" ; 0x066afd--0x066d09
-GaruraPicBack:: INCBIN "build/gfx/pokemon/garura/back.pic" ; 0x066d09--0x066eab
-TattuPicFront:: INCBIN "build/gfx/pokemon/tattu/front.pic" ; 0x066eab--0x066f87
-TattuPicBack:: INCBIN "build/gfx/pokemon/tattu/back.pic" ; 0x066f87--0x06703d
-SeadraPicFront:: INCBIN "build/gfx/pokemon/seadra/front.pic" ; 0x06703d--0x0671a4
-SeadraPicBack:: INCBIN "build/gfx/pokemon/seadra/back.pic" ; 0x0671a4--0x0672a3
-TosakintoPicFront:: INCBIN "build/gfx/pokemon/tosakinto/front.pic" ; 0x0672a3--0x06738f
-TosakintoPicBack:: INCBIN "build/gfx/pokemon/tosakinto/back.pic" ; 0x06738f--0x0674ea
-AzumaoPicFront:: INCBIN "build/gfx/pokemon/azumao/front.pic" ; 0x0674ea--0x0676c0
-AzumaoPicBack:: INCBIN "build/gfx/pokemon/azumao/back.pic" ; 0x0676c0--0x06782d
-HitodemanPicFront:: INCBIN "build/gfx/pokemon/hitodeman/front.pic" ; 0x06782d--0x067939
-HitodemanPicBack:: INCBIN "build/gfx/pokemon/hitodeman/back.pic" ; 0x067939--0x067a28
-StarmiePicFront:: INCBIN "build/gfx/pokemon/starmie/front.pic" ; 0x067a28--0x067bb8
-StarmiePicBack:: INCBIN "build/gfx/pokemon/starmie/back.pic" ; 0x067bb8--0x067ca1
+KinglerPicFront:: INCBIN "gfx/pokemon/kingler/front.pic" ; 0x064000--0x0641f2
+KinglerPicBack:: INCBIN "gfx/pokemon/kingler/back.pic" ; 0x0641f2--0x06433d
+BiriridamaPicFront:: INCBIN "gfx/pokemon/biriridama/front.pic" ; 0x06433d--0x0643c6
+BiriridamaPicBack:: INCBIN "gfx/pokemon/biriridama/back.pic" ; 0x0643c6--0x064467
+MaruminePicFront:: INCBIN "gfx/pokemon/marumine/front.pic" ; 0x064467--0x06452e
+MaruminePicBack:: INCBIN "gfx/pokemon/marumine/back.pic" ; 0x06452e--0x0645ed
+TamatamaPicFront:: INCBIN "gfx/pokemon/tamatama/front.pic" ; 0x0645ed--0x064806
+TamatamaPicBack:: INCBIN "gfx/pokemon/tamatama/back.pic" ; 0x064806--0x064924
+NassyPicFront:: INCBIN "gfx/pokemon/nassy/front.pic" ; 0x064924--0x064ae7
+NassyPicBack:: INCBIN "gfx/pokemon/nassy/back.pic" ; 0x064ae7--0x064c6d
+KarakaraPicFront:: INCBIN "gfx/pokemon/karakara/front.pic" ; 0x064c6d--0x064d5b
+KarakaraPicBack:: INCBIN "gfx/pokemon/karakara/back.pic" ; 0x064d5b--0x064eaf
+GaragaraPicFront:: INCBIN "gfx/pokemon/garagara/front.pic" ; 0x064eaf--0x065021
+GaragaraPicBack:: INCBIN "gfx/pokemon/garagara/back.pic" ; 0x065021--0x065153
+SawamularPicFront:: INCBIN "gfx/pokemon/sawamular/front.pic" ; 0x065153--0x0652f2
+SawamularPicBack:: INCBIN "gfx/pokemon/sawamular/back.pic" ; 0x0652f2--0x065443
+EbiwalarPicFront:: INCBIN "gfx/pokemon/ebiwalar/front.pic" ; 0x065443--0x0655ca
+EbiwalarPicBack:: INCBIN "gfx/pokemon/ebiwalar/back.pic" ; 0x0655ca--0x065712
+BeroringaPicFront:: INCBIN "gfx/pokemon/beroringa/front.pic" ; 0x065712--0x06589c
+BeroringaPicBack:: INCBIN "gfx/pokemon/beroringa/back.pic" ; 0x06589c--0x065980
+DogarsPicFront:: INCBIN "gfx/pokemon/dogars/front.pic" ; 0x065980--0x065acf
+DogarsPicBack:: INCBIN "gfx/pokemon/dogars/back.pic" ; 0x065acf--0x065c0f
+MatadogasPicFront:: INCBIN "gfx/pokemon/matadogas/front.pic" ; 0x065c0f--0x065e09
+MatadogasPicBack:: INCBIN "gfx/pokemon/matadogas/back.pic" ; 0x065e09--0x065f88
+SihornPicFront:: INCBIN "gfx/pokemon/sihorn/front.pic" ; 0x065f88--0x06618f
+SihornPicBack:: INCBIN "gfx/pokemon/sihorn/back.pic" ; 0x06618f--0x0662a1
+SidonPicFront:: INCBIN "gfx/pokemon/sidon/front.pic" ; 0x0662a1--0x0664a3
+SidonPicBack:: INCBIN "gfx/pokemon/sidon/back.pic" ; 0x0664a3--0x0665f9
+LuckyPicFront:: INCBIN "gfx/pokemon/lucky/front.pic" ; 0x0665f9--0x06674a
+LuckyPicBack:: INCBIN "gfx/pokemon/lucky/back.pic" ; 0x06674a--0x066844
+MonjaraPicFront:: INCBIN "gfx/pokemon/monjara/front.pic" ; 0x066844--0x0669f2
+MonjaraPicBack:: INCBIN "gfx/pokemon/monjara/back.pic" ; 0x0669f2--0x066afd
+GaruraPicFront:: INCBIN "gfx/pokemon/garura/front.pic" ; 0x066afd--0x066d09
+GaruraPicBack:: INCBIN "gfx/pokemon/garura/back.pic" ; 0x066d09--0x066eab
+TattuPicFront:: INCBIN "gfx/pokemon/tattu/front.pic" ; 0x066eab--0x066f87
+TattuPicBack:: INCBIN "gfx/pokemon/tattu/back.pic" ; 0x066f87--0x06703d
+SeadraPicFront:: INCBIN "gfx/pokemon/seadra/front.pic" ; 0x06703d--0x0671a4
+SeadraPicBack:: INCBIN "gfx/pokemon/seadra/back.pic" ; 0x0671a4--0x0672a3
+TosakintoPicFront:: INCBIN "gfx/pokemon/tosakinto/front.pic" ; 0x0672a3--0x06738f
+TosakintoPicBack:: INCBIN "gfx/pokemon/tosakinto/back.pic" ; 0x06738f--0x0674ea
+AzumaoPicFront:: INCBIN "gfx/pokemon/azumao/front.pic" ; 0x0674ea--0x0676c0
+AzumaoPicBack:: INCBIN "gfx/pokemon/azumao/back.pic" ; 0x0676c0--0x06782d
+HitodemanPicFront:: INCBIN "gfx/pokemon/hitodeman/front.pic" ; 0x06782d--0x067939
+HitodemanPicBack:: INCBIN "gfx/pokemon/hitodeman/back.pic" ; 0x067939--0x067a28
+StarmiePicFront:: INCBIN "gfx/pokemon/starmie/front.pic" ; 0x067a28--0x067bb8
+StarmiePicBack:: INCBIN "gfx/pokemon/starmie/back.pic" ; 0x067bb8--0x067ca1
SECTION "PKMN Pics 6", ROMX[$4000], BANK[$1A]
-BarrierdPicFront:: INCBIN "build/gfx/pokemon/barrierd/front.pic" ; 0x068000--0x068154
-BarrierdPicBack:: INCBIN "build/gfx/pokemon/barrierd/back.pic" ; 0x068154--0x06828f
-StrikePicFront:: INCBIN "build/gfx/pokemon/strike/front.pic" ; 0x06828f--0x0684af
-StrikePicBack:: INCBIN "build/gfx/pokemon/strike/back.pic" ; 0x0684af--0x0685dc
-RougelaPicFront:: INCBIN "build/gfx/pokemon/rougela/front.pic" ; 0x0685dc--0x068796
-RougelaPicBack:: INCBIN "build/gfx/pokemon/rougela/back.pic" ; 0x068796--0x068863
-ElebooPicFront:: INCBIN "build/gfx/pokemon/eleboo/front.pic" ; 0x068863--0x0689eb
-ElebooPicBack:: INCBIN "build/gfx/pokemon/eleboo/back.pic" ; 0x0689eb--0x068b21
-BooberPicFront:: INCBIN "build/gfx/pokemon/boober/front.pic" ; 0x068b21--0x068c7f
-BooberPicBack:: INCBIN "build/gfx/pokemon/boober/back.pic" ; 0x068c7f--0x068de5
-KailiosPicFront:: INCBIN "build/gfx/pokemon/kailios/front.pic" ; 0x068de5--0x068fb5
-KailiosPicBack:: INCBIN "build/gfx/pokemon/kailios/back.pic" ; 0x068fb5--0x06911e
-KentaurosPicFront:: INCBIN "build/gfx/pokemon/kentauros/front.pic" ; 0x06911e--0x0692f4
-KentaurosPicBack:: INCBIN "build/gfx/pokemon/kentauros/back.pic" ; 0x0692f4--0x06944b
-KoikingPicFront:: INCBIN "build/gfx/pokemon/koiking/front.pic" ; 0x06944b--0x0695dd
-KoikingPicBack:: INCBIN "build/gfx/pokemon/koiking/back.pic" ; 0x0695dd--0x0696f5
-GyaradosPicFront:: INCBIN "build/gfx/pokemon/gyarados/front.pic" ; 0x0696f5--0x069946
-GyaradosPicBack:: INCBIN "build/gfx/pokemon/gyarados/back.pic" ; 0x069946--0x069ae8
-LaplacePicFront:: INCBIN "build/gfx/pokemon/laplace/front.pic" ; 0x069ae8--0x069ca3
-LaplacePicBack:: INCBIN "build/gfx/pokemon/laplace/back.pic" ; 0x069ca3--0x069dc0
-MetamonPicFront:: INCBIN "build/gfx/pokemon/metamon/front.pic" ; 0x069dc0--0x069e5f
-MetamonPicBack:: INCBIN "build/gfx/pokemon/metamon/back.pic" ; 0x069e5f--0x069f0e
-EievuiPicFront:: INCBIN "build/gfx/pokemon/eievui/front.pic" ; 0x069f0e--0x06a003
-EievuiPicBack:: INCBIN "build/gfx/pokemon/eievui/back.pic" ; 0x06a003--0x06a110
-ShowersPicFront:: INCBIN "build/gfx/pokemon/showers/front.pic" ; 0x06a110--0x06a274
-ShowersPicBack:: INCBIN "build/gfx/pokemon/showers/back.pic" ; 0x06a274--0x06a38c
-ThundersPicFront:: INCBIN "build/gfx/pokemon/thunders/front.pic" ; 0x06a38c--0x06a4ec
-ThundersPicBack:: INCBIN "build/gfx/pokemon/thunders/back.pic" ; 0x06a4ec--0x06a5d8
-BoosterPicFront:: INCBIN "build/gfx/pokemon/booster/front.pic" ; 0x06a5d8--0x06a784
-BoosterPicBack:: INCBIN "build/gfx/pokemon/booster/back.pic" ; 0x06a784--0x06a8b1
-PorygonPicFront:: INCBIN "build/gfx/pokemon/porygon/front.pic" ; 0x06a8b1--0x06a9e1
-PorygonPicBack:: INCBIN "build/gfx/pokemon/porygon/back.pic" ; 0x06a9e1--0x06aae6
-OmnitePicFront:: INCBIN "build/gfx/pokemon/omnite/front.pic" ; 0x06aae6--0x06abbf
-OmnitePicBack:: INCBIN "build/gfx/pokemon/omnite/back.pic" ; 0x06abbf--0x06ace4
-OmstarPicFront:: INCBIN "build/gfx/pokemon/omstar/front.pic" ; 0x06ace4--0x06ae9c
-OmstarPicBack:: INCBIN "build/gfx/pokemon/omstar/back.pic" ; 0x06ae9c--0x06affe
-KabutoPicFront:: INCBIN "build/gfx/pokemon/kabuto/front.pic" ; 0x06affe--0x06b0c3
-KabutoPicBack:: INCBIN "build/gfx/pokemon/kabuto/back.pic" ; 0x06b0c3--0x06b18a
-KabutopsPicFront:: INCBIN "build/gfx/pokemon/kabutops/front.pic" ; 0x06b18a--0x06b343
-KabutopsPicBack:: INCBIN "build/gfx/pokemon/kabutops/back.pic" ; 0x06b343--0x06b4f3
-PteraPicFront:: INCBIN "build/gfx/pokemon/ptera/front.pic" ; 0x06b4f3--0x06b6ae
-PteraPicBack:: INCBIN "build/gfx/pokemon/ptera/back.pic" ; 0x06b6ae--0x06b78b
-KabigonPicFront:: INCBIN "build/gfx/pokemon/kabigon/front.pic" ; 0x06b78b--0x06b917
-KabigonPicBack:: INCBIN "build/gfx/pokemon/kabigon/back.pic" ; 0x06b917--0x06b992
-FreezerPicFront:: INCBIN "build/gfx/pokemon/freezer/front.pic" ; 0x06b992--0x06bbca
-FreezerPicBack:: INCBIN "build/gfx/pokemon/freezer/back.pic" ; 0x06bbca--0x06bce6
+BarrierdPicFront:: INCBIN "gfx/pokemon/barrierd/front.pic" ; 0x068000--0x068154
+BarrierdPicBack:: INCBIN "gfx/pokemon/barrierd/back.pic" ; 0x068154--0x06828f
+StrikePicFront:: INCBIN "gfx/pokemon/strike/front.pic" ; 0x06828f--0x0684af
+StrikePicBack:: INCBIN "gfx/pokemon/strike/back.pic" ; 0x0684af--0x0685dc
+RougelaPicFront:: INCBIN "gfx/pokemon/rougela/front.pic" ; 0x0685dc--0x068796
+RougelaPicBack:: INCBIN "gfx/pokemon/rougela/back.pic" ; 0x068796--0x068863
+ElebooPicFront:: INCBIN "gfx/pokemon/eleboo/front.pic" ; 0x068863--0x0689eb
+ElebooPicBack:: INCBIN "gfx/pokemon/eleboo/back.pic" ; 0x0689eb--0x068b21
+BooberPicFront:: INCBIN "gfx/pokemon/boober/front.pic" ; 0x068b21--0x068c7f
+BooberPicBack:: INCBIN "gfx/pokemon/boober/back.pic" ; 0x068c7f--0x068de5
+KailiosPicFront:: INCBIN "gfx/pokemon/kailios/front.pic" ; 0x068de5--0x068fb5
+KailiosPicBack:: INCBIN "gfx/pokemon/kailios/back.pic" ; 0x068fb5--0x06911e
+KentaurosPicFront:: INCBIN "gfx/pokemon/kentauros/front.pic" ; 0x06911e--0x0692f4
+KentaurosPicBack:: INCBIN "gfx/pokemon/kentauros/back.pic" ; 0x0692f4--0x06944b
+KoikingPicFront:: INCBIN "gfx/pokemon/koiking/front.pic" ; 0x06944b--0x0695dd
+KoikingPicBack:: INCBIN "gfx/pokemon/koiking/back.pic" ; 0x0695dd--0x0696f5
+GyaradosPicFront:: INCBIN "gfx/pokemon/gyarados/front.pic" ; 0x0696f5--0x069946
+GyaradosPicBack:: INCBIN "gfx/pokemon/gyarados/back.pic" ; 0x069946--0x069ae8
+LaplacePicFront:: INCBIN "gfx/pokemon/laplace/front.pic" ; 0x069ae8--0x069ca3
+LaplacePicBack:: INCBIN "gfx/pokemon/laplace/back.pic" ; 0x069ca3--0x069dc0
+MetamonPicFront:: INCBIN "gfx/pokemon/metamon/front.pic" ; 0x069dc0--0x069e5f
+MetamonPicBack:: INCBIN "gfx/pokemon/metamon/back.pic" ; 0x069e5f--0x069f0e
+EievuiPicFront:: INCBIN "gfx/pokemon/eievui/front.pic" ; 0x069f0e--0x06a003
+EievuiPicBack:: INCBIN "gfx/pokemon/eievui/back.pic" ; 0x06a003--0x06a110
+ShowersPicFront:: INCBIN "gfx/pokemon/showers/front.pic" ; 0x06a110--0x06a274
+ShowersPicBack:: INCBIN "gfx/pokemon/showers/back.pic" ; 0x06a274--0x06a38c
+ThundersPicFront:: INCBIN "gfx/pokemon/thunders/front.pic" ; 0x06a38c--0x06a4ec
+ThundersPicBack:: INCBIN "gfx/pokemon/thunders/back.pic" ; 0x06a4ec--0x06a5d8
+BoosterPicFront:: INCBIN "gfx/pokemon/booster/front.pic" ; 0x06a5d8--0x06a784
+BoosterPicBack:: INCBIN "gfx/pokemon/booster/back.pic" ; 0x06a784--0x06a8b1
+PorygonPicFront:: INCBIN "gfx/pokemon/porygon/front.pic" ; 0x06a8b1--0x06a9e1
+PorygonPicBack:: INCBIN "gfx/pokemon/porygon/back.pic" ; 0x06a9e1--0x06aae6
+OmnitePicFront:: INCBIN "gfx/pokemon/omnite/front.pic" ; 0x06aae6--0x06abbf
+OmnitePicBack:: INCBIN "gfx/pokemon/omnite/back.pic" ; 0x06abbf--0x06ace4
+OmstarPicFront:: INCBIN "gfx/pokemon/omstar/front.pic" ; 0x06ace4--0x06ae9c
+OmstarPicBack:: INCBIN "gfx/pokemon/omstar/back.pic" ; 0x06ae9c--0x06affe
+KabutoPicFront:: INCBIN "gfx/pokemon/kabuto/front.pic" ; 0x06affe--0x06b0c3
+KabutoPicBack:: INCBIN "gfx/pokemon/kabuto/back.pic" ; 0x06b0c3--0x06b18a
+KabutopsPicFront:: INCBIN "gfx/pokemon/kabutops/front.pic" ; 0x06b18a--0x06b343
+KabutopsPicBack:: INCBIN "gfx/pokemon/kabutops/back.pic" ; 0x06b343--0x06b4f3
+PteraPicFront:: INCBIN "gfx/pokemon/ptera/front.pic" ; 0x06b4f3--0x06b6ae
+PteraPicBack:: INCBIN "gfx/pokemon/ptera/back.pic" ; 0x06b6ae--0x06b78b
+KabigonPicFront:: INCBIN "gfx/pokemon/kabigon/front.pic" ; 0x06b78b--0x06b917
+KabigonPicBack:: INCBIN "gfx/pokemon/kabigon/back.pic" ; 0x06b917--0x06b992
+FreezerPicFront:: INCBIN "gfx/pokemon/freezer/front.pic" ; 0x06b992--0x06bbca
+FreezerPicBack:: INCBIN "gfx/pokemon/freezer/back.pic" ; 0x06bbca--0x06bce6
SECTION "PKMN Pics 7", ROMX[$4000], BANK[$1B]
-ThunderPicFront:: INCBIN "build/gfx/pokemon/thunder/front.pic" ; 0x06c000--0x06c1e7
-ThunderPicBack:: INCBIN "build/gfx/pokemon/thunder/back.pic" ; 0x06c1e7--0x06c305
-FirePicFront:: INCBIN "build/gfx/pokemon/fire/front.pic" ; 0x06c305--0x06c55b
-FirePicBack:: INCBIN "build/gfx/pokemon/fire/back.pic" ; 0x06c55b--0x06c66e
-MiniryuPicFront:: INCBIN "build/gfx/pokemon/miniryu/front.pic" ; 0x06c66e--0x06c748
-MiniryuPicBack:: INCBIN "build/gfx/pokemon/miniryu/back.pic" ; 0x06c748--0x06c814
-HakuryuPicFront:: INCBIN "build/gfx/pokemon/hakuryu/front.pic" ; 0x06c814--0x06c967
-HakuryuPicBack:: INCBIN "build/gfx/pokemon/hakuryu/back.pic" ; 0x06c967--0x06ca6c
-KairyuPicFront:: INCBIN "build/gfx/pokemon/kairyu/front.pic" ; 0x06ca6c--0x06cc81
-KairyuPicBack:: INCBIN "build/gfx/pokemon/kairyu/back.pic" ; 0x06cc81--0x06cdd1
-MewtwoPicFront:: INCBIN "build/gfx/pokemon/mewtwo/front.pic" ; 0x06cdd1--0x06cfd7
-MewtwoPicBack:: INCBIN "build/gfx/pokemon/mewtwo/back.pic" ; 0x06cfd7--0x06d144
-MewPicFront:: INCBIN "build/gfx/pokemon/mew/front.pic" ; 0x06d144--0x06d245
-MewPicBack:: INCBIN "build/gfx/pokemon/mew/back.pic" ; 0x06d245--0x06d382
-HappaPicFront:: INCBIN "build/gfx/pokemon/happa/front.pic" ; 0x06d382--0x06d46c
-HappaPicBack:: INCBIN "build/gfx/pokemon/happa/back.pic" ; 0x06d46c--0x06d57a
-HanamoguraPicFront:: INCBIN "build/gfx/pokemon/hanamogura/front.pic" ; 0x06d57a--0x06d6c0
-HanamoguraPicBack:: INCBIN "build/gfx/pokemon/hanamogura/back.pic" ; 0x06d6c0--0x06d7b5
-HanaryuPicFront:: INCBIN "build/gfx/pokemon/hanaryu/front.pic" ; 0x06d7b5--0x06d9e3
-HanaryuPicBack:: INCBIN "build/gfx/pokemon/hanaryu/back.pic" ; 0x06d9e3--0x06db0f
-HonogumaPicFront:: INCBIN "build/gfx/pokemon/honoguma/front.pic" ; 0x06db0f--0x06dc20
-HonogumaPicBack:: INCBIN "build/gfx/pokemon/honoguma/back.pic" ; 0x06dc20--0x06dd1c
-VolbearPicFront:: INCBIN "build/gfx/pokemon/volbear/front.pic" ; 0x06dd1c--0x06de85
-VolbearPicBack:: INCBIN "build/gfx/pokemon/volbear/back.pic" ; 0x06de85--0x06df82
-DynabearPicFront:: INCBIN "build/gfx/pokemon/dynabear/front.pic" ; 0x06df82--0x06e1a3
-DynabearPicBack:: INCBIN "build/gfx/pokemon/dynabear/back.pic" ; 0x06e1a3--0x06e275
-KurusuPicFront:: INCBIN "build/gfx/pokemon/kurusu/front.pic" ; 0x06e275--0x06e33f
-KurusuPicBack:: INCBIN "build/gfx/pokemon/kurusu/back.pic" ; 0x06e33f--0x06e42f
-AquaPicFront:: INCBIN "build/gfx/pokemon/aqua/front.pic" ; 0x06e42f--0x06e542
-AquaPicBack:: INCBIN "build/gfx/pokemon/aqua/back.pic" ; 0x06e542--0x06e628
-AquariaPicFront:: INCBIN "build/gfx/pokemon/aquaria/front.pic" ; 0x06e628--0x06e829
-AquariaPicBack:: INCBIN "build/gfx/pokemon/aquaria/back.pic" ; 0x06e829--0x06e8e9
-HohoPicFront:: INCBIN "build/gfx/pokemon/hoho/front.pic" ; 0x06e8e9--0x06e9fb
-HohoPicBack:: INCBIN "build/gfx/pokemon/hoho/back.pic" ; 0x06e9fb--0x06eb48
-BoboPicFront:: INCBIN "build/gfx/pokemon/bobo/front.pic" ; 0x06eb48--0x06ec87
-BoboPicBack:: INCBIN "build/gfx/pokemon/bobo/back.pic" ; 0x06ec87--0x06ed65
-PachimeePicFront:: INCBIN "build/gfx/pokemon/pachimee/front.pic" ; 0x06ed65--0x06ee74
-PachimeePicBack:: INCBIN "build/gfx/pokemon/pachimee/back.pic" ; 0x06ee74--0x06eff0
-MokokoPicFront:: INCBIN "build/gfx/pokemon/mokoko/front.pic" ; 0x06eff0--0x06f14f
-MokokoPicBack:: INCBIN "build/gfx/pokemon/mokoko/back.pic" ; 0x06f14f--0x06f2bc
-DenryuPicFront:: INCBIN "build/gfx/pokemon/denryu/front.pic" ; 0x06f2bc--0x06f448
-DenryuPicBack:: INCBIN "build/gfx/pokemon/denryu/back.pic" ; 0x06f448--0x06f56f
-MikonPicFront:: INCBIN "build/gfx/pokemon/mikon/front.pic" ; 0x06f56f--0x06f675
-MikonPicBack:: INCBIN "build/gfx/pokemon/mikon/back.pic" ; 0x06f675--0x06f7af
-MonjaPicFront:: INCBIN "build/gfx/pokemon/monja/front.pic" ; 0x06f7af--0x06f8b7
-MonjaPicBack:: INCBIN "build/gfx/pokemon/monja/back.pic" ; 0x06f8b7--0x06fa05
-JaranraPicFront:: INCBIN "build/gfx/pokemon/jaranra/front.pic" ; 0x06fa05--0x06fc03
-JaranraPicBack:: INCBIN "build/gfx/pokemon/jaranra/back.pic" ; 0x06fc03--0x06fd27
+ThunderPicFront:: INCBIN "gfx/pokemon/thunder/front.pic" ; 0x06c000--0x06c1e7
+ThunderPicBack:: INCBIN "gfx/pokemon/thunder/back.pic" ; 0x06c1e7--0x06c305
+FirePicFront:: INCBIN "gfx/pokemon/fire/front.pic" ; 0x06c305--0x06c55b
+FirePicBack:: INCBIN "gfx/pokemon/fire/back.pic" ; 0x06c55b--0x06c66e
+MiniryuPicFront:: INCBIN "gfx/pokemon/miniryu/front.pic" ; 0x06c66e--0x06c748
+MiniryuPicBack:: INCBIN "gfx/pokemon/miniryu/back.pic" ; 0x06c748--0x06c814
+HakuryuPicFront:: INCBIN "gfx/pokemon/hakuryu/front.pic" ; 0x06c814--0x06c967
+HakuryuPicBack:: INCBIN "gfx/pokemon/hakuryu/back.pic" ; 0x06c967--0x06ca6c
+KairyuPicFront:: INCBIN "gfx/pokemon/kairyu/front.pic" ; 0x06ca6c--0x06cc81
+KairyuPicBack:: INCBIN "gfx/pokemon/kairyu/back.pic" ; 0x06cc81--0x06cdd1
+MewtwoPicFront:: INCBIN "gfx/pokemon/mewtwo/front.pic" ; 0x06cdd1--0x06cfd7
+MewtwoPicBack:: INCBIN "gfx/pokemon/mewtwo/back.pic" ; 0x06cfd7--0x06d144
+MewPicFront:: INCBIN "gfx/pokemon/mew/front.pic" ; 0x06d144--0x06d245
+MewPicBack:: INCBIN "gfx/pokemon/mew/back.pic" ; 0x06d245--0x06d382
+HappaPicFront:: INCBIN "gfx/pokemon/happa/front.pic" ; 0x06d382--0x06d46c
+HappaPicBack:: INCBIN "gfx/pokemon/happa/back.pic" ; 0x06d46c--0x06d57a
+HanamoguraPicFront:: INCBIN "gfx/pokemon/hanamogura/front.pic" ; 0x06d57a--0x06d6c0
+HanamoguraPicBack:: INCBIN "gfx/pokemon/hanamogura/back.pic" ; 0x06d6c0--0x06d7b5
+HanaryuPicFront:: INCBIN "gfx/pokemon/hanaryu/front.pic" ; 0x06d7b5--0x06d9e3
+HanaryuPicBack:: INCBIN "gfx/pokemon/hanaryu/back.pic" ; 0x06d9e3--0x06db0f
+HonogumaPicFront:: INCBIN "gfx/pokemon/honoguma/front.pic" ; 0x06db0f--0x06dc20
+HonogumaPicBack:: INCBIN "gfx/pokemon/honoguma/back.pic" ; 0x06dc20--0x06dd1c
+VolbearPicFront:: INCBIN "gfx/pokemon/volbear/front.pic" ; 0x06dd1c--0x06de85
+VolbearPicBack:: INCBIN "gfx/pokemon/volbear/back.pic" ; 0x06de85--0x06df82
+DynabearPicFront:: INCBIN "gfx/pokemon/dynabear/front.pic" ; 0x06df82--0x06e1a3
+DynabearPicBack:: INCBIN "gfx/pokemon/dynabear/back.pic" ; 0x06e1a3--0x06e275
+KurusuPicFront:: INCBIN "gfx/pokemon/kurusu/front.pic" ; 0x06e275--0x06e33f
+KurusuPicBack:: INCBIN "gfx/pokemon/kurusu/back.pic" ; 0x06e33f--0x06e42f
+AquaPicFront:: INCBIN "gfx/pokemon/aqua/front.pic" ; 0x06e42f--0x06e542
+AquaPicBack:: INCBIN "gfx/pokemon/aqua/back.pic" ; 0x06e542--0x06e628
+AquariaPicFront:: INCBIN "gfx/pokemon/aquaria/front.pic" ; 0x06e628--0x06e829
+AquariaPicBack:: INCBIN "gfx/pokemon/aquaria/back.pic" ; 0x06e829--0x06e8e9
+HohoPicFront:: INCBIN "gfx/pokemon/hoho/front.pic" ; 0x06e8e9--0x06e9fb
+HohoPicBack:: INCBIN "gfx/pokemon/hoho/back.pic" ; 0x06e9fb--0x06eb48
+BoboPicFront:: INCBIN "gfx/pokemon/bobo/front.pic" ; 0x06eb48--0x06ec87
+BoboPicBack:: INCBIN "gfx/pokemon/bobo/back.pic" ; 0x06ec87--0x06ed65
+PachimeePicFront:: INCBIN "gfx/pokemon/pachimee/front.pic" ; 0x06ed65--0x06ee74
+PachimeePicBack:: INCBIN "gfx/pokemon/pachimee/back.pic" ; 0x06ee74--0x06eff0
+MokokoPicFront:: INCBIN "gfx/pokemon/mokoko/front.pic" ; 0x06eff0--0x06f14f
+MokokoPicBack:: INCBIN "gfx/pokemon/mokoko/back.pic" ; 0x06f14f--0x06f2bc
+DenryuPicFront:: INCBIN "gfx/pokemon/denryu/front.pic" ; 0x06f2bc--0x06f448
+DenryuPicBack:: INCBIN "gfx/pokemon/denryu/back.pic" ; 0x06f448--0x06f56f
+MikonPicFront:: INCBIN "gfx/pokemon/mikon/front.pic" ; 0x06f56f--0x06f675
+MikonPicBack:: INCBIN "gfx/pokemon/mikon/back.pic" ; 0x06f675--0x06f7af
+MonjaPicFront:: INCBIN "gfx/pokemon/monja/front.pic" ; 0x06f7af--0x06f8b7
+MonjaPicBack:: INCBIN "gfx/pokemon/monja/back.pic" ; 0x06f8b7--0x06fa05
+JaranraPicFront:: INCBIN "gfx/pokemon/jaranra/front.pic" ; 0x06fa05--0x06fc03
+JaranraPicBack:: INCBIN "gfx/pokemon/jaranra/back.pic" ; 0x06fc03--0x06fd27
SECTION "PKMN Pics 8", ROMX[$4000], BANK[$1C]
-HaneeiPicFront:: INCBIN "build/gfx/pokemon/haneei/front.pic" ; 0x070000--0x070176
-HaneeiPicBack:: INCBIN "build/gfx/pokemon/haneei/back.pic" ; 0x070176--0x0702cd
-PukuPicFront:: INCBIN "build/gfx/pokemon/puku/front.pic" ; 0x0702cd--0x0703b2
-PukuPicBack:: INCBIN "build/gfx/pokemon/puku/back.pic" ; 0x0703b2--0x0704f8
-ShibirefuguPicFront:: INCBIN "build/gfx/pokemon/shibirefugu/front.pic" ; 0x0704f8--0x07069c
-ShibirefuguPicBack:: INCBIN "build/gfx/pokemon/shibirefugu/back.pic" ; 0x07069c--0x0707a3
-PichuPicFront:: INCBIN "build/gfx/pokemon/pichu/front.pic" ; 0x0707a3--0x07083b
-PichuPicBack:: INCBIN "build/gfx/pokemon/pichu/back.pic" ; 0x07083b--0x0708f3
-PyPicFront:: INCBIN "build/gfx/pokemon/py/front.pic" ; 0x0708f3--0x0709a5
-PyPicBack:: INCBIN "build/gfx/pokemon/py/back.pic" ; 0x0709a5--0x070a65
-PupurinPicFront:: INCBIN "build/gfx/pokemon/pupurin/front.pic" ; 0x070a65--0x070b19
-PupurinPicBack:: INCBIN "build/gfx/pokemon/pupurin/back.pic" ; 0x070b19--0x070bd7
-MizuuoPicFront:: INCBIN "build/gfx/pokemon/mizuuo/front.pic" ; 0x070bd7--0x070d13
-MizuuoPicBack:: INCBIN "build/gfx/pokemon/mizuuo/back.pic" ; 0x070d13--0x070e08
-NatyPicFront:: INCBIN "build/gfx/pokemon/naty/front.pic" ; 0x070e08--0x070e9e
-NatyPicBack:: INCBIN "build/gfx/pokemon/naty/back.pic" ; 0x070e9e--0x070f4f
-NatioPicFront:: INCBIN "build/gfx/pokemon/natio/front.pic" ; 0x070f4f--0x07108e
-NatioPicBack:: INCBIN "build/gfx/pokemon/natio/back.pic" ; 0x07108e--0x0711e1
-GyopinPicFront:: INCBIN "build/gfx/pokemon/gyopin/front.pic" ; 0x0711e1--0x07128b
-GyopinPicBack:: INCBIN "build/gfx/pokemon/gyopin/back.pic" ; 0x07128b--0x071352
-MarilPicFront:: INCBIN "build/gfx/pokemon/maril/front.pic" ; 0x071352--0x071441
-MarilPicBack:: INCBIN "build/gfx/pokemon/maril/back.pic" ; 0x071441--0x07154b
-Manbo1PicFront:: INCBIN "build/gfx/pokemon/manbo1/front.pic" ; 0x07154b--0x071630
-Manbo1PicBack:: INCBIN "build/gfx/pokemon/manbo1/back.pic" ; 0x071630--0x071743
-IkariPicFront:: INCBIN "build/gfx/pokemon/ikari/front.pic" ; 0x071743--0x071858
-IkariPicBack:: INCBIN "build/gfx/pokemon/ikari/back.pic" ; 0x071858--0x071986
-GrotessPicFront:: INCBIN "build/gfx/pokemon/grotess/front.pic" ; 0x071986--0x071a7c
-GrotessPicBack:: INCBIN "build/gfx/pokemon/grotess/back.pic" ; 0x071a7c--0x071b51
-EksingPicFront:: INCBIN "build/gfx/pokemon/eksing/front.pic" ; 0x071b51--0x071cbe
-EksingPicBack:: INCBIN "build/gfx/pokemon/eksing/back.pic" ; 0x071cbe--0x071dba
-ParaPicFront:: INCBIN "build/gfx/pokemon/para/front.pic" ; 0x071dba--0x071ea9
-ParaPicBack:: INCBIN "build/gfx/pokemon/para/back.pic" ; 0x071ea9--0x071f96
-KokumoPicFront:: INCBIN "build/gfx/pokemon/kokumo/front.pic" ; 0x071f96--0x072051
-KokumoPicBack:: INCBIN "build/gfx/pokemon/kokumo/back.pic" ; 0x072051--0x072170
-TwoheadPicFront:: INCBIN "build/gfx/pokemon/twohead/front.pic" ; 0x072170--0x07232e
-TwoheadPicBack:: INCBIN "build/gfx/pokemon/twohead/back.pic" ; 0x07232e--0x0724b6
-YoroidoriPicFront:: INCBIN "build/gfx/pokemon/yoroidori/front.pic" ; 0x0724b6--0x0726b6
-YoroidoriPicBack:: INCBIN "build/gfx/pokemon/yoroidori/back.pic" ; 0x0726b6--0x072797
-AnimonPicFront:: INCBIN "build/gfx/pokemon/animon/front.pic" ; 0x072797--0x072846
-AnimonPicBack:: INCBIN "build/gfx/pokemon/animon/back.pic" ; 0x072846--0x0728cc
-HinazuPicFront:: INCBIN "build/gfx/pokemon/hinazu/front.pic" ; 0x0728cc--0x072a0a
-HinazuPicBack:: INCBIN "build/gfx/pokemon/hinazu/back.pic" ; 0x072a0a--0x072b8d
-SunnyPicFront:: INCBIN "build/gfx/pokemon/sunny/front.pic" ; 0x072b8d--0x072d26
-SunnyPicBack:: INCBIN "build/gfx/pokemon/sunny/back.pic" ; 0x072d26--0x072ebc
-PaonPicFront:: INCBIN "build/gfx/pokemon/paon/front.pic" ; 0x072ebc--0x072f94
-PaonPicBack:: INCBIN "build/gfx/pokemon/paon/back.pic" ; 0x072f94--0x07308b
-DonphanPicFront:: INCBIN "build/gfx/pokemon/donphan/front.pic" ; 0x07308b--0x07323a
-DonphanPicBack:: INCBIN "build/gfx/pokemon/donphan/back.pic" ; 0x07323a--0x073306
-TwinzPicFront:: INCBIN "build/gfx/pokemon/twinz/front.pic" ; 0x073306--0x073477
-TwinzPicBack:: INCBIN "build/gfx/pokemon/twinz/back.pic" ; 0x073477--0x0735c2
-KirinrikiPicFront:: INCBIN "build/gfx/pokemon/kirinriki/front.pic" ; 0x0735c2--0x07377e
-KirinrikiPicBack:: INCBIN "build/gfx/pokemon/kirinriki/back.pic" ; 0x07377e--0x073912
-PainterPicFront:: INCBIN "build/gfx/pokemon/painter/front.pic" ; 0x073912--0x073aaa
-PainterPicBack:: INCBIN "build/gfx/pokemon/painter/back.pic" ; 0x073aaa--0x073bdb
-KounyaPicFront:: INCBIN "build/gfx/pokemon/kounya/front.pic" ; 0x073bdb--0x073ca8
-KounyaPicBack:: INCBIN "build/gfx/pokemon/kounya/back.pic" ; 0x073ca8--0x073d7f
+HaneeiPicFront:: INCBIN "gfx/pokemon/haneei/front.pic" ; 0x070000--0x070176
+HaneeiPicBack:: INCBIN "gfx/pokemon/haneei/back.pic" ; 0x070176--0x0702cd
+PukuPicFront:: INCBIN "gfx/pokemon/puku/front.pic" ; 0x0702cd--0x0703b2
+PukuPicBack:: INCBIN "gfx/pokemon/puku/back.pic" ; 0x0703b2--0x0704f8
+ShibirefuguPicFront:: INCBIN "gfx/pokemon/shibirefugu/front.pic" ; 0x0704f8--0x07069c
+ShibirefuguPicBack:: INCBIN "gfx/pokemon/shibirefugu/back.pic" ; 0x07069c--0x0707a3
+PichuPicFront:: INCBIN "gfx/pokemon/pichu/front.pic" ; 0x0707a3--0x07083b
+PichuPicBack:: INCBIN "gfx/pokemon/pichu/back.pic" ; 0x07083b--0x0708f3
+PyPicFront:: INCBIN "gfx/pokemon/py/front.pic" ; 0x0708f3--0x0709a5
+PyPicBack:: INCBIN "gfx/pokemon/py/back.pic" ; 0x0709a5--0x070a65
+PupurinPicFront:: INCBIN "gfx/pokemon/pupurin/front.pic" ; 0x070a65--0x070b19
+PupurinPicBack:: INCBIN "gfx/pokemon/pupurin/back.pic" ; 0x070b19--0x070bd7
+MizuuoPicFront:: INCBIN "gfx/pokemon/mizuuo/front.pic" ; 0x070bd7--0x070d13
+MizuuoPicBack:: INCBIN "gfx/pokemon/mizuuo/back.pic" ; 0x070d13--0x070e08
+NatyPicFront:: INCBIN "gfx/pokemon/naty/front.pic" ; 0x070e08--0x070e9e
+NatyPicBack:: INCBIN "gfx/pokemon/naty/back.pic" ; 0x070e9e--0x070f4f
+NatioPicFront:: INCBIN "gfx/pokemon/natio/front.pic" ; 0x070f4f--0x07108e
+NatioPicBack:: INCBIN "gfx/pokemon/natio/back.pic" ; 0x07108e--0x0711e1
+GyopinPicFront:: INCBIN "gfx/pokemon/gyopin/front.pic" ; 0x0711e1--0x07128b
+GyopinPicBack:: INCBIN "gfx/pokemon/gyopin/back.pic" ; 0x07128b--0x071352
+MarilPicFront:: INCBIN "gfx/pokemon/maril/front.pic" ; 0x071352--0x071441
+MarilPicBack:: INCBIN "gfx/pokemon/maril/back.pic" ; 0x071441--0x07154b
+Manbo1PicFront:: INCBIN "gfx/pokemon/manbo1/front.pic" ; 0x07154b--0x071630
+Manbo1PicBack:: INCBIN "gfx/pokemon/manbo1/back.pic" ; 0x071630--0x071743
+IkariPicFront:: INCBIN "gfx/pokemon/ikari/front.pic" ; 0x071743--0x071858
+IkariPicBack:: INCBIN "gfx/pokemon/ikari/back.pic" ; 0x071858--0x071986
+GrotessPicFront:: INCBIN "gfx/pokemon/grotess/front.pic" ; 0x071986--0x071a7c
+GrotessPicBack:: INCBIN "gfx/pokemon/grotess/back.pic" ; 0x071a7c--0x071b51
+EksingPicFront:: INCBIN "gfx/pokemon/eksing/front.pic" ; 0x071b51--0x071cbe
+EksingPicBack:: INCBIN "gfx/pokemon/eksing/back.pic" ; 0x071cbe--0x071dba
+ParaPicFront:: INCBIN "gfx/pokemon/para/front.pic" ; 0x071dba--0x071ea9
+ParaPicBack:: INCBIN "gfx/pokemon/para/back.pic" ; 0x071ea9--0x071f96
+KokumoPicFront:: INCBIN "gfx/pokemon/kokumo/front.pic" ; 0x071f96--0x072051
+KokumoPicBack:: INCBIN "gfx/pokemon/kokumo/back.pic" ; 0x072051--0x072170
+TwoheadPicFront:: INCBIN "gfx/pokemon/twohead/front.pic" ; 0x072170--0x07232e
+TwoheadPicBack:: INCBIN "gfx/pokemon/twohead/back.pic" ; 0x07232e--0x0724b6
+YoroidoriPicFront:: INCBIN "gfx/pokemon/yoroidori/front.pic" ; 0x0724b6--0x0726b6
+YoroidoriPicBack:: INCBIN "gfx/pokemon/yoroidori/back.pic" ; 0x0726b6--0x072797
+AnimonPicFront:: INCBIN "gfx/pokemon/animon/front.pic" ; 0x072797--0x072846
+AnimonPicBack:: INCBIN "gfx/pokemon/animon/back.pic" ; 0x072846--0x0728cc
+HinazuPicFront:: INCBIN "gfx/pokemon/hinazu/front.pic" ; 0x0728cc--0x072a0a
+HinazuPicBack:: INCBIN "gfx/pokemon/hinazu/back.pic" ; 0x072a0a--0x072b8d
+SunnyPicFront:: INCBIN "gfx/pokemon/sunny/front.pic" ; 0x072b8d--0x072d26
+SunnyPicBack:: INCBIN "gfx/pokemon/sunny/back.pic" ; 0x072d26--0x072ebc
+PaonPicFront:: INCBIN "gfx/pokemon/paon/front.pic" ; 0x072ebc--0x072f94
+PaonPicBack:: INCBIN "gfx/pokemon/paon/back.pic" ; 0x072f94--0x07308b
+DonphanPicFront:: INCBIN "gfx/pokemon/donphan/front.pic" ; 0x07308b--0x07323a
+DonphanPicBack:: INCBIN "gfx/pokemon/donphan/back.pic" ; 0x07323a--0x073306
+TwinzPicFront:: INCBIN "gfx/pokemon/twinz/front.pic" ; 0x073306--0x073477
+TwinzPicBack:: INCBIN "gfx/pokemon/twinz/back.pic" ; 0x073477--0x0735c2
+KirinrikiPicFront:: INCBIN "gfx/pokemon/kirinriki/front.pic" ; 0x0735c2--0x07377e
+KirinrikiPicBack:: INCBIN "gfx/pokemon/kirinriki/back.pic" ; 0x07377e--0x073912
+PainterPicFront:: INCBIN "gfx/pokemon/painter/front.pic" ; 0x073912--0x073aaa
+PainterPicBack:: INCBIN "gfx/pokemon/painter/back.pic" ; 0x073aaa--0x073bdb
+KounyaPicFront:: INCBIN "gfx/pokemon/kounya/front.pic" ; 0x073bdb--0x073ca8
+KounyaPicBack:: INCBIN "gfx/pokemon/kounya/back.pic" ; 0x073ca8--0x073d7f
SECTION "PKMN Pics 9", ROMX[$4000], BANK[$1D]
-RinrinPicFront:: INCBIN "build/gfx/pokemon/rinrin/front.pic" ; 0x074000--0x074109
-RinrinPicBack:: INCBIN "build/gfx/pokemon/rinrin/back.pic" ; 0x074109--0x07421a
-BerurunPicFront:: INCBIN "build/gfx/pokemon/berurun/front.pic" ; 0x07421a--0x074346
-BerurunPicBack:: INCBIN "build/gfx/pokemon/berurun/back.pic" ; 0x074346--0x074419
-NyorotonoPicFront:: INCBIN "build/gfx/pokemon/nyorotono/front.pic" ; 0x074419--0x0745c2
-NyorotonoPicBack:: INCBIN "build/gfx/pokemon/nyorotono/back.pic" ; 0x0745c2--0x0746a7
-YadokingPicFront:: INCBIN "build/gfx/pokemon/yadoking/front.pic" ; 0x0746a7--0x074865
-YadokingPicBack:: INCBIN "build/gfx/pokemon/yadoking/back.pic" ; 0x074865--0x0749b8
-RedibaPicFront:: INCBIN "build/gfx/pokemon/rediba/front.pic" ; 0x0749b8--0x074afa
-RedibaPicBack:: INCBIN "build/gfx/pokemon/rediba/back.pic" ; 0x074afa--0x074c54
-MitsuboshiPicFront:: INCBIN "build/gfx/pokemon/mitsuboshi/front.pic" ; 0x074c54--0x074d6c
-MitsuboshiPicBack:: INCBIN "build/gfx/pokemon/mitsuboshi/back.pic" ; 0x074d6c--0x074e1d
-PuchicornPicFront:: INCBIN "build/gfx/pokemon/puchicorn/front.pic" ; 0x074e1d--0x074f29
-PuchicornPicBack:: INCBIN "build/gfx/pokemon/puchicorn/back.pic" ; 0x074f29--0x075060
-EifiePicFront:: INCBIN "build/gfx/pokemon/eifie/front.pic" ; 0x075060--0x0751b6
-EifiePicBack:: INCBIN "build/gfx/pokemon/eifie/back.pic" ; 0x0751b6--0x0752fa
-BlackyPicFront:: INCBIN "build/gfx/pokemon/blacky/front.pic" ; 0x0752fa--0x075409
-BlackyPicBack:: INCBIN "build/gfx/pokemon/blacky/back.pic" ; 0x075409--0x075515
-TurbanPicFront:: INCBIN "build/gfx/pokemon/turban/front.pic" ; 0x075515--0x07566b
-TurbanPicBack:: INCBIN "build/gfx/pokemon/turban/back.pic" ; 0x07566b--0x0757b1
-BetbabyPicFront:: INCBIN "build/gfx/pokemon/betbaby/front.pic" ; 0x0757b1--0x075849
-BetbabyPicBack:: INCBIN "build/gfx/pokemon/betbaby/back.pic" ; 0x075849--0x0758eb
-TeppouoPicFront:: INCBIN "build/gfx/pokemon/teppouo/front.pic" ; 0x0758eb--0x0759f2
-TeppouoPicBack:: INCBIN "build/gfx/pokemon/teppouo/back.pic" ; 0x0759f2--0x075b3c
-OkutankPicFront:: INCBIN "build/gfx/pokemon/okutank/front.pic" ; 0x075b3c--0x075c7a
-OkutankPicBack:: INCBIN "build/gfx/pokemon/okutank/back.pic" ; 0x075c7a--0x075d92
-GonguPicFront:: INCBIN "build/gfx/pokemon/gongu/front.pic" ; 0x075d92--0x075e8a
-GonguPicBack:: INCBIN "build/gfx/pokemon/gongu/back.pic" ; 0x075e8a--0x075f9e
-KapoererPicFront:: INCBIN "build/gfx/pokemon/kapoerer/front.pic" ; 0x075f9e--0x076180
-KapoererPicBack:: INCBIN "build/gfx/pokemon/kapoerer/back.pic" ; 0x076180--0x0762ea
-PudiePicFront:: INCBIN "build/gfx/pokemon/pudie/front.pic" ; 0x0762ea--0x0763b3
-PudiePicBack:: INCBIN "build/gfx/pokemon/pudie/back.pic" ; 0x0763b3--0x07648b
-HanekoPicFront:: INCBIN "build/gfx/pokemon/haneko/front.pic" ; 0x07648b--0x076572
-HanekoPicBack:: INCBIN "build/gfx/pokemon/haneko/back.pic" ; 0x076572--0x076699
-PoponekoPicFront:: INCBIN "build/gfx/pokemon/poponeko/front.pic" ; 0x076699--0x0767c6
-PoponekoPicBack:: INCBIN "build/gfx/pokemon/poponeko/back.pic" ; 0x0767c6--0x076906
-WatanekoPicFront:: INCBIN "build/gfx/pokemon/wataneko/front.pic" ; 0x076906--0x076ad1
-WatanekoPicBack:: INCBIN "build/gfx/pokemon/wataneko/back.pic" ; 0x076ad1--0x076c34
-BaririnaPicFront:: INCBIN "build/gfx/pokemon/baririna/front.pic" ; 0x076c34--0x076ce2
-BaririnaPicBack:: INCBIN "build/gfx/pokemon/baririna/back.pic" ; 0x076ce2--0x076db0
-LipPicFront:: INCBIN "build/gfx/pokemon/lip/front.pic" ; 0x076db0--0x076e9b
-LipPicBack:: INCBIN "build/gfx/pokemon/lip/back.pic" ; 0x076e9b--0x076f77
-ElebabyPicFront:: INCBIN "build/gfx/pokemon/elebaby/front.pic" ; 0x076f77--0x077022
-ElebabyPicBack:: INCBIN "build/gfx/pokemon/elebaby/back.pic" ; 0x077022--0x0770ea
-BoobyPicFront:: INCBIN "build/gfx/pokemon/booby/front.pic" ; 0x0770ea--0x077222
-BoobyPicBack:: INCBIN "build/gfx/pokemon/booby/back.pic" ; 0x077222--0x077310
-KireihanaPicFront:: INCBIN "build/gfx/pokemon/kireihana/front.pic" ; 0x077310--0x0774dc
-KireihanaPicBack:: INCBIN "build/gfx/pokemon/kireihana/back.pic" ; 0x0774dc--0x077654
-TsubomittoPicFront:: INCBIN "build/gfx/pokemon/tsubomitto/front.pic" ; 0x077654--0x07783e
-TsubomittoPicBack:: INCBIN "build/gfx/pokemon/tsubomitto/back.pic" ; 0x07783e--0x0779e0
-MiltankPicFront:: INCBIN "build/gfx/pokemon/miltank/front.pic" ; 0x0779e0--0x077b5a
-MiltankPicBack:: INCBIN "build/gfx/pokemon/miltank/back.pic" ; 0x077b5a--0x077c81
-BombseekerPicFront:: INCBIN "build/gfx/pokemon/bombseeker/front.pic" ; 0x077c81--0x077dac
-BombseekerPicBack:: INCBIN "build/gfx/pokemon/bombseeker/back.pic" ; 0x077dac--0x077ecf
+RinrinPicFront:: INCBIN "gfx/pokemon/rinrin/front.pic" ; 0x074000--0x074109
+RinrinPicBack:: INCBIN "gfx/pokemon/rinrin/back.pic" ; 0x074109--0x07421a
+BerurunPicFront:: INCBIN "gfx/pokemon/berurun/front.pic" ; 0x07421a--0x074346
+BerurunPicBack:: INCBIN "gfx/pokemon/berurun/back.pic" ; 0x074346--0x074419
+NyorotonoPicFront:: INCBIN "gfx/pokemon/nyorotono/front.pic" ; 0x074419--0x0745c2
+NyorotonoPicBack:: INCBIN "gfx/pokemon/nyorotono/back.pic" ; 0x0745c2--0x0746a7
+YadokingPicFront:: INCBIN "gfx/pokemon/yadoking/front.pic" ; 0x0746a7--0x074865
+YadokingPicBack:: INCBIN "gfx/pokemon/yadoking/back.pic" ; 0x074865--0x0749b8
+RedibaPicFront:: INCBIN "gfx/pokemon/rediba/front.pic" ; 0x0749b8--0x074afa
+RedibaPicBack:: INCBIN "gfx/pokemon/rediba/back.pic" ; 0x074afa--0x074c54
+MitsuboshiPicFront:: INCBIN "gfx/pokemon/mitsuboshi/front.pic" ; 0x074c54--0x074d6c
+MitsuboshiPicBack:: INCBIN "gfx/pokemon/mitsuboshi/back.pic" ; 0x074d6c--0x074e1d
+PuchicornPicFront:: INCBIN "gfx/pokemon/puchicorn/front.pic" ; 0x074e1d--0x074f29
+PuchicornPicBack:: INCBIN "gfx/pokemon/puchicorn/back.pic" ; 0x074f29--0x075060
+EifiePicFront:: INCBIN "gfx/pokemon/eifie/front.pic" ; 0x075060--0x0751b6
+EifiePicBack:: INCBIN "gfx/pokemon/eifie/back.pic" ; 0x0751b6--0x0752fa
+BlackyPicFront:: INCBIN "gfx/pokemon/blacky/front.pic" ; 0x0752fa--0x075409
+BlackyPicBack:: INCBIN "gfx/pokemon/blacky/back.pic" ; 0x075409--0x075515
+TurbanPicFront:: INCBIN "gfx/pokemon/turban/front.pic" ; 0x075515--0x07566b
+TurbanPicBack:: INCBIN "gfx/pokemon/turban/back.pic" ; 0x07566b--0x0757b1
+BetbabyPicFront:: INCBIN "gfx/pokemon/betbaby/front.pic" ; 0x0757b1--0x075849
+BetbabyPicBack:: INCBIN "gfx/pokemon/betbaby/back.pic" ; 0x075849--0x0758eb
+TeppouoPicFront:: INCBIN "gfx/pokemon/teppouo/front.pic" ; 0x0758eb--0x0759f2
+TeppouoPicBack:: INCBIN "gfx/pokemon/teppouo/back.pic" ; 0x0759f2--0x075b3c
+OkutankPicFront:: INCBIN "gfx/pokemon/okutank/front.pic" ; 0x075b3c--0x075c7a
+OkutankPicBack:: INCBIN "gfx/pokemon/okutank/back.pic" ; 0x075c7a--0x075d92
+GonguPicFront:: INCBIN "gfx/pokemon/gongu/front.pic" ; 0x075d92--0x075e8a
+GonguPicBack:: INCBIN "gfx/pokemon/gongu/back.pic" ; 0x075e8a--0x075f9e
+KapoererPicFront:: INCBIN "gfx/pokemon/kapoerer/front.pic" ; 0x075f9e--0x076180
+KapoererPicBack:: INCBIN "gfx/pokemon/kapoerer/back.pic" ; 0x076180--0x0762ea
+PudiePicFront:: INCBIN "gfx/pokemon/pudie/front.pic" ; 0x0762ea--0x0763b3
+PudiePicBack:: INCBIN "gfx/pokemon/pudie/back.pic" ; 0x0763b3--0x07648b
+HanekoPicFront:: INCBIN "gfx/pokemon/haneko/front.pic" ; 0x07648b--0x076572
+HanekoPicBack:: INCBIN "gfx/pokemon/haneko/back.pic" ; 0x076572--0x076699
+PoponekoPicFront:: INCBIN "gfx/pokemon/poponeko/front.pic" ; 0x076699--0x0767c6
+PoponekoPicBack:: INCBIN "gfx/pokemon/poponeko/back.pic" ; 0x0767c6--0x076906
+WatanekoPicFront:: INCBIN "gfx/pokemon/wataneko/front.pic" ; 0x076906--0x076ad1
+WatanekoPicBack:: INCBIN "gfx/pokemon/wataneko/back.pic" ; 0x076ad1--0x076c34
+BaririnaPicFront:: INCBIN "gfx/pokemon/baririna/front.pic" ; 0x076c34--0x076ce2
+BaririnaPicBack:: INCBIN "gfx/pokemon/baririna/back.pic" ; 0x076ce2--0x076db0
+LipPicFront:: INCBIN "gfx/pokemon/lip/front.pic" ; 0x076db0--0x076e9b
+LipPicBack:: INCBIN "gfx/pokemon/lip/back.pic" ; 0x076e9b--0x076f77
+ElebabyPicFront:: INCBIN "gfx/pokemon/elebaby/front.pic" ; 0x076f77--0x077022
+ElebabyPicBack:: INCBIN "gfx/pokemon/elebaby/back.pic" ; 0x077022--0x0770ea
+BoobyPicFront:: INCBIN "gfx/pokemon/booby/front.pic" ; 0x0770ea--0x077222
+BoobyPicBack:: INCBIN "gfx/pokemon/booby/back.pic" ; 0x077222--0x077310
+KireihanaPicFront:: INCBIN "gfx/pokemon/kireihana/front.pic" ; 0x077310--0x0774dc
+KireihanaPicBack:: INCBIN "gfx/pokemon/kireihana/back.pic" ; 0x0774dc--0x077654
+TsubomittoPicFront:: INCBIN "gfx/pokemon/tsubomitto/front.pic" ; 0x077654--0x07783e
+TsubomittoPicBack:: INCBIN "gfx/pokemon/tsubomitto/back.pic" ; 0x07783e--0x0779e0
+MiltankPicFront:: INCBIN "gfx/pokemon/miltank/front.pic" ; 0x0779e0--0x077b5a
+MiltankPicBack:: INCBIN "gfx/pokemon/miltank/back.pic" ; 0x077b5a--0x077c81
+BombseekerPicFront:: INCBIN "gfx/pokemon/bombseeker/front.pic" ; 0x077c81--0x077dac
+BombseekerPicBack:: INCBIN "gfx/pokemon/bombseeker/back.pic" ; 0x077dac--0x077ecf
SECTION "PKMN Pics 10", ROMX[$4000], BANK[$1E]
-GiftPicFront:: INCBIN "build/gfx/pokemon/gift/front.pic" ; 0x078000--0x078153
-GiftPicBack:: INCBIN "build/gfx/pokemon/gift/back.pic" ; 0x078153--0x078281
-KotoraPicFront:: INCBIN "build/gfx/pokemon/kotora/front.pic" ; 0x078281--0x0783b2
-KotoraPicBack:: INCBIN "build/gfx/pokemon/kotora/back.pic" ; 0x0783b2--0x078519
-RaitoraPicFront:: INCBIN "build/gfx/pokemon/raitora/front.pic" ; 0x078519--0x078731
-RaitoraPicBack:: INCBIN "build/gfx/pokemon/raitora/back.pic" ; 0x078731--0x07882b
-MadamePicFront:: INCBIN "build/gfx/pokemon/madame/front.pic" ; 0x07882b--0x078a32
-MadamePicBack:: INCBIN "build/gfx/pokemon/madame/back.pic" ; 0x078a32--0x078b5b
-NorowaraPicFront:: INCBIN "build/gfx/pokemon/norowara/front.pic" ; 0x078b5b--0x078cb1
-NorowaraPicBack:: INCBIN "build/gfx/pokemon/norowara/back.pic" ; 0x078cb1--0x078e35
-KyonpanPicFront:: INCBIN "build/gfx/pokemon/kyonpan/front.pic" ; 0x078e35--0x078f94
-KyonpanPicBack:: INCBIN "build/gfx/pokemon/kyonpan/back.pic" ; 0x078f94--0x07908f
-YamikarasuPicFront:: INCBIN "build/gfx/pokemon/yamikarasu/front.pic" ; 0x07908f--0x07919e
-YamikarasuPicBack:: INCBIN "build/gfx/pokemon/yamikarasu/back.pic" ; 0x07919e--0x079286
-HappiPicFront:: INCBIN "build/gfx/pokemon/happi/front.pic" ; 0x079286--0x079414
-HappiPicBack:: INCBIN "build/gfx/pokemon/happi/back.pic" ; 0x079414--0x07951b
-ScissorsPicFront:: INCBIN "build/gfx/pokemon/scissors/front.pic" ; 0x07951b--0x079749
-ScissorsPicBack:: INCBIN "build/gfx/pokemon/scissors/back.pic" ; 0x079749--0x0798cc
-PurakkusuPicFront:: INCBIN "build/gfx/pokemon/purakkusu/front.pic" ; 0x0798cc--0x079a9e
-PurakkusuPicBack:: INCBIN "build/gfx/pokemon/purakkusu/back.pic" ; 0x079a9e--0x079bfe
-DevilPicFront:: INCBIN "build/gfx/pokemon/devil/front.pic" ; 0x079bfe--0x079d21
-DevilPicBack:: INCBIN "build/gfx/pokemon/devil/back.pic" ; 0x079d21--0x079e14
-HelgaaPicFront:: INCBIN "build/gfx/pokemon/helgaa/front.pic" ; 0x079e14--0x079fa3
-HelgaaPicBack:: INCBIN "build/gfx/pokemon/helgaa/back.pic" ; 0x079fa3--0x07a0a7
-WolfmanPicFront:: INCBIN "build/gfx/pokemon/wolfman/front.pic" ; 0x07a0a7--0x07a1b4
-WolfmanPicBack:: INCBIN "build/gfx/pokemon/wolfman/back.pic" ; 0x07a1b4--0x07a2b9
-WarwolfPicFront:: INCBIN "build/gfx/pokemon/warwolf/front.pic" ; 0x07a2b9--0x07a4bc
-WarwolfPicBack:: INCBIN "build/gfx/pokemon/warwolf/back.pic" ; 0x07a4bc--0x07a5c5
-Porygon2PicFront:: INCBIN "build/gfx/pokemon/porygon2/front.pic" ; 0x07a5c5--0x07a72f
-Porygon2PicBack:: INCBIN "build/gfx/pokemon/porygon2/back.pic" ; 0x07a72f--0x07a87d
-NameilPicFront:: INCBIN "build/gfx/pokemon/nameil/front.pic" ; 0x07a87d--0x07aa2b
-NameilPicBack:: INCBIN "build/gfx/pokemon/nameil/back.pic" ; 0x07aa2b--0x07ab36
-HaganeilPicFront:: INCBIN "build/gfx/pokemon/haganeil/front.pic" ; 0x07ab36--0x07ad76
-HaganeilPicBack:: INCBIN "build/gfx/pokemon/haganeil/back.pic" ; 0x07ad76--0x07aecd
-KingdraPicFront:: INCBIN "build/gfx/pokemon/kingdra/front.pic" ; 0x07aecd--0x07b0cf
-KingdraPicBack:: INCBIN "build/gfx/pokemon/kingdra/back.pic" ; 0x07b0cf--0x07b1f6
-RaiPicFront:: INCBIN "build/gfx/pokemon/rai/front.pic" ; 0x07b1f6--0x07b3da
+GiftPicFront:: INCBIN "gfx/pokemon/gift/front.pic" ; 0x078000--0x078153
+GiftPicBack:: INCBIN "gfx/pokemon/gift/back.pic" ; 0x078153--0x078281
+KotoraPicFront:: INCBIN "gfx/pokemon/kotora/front.pic" ; 0x078281--0x0783b2
+KotoraPicBack:: INCBIN "gfx/pokemon/kotora/back.pic" ; 0x0783b2--0x078519
+RaitoraPicFront:: INCBIN "gfx/pokemon/raitora/front.pic" ; 0x078519--0x078731
+RaitoraPicBack:: INCBIN "gfx/pokemon/raitora/back.pic" ; 0x078731--0x07882b
+MadamePicFront:: INCBIN "gfx/pokemon/madame/front.pic" ; 0x07882b--0x078a32
+MadamePicBack:: INCBIN "gfx/pokemon/madame/back.pic" ; 0x078a32--0x078b5b
+NorowaraPicFront:: INCBIN "gfx/pokemon/norowara/front.pic" ; 0x078b5b--0x078cb1
+NorowaraPicBack:: INCBIN "gfx/pokemon/norowara/back.pic" ; 0x078cb1--0x078e35
+KyonpanPicFront:: INCBIN "gfx/pokemon/kyonpan/front.pic" ; 0x078e35--0x078f94
+KyonpanPicBack:: INCBIN "gfx/pokemon/kyonpan/back.pic" ; 0x078f94--0x07908f
+YamikarasuPicFront:: INCBIN "gfx/pokemon/yamikarasu/front.pic" ; 0x07908f--0x07919e
+YamikarasuPicBack:: INCBIN "gfx/pokemon/yamikarasu/back.pic" ; 0x07919e--0x079286
+HappiPicFront:: INCBIN "gfx/pokemon/happi/front.pic" ; 0x079286--0x079414
+HappiPicBack:: INCBIN "gfx/pokemon/happi/back.pic" ; 0x079414--0x07951b
+ScissorsPicFront:: INCBIN "gfx/pokemon/scissors/front.pic" ; 0x07951b--0x079749
+ScissorsPicBack:: INCBIN "gfx/pokemon/scissors/back.pic" ; 0x079749--0x0798cc
+PurakkusuPicFront:: INCBIN "gfx/pokemon/purakkusu/front.pic" ; 0x0798cc--0x079a9e
+PurakkusuPicBack:: INCBIN "gfx/pokemon/purakkusu/back.pic" ; 0x079a9e--0x079bfe
+DevilPicFront:: INCBIN "gfx/pokemon/devil/front.pic" ; 0x079bfe--0x079d21
+DevilPicBack:: INCBIN "gfx/pokemon/devil/back.pic" ; 0x079d21--0x079e14
+HelgaaPicFront:: INCBIN "gfx/pokemon/helgaa/front.pic" ; 0x079e14--0x079fa3
+HelgaaPicBack:: INCBIN "gfx/pokemon/helgaa/back.pic" ; 0x079fa3--0x07a0a7
+WolfmanPicFront:: INCBIN "gfx/pokemon/wolfman/front.pic" ; 0x07a0a7--0x07a1b4
+WolfmanPicBack:: INCBIN "gfx/pokemon/wolfman/back.pic" ; 0x07a1b4--0x07a2b9
+WarwolfPicFront:: INCBIN "gfx/pokemon/warwolf/front.pic" ; 0x07a2b9--0x07a4bc
+WarwolfPicBack:: INCBIN "gfx/pokemon/warwolf/back.pic" ; 0x07a4bc--0x07a5c5
+Porygon2PicFront:: INCBIN "gfx/pokemon/porygon2/front.pic" ; 0x07a5c5--0x07a72f
+Porygon2PicBack:: INCBIN "gfx/pokemon/porygon2/back.pic" ; 0x07a72f--0x07a87d
+NameilPicFront:: INCBIN "gfx/pokemon/nameil/front.pic" ; 0x07a87d--0x07aa2b
+NameilPicBack:: INCBIN "gfx/pokemon/nameil/back.pic" ; 0x07aa2b--0x07ab36
+HaganeilPicFront:: INCBIN "gfx/pokemon/haganeil/front.pic" ; 0x07ab36--0x07ad76
+HaganeilPicBack:: INCBIN "gfx/pokemon/haganeil/back.pic" ; 0x07ad76--0x07aecd
+KingdraPicFront:: INCBIN "gfx/pokemon/kingdra/front.pic" ; 0x07aecd--0x07b0cf
+KingdraPicBack:: INCBIN "gfx/pokemon/kingdra/back.pic" ; 0x07b0cf--0x07b1f6
+RaiPicFront:: INCBIN "gfx/pokemon/rai/front.pic" ; 0x07b1f6--0x07b3da
db 0 ; how did that get here?
-RaiPicBack:: INCBIN "build/gfx/pokemon/rai/back.pic" ; 0x07b3db--0x07b51a
-EnPicFront:: INCBIN "build/gfx/pokemon/en/front.pic" ; 0x07b51a--0x07b73d
-EnPicBack:: INCBIN "build/gfx/pokemon/en/back.pic" ; 0x07b73d--0x07b824
-SuiPicFront:: INCBIN "build/gfx/pokemon/sui/front.pic" ; 0x07b824--0x07ba63
-SuiPicBack:: INCBIN "build/gfx/pokemon/sui/back.pic" ; 0x07ba63--0x07bbb4
-NyulaPicFront:: INCBIN "build/gfx/pokemon/nyula/front.pic" ; 0x07bbb4--0x07bccb
-NyulaPicBack:: INCBIN "build/gfx/pokemon/nyula/back.pic" ; 0x07bccb--0x07be22
+RaiPicBack:: INCBIN "gfx/pokemon/rai/back.pic" ; 0x07b3db--0x07b51a
+EnPicFront:: INCBIN "gfx/pokemon/en/front.pic" ; 0x07b51a--0x07b73d
+EnPicBack:: INCBIN "gfx/pokemon/en/back.pic" ; 0x07b73d--0x07b824
+SuiPicFront:: INCBIN "gfx/pokemon/sui/front.pic" ; 0x07b824--0x07ba63
+SuiPicBack:: INCBIN "gfx/pokemon/sui/back.pic" ; 0x07ba63--0x07bbb4
+NyulaPicFront:: INCBIN "gfx/pokemon/nyula/front.pic" ; 0x07bbb4--0x07bccb
+NyulaPicBack:: INCBIN "gfx/pokemon/nyula/back.pic" ; 0x07bccb--0x07be22
SECTION "PKMN Pics 11", ROMX[$4000], BANK[$1F]
-HououPicFront:: INCBIN "build/gfx/pokemon/houou/front.pic" ; 0x07c000--0x07c2ab
-HououPicBack:: INCBIN "build/gfx/pokemon/houou/back.pic" ; 0x07c2ab--0x07c3e7
-TogepyPicFront:: INCBIN "build/gfx/pokemon/togepy/front.pic" ; 0x07c3e7--0x07c4ea
-TogepyPicBack:: INCBIN "build/gfx/pokemon/togepy/back.pic" ; 0x07c4ea--0x07c626
-BuluPicFront:: INCBIN "build/gfx/pokemon/bulu/front.pic" ; 0x07c626--0x07c761
-BuluPicBack:: INCBIN "build/gfx/pokemon/bulu/back.pic" ; 0x07c761--0x07c891
-TailPicFront:: INCBIN "build/gfx/pokemon/tail/front.pic" ; 0x07c891--0x07c99f
-TailPicBack:: INCBIN "build/gfx/pokemon/tail/back.pic" ; 0x07c99f--0x07ca6b
-LeafyPicFront:: INCBIN "build/gfx/pokemon/leafy/front.pic" ; 0x07ca6b--0x07cc18
-LeafyPicBack:: INCBIN "build/gfx/pokemon/leafy/back.pic" ; 0x07cc18--0x07cd6a
+HououPicFront:: INCBIN "gfx/pokemon/houou/front.pic" ; 0x07c000--0x07c2ab
+HououPicBack:: INCBIN "gfx/pokemon/houou/back.pic" ; 0x07c2ab--0x07c3e7
+TogepyPicFront:: INCBIN "gfx/pokemon/togepy/front.pic" ; 0x07c3e7--0x07c4ea
+TogepyPicBack:: INCBIN "gfx/pokemon/togepy/back.pic" ; 0x07c4ea--0x07c626
+BuluPicFront:: INCBIN "gfx/pokemon/bulu/front.pic" ; 0x07c626--0x07c761
+BuluPicBack:: INCBIN "gfx/pokemon/bulu/back.pic" ; 0x07c761--0x07c891
+TailPicFront:: INCBIN "gfx/pokemon/tail/front.pic" ; 0x07c891--0x07c99f
+TailPicBack:: INCBIN "gfx/pokemon/tail/back.pic" ; 0x07c99f--0x07ca6b
+LeafyPicFront:: INCBIN "gfx/pokemon/leafy/front.pic" ; 0x07ca6b--0x07cc18
+LeafyPicBack:: INCBIN "gfx/pokemon/leafy/back.pic" ; 0x07cc18--0x07cd6a
diff --git a/tools/Makefile b/tools/Makefile
index c591d9c..6c49ccb 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,8 +4,7 @@ CFLAGS := -O3 -std=c99 -Wall -Wextra
tools := \
pkmncompress \
- gfx \
- make_shim
+ gfx
all: $(tools)
diff --git a/tools/make_shim.c b/tools/make_shim.c
deleted file mode 100644
index a025905..0000000
--- a/tools/make_shim.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include <stdio.h>
-#include <getopt.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-struct Section {
- unsigned short end;
- bool invalid;
- char * name;
- bool banked;
-};
-
-typedef struct Section section_t;
-
-// These functions are like strspn and strcspn, but from the right of the string rather than the left.
-size_t strrspn(const char *s1, const char *s2) {
- const char * _s1 = s1;
- const char * _s2;
-
- while (*_s1++);
- _s1--;
- while (_s1 > s1) {
- for (_s2 = s2; *_s2; _s2++) {
- if (_s1[-1] == *_s2) {
- break;
- }
- }
- if (*_s2 == 0)
- break;
- _s1--;
- }
-
- return _s1 - s1;
-}
-
-size_t strrcspn(const char *s1, const char *s2) {
- const char * _s1 = s1;
- const char * _s2;
-
- while (*_s1++);
- _s1--;
- while (_s1 > s1) {
- for (_s2 = s2; *_s2; _s2++) {
- if (_s1[-1] == *_s2)
- break;
- }
- if (*_s2)
- break;
- _s1--;
- }
-
- return _s1 - s1;
-}
-
-#define RIP(errmsg) { \
- fprintf(stderr, "%s:%d:%s: %s\n", fname, lineno, eline, errmsg); \
- if (file) fclose(file); \
- return 1; \
-}
-
-int main(int argc, char * argv[]) {
- int ch;
- char line[16*1024];
- char eline[16*1024];
- char *lineptr = NULL;
- char *fname;
- int lineno;
-
- section_t section_list[] = {
- {0x4000, false, "ROM0", false},
- {0x8000, false, "ROMX", true},
- {0xA000, false, "VRAM", true},
- {0xC000, false, "SRAM", true},
- {0xD000, false, "WRAM0", false},
- {0xE000, false, "WRAMX", true},
- {0xFE00, true, "Echo RAM", false},
- {0xFEA0, false, "OAM", false},
- {0xFF80, true, "FEXX / IO", false},
- {0xFFFF, false, "HRAM", false},
- {}
- };
-
- while ((ch = getopt(argc, argv, "wdt")) != -1) {
- switch (ch) {
- case 'w':
- case 'd':
- section_list[4].end = 0xE000;
- break;
- case 't':
- section_list[0].end = 0x8000;
- break;
- }
- }
-
- for (int arg_idx = optind; arg_idx < argc; arg_idx++) {
- int last = -1;
- int curr;
- eline[0] = 0;
- lineno = 0;
- fname = argv[arg_idx];
- FILE * file = fopen(fname, "r");
- if (file == NULL)
- RIP("Unable to open file");
- while ((lineptr = fgets(line, sizeof(line), file)) != NULL) {
- // Assume it's already sorted
- lineno++;
- unsigned short bank = 0;
- unsigned short pointer = 0;
- char * symbol = NULL;
- char * end;
- char * addr_p;
- strcpy(eline, line); // Unmodified copy for tracebacks
- *strrchr(eline, '\n') = 0;
-
- // line = line.split(";")[0].strip()
- lineptr += strspn(lineptr, " \t\n");
- end = strchr(lineptr, ';');
- if (end) *end = 0;
- lineptr[strrspn(lineptr, " \t\n")] = 0;
- if (!*lineptr)
- continue;
-
- // Get the bank, address, and symbol
- end = lineptr + strcspn(lineptr, " \t\n");
- symbol = end + strspn(end, " \t\n");
- if (!*symbol)
- RIP("Declaration not in \"bank:addr Name\" format");
- *end = 0;
- addr_p = strchr(lineptr, ':');
- if (!addr_p)
- RIP("Pointer not in bank:addr format");
- *addr_p++ = 0;
- pointer = strtoul(addr_p, &end, 16);
- if (pointer == 0 && end == addr_p)
- RIP("Unable to parse symbol address");
- bank = strtoul(lineptr, &end, 16);
- if (bank == 0 && end == lineptr)
- RIP("Unable to parse bank number");
- curr = (bank << 14) | (pointer & 0x3fff);
-
- // Main loop
- const char * section = NULL;
- section_t * section_type;
-
- for (section_type = section_list; section_type->end; section_type++) {
- if (pointer < section_type->end) {
- if (section_type->invalid) {
- fprintf(stderr, "Warning: cannot shim '%s' in section type '%s'\n", symbol, section_type->name);
- } else {
- section = section_type->name;
- if (!section_type->banked)
- bank = 0;
- }
- break;
- }
- }
-
- if (section == NULL)
- // Found section, but cannot shim it
- continue;
-
- if (curr != last) {
- if (last != -1)
- fputc('\n', stdout);
- printf("SECTION \"Shim for %s\", %s[$%04X]", symbol, section, pointer);
- if (bank)
- printf(", BANK[$%04X]", bank);
- printf("\n%s::\n", symbol);
- last = curr;
- } else
- printf("%s::\n", symbol);
- fflush(stdout);
- }
- fclose(file);
- }
- return 0;
-}
diff --git a/tools/make_shim.py b/tools/make_shim.py
index 65d9362..e2e4bf2 100644
--- a/tools/make_shim.py
+++ b/tools/make_shim.py
@@ -5,19 +5,19 @@ import argparse
from sys import stderr
from collections import OrderedDict, namedtuple
-Section = namedtuple('Section', ('end', 'invalud', 'banked'))
-section_list = OrderedDict(
- ROM0=Section(0x4000, False, False),
- ROMX=Section(0x8000, False, True),
- VRAM=Section(0xA000, False, True),
- SRAM=Section(0xC000, False, True),
- WRAM0=Section(0xD000, False, False),
- WRAMX=Section(0xE000, False, True),
- EchoRAM=Section(0xFE00, True, False),
- OAM=Section(0xFEA0, False, False),
- IO=Section(0xFF80, True, False),
- HRAM=Section(0xFFFF, False, False)
-)
+Section = namedtuple('Section', ('end', 'invalid', 'banked'))
+section_list = OrderedDict((
+ ('ROM0', Section(0x4000, False, False)),
+ ('ROMX', Section(0x8000, False, True)),
+ ('VRAM', Section(0xA000, False, True)),
+ ('SRAM', Section(0xC000, False, True)),
+ ('WRAM0', Section(0xD000, False, False)),
+ ('WRAMX', Section(0xE000, False, True)),
+ ('EchoRAM', Section(0xFE00, True, False)),
+ ('OAM', Section(0xFEA0, False, False)),
+ ('IO', Section(0xFF80, True, False)),
+ ('HRAM', Section(0xFFFF, False, False))
+))
parser = argparse.ArgumentParser()
parser.add_argument('files', nargs='+', type=argparse.FileType())
@@ -28,14 +28,14 @@ args = parser.parse_args()
if args.w or args.d:
- section_list['WRAM0'].end = 0xE000
+ section_list['WRAM0'] = Section(0xE000, *section_list['WRAM0'][1:])
if args.t:
- section_list['ROM0'].end = 0x8000
+ section_list['ROM0'] = Section(0x8000, *section_list['ROM0'][1:])
-for file_name in args.files:
- for line in open(file_name, "rt"):
+for f in args.files:
+ for line in f:
# Strip out the comment
line = line.split(";")[0].strip()
@@ -50,13 +50,13 @@ for file_name in args.files:
pointer = int(pointer, 16)
except ValueError:
print("Error: Cannot parse line: %s" % line, file=stderr)
- raise from None
+ raise
section = None
for name, section_type in section_list.items():
if pointer < section_type.end:
if section_type.invalid:
- print("Warning: cannot shim '%s' in section type '%s'" % (symbol, section_type['name']), file=stderr)
+ print("Warning: cannot shim '%s' in section type '%s'" % (symbol, name), file=stderr)
section = False
else:
section = name
diff --git a/tools/scan_includes.py b/tools/scan_includes.py
index 592d6bd..e659dca 100644
--- a/tools/scan_includes.py
+++ b/tools/scan_includes.py
@@ -42,10 +42,14 @@ def shallow_dependencies_of(asm_file_path):
keyword = m.group(1).upper()
line = line.split(';', 1)[0]
- path = line[line.index('"') + 1:line.rindex('"')]
+ # RGBDS treats absolute(-looking) paths as relative,
+ # so leading slashes should be stripped.
+ path = line[line.index('"') + 1:line.rindex('"')].lstrip('/')
if keyword == 'INCLUDE':
asm_dependencies.add(path)
else:
+ if not os.path.isfile(path):
+ path = 'build/' + path
bin_dependencies.add(path)
return asm_dependencies, bin_dependencies