Gbagfx OAM chunk handling, with override support (#143)

* Add tooling support for graphics with 2^n chunking

* update to OAM handling, from 2n sizing

* Update assembly to use the hex, rather than music name, for ease of uese in decompme/m2C

* additional tools/examples

* graphics build, not currently compare matching.

* remove sprites.png

* working conversion in make file!

* stage/main folder done

* stage/misc folder done

* stage/ruby complete

* stage/sapphire updated

* base for remaining kinda-graphics; file name casing

* more name casing

* extract catch sprites

* remove special 6x4 handling from oam slicer; switched hed the 2 images to using non-oam 2x2 chunks. (net same, but allows the 6x4 to process normally when things like the whalmer are found)

* Palette info for the catch sprites, thanks to cyphgirl

* obliterate the old hatch-sprite code

* refactor segments to not have the base file name dependancy

* catch mon 1-9, horizontal layout

* rename the f param in the json for graphics

* casing cleanup?

* .

* possible fix for the out of date segment piece

* Replace graphic_cnvt_attrs.txt strategy with individually-generated makefile rules

* Don't specify tileCount

---------

Co-authored-by: Marcus Huderle <huderlem@gmail.com>

.gitattributes

@@ -9,6 +9,7 @@ Makefile text eol=lf
 *.inc text eol=lf
 *.sha1 text eol=lf
 *.sed text eol=lf
+*.sh text eol=lf
 
 *.png binary
 *.bin binary

.gitignore

@@ -38,6 +38,7 @@ baserom.*
 build-cmake-*/
 compile_commands.json
 CMakeLists.txt
+graphics_rules_generated.mk
 
 # clangd
 .cache/

Makefile

@@ -72,7 +72,7 @@ FIX       := tools/gbafix/gbafix$(EXE)
 SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 
 TOOLS_DIR = tools
-TOOLDIRS = $(filter-out $(TOOLS_DIR)/agbcc $(TOOLS_DIR)/m2ctx.py,$(wildcard $(TOOLS_DIR)/*))
+TOOLDIRS = $(filter-out $(TOOLS_DIR)/agbcc $(TOOLS_DIR)/m2ctx.py $(TOOLS_DIR)/scripts,$(wildcard $(TOOLS_DIR)/*))
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
@@ -125,6 +125,7 @@ compare: rom
 
 clean: tidy clean-tools
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+	rm -f graphics_rules_generated.mk
 	find sound -iname '*.bin' -exec rm {} +
 
 tidy:

data/graphics/mon_catch_sprites.inc

@@ -0,0 +1,85 @@
+gMonCatchSprite_Gfx:: @ 0x08400C8C
+	.incbin "graphics/mon_catch_sprites/catch_mon_01_treecko.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_02_torchic.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_03_mudkip.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_04_poochyena.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_05_zigzagoon.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_06_silcoon.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_07_cascoon.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_08_lombre.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_09_nuzleaf.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_10_tailow.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_11_wingull.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_12_slakoth.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_13_abra.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_14_nincada.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_15_loudred.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_16_makuhita.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_17_goldeen.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_18_magikarp.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_19_marill.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_20_geodude.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_21_nosepass.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_22_tentacool.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_23_sableye.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_24_mawile.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_25_machop.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_26_meditite.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_27_electrike.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_28_magnemite.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_29_voltorb.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_30_volbeat.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_31_illumise.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_32_doduo.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_33_roselia.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_34_carvanha.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_35_wailmer.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_36_numel.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_37_slugma.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_38_torkoal.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_39_grimer.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_40_koffing.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_41_skarmory.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_42_vibrava.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_43_cacnea.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_44_swablu.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_45_zangoose.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_46_seviper.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_47_lunatone.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_48_solrock.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_49_barboach.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_50_corphish.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_51_baltoy.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_52_lileep.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_53_anorith.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_54_jigglypuff.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_55_febas.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_56_castform.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_57_staryu.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_58_kecleon.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_59_duskull.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_60_tropius.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_61_absol.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_62_vulpix.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_63_pikachu.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_64_psyduck.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_65_wobbuffet.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_66_girafarig.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_67_pinsir.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_68_heracross.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_69_rhyhorn.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_70_clamperl.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_71_relicanth.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_72_luvdisc.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_73_shelgon.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_74_beldum.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_75_regirock.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_76_regice.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_77_registeel.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_78_latias.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_79_latios.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_80_jirachi.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_81_chikorita.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_82_cyndaquil.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_83_totodile.4bpp"
+	.incbin "graphics/mon_catch_sprites/catch_mon_84_aerodactyl.4bpp"

data/graphics/mon_catch_sprites_pals.inc

@@ -0,0 +1,133 @@
+gMonCatchSprite_Pal:: @ 0x081AEBE4
+	.incbin "graphics/mon_catch_sprites/catch_mon_01_treecko.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_02_torchic.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_03_mudkip.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_04_poochyena.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_05_zigzagoon.gbapal"
+
+    .incbin "baserom.gba", 0x1AEC84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_06_silcoon.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_07_cascoon.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_08_lombre.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_09_nuzleaf.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_10_tailow.gbapal"
+
+    .incbin "baserom.gba", 0x1AEE84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_11_wingull.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_12_slakoth.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_13_abra.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_14_nincada.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_15_loudred.gbapal"
+
+    .incbin "baserom.gba", 0x1AF084, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_16_makuhita.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_17_goldeen.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_18_magikarp.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_19_marill.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_20_geodude.gbapal"
+
+    .incbin "baserom.gba", 0x1AF284, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_21_nosepass.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_22_tentacool.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_23_sableye.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_24_mawile.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_25_machop.gbapal"
+
+    .incbin "baserom.gba", 0x1AF484, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_26_meditite.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_27_electrike.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_28_magnemite.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_29_voltorb.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_30_volbeat.gbapal"
+
+    .incbin "baserom.gba", 0x1AF684, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_31_illumise.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_32_doduo.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_33_roselia.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_34_carvanha.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_35_wailmer.gbapal"
+
+    .incbin "baserom.gba", 0x1AF884, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_36_numel.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_37_slugma.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_38_torkoal.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_39_grimer.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_40_koffing.gbapal"
+
+    .incbin "baserom.gba", 0x1AFA84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_41_skarmory.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_42_vibrava.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_43_cacnea.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_44_swablu.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_45_zangoose.gbapal"
+
+    .incbin "baserom.gba", 0x1AFC84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_46_seviper.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_47_lunatone.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_48_solrock.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_49_barboach.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_50_corphish.gbapal"
+
+    .incbin "baserom.gba", 0x1AFE84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_51_baltoy.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_52_lileep.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_53_anorith.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_54_jigglypuff.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_55_febas.gbapal"
+
+    .incbin "baserom.gba", 0x1B0084, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_56_castform.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_57_staryu.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_58_kecleon.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_59_duskull.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_60_tropius.gbapal"
+
+    .incbin "baserom.gba", 0x1B0284, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_61_absol.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_62_vulpix.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_63_pikachu.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_64_psyduck.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_65_wobbuffet.gbapal"
+
+    .incbin "baserom.gba", 0x1B0484, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_66_girafarig.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_67_pinsir.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_68_heracross.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_69_rhyhorn.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_70_clamperl.gbapal"
+
+    .incbin "baserom.gba", 0x1B0684, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_71_relicanth.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_72_luvdisc.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_73_shelgon.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_74_beldum.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_75_regirock.gbapal"
+
+    .incbin "baserom.gba", 0x1B0884, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_76_regice.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_77_registeel.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_78_latias.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_79_latios.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_80_jirachi.gbapal"
+
+    .incbin "baserom.gba", 0x1B0A84, 0x160
+
+	.incbin "graphics/mon_catch_sprites/catch_mon_81_chikorita.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_82_cyndaquil.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_83_totodile.gbapal"
+	.incbin "graphics/mon_catch_sprites/catch_mon_84_aerodactyl.gbapal"

data/rom_1.s

@@ -1362,7 +1362,10 @@ gUnknown_0816A7C4:: @ 0x0816A7C4
 	.incbin "baserom.gba", 0x16A7C4, 0x1C20
 
 gUnknown_0816C3E4:: @ 0x0816C3E4
-	.incbin "baserom.gba", 0x16C3E4, 0x44A00
+	.incbin "baserom.gba", 0x16C3E4, 0x42800
+	.include "data/graphics/mon_catch_sprites_pals.inc"
+@	.incbin "baserom.gba", 0x1AEBE4, 0xA80
+	.incbin "baserom.gba", 0x1B0C64, 0x180
 
 gUnknown_081B0DE4:: @ 0x081B0DE4
 	.incbin "baserom.gba", 0x1B0DE4, 0x200
@@ -1719,7 +1722,9 @@ gUnknown_083FFD4C:: @ 0x083FFD4C
 	.incbin "baserom.gba", 0x3FFD4C, 0x40
 
 gUnknown_083FFD8C:: @ 0x083FFD8C
-	.incbin "baserom.gba", 0x3FFD8C, 0x47D00
+	.incbin "baserom.gba", 0x3FFD8C, 0xF00 @ 0x47D00
+
+	.include "data/graphics/mon_catch_sprites.inc"
 
 gUnknown_08447A8C:: @ 0x08447A8C
 	.incbin "baserom.gba", 0x447A8C, 0x900
@@ -1891,43 +1896,43 @@ gUnknown_084C4B6C:: @ 0x084C4B6C
 .incbin "baserom.gba", 0x4ECF6C, 0x160 @ 0x4ED0CC - 0x4ECF6C
 
 gUnknown_084ED0CC:: @ 0x084ED0CC
-	.incbin "baserom.gba", 0x4ED0CC, 0x600
+	.incbin "graphics/stage/ruby/shop_door.4bpp";
 
 gUnknown_084ED6CC:: @ 0x084ED6CC
-	.incbin "baserom.gba", 0x4ED6CC, 0x400
-
+	.incbin "graphics/stage/gunk_084ED6CC.4bpp";
+	
 gUnknown_084EDACC:: @ 0x084EDACC
 	.incbin "graphics/stage/dusclops/dusclops.4bpp";
 
 gUnknown_084F5ACC:: @ 0x084F5ACC
-	.incbin "baserom.gba", 0x4F5ACC, 0x720
+	.incbin "graphics/stage/ruby/sharpedo.4bpp";
 
 gUnknown_084F61EC:: @ 0x084F61EC
-	.incbin "baserom.gba", 0x4F61EC, 0x920
+	.incbin "graphics/stage/main/gunk_084F61EC.4bpp";
 
 gUnknown_084F6B0C:: @ 0x084F6B0C
-	.incbin "baserom.gba", 0x4F6B0C, 0x3700
+	.incbin "graphics/stage/ruby/shop.4bpp";
 
 gUnknown_084FA20C:: @ 0x084FA20C
-	.incbin "baserom.gba", 0x4FA20C, 0x280
+	.incbin "graphics/stage/misc/gunk_084FA20C.4bpp";
 
 gUnknown_084FA48C:: @ 0x084FA48C
-	.incbin "baserom.gba", 0x4FA48C, 0x1200
+	.incbin "graphics/stage/main/pika_spinner.4bpp";
 
 gUnknown_084FB68C:: @ 0x084FB68C
-	.incbin "baserom.gba", 0x4FB68C, 0x1B00
+	.incbin "graphics/stage/ruby/hatch_cave.4bpp";
 
 gUnknown_084FD18C:: @ 0x084FD18C
 	.incbin "baserom.gba", 0x4FD18C, 0xE00
 
 gUnknown_084FDF8C:: @ 0x084FDF8C
-	.incbin "baserom.gba", 0x4FDF8C, 0xA80
+	.incbin "graphics/stage/sapphire/seedot.4bpp";
 
 gUnknown_084FEA0C:: @ 0x084FEA0C
-	.incbin "baserom.gba", 0x4FEA0C, 0x500
+	.incbin "graphics/stage/sapphire/shop_shock_wall.4bpp";
 
 gUnknown_084FEF0C:: @ 0x084FEF0C
-	.incbin "baserom.gba", 0x4FEF0C, 0x400
+	.incbin "graphics/stage/ruby/ramp_prize.4bpp";
 
 gUnknown_084FF30C:: @ 0x084FF30C
 	.incbin "graphics/stage/dusclops/dusclops_ball_grab.4bpp";
@@ -1936,43 +1941,43 @@ gUnknown_084FF90C:: @ 0x084FF90C
 	.incbin "baserom.gba", 0x4FF90C, 0x1700
 
 gUnknown_0850100C:: @ 0x0850100C
-	.incbin "baserom.gba", 0x50100C, 0x18C0
-
+	.incbin "graphics/stage/main/ball_save.4bpp";
+	
 gUnknown_085028CC:: @ 0x085028CC
-	.incbin "baserom.gba", 0x5028CC, 0x1000
-
+	.incbin "graphics/stage/main/latios.4bpp";
+	
 gUnknown_085038CC:: @ 0x085038CC
-	.incbin "baserom.gba", 0x5038CC, 0xC0
+	.incbin "graphics/stage/main/latios_arm.4bpp";
 
 gUnknown_0850398C:: @ 0x0850398C
-	.incbin "baserom.gba", 0x50398C, 0x1C00
+	.incbin "graphics/stage/main/end_of_ball.4bpp";
 
 gUnknown_0850558C:: @ 0x0850558C
-	.incbin "baserom.gba", 0x50558C, 0x600
+	.incbin "graphics/stage/misc/gunk_0850558C.4bpp";
 
 gUnknown_08505B8C:: @ 0x08505B8C
 	.incbin "baserom.gba", 0x505B8C, 0x40
 
 gUnknown_08505BCC:: @ 0x08505BCC
-	.incbin "baserom.gba", 0x505BCC, 0x4380
+	.incbin "graphics/stage/main/evo_banner.4bpp";
 
 gUnknown_08509F4C:: @ 0x08509F4C
-	.incbin "baserom.gba", 0x509F4C, 0x400
+	.incbin "graphics/stage/main/game_over_text.4bpp";
 
 gUnknown_0850A34C:: @ 0x0850A34C
-	.incbin "baserom.gba", 0x50A34C, 0x4380
+	.incbin "graphics/stage/main/jirachi_banner.4bpp";
 
 gUnknown_0850E6CC:: @ 0x0850E6CC
-	.incbin "baserom.gba", 0x50E6CC, 0x25E0
+	.incbin "graphics/stage/main/travel.4bpp";
 
 gUnknown_08510CAC:: @ 0x08510CAC
-	.incbin "baserom.gba", 0x510CAC, 0x1A0
+	.incbin "graphics/stage/main/pause_menu_text.4bpp";
 
 gUnknown_08510E4C:: @ 0x08510E4C
 	.incbin "graphics/stage/dusclops/duskull.4bpp";
 
 gUnknown_08512C4C:: @ 0x08512C4C
-	.incbin "baserom.gba", 0x512C4C, 0x2300
+	.incbin "graphics/stage/sapphire/zigzagoon.4bpp";
 
 gUnknown_08514F4C:: @ 0x08514F4C
 	.incbin "baserom.gba", 0x514F4C, 0x20
@@ -1999,7 +2004,9 @@ gUnknown_085223AC:: @ 0x085223AC
 	.incbin "baserom.gba", 0x5223AC, 0x4A20
 
 gUnknown_08526DCC:: @ 0x08526DCC
-	.incbin "baserom.gba", 0x526DCC, 0xF56
+	.incbin "graphics/stage/sapphire/zigzagoon_fx.4bpp";
+
+	.incbin "baserom.gba", 0x5279CC, 0x356
 
 
 gOptionsBGMList:: @ 0x08527D22

graphics/mon_catch_sprites/catch_sprites_gfx.json

@@ -0,0 +1,349 @@
+{
+  "kind": "gfx-config",
+  "version": 1,
+  "defaults": {
+    "mwidth": 6,
+    "mheight": 6,
+    "oam": true,
+    "width": 18,
+    "palette": ""
+  },
+  "files": [
+    {
+      "gfx_filename": "catch_mon_01_treecko",
+      "palette": "catch_mon_01_treecko.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_02_torchic",
+      "palette": "catch_mon_02_torchic.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_03_mudkip",
+      "palette": "catch_mon_03_mudkip.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_04_poochyena",
+      "palette": "catch_mon_04_poochyena.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_05_zigzagoon",
+      "palette": "catch_mon_05_zigzagoon.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_06_silcoon",
+      "palette": "catch_mon_06_silcoon.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_07_cascoon",
+      "palette": "catch_mon_07_cascoon.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_08_lombre",
+      "palette": "catch_mon_08_lombre.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_09_nuzleaf",
+      "palette": "catch_mon_09_nuzleaf.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_10_tailow",
+      "palette": "catch_mon_10_tailow.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_11_wingull",
+      "palette": "catch_mon_11_wingull.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_12_slakoth",
+      "palette": "catch_mon_12_slakoth.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_13_abra",
+      "palette": "catch_mon_13_abra.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_14_nincada",
+      "palette": "catch_mon_14_nincada.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_15_loudred",
+      "palette": "catch_mon_15_loudred.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_16_makuhita",
+      "palette": "catch_mon_16_makuhita.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_17_goldeen",
+      "palette": "catch_mon_17_goldeen.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_18_magikarp",
+      "palette": "catch_mon_18_magikarp.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_19_marill",
+      "palette": "catch_mon_19_marill.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_20_geodude",
+      "palette": "catch_mon_20_geodude.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_21_nosepass",
+      "palette": "catch_mon_21_nosepass.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_22_tentacool",
+      "palette": "catch_mon_22_tentacool.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_23_sableye",
+      "palette": "catch_mon_23_sableye.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_24_mawile",
+      "palette": "catch_mon_24_mawile.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_25_machop",
+      "palette": "catch_mon_25_machop.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_26_meditite",
+      "palette": "catch_mon_26_meditite.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_27_electrike",
+      "palette": "catch_mon_27_electrike.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_28_magnemite",
+      "palette": "catch_mon_28_magnemite.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_29_voltorb",
+      "palette": "catch_mon_29_voltorb.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_30_volbeat",
+      "palette": "catch_mon_30_volbeat.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_31_illumise",
+      "palette": "catch_mon_31_illumise.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_32_doduo",
+      "palette": "catch_mon_32_doduo.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_33_roselia",
+      "palette": "catch_mon_33_roselia.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_34_carvanha",
+      "palette": "catch_mon_34_carvanha.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_35_wailmer",
+      "palette": "catch_mon_35_wailmer.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_36_numel",
+      "palette": "catch_mon_36_numel.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_37_slugma",
+      "palette": "catch_mon_37_slugma.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_38_torkoal",
+      "palette": "catch_mon_38_torkoal.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_39_grimer",
+      "palette": "catch_mon_39_grimer.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_40_koffing",
+      "palette": "catch_mon_40_koffing.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_41_skarmory",
+      "palette": "catch_mon_41_skarmory.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_42_vibrava",
+      "palette": "catch_mon_42_vibrava.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_43_cacnea",
+      "palette": "catch_mon_43_cacnea.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_44_swablu",
+      "palette": "catch_mon_44_swablu.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_45_zangoose",
+      "palette": "catch_mon_45_zangoose.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_46_seviper",
+      "palette": "catch_mon_46_seviper.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_47_lunatone",
+      "palette": "catch_mon_47_lunatone.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_48_solrock",
+      "palette": "catch_mon_48_solrock.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_49_barboach",
+      "palette": "catch_mon_49_barboach.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_50_corphish",
+      "palette": "catch_mon_50_corphish.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_51_baltoy",
+      "palette": "catch_mon_51_baltoy.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_52_lileep",
+      "palette": "catch_mon_52_lileep.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_53_anorith",
+      "palette": "catch_mon_53_anorith.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_54_jigglypuff",
+      "palette": "catch_mon_54_jigglypuff.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_55_febas",
+      "palette": "catch_mon_55_febas.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_56_castform",
+      "palette": "catch_mon_56_castform.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_57_staryu",
+      "palette": "catch_mon_57_staryu.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_58_kecleon",
+      "palette": "catch_mon_58_kecleon.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_59_duskull",
+      "palette": "catch_mon_59_duskull.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_60_tropius",
+      "palette": "catch_mon_60_tropius.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_61_absol",
+      "palette": "catch_mon_61_absol.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_62_vulpix",
+      "palette": "catch_mon_62_vulpix.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_63_pikachu",
+      "palette": "catch_mon_63_pikachu.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_64_psyduck",
+      "palette": "catch_mon_64_psyduck.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_65_wobbuffet",
+      "palette": "catch_mon_65_wobbuffet.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_66_girafarig",
+      "palette": "catch_mon_66_girafarig.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_67_pinsir",
+      "palette": "catch_mon_67_pinsir.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_68_heracross",
+      "palette": "catch_mon_68_heracross.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_69_rhyhorn",
+      "palette": "catch_mon_69_rhyhorn.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_70_clamperl",
+      "palette": "catch_mon_70_clamperl.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_71_relicanth",
+      "palette": "catch_mon_71_relicanth.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_72_luvdisc",
+      "palette": "catch_mon_72_luvdisc.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_73_shelgon",
+      "palette": "catch_mon_73_shelgon.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_74_beldum",
+      "palette": "catch_mon_74_beldum.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_75_regirock",
+      "palette": "catch_mon_75_regirock.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_76_regice",
+      "palette": "catch_mon_76_regice.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_77_registeel",
+      "palette": "catch_mon_77_registeel.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_78_latias",
+      "palette": "catch_mon_78_latias.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_79_latios",
+      "palette": "catch_mon_79_latios.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_80_jirachi",
+      "palette": "catch_mon_80_jirachi.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_81_chikorita",
+      "palette": "catch_mon_81_chikorita.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_82_cyndaquil",
+      "palette": "catch_mon_82_cyndaquil.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_83_totodile",
+      "palette": "catch_mon_83_totodile.gbapal"
+    },
+    {
+      "gfx_filename": "catch_mon_84_aerodactyl",
+      "palette": "catch_mon_84_aerodactyl.gbapal"
+    }
+  ]
+}

graphics/mon_hatch_sprites/hatch.json

@@ -0,0 +1,144 @@
+{
+  "kind": "gfx-config",
+  "version": 1,
+  "defaults": {
+    "mwidth": 3,
+    "mheight": 3,
+    "width": 15,
+    "oam": true
+  },
+  "files": [
+    {
+      "gfx_filename": "aron_hatch",
+      "palette": "aron_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "azurill_hatch",
+      "palette": "azurill_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "bagon_hatch",
+      "palette": "bagon_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "chimecho_hatch",
+      "palette": "chimecho_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "chinchou_hatch",
+      "palette": "chinchou_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "corsola_hatch",
+      "palette": "corsola_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "gulpin_hatch",
+      "palette": "gulpin_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "horsea_hatch",
+      "palette": "horsea_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "igglybuff_hatch",
+      "palette": "igglybuff_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "lotad_hatch",
+      "palette": "lotad_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "minun_hatch",
+      "palette": "minun_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "natu_hatch",
+      "palette": "natu_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "oddish_hatch",
+      "palette": "oddish_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "phanpy_hatch",
+      "palette": "phanpy_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "pichu_2_hatch",
+      "palette": "pichu_2_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "pichu_hatch",
+      "palette": "pichu_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "plusle_hatch",
+      "palette": "plusle_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "ralts_hatch",
+      "palette": "ralts_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "sandshrew_hatch",
+      "palette": "sandshrew_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "seedot_hatch",
+      "palette": "seedot_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "shroomish_hatch",
+      "palette": "shroomish_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "shuppet_hatch",
+      "palette": "shuppet_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "skitty_hatch",
+      "palette": "skitty_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "snorunt_hatch",
+      "palette": "snorunt_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "spheal_hatch",
+      "palette": "spheal_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "spinda_hatch",
+      "palette": "spinda_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "spoink_hatch",
+      "palette": "spoink_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "surskit_hatch",
+      "palette": "surskit_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "trapinch_hatch",
+      "palette": "trapinch_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "whismur_hatch",
+      "palette": "whismur_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "wurmple_hatch",
+      "palette": "wurmple_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "wynaut_hatch",
+      "palette": "wynaut_hatch.gbapal"
+    },
+    {
+      "gfx_filename": "zubat_hatch",
+      "palette": "zubat_hatch.gbapal"
+    }
+  ]
+}