Derive Pokémon frontpic dimensions using tools/png_dimensions

.gitignore

@@ -51,3 +51,4 @@ used_space.png
 *.2bpp
 *.lz
 *.gbcpal
+*.dimensions

Makefile

@@ -53,7 +53,7 @@ silver: pokesilver.gbc
 
 clean:
 	rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
-	find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" \) -delete
+	find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" -o -name "*.dimensions" \) -delete
 	$(MAKE) clean -C tools/
 
 tidy:
@@ -224,3 +224,6 @@ gfx/sgb/silver_border.2bpp: tools/gfx += --trim-whitespace
 
 %.gbcpal: %.png
 	$(RGBGFX) -p $@ $<
+
+%.dimensions: %.png
+	tools/png_dimensions $< $@

data/pokemon/base_stats/abra.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/abra/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/abra/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/aerodactyl.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/aerodactyl/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/aerodactyl/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/aipom.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/aipom/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/aipom/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/alakazam.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/alakazam/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/alakazam/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/ampharos.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/ampharos/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/ampharos/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_GROUND ; egg groups

data/pokemon/base_stats/arbok.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/arbok/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/arbok/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_DRAGON ; egg groups

data/pokemon/base_stats/arcanine.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/arcanine/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/arcanine/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/ariados.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pokemon/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/articuno.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/articuno/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/articuno/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/azumarill.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/azumarill/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/azumarill/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_WATER_1, EGG_FAIRY ; egg groups

data/pokemon/base_stats/bayleef.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pokemon/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

data/pokemon/base_stats/beedrill.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/beedrill/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/beedrill/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/bellossom.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/bellossom/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/bellossom/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_PLANT, EGG_PLANT ; egg groups

data/pokemon/base_stats/bellsprout.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/bellsprout/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/bellsprout/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_PLANT, EGG_PLANT ; egg groups

data/pokemon/base_stats/blastoise.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/blastoise/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/blastoise/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_WATER_1 ; egg groups

data/pokemon/base_stats/blissey.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/blissey/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/blissey/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups

data/pokemon/base_stats/bulbasaur.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/bulbasaur/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/bulbasaur/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

data/pokemon/base_stats/butterfree.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/butterfree/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/butterfree/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/caterpie.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/caterpie/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/caterpie/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/celebi.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5 , 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/celebi/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/celebi/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/chansey.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/chansey/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/chansey/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups

data/pokemon/base_stats/charizard.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/charizard/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/charizard/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_DRAGON ; egg groups

data/pokemon/base_stats/charmander.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/charmander/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/charmander/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_DRAGON ; egg groups

data/pokemon/base_stats/charmeleon.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/charmeleon/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/charmeleon/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_DRAGON ; egg groups

data/pokemon/base_stats/chikorita.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/chikorita/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/chikorita/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

data/pokemon/base_stats/chinchou.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/chinchou/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/chinchou/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_2, EGG_WATER_2 ; egg groups

data/pokemon/base_stats/clefable.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/clefable/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/clefable/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups

data/pokemon/base_stats/clefairy.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/clefairy/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/clefairy/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups

data/pokemon/base_stats/cleffa.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/cleffa/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/cleffa/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/cloyster.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/cloyster/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/cloyster/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_3, EGG_WATER_3 ; egg groups

data/pokemon/base_stats/corsola.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/corsola/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/corsola/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_WATER_1, EGG_WATER_3 ; egg groups

data/pokemon/base_stats/crobat.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/crobat/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/crobat/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/croconaw.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/croconaw/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/croconaw/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_WATER_1 ; egg groups

data/pokemon/base_stats/cubone.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/cubone/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/cubone/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_MONSTER, EGG_MONSTER ; egg groups

data/pokemon/base_stats/cyndaquil.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/cyndaquil/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/cyndaquil/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/delibird.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/delibird/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/delibird/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_WATER_1, EGG_GROUND ; egg groups

data/pokemon/base_stats/dewgong.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dewgong/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dewgong/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_WATER_1, EGG_GROUND ; egg groups

data/pokemon/base_stats/diglett.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/diglett/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/diglett/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/ditto.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/ditto/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/ditto/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_DITTO, EGG_DITTO ; egg groups

data/pokemon/base_stats/dodrio.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dodrio/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dodrio/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/doduo.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/doduo/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/doduo/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/donphan.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/donphan/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/donphan/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/dragonair.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dragonair/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dragonair/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_1, EGG_DRAGON ; egg groups

data/pokemon/base_stats/dragonite.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dragonite/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dragonite/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_1, EGG_DRAGON ; egg groups

data/pokemon/base_stats/dratini.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dratini/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dratini/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_1, EGG_DRAGON ; egg groups

data/pokemon/base_stats/drowzee.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/drowzee/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/drowzee/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/dugtrio.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dugtrio/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dugtrio/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/dunsparce.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/dunsparce/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/dunsparce/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/eevee.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/eevee/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/eevee/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/ekans.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/ekans/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/ekans/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_DRAGON ; egg groups

