diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-01-31 21:09:12 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-02-04 11:07:16 -0500 |
| commit | d482dc28f4c0f1519fb4a006d9f0cfb58c0c02ff (patch) | |
| tree | c4e5fec0f3393ae75cb5fce96bd6ea73c7839fda | |
| parent | b1c85486283274fbd1dd9072116ab1bb034e7756 (diff) | |
Identify four padding bytes in base data as beta front/back pic pointers
254 files changed, 259 insertions, 257 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 9ba6953d9..cbdbbd17b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -19,7 +19,8 @@ BASE_UNKNOWN_1 EQUS "(wBaseUnknown1 - wCurBaseData)" BASE_EGG_STEPS EQUS "(wBaseEggSteps - wCurBaseData)" BASE_UNKNOWN_2 EQUS "(wBaseUnknown2 - wCurBaseData)" BASE_PIC_SIZE EQUS "(wBasePicSize - wCurBaseData)" -BASE_PADDING EQUS "(wBasePadding - wCurBaseData)" +BASE_FRONTPIC EQUS "(wBaseUnusedFrontpic - wCurBaseData)" +BASE_BACKPIC EQUS "(wBaseUnusedBackpic - wCurBaseData)" BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)" BASE_EGG_GROUPS EQUS "(wBaseEggGroups - wCurBaseData)" BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)" diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 890c46f20..473a8445a 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" - 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 29e406504..250109fec 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" - 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 12edacca2..04fd4515b 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" - 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 5de640d73..06d1a6855 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" - 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 e4ef4bd0a..5c649bb8e 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index b90c83b1c..9c2282e2f 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" - 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 92f9b0233..d041e08a1 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/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/ariados.asm b/data/pokemon/base_stats/ariados.asm index ca8076a20..7f82121c7 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 1189afec1..f649dbed1 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/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/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index d76e1bd72..9b1070656 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" - 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 1228b4d49..e79f80482 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 8e371d790..39c705f35 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" - 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 328959a5f..41b0116b2 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" - 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 099dc7142..f10faabcb 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" - 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 9cb62420a..76ca11322 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 8e6256843..eee88ee6a 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" - 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 f4178d8ae..d989f47df 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/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/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index f2c125ac4..24a273843 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" - 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 d7525ee53..88d6220a0 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" - 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 8943dc8bc..537d6a4a7 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -12,7 +12,7 @@ db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" - 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 78ec783ae..8a9979878 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" - 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 237f7d72b..053a8a5bc 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/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_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 6f60c22a8..80d5da1f5 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/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_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 832757a7e..0c004af6b 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/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_DRAGON ; egg groups diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 639e51377..ddcb1a0ae 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/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/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index 3bad12e41..79bcc2b06 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" - 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 dc627f02c..536d1afd2 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" - 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 71c8ac9a7..6c653dca7 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" - 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 923b339b9..4c20b3cc4 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" - 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 7dfc72ff9..d0347d569 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" - 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 e5f2536f8..b782106d6 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" - 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 11b39ab2d..b3393d60c 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" - 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 8b0fa482f..35c32d3d3 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index a44eea42e..4a2ba7d7b 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" - 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 8170baa48..37999f6d3 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/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/delibird.asm b/data/pokemon/base_stats/delibird.asm index 636541752..f4168cbe6 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" - 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 7abfad876..b00ad60cc 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" - 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 7027030e6..ac3f890b0 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" - 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 4528b5381..28c039ea8 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" - 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 dbdb095e2..e3ca74b26 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" - 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 668740723..cf72aff81 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" - 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 4d1e58f14..c0461bd9c 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" - 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 a876a54de..d65251794 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" - 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 6d088437f..6abb516c1 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" - 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 2e8b2a226..1e384ce3d 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" - 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 d00ea31b3..d3bf6172b 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" - 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 ec1fb51f5..da49ac4fe 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" - 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 6ebebf36c..b59250edc 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" - 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 9a267c70a..19701299b 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" - 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 997125e31..6987bc698 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" - 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 b9524d571..371132846 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" - 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 ec4714cd3..75358d723 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" - 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 ba7abf250..b67f6158f 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/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/entei.asm b/data/pokemon/base_stats/entei.asm index 7085e8990..a06075d7d 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 4763ce9e9..8cafacf98 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" - 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 34c132fde..f5ad6957e 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" - 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 b9df54bad..d6287cb80 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" - 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 b08bd8135..dd9ae2c95 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" - 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 294aa8b4d..2e942b734 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" - 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 acdbc4126..dd53771e8 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index 3ce3116cf..48d3d5f14 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index a57bf46e3..041ccf0da 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" - 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 24eded41f..4765c22c6 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" - 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 c63f0a664..40e301bf0 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" - 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 3845f1991..282c3c4bd 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" - 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 33faaa3f7..ece30ff7a 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" - 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 f084e0b84..041e64a63 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" - 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 2e2c7812a..f1e56693a 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" - 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 ae609d5d2..0f6d90b60 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" - 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 87941e18a..eee63034c 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" - 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 071df7e59..4dc79906a 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" - 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 eb432d38b..b2574903d 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" - 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 8a0acfebd..543850ae7 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" - 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 bb973d0b9..8812b8dfe 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" - 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 05c268003..1313d2c30 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" - 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 97c4699c0..f9c702a80 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" - 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 72eb064e3..db200f27e 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" - 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 84113f0fb..3cb0070f9 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/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/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 0e4d5ca6e..30662ed8c 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -12,7 +12,7 @@ db 5 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" - 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 1ce4557bc..44216fc8f 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" - 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 699fc40a8..d31d309e9 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" - 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 49d92287c..affc9e697 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" - 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 a8b11274a..eb8a47c49 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" - 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 6a383b07c..deb0e473f 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" - 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 d2a7627cb..f78731820 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -12,7 +12,7 @@ db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/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/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index 29293fc6a..f5d1440a6 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" - 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 da08514ef..081052fc0 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" - 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 dd3c085a8..328e38a2a 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" - 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 6bb11aa86..60d3d08d5 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/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/houndour.asm b/data/pokemon/base_stats/houndour.asm index 3eac9dafd..fe205ed70 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/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/hypno.asm b/data/pokemon/base_stats/hypno.asm index e9761fe8d..67213c839 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" - 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 687171369..9b5e0b305 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" - 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 870a4b675..cfa1a47f7 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/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/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 5a3066a56..2d96cb11a 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" - 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 3984d9d93..8798265b9 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" - 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 61a8b7fe2..164d78e9c 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" - 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 1a7149d35..dc2d0332a 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" - 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 f9ac24011..b8d9ea594 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -12,7 +12,7 @@ db 30 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" - 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 c6d755694..84b334a67 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -12,7 +12,7 @@ db 30 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" - 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 9a7f7f841..faef29713 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" - 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 20c0db908..bcc734adf 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" - 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 f56401af5..151589e19 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" - 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 930f30b7b..2638f7459 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" - 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 3362dc4f0..ef34951dc 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" - 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 13f297f0f..5678bb4f2 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" - 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 5b8214773..25da798e8 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" - 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 140d85dc4..6654deb21 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" - 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 dbbaa0203..511dd7308 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" - 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 fc595d973..8a9419af9 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" - 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 ac8e998b7..eb7ac46b1 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/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/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index 7ec0cf21b..35d08c346 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/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/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 71b61380f..33490e673 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" - 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 db3c17b29..5da2f85c3 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -12,7 +12,7 @@ db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/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/machamp.asm b/data/pokemon/base_stats/machamp.asm index 5595336c7..595586da5 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" - 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 ebbd9e3a8..1ad42c513 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" - 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 51446b53f..33b3cdbd7 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" - 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 1d029bd65..28f7fadb5 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/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/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index 472e67895..7248e0841 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" - 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 16e0cebc9..2c78bf40b 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -12,7 +12,7 @@ db 5 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" - 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 a01e0387b..0e58ddbe5 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" - 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 5a34e2bbc..44a5599f4 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" - 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 620171c17..b0c25a578 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" - 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 c56672f7b..04ac4b4a4 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" - 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 7b5cd54a9..2ba61ef6f 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" - 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 7ed0d477e..364cdc331 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index 28f936745..f02d0841b 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" - 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 264814f55..6f4cdd192 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" - 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 b5e67957f..1cf9a62c0 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/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/meowth.asm b/data/pokemon/base_stats/meowth.asm index bd51fbc19..d395e24a6 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" - 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 335e894e3..98f023048 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" - 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 aa9ed7012..3655860fa 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -12,7 +12,7 @@ db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" - 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 348603b84..e71c41982 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -12,7 +12,7 @@ db 120 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/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/miltank.asm b/data/pokemon/base_stats/miltank.asm index 471e45208..22da33708 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/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/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index 821cb37ac..e2ab00f5a 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" - 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 2635909d1..e23951d01 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/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/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 476483d9e..6f2f6e3df 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" - 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 48c4e5cd7..e316e605a 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" - 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 db9c40fa1..6b0ebfd15 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" - 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 6f1076eb7..88d756af1 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" - 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 af3572a96..08cd72013 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 72eb9336c..d673bcbc2 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" - 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 e3cb1c9b2..4eb72c3e6 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 8b3d28ddc..06d41d485 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index d446a0d3b..a1967cf27 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" - 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 7ece56a58..dc2cef78e 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/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_GROUND ; egg groups diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index cb8f538b0..4aa6a1d22 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" - 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 5ad54adc6..e6eae9cea 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" - 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 c4a9a9c09..9bfe853fe 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" - 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 3bb4fb1a3..be72b64f8 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" - 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 d676205de..ec4e3682a 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -12,7 +12,7 @@ db 30 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" - 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 33816ae00..8f04d5b55 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -12,7 +12,7 @@ db 30 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" - 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 6b3183e97..452454cf7 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" - 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 1cd8aa500..4d95f1f33 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" - 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 f5b1a4fe5..4b30a7636 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" - 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 c71837785..ba46e5fd0 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" - 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 27221d4fb..614662dfb 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" - 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 6805a0386..324916e34 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/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/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 5d935b01d..48dfc39bc 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" - 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 766a2e5cf..20d05fd3a 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" - 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 4d9ccb21a..91d998558 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" - 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 7beb911ff..6a2afcf0f 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" - 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 077146eca..fb6c83dc6 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/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/pineco.asm b/data/pokemon/base_stats/pineco.asm index fc5e2e591..e57361da5 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" - 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 7d7a46257..4ce468e2a 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" - 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 617dc0c7c..111a0c83c 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" - 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 d3a2722a5..dced76ead 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" - 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 2c2e9dba9..8f56618b2 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" - 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 114cc7c88..e1551d4f8 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" - 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 0be847fbd..4f6397d86 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" - 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 e8b1f4402..cb13bb1b0 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" - 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 11fd950aa..b4b588301 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" - 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 15da82cb3..61fa9155f 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" - 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 dd964344b..0fb1eaadf 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" - 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 b4bc6e5e7..f95992773 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" - 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 c3599d036..d9173ae25 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" - 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 82cf03a7f..1d5bce749 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/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/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 16cf03d07..518b524b9 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" - 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 6b7727f6b..4756cbfc7 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" - 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 753800d93..bf3e97fb1 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 9827add2d..83e9afb1a 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" - 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 8fbcc2e40..088a97686 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" - 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 30c9581ec..6a5ae423e 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" - 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 a41ce6ce8..a73afb269 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" - 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 9b95d9e94..55a55a4f8 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" - 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 ee691b796..5ca95903c 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" - 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 8da9f1a88..45789bb06 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" - 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 f2936e47b..a145394df 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" - 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 e59a4bd96..99b524975 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" - 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 a39f00ec9..8715ee170 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" - 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 9793dbc2a..ea97b0cac 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" - 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 16877fbc4..b4b75d2c4 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" - 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 8635ff507..f51e2162c 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" - 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 bb68d5c50..5b79532dc 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" - 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 c7a39fc88..c6e452fcd 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" - 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 ca4cbc9c2..57732dba4 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" - 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 73fc39741..cc1ab6820 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" - 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 f3ae26958..3ea1fe984 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" - 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 797dbbf3a..ac4f8d4b4 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" - 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 56e565e5c..b2963dbe6 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" - 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 99d9a60ba..9d4eeae74 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" - 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 26e8818c7..862b63655 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" - 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 1a9c891f1..165f9e01d 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" - 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 7be8e51de..d4f0b3c79 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/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/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 2b58b31eb..5723db5b4 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 68b1be600..d1bb0fdb4 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" - 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 bcfac58e7..cd4dc6db7 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" - 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 98b61b6b7..bd39c8ed5 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" - 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 e02fb6ca1..8e3079173 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 f09725cb0..cbb245f23 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index bc3145cd5..6605d9ba8 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/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/starmie.asm b/data/pokemon/base_stats/starmie.asm index 8823bbbe2..b52e7379b 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" - 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 d999b0d13..a339893e3 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" - 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 e8e620831..50150a8dc 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" - 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 cd95db096..830a9a2b7 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" - 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 b52e0f5d0..ddb4cf1db 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 aac7603f6..309f7bd3f 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" - 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 c646e80db..ac034d969 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" - 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 62a330733..50ad6c413 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 2535b6c82..889aacf62 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" - 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 307033fd2..db4345d83 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/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/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 9309d247d..4420fc4d7 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" - 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 c5ce41e0a..a7f2a557a 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" - 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 35037c668..7c0e11b00 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" - 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 98b5f6bcd..56b57f62b 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" - 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 77176266c..10897250b 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" - 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 86830e11e..f17420441 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index 181a24661..fbb01b96d 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/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/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index a3bd68aef..014868fd3 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -12,7 +12,7 @@ db 40 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" - 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 fb7e75eb5..31c6eec26 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -12,7 +12,7 @@ db 25 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/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/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 55dc75902..72fcdc25e 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" - 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 248aae9d1..2419f8025 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 1cc2f21a8..b761eb9d4 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" - 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 8e266396e..08c9f8eae 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -12,7 +12,7 @@ db 35 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" - 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 43e50bfd4..a34a5a927 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" - 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 77f05af31..d8b7136bd 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" - 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 bd7664e57..ff00c700d 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/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/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 43fe562f9..3e69b3221 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" - 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 fff689e49..0ec3f18b5 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" - 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 ad5f16737..378b675b4 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" - 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 1f19771ee..8b6533660 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" - 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 20db04447..8f836122e 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/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_WATER_1 ; egg groups diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index c2536b316..6ff0c8fe6 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" - 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 4a4069abb..504651d59 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" - 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 e18c78bb2..4e4650054 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" - 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 0a3498b8f..ba1db8e0e 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -12,7 +12,7 @@ db 10 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" - 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 39514450e..2a5c95f24 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" - 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 5cc4a6666..1755a8fe7 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" - 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 79bf0bc60..3fc1ec54b 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" - 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 01918230c..dc0ab6436 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -12,7 +12,7 @@ db 20 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" - 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 a5589ab9a..3859b5a44 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -12,7 +12,7 @@ db 80 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/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/zubat.asm b/data/pokemon/base_stats/zubat.asm index ee3716844..f28c0345a 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -12,7 +12,7 @@ db 15 ; step cycles to hatch db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" - 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/home/mon_data.asm b/home/mon_data.asm index dec80383c..f365f019c 100644 --- a/home/mon_data.asm +++ b/home/mon_data.asm @@ -31,7 +31,6 @@ GetBaseData:: jr .end .egg -; ???? ld de, UnknownEggPic ; Sprite dimensions @@ -39,8 +38,9 @@ GetBaseData:: ld hl, wBasePicSize ld [hl], b -; ???? - ld hl, wBasePadding +; Beta front and back sprites +; (see pokegold-spaceworld's data/pokemon/base_stats/*) + ld hl, wBaseUnusedFrontpic ld [hl], e inc hl ld [hl], d @@ -48,7 +48,7 @@ GetBaseData:: ld [hl], e inc hl ld [hl], d - jr .end + jr .end ; useless .end ; Replace Pokedex # with species @@ -2248,7 +2248,8 @@ wBaseUnknown1:: db ; d244 wBaseEggSteps:: db ; d245 wBaseUnknown2:: db ; d246 wBasePicSize:: db ; d247 -wBasePadding:: ds 4 ; d248 +wBaseUnusedFrontpic:: dw ; d248 +wBaseUnusedBackpic:: dw ; d24a wBaseGrowthRate:: db ; d24c wBaseEggGroups:: db ; d24d wBaseTMHM:: flag_array NUM_TM_HM_TUTOR ; d24e |