diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-14 19:00:34 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-14 19:00:34 -0400 |
| commit | b6b573152cb86ff47cac3f6cae95fa1edcd3a64f (patch) | |
| tree | 5eb78ee9ae0676fa79343eb074272281ff3cce91 | |
| parent | 1521f52e37741a9220a1362443df6d0462e582d3 (diff) | |
Derive Pokémon frontpic dimensions using tools/png_dimensions
255 files changed, 1282 insertions, 252 deletions
@@ -51,3 +51,4 @@ used_space.png *.2bpp *.lz *.gbcpal +*.dimensions @@ -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 $< $@ diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index d5073235..10e4e64e 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/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 diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 6db51a2e..c808e5db 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/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 diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 3a3b0c1c..ab328b6e 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/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 diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 673ae050..47e5d25d 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/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 diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index a3b97118..6bc677a7 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/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 diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index d6344a3b..584c2417 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/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 diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index bab03666..b475be53 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/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 diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 63480fe9..ca8076a2 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/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 diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index 7212c293..c43f001f 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/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 diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index b5567034..460b0432 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/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 diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index b2878212..1228b4d4 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/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 diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 9dbff687..fc2e2937 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/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 diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 920568cb..a094fe50 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/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 diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 052f6b10..1373bb8b 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/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 diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 0d45b5a9..d4381164 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/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 diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 000d774f..271d3896 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/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 diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 0262753f..a3e3f7d7 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/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 diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index 57e703b4..8556d884 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/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 diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index 23a53962..4acbeb7c 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/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 diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index cef8879f..5d5740c3 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/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 diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index 85971c51..90424762 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/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 diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 974322b6..3de01c04 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/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 diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 0f8c537d..aac5d49f 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/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 diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index df134b0e..6faefc1c 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/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 diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index f49054a2..f2017e47 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/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 diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index a4c1c671..3eee1110 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/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 diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 9090dd6e..96ae5db5 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/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 diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index e3f32b12..bb5aa3b8 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/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 diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 7312f36a..cfd4183d 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/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 diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index dc180b3e..0d23669d 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/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 diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 3b82a98e..31249440 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/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 diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 5cbed1f4..d9ff34ce 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/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 diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 0d3d6666..7a62fe05 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/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 diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 77ac01b3..e81668fe 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/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 diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index 192d92ac..da6b2893 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/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 diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 9515ba1c..44d891e1 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/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 diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index ad7bdaeb..d997d7b2 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/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 diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index c0511759..1eb33ffc 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/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 diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 8df89bee..6fba10c3 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/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 diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index e81dedf2..c5217c38 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/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 diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index e19eb4a3..228d6567 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/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 diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index 5fd71a0f..efcf2d16 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/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 diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 5750cc0e..3cd8fdb6 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/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 diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index 3905bffc..78df1736 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/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 diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index f6cd8647..b7a24cd8 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/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 diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index f6865872..9f7ebdf8 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/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 diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index b7c34d5e..82676c63 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/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 diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 5c08dee2..c11ac8c9 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/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 diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index b21f2476..ddb1aa32 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/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 diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 4d5aba91..66c9d7b5 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/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 diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index c8f08073..a1bab3df 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/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 diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index ad1fc975..a8e41bc3 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/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 diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index a11b000f..03342f48 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/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 diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 63e96b81..0f6f764c 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/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 diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 44126640..f62af38f 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/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 diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 8ec4ac50..35db2c90 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/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 diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 7a217259..63ca848e 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/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 diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 73fe033c..23dfbbce 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/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 diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index ee7abe71..b80a3830 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/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 diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index c5f1c34e..93a081d8 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/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 diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index cfd2cd68..b38fece3 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/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 diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 6889e339..827bf9d1 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/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 diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 3e355cd0..612620ba 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/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 diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index 17154603..80462ea6 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/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 diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index af34fb33..12fceee4 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/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 diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 272fa90f..9481eaca 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/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 diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 683dc99f..d29d69cc 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/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 diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 015b46ad..cc7db64b 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/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 diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index 62fd4192..822a9e0e 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/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 diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 8d31f6a5..d92a10de 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/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 diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index c9897012..27bdbd9b 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/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 diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 8f02b917..b1ed4cbb 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/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 diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index c850e167..b6d732b1 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/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 diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index b3bb8f53..231a0207 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/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 diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index f763eb07..5562ec12 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/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 diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index 83671ba2..406a8119 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/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 diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 87edf673..ab79abb2 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/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 diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index 7f82b027..e1622935 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/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 diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 051e4821..be1e5c55 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/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 diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 1e8128be..f439a86c 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/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 diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index 95e792ba..b1f35dd4 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/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 diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 7db7064d..45219ab2 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/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 diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index d482fcf0..c68729c7 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/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 diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index 290d4920..833886c3 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/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 diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 81d72b3d..a862da72 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/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 diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index b71b049f..e03aee87 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/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 diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index 1d5fa553..322db362 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/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 diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 87327a1d..71ae3039 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/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 diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index c47e33f6..b6222f59 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/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 diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index c2d5ad8f..fe33cd96 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/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 diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 8490a106..e9458dc7 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/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 diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 213c01c9..1e8987fd 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/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 diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index c9383620..3b264db2 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/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 diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 30871368..2ffc9c1f 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/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 diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index 29cfe9fb..f99a7b14 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/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 diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index 754dd125..ae8d4a82 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/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 diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 6563aa28..c7def1d9 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/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 diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 7d808046..9a9b4009 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/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 diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index a5ce92bd..18e4b889 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 30 ; step cycles to hatch db 5 ; unknown 2 - dn 6, 6 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/kabutops/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kabutops/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 diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 48a34dde..8d621be1 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.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/kadabra/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kadabra/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 8b3efd96..6cd4fd54 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.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/kakuna/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kakuna/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index aa676dfd..15cd7252 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.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/kangaskhan/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kangaskhan/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index 9117d9b8..f638e772 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.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/kingdra/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kingdra/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index d96c28ec..2056d27a 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.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/kingler/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/kingler/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index c7b65482..f8b1c279 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.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/koffing/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/koffing/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index 0b3110bb..f1e9be0a 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.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/krabby/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/krabby/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index d1a7ad07..f861b62f 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.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/lanturn/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/lanturn/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index e887325e..05654de1 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.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/lapras/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/lapras/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index 71aa4d03..48a7af98 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.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/larvitar/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/larvitar/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 520667d9..965d4e35 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.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/ledian/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/ledian/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index ef27195c..18285bf9 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.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/ledyba/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/ledyba/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index c2feb731..948327c4 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.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/lickitung/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/lickitung/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index f29ccc33..4676b4e0 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.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/lugia/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/lugia/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 2d1e7932..f4f2783f 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.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/machamp/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/machamp/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index b435c956..e8d7a783 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.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/machoke/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/machoke/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index fdfbe606..cc7636a3 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.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/machop/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/machop/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index fbe1f752..f79f317d 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.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/magby/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magby/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index c616dbfc..83b2a65d 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.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/magcargo/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magcargo/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index b659064e..078c1917 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 5 ; step cycles to hatch db 5 ; unknown 2 - dn 6, 6 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/magikarp/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magikarp/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_2, EGG_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 3d19da38..4c7aab0a 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.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/magmar/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magmar/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 6aa8e104..dc2eb981 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.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/magnemite/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magnemite/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index ea1dbfae..3e5e6dd3 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.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/magneton/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/magneton/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 0bed9309..f82ac1c3 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.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/mankey/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mankey/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index 6a05afa8..ffc2136d 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.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/mantine/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mantine/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_1, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 5461beb0..d3ee0a54 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.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/mareep/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mareep/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index 74d32f30..7acf4106 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.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/marill/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/marill/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_WATER_1, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index e0238145..5c956663 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.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/marowak/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/marowak/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index a2a83bbf..cd900857 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.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/meganium/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/meganium/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index f9ed1478..dca29878 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.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/meowth/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/meowth/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index 19b03a8c..995c0fab 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.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/metapod/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/metapod/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 6236dc88..31a780ef 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.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/mew/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mew/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 66a7bd72..56635e92 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.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/mewtwo/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mewtwo/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index 7ab32c84..4ca88b45 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.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/miltank/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/miltank/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index 6f346a8a..8b297b61 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.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/misdreavus/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/misdreavus/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 2c8b22f6..db3ef22a 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.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/moltres/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/moltres/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index f690cec6..afe90bf5 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.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/mr__mime/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/mr__mime/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index be0b635a..0228d20c 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.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/muk/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/muk/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 497a3b84..37f33584 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.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/murkrow/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/murkrow/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index e4906ab9..a18700aa 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.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/natu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/natu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index a39933a6..a2504b75 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.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/nidoking/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidoking/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index a6b7c069..b0ae0184 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.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/nidoqueen/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidoqueen/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 71d92143..444dac3f 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.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/nidoran_f/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidoran_f/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 62aa5bce..53421c1d 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.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/nidoran_m/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidoran_m/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 9df1dd30..51ab37be 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.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/nidorina/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidorina/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 3dff4b4c..79761398 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.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/nidorino/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/nidorino/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index d7edc784..732ba34d 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.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/ninetales/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/ninetales/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 118c8f84..6f5333f0 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.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/noctowl/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/noctowl/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index d5140361..3015631f 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.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/octillery/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/octillery/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_2 ; egg groups diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 4fb3f051..cc120389 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.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/oddish/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/oddish/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index a4286d90..bf29d079 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.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/omanyte/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/omanyte/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 diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index a9531fc9..7d9f6001 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 30 ; step cycles to hatch db 5 ; unknown 2 - dn 6, 6 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/omastar/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/omastar/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 diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index e95d9882..f1b6183b 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.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/onix/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/onix/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index d1c78cf6..9a6780bd 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.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/paras/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/paras/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index c671a859..b880fa0b 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.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/parasect/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/parasect/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index 605f9e70..7f88abb8 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.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/persian/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/persian/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index de41f3ed..26599e0b 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.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/phanpy/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/phanpy/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index c705e637..01f5ad5e 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.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/pichu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pichu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 98bd4357..41bcc632 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.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/pidgeot/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pidgeot/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index b6ee7dca..3a925470 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.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/pidgeotto/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pidgeotto/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index ef4ac9f7..11373713 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.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/pidgey/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pidgey/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index cd8d1643..3a492e57 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.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/pikachu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pikachu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index 132627f5..032ebe8b 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.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/piloswine/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/piloswine/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 0dffedc8..4da75e3a 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.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/pineco/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pineco/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index d2564840..5b7aee42 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.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/pinsir/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pinsir/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index a861fbe8..b360c755 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.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/politoed/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/politoed/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_WATER_1, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 513d8a41..bafe7a4f 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.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/poliwag/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/poliwag/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_WATER_1, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index a19f001d..a96e4eb1 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.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/poliwhirl/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/poliwhirl/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_WATER_1, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 52ee3375..259e714b 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.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/poliwrath/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/poliwrath/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_WATER_1, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index a2dfc95c..dc23607f 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.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/ponyta/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/ponyta/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index ae3d5d16..c2926e3f 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.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/porygon/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/porygon/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index b5dc451e..fe7ff3c7 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.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/porygon2/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/porygon2/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 11875a91..31fc9e5b 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.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/primeape/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/primeape/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index 6ac01bd7..3f533189 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.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/psyduck/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/psyduck/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index b2c2ff44..f5474307 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.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/pupitar/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/pupitar/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index c00de0f3..5d756497 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.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/quagsire/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/quagsire/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 4d956c25..dd0ca7d4 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.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/quilava/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/quilava/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 152c91d9..838a2060 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.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/qwilfish/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/qwilfish/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 diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index 46c1fc87..ca4fa2fa 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 10 ; step cycles to hatch db 5 ; unknown 2 - dn 7, 7 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/raichu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/raichu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 1d36a7a3..1c37838b 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.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/raikou/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index ae62917b..11e52f09 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.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/rapidash/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/rapidash/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 275550e0..563bd89c 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.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/raticate/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/raticate/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index e6e0286e..68819c61 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.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/rattata/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/rattata/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index d6caf7f2..a69f8439 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.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/remoraid/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/remoraid/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_2 ; egg groups diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index 20a43135..421ffb0d 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.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/rhydon/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/rhydon/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index de143249..f1e3acd6 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.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/rhyhorn/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/rhyhorn/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 7551c0fd..2988e8e1 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.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/sandshrew/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sandshrew/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 60cc9e48..15236848 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.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/sandslash/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sandslash/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index 55e58b1a..952ac1f8 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.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/scizor/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/scizor/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index f1f22e6c..79a18040 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.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/scyther/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/scyther/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 089bac40..0e48e76b 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.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/seadra/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/seadra/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index db87d60e..92ca2922 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.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/seaking/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/seaking/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 diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index d1420d46..96afc435 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.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/seel/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/seel/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index 11f6dba5..41db5596 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.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/sentret/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sentret/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index fd01675a..d7910413 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.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/shellder/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/shellder/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index c70d4695..887abacc 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.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/shuckle/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/shuckle/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 9c93baec..eae4d1be 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.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/skarmory/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/skarmory/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 473202fc..9fe8945e 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.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/skiploom/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/skiploom/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_FAIRY, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index ffe95d6c..ec4139b9 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.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/slowbro/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/slowbro/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index d7e9b4af..02cd456c 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.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/slowking/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/slowking/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index cc06c5b0..e478eaed 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.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/slowpoke/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/slowpoke/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 4f7d84dd..ae882b17 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.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/slugma/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/slugma/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index b10d068f..8a1d5822 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.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/smeargle/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/smeargle/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index 548ad5f5..d1c87ea1 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 25 ; step cycles to hatch db 5 ; unknown 2 - dn 5, 5 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/smoochum/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/smoochum/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index d9c9ae8a..826e8567 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.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/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 411c83ab..cc8b1b61 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.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/snorlax/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/snorlax/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 907a5483..36551da5 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.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/snubbull/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/snubbull/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 07b5cf9b..0115c931 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.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/spearow/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/spearow/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index 1a47348b..e02fb6ca 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -11,7 +11,7 @@ db 100 ; unknown 1 db 15 ; step cycles to hatch db 5 ; unknown 2 - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 91e27c33..f04c19e3 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.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/squirtle/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/squirtle/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index a8138be7..02adb7c3 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.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/stantler/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/stantler/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 337afa76..2b18980f 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.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/starmie/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/starmie/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 7a98dca2..b4858ea7 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.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/staryu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/staryu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 610a3f79..94fbee63 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.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/steelix/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/steelix/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index ca285cab..1a5bc4d2 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.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/sudowoodo/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sudowoodo/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index ee873321..9ff71441 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.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/suicune/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index 013dc23f..590728dd 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.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/sunflora/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sunflora/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index b5fb9f23..99891ecc 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.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/sunkern/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/sunkern/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index b754a311..70117b39 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.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/swinub/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 2b905a14..4d4035a4 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.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/tangela/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tangela/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 49406edb..c3ac20e8 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.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/tauros/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tauros/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 3836fdc1..bcd2dacb 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.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/teddiursa/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/teddiursa/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index aefb6acb..e07205f8 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.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/tentacool/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tentacool/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index ca9569cf..cd9cd112 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.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/tentacruel/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tentacruel/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index e553cbde..cf419e1e 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.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/togepi/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/togepi/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index 589e2784..bd2bc93d 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 10 ; step cycles to hatch db 5 ; unknown 2 - dn 7, 7 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/togetic/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/togetic/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FLYING, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 49a81790..637e2b2d 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.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/totodile/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/totodile/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index eb3308ef..8169486b 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.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/typhlosion/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/typhlosion/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index c1646bc1..588f8fa5 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.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/tyranitar/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tyranitar/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_MONSTER ; egg groups diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index e99b00bc..3470fd4a 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -11,7 +11,11 @@ db 100 ; unknown 1 db 25 ; step cycles to hatch db 5 ; unknown 2 - dn 5, 5 ; frontpic dimensions +IF DEF(_GOLD) + INCBIN "gfx/pokemon/tyrogue/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/tyrogue/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index badf286f..ce23e1cd 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.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/umbreon/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/umbreon/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index b8db2883..d61a5046 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -11,7 +11,7 @@ db 100 ; unknown 1 db 40 ; step cycles to hatch db 5 ; unknown 2 - dn 5, 5 ; frontpic dimensions + INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 2d397e65..a1f81b6b 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.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/ursaring/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/ursaring/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 1b448591..20b9c6e8 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.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/vaporeon/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/vaporeon/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index 2fe61281..19659d66 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.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/venomoth/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/venomoth/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 41806ac8..4a44668e 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.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/venonat/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/venonat/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 4f2b00eb..f55837f2 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.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/venusaur/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/venusaur/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index db87ff76..fd92f887 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.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/victreebel/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/victreebel/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 7c536e38..ddba1ca0 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.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/vileplume/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/vileplume/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index e6b83614..2c1041c6 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.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/voltorb/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/voltorb/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index 7cac4abb..22a1004c 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.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/vulpix/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/vulpix/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index 2641c32a..c095f342 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.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/wartortle/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/wartortle/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index feb73f77..587e4c85 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.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/weedle/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/weedle/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index f72242d2..2ca1231a 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.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/weepinbell/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/weepinbell/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_PLANT, EGG_PLANT ; egg groups diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 74cb9d0f..2d60a92e 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.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/weezing/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/weezing/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index c2fb6796..cfc801b4 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.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/wigglytuff/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/wigglytuff/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 855a7d99..b739900b 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.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/wobbuffet/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/wobbuffet/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index 2d2ece7e..a9809947 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.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/wooper/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/wooper/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index f1fc7a55..bf0459a8 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.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/xatu/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/xatu/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 0a12638f..388c6986 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.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/yanma/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/yanma/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_BUG, EGG_BUG ; egg groups diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 6345b943..6068ae82 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.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/zapdos/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/zapdos/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index ec8be5e5..705d5f83 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.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/zubat/front_gold.dimensions" +ELIF DEF(_SILVER) + INCBIN "gfx/pokemon/zubat/front_silver.dimensions" +ENDC db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/tools/Makefile b/tools/Makefile index a86675d3..797ee2c9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,6 +5,7 @@ CFLAGS := -O3 -std=c99 -Wall -Wextra -Wno-missing-field-initializers tools := \ lzcomp \ + png_dimensions \ scan_includes \ gfx all: $(tools) diff --git a/tools/png_dimensions.c b/tools/png_dimensions.c new file mode 100644 index 00000000..900485bd --- /dev/null +++ b/tools/png_dimensions.c @@ -0,0 +1,57 @@ +#include <stdio.h> +#include <stdint.h> +#include <stdlib.h> + +void usage(void) { + fprintf(stderr, "Usage: png_dimensions infile outfile\n"); + exit(1); +} + +void output_dimensions(char* png_filename, char* out_filename) { + FILE* f; + int width, height; + int i; + uint8_t bytes[4]; + uint8_t output; + + f = fopen(png_filename, "rb"); + if (f == NULL) { + fprintf(stderr, "failed to open file %s\n", png_filename); + exit(1); + } + + // width + fseek(f, 16, SEEK_SET); + int size = fread(bytes, 1, 4, f); + fclose(f); + if (size != 4) { + fprintf(stderr, "failed to read at offset 0x10 in file %s\n", png_filename); + exit(1); + } + + width = 0; + for (i = 0; i < 4; i++) { + width |= bytes[i] << (8 * (3 - i)); + } + width >>= 3; + height = width; + + output = width & 0xf; + output |= (height & 0xf) << 4; + + f = fopen(out_filename, "wb"); + if (f == NULL) { + fprintf(stderr, "failed to open file %s\n", out_filename); + exit(1); + } + fwrite(&output, 1, 1, f); + fclose(f); +} + +int main(int argc, char* argv[]) { + if (argc < 3) { + usage(); + } + output_dimensions(argv[1], argv[2]); + return 0; +} |