data/pokemon/base_stats/electabuzz.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/electabuzz/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/electabuzz/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/electrode.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/electrode/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/electrode/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_MINERAL, EGG_MINERAL ; egg groups

data/pokemon/base_stats/elekid.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/elekid/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/elekid/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/entei.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pokemon/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/espeon.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/espeon/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/espeon/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/exeggcute.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/exeggcute/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/exeggcute/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_PLANT, EGG_PLANT ; egg groups

data/pokemon/base_stats/exeggutor.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/exeggutor/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/exeggutor/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_PLANT, EGG_PLANT ; egg groups

data/pokemon/base_stats/farfetch_d.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/farfetch_d/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/farfetch_d/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_GROUND ; egg groups

data/pokemon/base_stats/fearow.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/fearow/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/fearow/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/feraligatr.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/feraligatr/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/feraligatr/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_WATER_1 ; egg groups

data/pokemon/base_stats/flaaffy.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/flaaffy/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/flaaffy/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_GROUND ; egg groups

data/pokemon/base_stats/flareon.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/flareon/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/flareon/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/forretress.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/forretress/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/forretress/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/furret.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/furret/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/furret/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/gastly.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/gastly/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/gastly/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

data/pokemon/base_stats/gengar.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/gengar/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/gengar/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

data/pokemon/base_stats/geodude.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/geodude/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/geodude/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MINERAL, EGG_MINERAL ; egg groups

data/pokemon/base_stats/girafarig.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/girafarig/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/girafarig/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/gligar.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/gligar/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/gligar/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/gloom.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/gloom/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/gloom/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_PLANT, EGG_PLANT ; egg groups

data/pokemon/base_stats/golbat.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/golbat/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/golbat/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/goldeen.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/goldeen/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/goldeen/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_WATER_2, EGG_WATER_2 ; egg groups

data/pokemon/base_stats/golduck.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/golduck/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/golduck/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_WATER_1, EGG_GROUND ; egg groups

data/pokemon/base_stats/golem.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/golem/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/golem/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MINERAL, EGG_MINERAL ; egg groups

data/pokemon/base_stats/granbull.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/granbull/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/granbull/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_GROUND, EGG_FAIRY ; egg groups

data/pokemon/base_stats/graveler.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/graveler/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/graveler/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MINERAL, EGG_MINERAL ; egg groups

data/pokemon/base_stats/grimer.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/grimer/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/grimer/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

data/pokemon/base_stats/growlithe.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/growlithe/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/growlithe/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/gyarados.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 5 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/gyarados/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/gyarados/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_WATER_2, EGG_DRAGON ; egg groups

data/pokemon/base_stats/haunter.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/haunter/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/haunter/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

data/pokemon/base_stats/heracross.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/heracross/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/heracross/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups

data/pokemon/base_stats/hitmonchan.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hitmonchan/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hitmonchan/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/hitmonlee.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hitmonlee/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hitmonlee/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/hitmontop.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hitmontop/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hitmontop/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/ho_oh.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7 , 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/ho_oh/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/ho_oh/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/hoothoot.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hoothoot/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hoothoot/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_FLYING, EGG_FLYING ; egg groups

data/pokemon/base_stats/hoppip.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hoppip/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hoppip/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_FAIRY, EGG_PLANT ; egg groups

data/pokemon/base_stats/horsea.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/horsea/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/horsea/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_WATER_1, EGG_DRAGON ; egg groups

data/pokemon/base_stats/houndoom.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/houndoom/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/houndoom/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/houndour.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/houndour/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/houndour/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_SLOW ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/hypno.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/hypno/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/hypno/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/igglybuff.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/igglybuff/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/igglybuff/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/ivysaur.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/ivysaur/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/ivysaur/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

data/pokemon/base_stats/jigglypuff.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/jigglypuff/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/jigglypuff/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_FAST ; growth rate
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups

data/pokemon/base_stats/jolteon.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/jolteon/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/jolteon/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_GROUND, EGG_GROUND ; egg groups

data/pokemon/base_stats/jumpluff.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 7, 7 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/jumpluff/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/jumpluff/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_SLOW ; growth rate
 	dn EGG_FAIRY, EGG_PLANT ; egg groups

data/pokemon/base_stats/jynx.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 6, 6 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/jynx/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/jynx/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

data/pokemon/base_stats/kabuto.asm

@@ -11,7 +11,11 @@
 	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
 	db 5 ; unknown 2
-	dn 5, 5 ; frontpic dimensions
+IF DEF(_GOLD)
+	INCBIN "gfx/pokemon/kabuto/front_gold.dimensions"
+ELIF DEF(_SILVER)
+	INCBIN "gfx/pokemon/kabuto/front_silver.dimensions"
+ENDC
 	db 0, 0, 0, 0 ; padding
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_WATER_1, EGG_WATER_3 ; egg groups