diff options
261 files changed, 353 insertions, 392 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 2b75974e..6808cd8a 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1961,8 +1961,8 @@ const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY const EVENT_BURNED_TOWER_FIREBREATHER_DICK_NORMAL const EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES - const EVENT_RANG_CLEAR_BELL_1 ; needs rename - const EVENT_RANG_CLEAR_BELL_2 ; needs rename + const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT + const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT const EVENT_768 ; unused const EVENT_769 ; unused const EVENT_76A ; unused diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 56e2a12b..e850d4fe 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -229,15 +229,6 @@ NUM_FRUIT_TREES EQU const_value - 1 const DECODESC_BIG_DOLL ; 3 const DECODESC_CONSOLE ; 4 -; swarm arguments -; StoreSwarmMapIndices arguments -; tentative/placeholder, this is just the order from swarm_grass.asm - const_def - const SWARM_YANMA ; 0 - const SWARM_SNUBBULL ; 1 - const SWARM_DUNSPARCE ; 2 - const SWARM_MARILL ; 3 - ; ActivateFishingSwarm setval arguments const_def const FISHSWARM_NONE ; 0 diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 10e4e64e..6e72fb7f 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/abra/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c808e5db..5c9133f6 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/aerodactyl/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ab328b6e..7d5029b9 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/aipom/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 47e5d25d..7163a87b 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/alakazam/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6bc677a7..c0c55b35 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ampharos/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 584c2417..9a7b32d5 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/arbok/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b475be53..1a5ff3f5 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/arcanine/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ca8076a2..7f82121c 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c43f001f..f37b91ce 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/articuno/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 460b0432..bfb8592f 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/azumarill/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1228b4d4..e79f8048 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 fc2e2937..d25c3117 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/beedrill/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a094fe50..2b59192c 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/bellossom/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1373bb8b..88f973e2 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/bellsprout/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d4381164..7578c497 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/blastoise/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 271d3896..a7b78a98 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/blissey/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a3e3f7d7..0b4072c6 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/bulbasaur/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 8556d884..13de4217 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/butterfree/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4acbeb7c..137d6982 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/caterpie/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 5d5740c3..cc0138a7 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/celebi/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 90424762..74e26d6c 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/chansey/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3de01c04..aed1fa3d 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/charizard/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 aac5d49f..5bfb1b0c 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/charmander/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6faefc1c..410217c7 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/charmeleon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f2017e47..be08d965 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/chikorita/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3eee1110..9ae8ce80 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/chinchou/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 96ae5db5..7bddce62 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/clefable/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bb5aa3b8..8f230f7e 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/clefairy/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cfd4183d..7c35b0b0 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/cleffa/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 0d23669d..8da5d1a4 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/cloyster/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 31249440..ce15750b 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/corsola/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d9ff34ce..33e7b8b6 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/crobat/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 7a62fe05..8c243fc4 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/croconaw/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e81668fe..0e78e1e9 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/cubone/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 da6b2893..3161b7ce 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/cyndaquil/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 44d891e1..16981897 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/delibird/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d997d7b2..74a38923 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dewgong/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1eb33ffc..50127aba 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/diglett/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6fba10c3..d03f55fc 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ditto/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c5217c38..3ba7f921 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dodrio/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 228d6567..1ca8bec1 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/doduo/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 efcf2d16..860ebdd2 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/donphan/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3cd8fdb6..a43ff8b0 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dragonair/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 78df1736..25f233bd 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dragonite/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b7a24cd8..7ee9dbf8 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dratini/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9f7ebdf8..f2962881 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/drowzee/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 82676c63..a6bdcf44 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dugtrio/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c11ac8c9..310afe8a 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/dunsparce/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ddb1aa32..1b4a74e4 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/eevee/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 66c9d7b5..308d57f8 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ekans/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a1bab3df..53ceb7c7 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/electabuzz/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a8e41bc3..978e17f3 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/electrode/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 03342f48..48b459ff 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/elekid/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 0f6f764c..bfc1bb21 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f62af38f..9b1a181e 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/espeon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 35db2c90..ddb2e1f1 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/exeggcute/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 63ca848e..2237ec16 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/exeggutor/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 23dfbbce..3f92e918 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/farfetch_d/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b80a3830..ec458fb2 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/fearow/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 93a081d8..bec8af29 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/feraligatr/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b38fece3..02ac155c 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/flaaffy/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 827bf9d1..c09cafa7 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/flareon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 612620ba..ff902070 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/forretress/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 80462ea6..48cea3ca 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/furret/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 12fceee4..926f0773 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/gastly/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9481eaca..4335e6a8 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/gengar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d29d69cc..7b689f94 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/geodude/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cc7db64b..79bc21e9 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/girafarig/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 822a9e0e..df591d98 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/gligar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d92a10de..11d8b937 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/gloom/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 27bdbd9b..f2c5ff7d 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/golbat/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b1ed4cbb..0e5d572a 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/goldeen/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b6d732b1..83981c32 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/golduck/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 231a0207..9d9a9ee5 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/golem/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 5562ec12..3018fa88 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/granbull/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 406a8119..9bc86b30 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/graveler/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ab79abb2..b9e70cc7 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/grimer/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e1622935..613a4662 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/growlithe/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 be1e5c55..0da801e1 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/gyarados/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f439a86c..7984873b 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/haunter/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b1f35dd4..bc9cabdd 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/heracross/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 45219ab2..8c01a879 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hitmonchan/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c68729c7..fdacb7b3 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hitmonlee/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 833886c3..6a60424f 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hitmontop/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a862da72..bcb8512d 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ho_oh/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e03aee87..7f26a60b 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hoothoot/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 322db362..87c26fd1 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hoppip/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 71ae3039..620ea2d3 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/horsea/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b6222f59..cff763c7 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/houndoom/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 fe33cd96..28dadd58 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/houndour/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e9458dc7..366805f3 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/hypno/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1e8987fd..2d844128 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/igglybuff/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3b264db2..9927be7e 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ivysaur/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2ffc9c1f..ebea6a02 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/jigglypuff/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f99a7b14..2a1fea06 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/jolteon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ae8d4a82..58d1e480 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/jumpluff/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c7def1d9..e42ab33a 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/jynx/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9a9b4009..865fa32e 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kabuto/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 18e4b889..79f80a3a 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kabutops/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 8d621be1..f9a622d1 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kadabra/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6cd4fd54..8a8d815d 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kakuna/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 15cd7252..e25c91e4 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kangaskhan/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f638e772..414540b4 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kingdra/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2056d27a..3cb1ab3e 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/kingler/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f8b1c279..1daaaab2 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/koffing/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f1e9be0a..f3ae3854 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/krabby/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f861b62f..cdfc79a6 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/lanturn/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 05654de1..2d2af64d 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/lapras/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 48a7af98..3cfa8a5f 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/larvitar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 965d4e35..2739051a 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ledian/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 18285bf9..e0d28076 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ledyba/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 948327c4..75fdfb40 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/lickitung/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4676b4e0..35bdefd3 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/lugia/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f4f2783f..a1badf41 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/machamp/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e8d7a783..9515c908 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/machoke/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cc7636a3..ea85c522 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/machop/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f79f317d..e48e1140 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magby/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 83b2a65d..390182f5 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magcargo/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 078c1917..618dbeaa 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magikarp/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4c7aab0a..1f8191ce 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magmar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 dc2eb981..f34e46a9 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magnemite/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3e5e6dd3..0098bfd1 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/magneton/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f82ac1c3..6480ec23 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mankey/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ffc2136d..cc63d20d 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mantine/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d3ee0a54..a1c0781b 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mareep/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 7acf4106..620a93e6 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/marill/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 5c956663..292c6884 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/marowak/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cd900857..49a542dc 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/meganium/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 dca29878..4df112d4 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/meowth/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 995c0fab..c6f99716 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/metapod/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 31a780ef..73ed3712 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mew/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 56635e92..19cc2586 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mewtwo/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4ca88b45..a464a882 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/miltank/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 8b297b61..064754b9 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/misdreavus/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 db3ef22a..55de86be 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/moltres/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 afe90bf5..e716d33b 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/mr__mime/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 0228d20c..e30bd55a 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/muk/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 37f33584..ac6a33ea 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/murkrow/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a18700aa..fe3f8de5 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/natu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a2504b75..39b7284e 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidoking/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b0ae0184..a6130613 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidoqueen/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 444dac3f..5ec31ad9 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidoran_f/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 53421c1d..db109f69 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidoran_m/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 51ab37be..1dadeac9 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidorina/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 79761398..3ff56ae0 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/nidorino/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 732ba34d..024d1ad4 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ninetales/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6f5333f0..8b87ce63 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/noctowl/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3015631f..20184d1b 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/octillery/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cc120389..59cbff23 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/oddish/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bf29d079..055e6cf0 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/omanyte/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 7d9f6001..ea203662 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/omastar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f1b6183b..115f075d 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/onix/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9a6780bd..c2426573 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/paras/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b880fa0b..4a10a83c 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/parasect/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 7f88abb8..e51c6d6b 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/persian/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 26599e0b..0b275300 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/phanpy/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 01f5ad5e..11c051f7 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pichu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 41bcc632..7ab75179 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pidgeot/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3a925470..f9654f17 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pidgeotto/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 11373713..0d89a9f9 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pidgey/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3a492e57..351740fa 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pikachu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 032ebe8b..d776a9a0 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/piloswine/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4da75e3a..e9391461 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pineco/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 5b7aee42..e4c20ec7 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pinsir/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b360c755..8055128c 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/politoed/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bafe7a4f..22eca897 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/poliwag/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a96e4eb1..0e3f8f61 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/poliwhirl/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 259e714b..322e2b5e 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/poliwrath/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 dc23607f..94fb5be8 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ponyta/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c2926e3f..d94b49aa 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/porygon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 fe7ff3c7..49210145 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/porygon2/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 31fc9e5b..d5896800 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/primeape/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3f533189..82cb3d04 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/psyduck/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f5474307..236cfaf6 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/pupitar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 5d756497..225fbebb 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/quagsire/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 dd0ca7d4..30e5f158 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/quilava/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 838a2060..005fa9d5 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/qwilfish/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ca4fa2fa..a40d8cb7 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/raichu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1c37838b..5a7b197a 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 11e52f09..4d5b2cb7 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/rapidash/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 563bd89c..2389b4c6 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/raticate/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 68819c61..4a3c1833 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/rattata/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a69f8439..48786c46 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/remoraid/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 421ffb0d..277b5cfa 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/rhydon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f1e3acd6..a249c74a 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/rhyhorn/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2988e8e1..becc062e 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sandshrew/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 15236848..1addbd35 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sandslash/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 952ac1f8..06370075 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/scizor/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 79a18040..9ad290e9 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/scyther/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 0e48e76b..b7053ce7 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/seadra/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 92ca2922..9f6d1d7c 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/seaking/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 96afc435..a75a9a85 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/seel/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 41db5596..190c6678 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sentret/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d7910413..b2d7c860 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/shellder/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 887abacc..fd805aa8 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/shuckle/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 eae4d1be..bf5b3020 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/skarmory/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9fe8945e..59f1173a 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/skiploom/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ec4139b9..61fe6489 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/slowbro/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 02cd456c..6c1cc88a 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/slowking/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e478eaed..27c3a26c 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/slowpoke/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ae882b17..309b6404 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/slugma/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 8a1d5822..93a7a1f4 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/smeargle/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d1c87ea1..e8d782f6 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/smoochum/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 826e8567..faa558c8 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cc8b1b61..7ce44ca5 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/snorlax/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 36551da5..d702a4ec 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/snubbull/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 0115c931..79449d95 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/spearow/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e02fb6ca..8e307917 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f04c19e3..494fd3e6 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/squirtle/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 02adb7c3..eb11ad5e 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/stantler/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2b18980f..37cb25dd 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/starmie/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b4858ea7..d5e97858 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/staryu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 94fbee63..7b88f64f 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/steelix/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 1a5bc4d2..6b5501a2 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sudowoodo/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 9ff71441..b5533f7e 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 590728dd..2b85015d 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sunflora/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 99891ecc..e3ce1f28 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/sunkern/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 70117b39..910e2a49 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4d4035a4..7d029b45 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tangela/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c3ac20e8..aa8320ed 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tauros/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bcd2dacb..9d330498 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/teddiursa/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 e07205f8..e631cb49 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tentacool/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cd9cd112..0e21d556 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tentacruel/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cf419e1e..cfd189a8 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/togepi/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bd2bc93d..56bc412f 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/togetic/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 637e2b2d..a8e9e342 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/totodile/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 8169486b..d56bd590 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/typhlosion/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 588f8fa5..406ea8d5 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tyranitar/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 3470fd4a..f68b30e1 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/tyrogue/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ce23e1cd..f5c9981f 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/umbreon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 d61a5046..e739c9fb 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a1f81b6b..831ac1de 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/ursaring/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 20b9c6e8..40cf64ed 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/vaporeon/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 19659d66..f1a6fef1 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/venomoth/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 4a44668e..ba6edb61 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/venonat/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 f55837f2..46e449f6 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/venusaur/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 fd92f887..a259f184 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/victreebel/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 ddba1ca0..f0c997e4 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/vileplume/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2c1041c6..bb8c623e 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/voltorb/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 22a1004c..22c0c524 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/vulpix/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 c095f342..256c57d1 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/wartortle/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 587e4c85..c7108dda 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/weedle/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2ca1231a..2bdac3cb 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/weepinbell/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 2d60a92e..4a1c3d54 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/weezing/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 cfc801b4..54999988 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/wigglytuff/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 b739900b..bb804576 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/wobbuffet/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 a9809947..d127b64f 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/wooper/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 bf0459a8..80c223b8 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/xatu/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 388c6986..6365a968 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/yanma/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 6068ae82..faaf1348 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/zapdos/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) 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 705d5f83..401c38a5 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -16,7 +16,7 @@ IF DEF(_GOLD) ELIF DEF(_SILVER) INCBIN "gfx/pokemon/zubat/front_silver.dimensions" ENDC - db 0, 0, 0, 0 ; padding + dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_FAST ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 83b99c54..fd92195c 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1334,7 +1334,7 @@ _DayCareManIntroText:: cont "raise a #MON?" done -_DayCareManOddEggText:: +_DayCareManIntroEggText:: text "I'm the DAY-CARE" line "MAN. Do you know" cont "about EGGS?" @@ -1361,7 +1361,7 @@ _DayCareLadyIntroText:: line "#MON for you?" done -_DayCareLadyOddEggText:: +_DayCareLadyIntroEggText:: text "I'm the DAY-CARE" line "LADY. Do you know" cont "about EGGS?" diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 9cbe61ce..2cc6c12a 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -1,9 +1,9 @@ ; PrintDayCareText.TextTable indexes const_def const DAYCARETEXT_MAN_INTRO - const DAYCARETEXT_MAN_EGG + const DAYCARETEXT_MAN_INTRO_EGG const DAYCARETEXT_LADY_INTRO - const DAYCARETEXT_LADY_EGG + const DAYCARETEXT_LADY_INTRO_EGG const DAYCARETEXT_WHICH_ONE const DAYCARETEXT_DEPOSIT const DAYCARETEXT_CANT_BREED_EGG @@ -160,10 +160,9 @@ DayCareAskDepositPokemon: scf ret -.DummyText: - ; +.DaycareDummyText: text_far _DaycareDummyText - db "@" + text_end DayCare_DepositPokemonText: ld a, DAYCARETEXT_DEPOSIT @@ -201,7 +200,7 @@ DayCare_AskWithdrawBreedMon: jr c, .not_enough_money ld a, [wPartyCount] cp PARTY_LENGTH - jr nc, .PartyFull + jr nc, .party_full and a ret @@ -215,7 +214,7 @@ DayCare_AskWithdrawBreedMon: scf ret -.PartyFull: +.party_full ld a, DAYCARETEXT_PARTY_FULL scf ret @@ -268,142 +267,121 @@ PrintDayCareText: .TextTable: ; entries correspond to DAYCARETEXT_* constants - dw .DayCareManIntro ; 00 - dw .DayCareManOddEgg ; 01 - dw .DayCareLadyIntro ; 02 - dw .DayCareLadyOddEgg ; 03 - dw .WhichOne ; 04 - dw .OkayIllRaiseYourMon ; 05 - dw .CantAcceptEgg ; 06 - dw .JustOneMon ; 07 - dw .LastHealthyMon ; 08 - dw .ComeBackForItLater ; 09 - dw .RemoveMail ; 0a - dw .AreWeGeniusesOrWhat ; 0b - dw .AskRetrieveMon ; 0c - dw .PerfectHeresYourMon ; 0d - dw .GotBackMon ; 0e - dw .ImmediatelyWithdrawMon ; 0f - dw .PartyFull ; 10 - dw .NotEnoughMoney ; 11 - dw .OhFineThen ; 12 - dw .ComeAgain ; 13 - -.DayCareManIntro: - ; I'm the DAY-CARE MAN. Want me to raise a #MON? + dw .DayCareManIntroText ; 00 + dw .DayCareManIntroEggText ; 01 + dw .DayCareLadyIntroText ; 02 + dw .DayCareLadyIntroEggText ; 03 + dw .WhatShouldIRaiseText ; 04 + dw .IllRaiseYourMonText ; 05 + dw .CantAcceptEggText ; 06 + dw .OnlyOneMonText ; 07 + dw .LastHealthyMonText ; 08 + dw .ComeBackLaterText ; 09 + dw .RemoveMailText ; 0a + dw .AreWeGeniusesText ; 0b + dw .YourMonHasGrownText ; 0c + dw .PerfectHeresYourMonText ; 0d + dw .GotBackMonText ; 0e + dw .BackAlreadyText ; 0f + dw .HaveNoRoomText ; 10 + dw .NotEnoughMoneyText ; 11 + dw .OhFineThenText ; 12 + dw .ComeAgainText ; 13 + +.DayCareManIntroText: text_far _DayCareManIntroText - db "@" + text_end -.DayCareManOddEgg: - ; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON? - text_far _DayCareManOddEggText - db "@" +.DayCareManIntroEggText: + text_far _DayCareManIntroEggText + text_end -.DayCareLadyIntro: - ; I'm the DAY-CARE LADY. Should I raise a #MON for you? +.DayCareLadyIntroText: text_far _DayCareLadyIntroText - db "@" + text_end -.DayCareLadyOddEgg: - ; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you? - text_far _DayCareLadyOddEggText - db "@" +.DayCareLadyIntroEggText: + text_far _DayCareLadyIntroEggText + text_end -.WhichOne: - ; What should I raise for you? +.WhatShouldIRaiseText: text_far _WhatShouldIRaiseText - db "@" + text_end -.JustOneMon: - ; Oh? But you have just one #MON. +.OnlyOneMonText: text_far _OnlyOneMonText - db "@" + text_end -.CantAcceptEgg: - ; Sorry, but I can't accept an EGG. +.CantAcceptEggText: text_far _CantAcceptEggText - db "@" + text_end -.RemoveMail: - ; Remove MAIL before you come see me. +.RemoveMailText: text_far _RemoveMailText - db "@" + text_end -.LastHealthyMon: - ; If you give me that, what will you battle with? +.LastHealthyMonText: text_far _LastHealthyMonText - db "@" + text_end -.OkayIllRaiseYourMon: - ; OK. I'll raise your @ . +.IllRaiseYourMonText: text_far _IllRaiseYourMonText - db "@" + text_end -.ComeBackForItLater: - ; Come back for it later. +.ComeBackLaterText: text_far _ComeBackLaterText - db "@" + text_end -.AreWeGeniusesOrWhat: - ; Are we geniuses or what? Want to see your @ ? +.AreWeGeniusesText: text_far _AreWeGeniusesText - db "@" + text_end -.AskRetrieveMon: - ; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ . +.YourMonHasGrownText: text_far _YourMonHasGrownText - db "@" + text_end -.PerfectHeresYourMon: - ; Perfect! Here's your #MON. +.PerfectHeresYourMonText: text_far _PerfectHeresYourMonText - db "@" + text_end -.GotBackMon: - ; got back @ . +.GotBackMonText: text_far _GotBackMonText - db "@" + text_end -.ImmediatelyWithdrawMon: - ; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100. +.BackAlreadyText: text_far _BackAlreadyText - db "@" + text_end -.PartyFull: - ; You have no room for it. +.HaveNoRoomText: text_far _HaveNoRoomText - db "@" + text_end -.NotEnoughMoney: - ; You don't have enough money. +.NotEnoughMoneyText: text_far _NotEnoughMoneyText - db "@" + text_end -.OhFineThen: - ; Oh, fine then. +.OhFineThenText: text_far _OhFineThenText - db "@" + text_end -.ComeAgain: - ; Come again. +.ComeAgainText: text_far _ComeAgainText - db "@" + text_end DayCareManOutside: ld hl, wDayCareMan bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg - ld hl, .NotYet + ld hl, .NotYetText call PrintText ret -.NotYet: - ; Not yet… +.NotYetText: text_far _NotYetText - db "@" + text_end .AskGiveEgg: - ld hl, .IntroText + ld hl, .FoundAnEggText call PrintText call YesNoBox jr c, .Declined @@ -414,13 +392,13 @@ DayCareManOutside: ld hl, wDayCareMan res DAYCAREMAN_HAS_EGG_F, [hl] call DayCare_InitBreeding - ld hl, .GotEggText + ld hl, .ReceivedEggText call PrintText ld de, SFX_GET_EGG call PlaySFX ld c, 120 call DelayFrames - ld hl, .TakeGoodCareOfItText + ld hl, .TakeGoodCareOfEggText jr .Load0 .Declined: @@ -433,36 +411,31 @@ DayCareManOutside: ret .PartyFull: - ld hl, .PartyFullText + ld hl, .NoRoomForEggText call PrintText ld a, TRUE ld [wScriptVar], a ret -.IntroText: - ; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it? +.FoundAnEggText: text_far _FoundAnEggText - db "@" + text_end -.GotEggText: - ; received the EGG! +.ReceivedEggText: text_far _ReceivedEggText - db "@" + text_end -.TakeGoodCareOfItText: - ; Take good care of it. +.TakeGoodCareOfEggText: text_far _TakeGoodCareOfEggText - db "@" + text_end .IllKeepItThanksText: - ; Well then, I'll keep it. Thanks! text_far _IllKeepItThanksText - db "@" + text_end -.PartyFullText: - ; You have no room in your party. Come back later. +.NoRoomForEggText: text_far _NoRoomForEggText - db "@" + text_end DayCare_GiveEgg: ld a, [wEggMonLevel] diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 53ab9f9a..f74645b7 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -15,7 +15,7 @@ HallOfFame:: set STATUSFLAGS_HALL_OF_FAME_F, [hl] ; Bug: Gold/Silver fail to (conditionally) erase the previous save and -; initialize the current save, if the player did not save on this playthrough! +; initialize the current save, if the player did not save on this playthrough. ld hl, wHallOfFameCount ld a, [hl] diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 2a6991ac..9e1d9b9b 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -96,6 +96,8 @@ CheckForLuckyNumberWinners: .SkipBox: inc c ld a, c + + ; BUG: fails to find winning mon in boxes 10-14 if not the active box cp NUM_BOXES_JAPANESE jr c, .BoxesLoop diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 6fd704d3..c1e9164c 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -530,7 +530,7 @@ InitializeEventsScript: setevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_KURTS_HOUSE_KURT_2 setevent EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES - setevent EVENT_RANG_CLEAR_BELL_1 ; ? + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT setevent EVENT_PLAYERS_HOUSE_MOM_2 setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKETS_IN_MAHOGANY diff --git a/home/video.asm b/home/video.asm index 242584cb..e4e9fa78 100644 --- a/home/video.asm +++ b/home/video.asm @@ -7,7 +7,7 @@ UpdateBGMapBuffer:: ; Return carry on success. ldh a, [hBGMapUpdate] - and a ; 0 + and a ret z ld [hSPBuffer], sp @@ -93,7 +93,7 @@ UpdateBGMap:: ; Update the BG Map, in thirds, from wTilemap and wAttrmap. ldh a, [hBGMapMode] - and a + and a ; 0 ret z ; BG Map 0 @@ -239,8 +239,6 @@ endr ret Serve1bppRequest:: -; Only call during the first fifth of VBlank - ld a, [wRequested1bpp] and a ret z @@ -310,8 +308,6 @@ endr ret Serve2bppRequest:: -; Only call during the first fifth of VBlank - ld a, [wRequested2bpp] and a ret z @@ -373,8 +369,6 @@ endr ret AnimateTileset:: -; Only call during the first fifth of VBlank - ldh a, [hMapAnims] and a ret z @@ -390,8 +384,10 @@ AnimateTileset:: rst Bankswitch ret +; unused ret +; unused ld hl, rLCDC set 1, [hl] ret @@ -415,7 +411,7 @@ Function1642:: ld l, a ld de, SCREEN_WIDTH add hl, de - ld b, $12 + ld b, SCREEN_HEIGHT ld a, $60 .loop1 rept 12 @@ -22,7 +22,6 @@ hSeconds:: db ; ff9a hVBlankCounter:: db ; ff9d -; hDMATransfer? hFF9E:: db ; ff9e hROMBank:: db ; ff9f diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 5356757e..49d99157 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -18,7 +18,7 @@ EcruteakTinTowerEntrance_MapScripts: end EcruteakTinTowerEntrance_CoordEvent1: - checkevent EVENT_RANG_CLEAR_BELL_2 + checkevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 @@ -28,7 +28,7 @@ EcruteakTinTowerEntrance_CoordEvent1: end EcruteakTinTowerEntrance_CoordEvent2: - checkevent EVENT_RANG_CLEAR_BELL_1 + checkevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 @@ -158,7 +158,7 @@ EcruteakTinTowerEntrance_MapEvents: db 0 ; bg events db 4 ; object events - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_1 - object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_2 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT + object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceWanderingSageScript, -1 object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, -1 |