diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 12:03:43 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 12:03:43 -0500 |
| commit | 0eeb00d6ac67199b3343c5a6ddc739b251f7a68f (patch) | |
| tree | c5e77972cd5431fac0badf4b00eab3192cb96526 | |
| parent | b8f4b1b8a7991222ae2320e5891ded675d541043 (diff) | |
Official egg group names
254 files changed, 526 insertions, 526 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 238f23aa2..038a1c34d 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -37,30 +37,30 @@ GENDERLESS EQU -1 ; BaseGrowthRate values ; GrowthRates indexes (see data/growth_rates.asm) const_def - const MEDIUM_FAST - const SLIGHTLY_FAST - const SLIGHTLY_SLOW - const MEDIUM_SLOW - const FAST - const SLOW + const GROWTH_MEDIUM_FAST + const GROWTH_SLIGHTLY_FAST + const GROWTH_SLIGHTLY_SLOW + const GROWTH_MEDIUM_SLOW + const GROWTH_FAST + const GROWTH_SLOW ; BaseEggGroups values const_def 1 - const MONSTER ; 1 - const AMPHIBIAN ; 2 - const INSECT ; 3 - const AVIAN ; 4 - const FIELD ; 5 - const FAIRY ; 6 - const PLANT ; 7 - const HUMANSHAPE ; 8 - const INVERTEBRATE ; 9 - const MINERAL ; a - const AMORPHOUS ; b - const FISH ; c - const POLY ; d - const REPTILE ; e - const NO_EGGS ; f + const EGG_MONSTER ; 1 + const EGG_WATER_1 ; 2 + const EGG_BUG ; 3 + const EGG_FLYING ; 4 + const EGG_FIELD ; 5 + const EGG_FAIRY ; 6 + const EGG_GRASS ; 7 + const EGG_HUMANLIKE ; 8 + const EGG_WATER_3 ; 9 + const EGG_MINERAL ; a + const EGG_AMORPHOUS ; b + const EGG_WATER_2 ; c + const EGG_DITTO ; d + const EGG_DRAGON ; e + const EGG_UNDISCOVERED ; f ; pokedex entries (see data/pokemon/dex_entries.asm) diff --git a/data/growth_rates.asm b/data/growth_rates.asm index 4a1564515..84e600139 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -10,7 +10,7 @@ growth_rate: MACRO ENDM GrowthRates: ; 50efa -; entries correspond to base growth rate constants (see constants/pokemon_data_constants.asm) +; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) growth_rate 1, 1, 0, 0, 0 ; Medium Fast growth_rate 3, 4, 10, 0, 30 ; Slightly Fast growth_rate 3, 4, 20, 0, 70 ; Slightly Slow diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 687c3a872..9dca824c0 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 531c03803..889909fa9 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 9da59d7ac..a03372532 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index affcd565b..3d5c6672b 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index 90086b7cd..c10d364af 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 76302d5d5..ece66c976 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 406199c2d..8bbca643f 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 431291ec3..792a87d3f 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index bd8d1f59f..24b5cd5f8 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 870fbc0f2..30ba90c5a 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index ef5b38ab0..3a0720e2e 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 074dabd4b..40a52b0e9 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 6c2986ba8..8f5405091 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 3b40c1783..038692552 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 86706bfdd..82c282f6a 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index ef7db52de..ef9d1714b 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 6afca0c97..7e97d62c8 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index f1037d971..c943ea07c 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index 045123043..60ff1c018 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index 757f7ec48..3307591f9 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index 53cd2caed..993150249 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index cffacc93b..631e864d9 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 667211ee5..b132a0ddf 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index b3806de4c..826c5fcf4 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 2876a776f..034d79355 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index 508c104be..570135584 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 7fcff1bb4..34b332358 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 59d265359..2ff9c1645 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 7a1a74402..5436c661e 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 59544abe2..552d9a6fe 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index e06f509cc..16234bbf1 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 0e7bad390..f52866f3b 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 0afdd1a14..2f08eaecc 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 174dcb5a1..55fdf7586 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index dfd052d5f..9ffb7a562 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 3736e4e00..f00e6fbf6 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 332597ee8..d90aac1b3 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 4079fe063..8c97db59d 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 71a5b4762..06c7f2b4c 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn POLY, POLY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_DITTO, EGG_DITTO ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index b26b4f631..c3232e2f1 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 6e649a9fe..0d503a191 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index 8b68360bc..af38c1aee 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index f2ca387c7..272310082 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index a004b0d31..b3698900a 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index eb1fc4f61..7cdf68c88 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index d84a3cb41..9cfad8c45 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index 07c0f1c1e..fe6d0415b 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 407d81820..5118dfd2c 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 69d4b4525..8fce2db3f 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 0dbb46384..a0c72af1e 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 1a5e52508..521a23344 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index f00eed0cc..456bc5797 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index e60b486de..48eb8ac14 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 6e58a9daa..3e0a778c7 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 4e6b93282..502185e9a 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index f6b6c183f..3cc9a8543 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 6d406897b..3e3e83281 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index bf5c05921..874f06d69 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index b337a282e..432c9965a 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index cee2f4cfb..6cdaa6857 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index 737210352..01d1fcc77 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 5b03e2ac9..d38a9411a 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 4f486b292..a22389430 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index 8fdc6df96..303e301d0 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index 97383ac89..cc399fabf 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 98f3ebf1f..a8b2240a2 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index b3c3603ba..4cfc7ea5b 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index eb159919a..996171792 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index 8bd607656..d0b026f7c 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 30f4cbe9c..78ca61d01 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index a73d5651f..0928342a3 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 3651e0948..1a598fd28 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index ea89e9436..53a633c1d 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index 6de25b590..b484a9f73 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index f49bf530c..272cb2c04 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FIELD, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index 98eaef882..216378ea9 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 2aa87d4e2..24a0c6edd 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index f61260b55..aaef18154 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 894982327..66916f2d8 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index a5cf1e459..e6268fefa 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index 762813ac4..b02fb74d8 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index e1d3c7c58..0d753ff50 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index 3296cbdd9..6fd72dd4e 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index c45aa51e6..f7041fbc1 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 20d96bafe..f63bd3a1b 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index 50b2bdf9e..9fcc72dcf 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index 32c09f16c..05d378af8 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 2321b4d66..1869ebacf 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 25d728edf..7c14cf179 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index 010b21928..c212ea227 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index af03aa777..312659af0 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index b8a198d91..73cf2f077 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index f416b76e3..aa3d60b65 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 222c05820..42f9a3e69 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index 311e07b9a..283ce0fd8 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index e20b59e3d..d9ffb165a 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index ec8c47d9c..47fbefdc2 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 984e66da7..36089b5a2 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index a7e2e521c..4cba3259e 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index ece5f8a79..7533d2894 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index a4f9dd363..5c9902df5 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index b2a7d64b1..69f6ba6f9 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index 65993ea25..f64cddccc 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index 947526dd6..f76ff1a26 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 1e55c5010..593be0a67 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index d386988a5..830908fd5 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index 28fd3aed2..d8e38b369 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 9a40f3447..5985e9f68 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index acdfd290f..d40e559c6 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 27a002dcd..e8fcc7db1 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index e65614248..a532862ea 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 3c7c96e40..80c034a8a 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index fe7391c04..76678116a 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 1e7a07e5f..67566ee37 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 87ceb4549..fa18abc93 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 4969a8403..ee81897a0 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index 37075404b..dcf076627 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index d91f72b27..03a8e8147 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index 220f5ddd9..3398a5291 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 8a11e538d..dcef3350c 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index aff31035e..667ca215e 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 0b694fcf6..201ac98c2 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 82c9456ff..4f4c8323c 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index 80f5dde6b..33b674f4e 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 8a68d5cf2..dbc7542ab 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index e190e0d0c..f57d0e577 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index 453bb9932..b98e344ee 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index 3e02ced99..41336bf88 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index feb97df30..4f12a79ff 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index 8a4d27220..4f91cbd72 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index f09d291a9..ddc70b947 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 98ee9e43a..2c1e68497 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index 35642718b..8a28845f7 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index ebb2a8160..232fc4bea 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 2b02ad1b9..17f90610e 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index cf3707f0f..3073f6d6e 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANLIKE, EGG_HUMANLIKE ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 32e326cbe..4f22ac6b1 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 404a8d8ac..7e49aa5d9 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index ae5c9839e..01fe673d3 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 796d87a93..e06b80f19 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 4637b486f..96436233c 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 0fa3ea2ed..b6d52cbbf 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index f23405a78..b155aaf52 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 65dfd558e..fb406792c 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 7ba686eff..60b0a9f34 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 892874071..6f167809e 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 6adcdc976..a0ee3cf39 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 247b996ca..935e1e649 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index a4cba7085..fd7cecbfb 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index a7d9d346d..1d934e51f 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index a2d60abf3..446f13bcd 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 45e38bb32..e9e1d53ec 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 8f99631ce..6bea13e23 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index 32b823b83..c2113d8ad 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index eace03a07..5b580bab7 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 58d3a810d..20bb20668 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 08346c338..319f50c62 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index b8270e0b2..398d3aab6 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 1951abc75..cafa3a403 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index cd547de53..72f66c923 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 2ac75e086..2edf64ee2 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index ee013c2e4..fe20a92f7 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 09eae2319..55cf7d4a4 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 37c3dfced..37f28a030 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index ba152e9e2..3cf6ec968 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index a8cddbdeb..119b5f071 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index e76dd5b4b..6d0347b28 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 95c8406e9..fb20eab80 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 4a32f9010..f2e8d1276 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index aee297b9d..b8287bde2 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 8cc3211ef..2f6dd81c7 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 276f8e39a..c02101bcc 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index 98bd99337..af71eb065 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 80ba55692..59b44d324 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 3972a0763..0c583bed0 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 13789d3a6..5f687007b 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 5dfc6f982..6a2de9a23 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index a691fecd3..482452179 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index d8b2a98ed..4a1775245 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 8da61a515..6cc216709 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 31440b27a..96269adb7 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 761e6400b..f1479d2d9 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index c201544ea..a611ffda8 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index cd4498a8a..b610aaa52 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index f9b0fb693..8127827a2 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index daa6574a3..0132b0fa8 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 8296cc27d..5b7a13467 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index ced06ee44..6cd870ccd 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index fa1beee7f..0d39fe8ff 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 2f1e38c01..a6f557de5 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 4f32ed710..237c9e4ff 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index b3528b8eb..3776f51a4 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index 15cf518ce..f0cb873e9 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 19e4d9e45..64ed157ae 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index 51d02d70c..78e52d9d4 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index aaeddade7..063c38513 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index c37c5da1f..585aad5c3 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index 5696c8c1e..c4b0ce378 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index d40beb2f9..4f3f570d5 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 95ab73a95..b5efaa2ad 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 77bb71573..65d29368a 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index 6d7ebe8a7..bd77a4578 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index 4739e5269..90f8fb084 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index a5fbeff57..b092b5540 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index a5bf72f69..aeb87f428 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 11d121ec2..1beab40e9 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FIELD, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 66e929f65..a8d565733 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index 9c73af7c0..29acb53aa 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 6f6712431..c8c8f8783 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index 1a14001a2..91793abdc 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index bb6f66218..5d0dd82f6 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 1b2fd1dc7..cdb4db546 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 2908396fc..2332b5abb 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 52ff96429..63b1d3349 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index 68feb6003..669a85aaa 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index 04c0ed1d8..96973dc7d 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index 2a5581ab2..b6305b273 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index 800b32f49..9b12a6c6e 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 9a41a16ab..7b8272210 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 8d6d0ca93..1b294e951 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 2283850ab..a88ea6b64 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index d036f1401..a11b5e0fe 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index 2e47041ff..b5e4876a4 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index 14c5cb58b..a660370a6 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index 2c4461836..fb96952f8 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AVIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FLYING, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 4a81090a1..476ac9614 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index d52c06ddf..49f518649 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index e11e39a2a..6ad00c834 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 38f5dc913..74d2ae9d6 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 962cb7a84..4e04da7fb 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index 992d51971..6eef4b84d 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index aed338f70..20b47b992 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 245179e51..1bb244087 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index 76bcf584b..da5331286 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index b55518730..2da97c64f 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 7fd7895a1..39968701f 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GRASS ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 3969e5f25..95f3b42db 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 8cbce585a..c0316bfee 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 0bbcd7275..13ca3fef3 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MINERAL, MINERAL ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index 50f5406d1..21ca508bc 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FIELD, EGG_FIELD ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index a032a60a6..ea7a0bd84 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 5c8475b8f..da63aa6f4 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 4c597e7d7..c55c8234f 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GRASS, EGG_GRASS ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 25e0e45e9..10270e200 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 38f0f815d..c8577ff6c 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index a94280a8c..c84ac68c4 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_AMORPHOUS, EGG_AMORPHOUS ; egg groups ; tm/hm learnset tmhm diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index 0d45b3c34..da5101f9c 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_FIELD ; egg groups ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index cf3688b6f..3c58623b8 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 78f412844..756482591 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index e56172d77..342590f12 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_UNDISCOVERED, EGG_UNDISCOVERED ; egg groups ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 84673fef7..abbd6402d 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -13,8 +13,8 @@ db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING diff --git a/engine/breeding.asm b/engine/breeding.asm index d66616061..f0f69e539 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -112,14 +112,14 @@ CheckBreedmonCompatibility: ; 16e1d ld [CurSpecies], a call GetBaseData ld a, [BaseEggGroups] - cp NO_EGGS * $11 + cp EGG_UNDISCOVERED * $11 jr z, .Incompatible ld a, [wBreedMon1Species] ld [CurSpecies], a call GetBaseData ld a, [BaseEggGroups] - cp NO_EGGS * $11 + cp EGG_UNDISCOVERED * $11 jr z, .Incompatible ; Ditto is automatically compatible with everything. |