diff options
240 files changed, 258 insertions, 259 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 8712a962..04df889b 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -44,24 +44,23 @@ GENDER_UNKNOWN EQU -1 const GROWTH_FAST const GROWTH_SLOW -; egg group constants -const_value SET 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 INANIMATE ; a - const AMORPHOUS ; b - const FISH ; c - const LADIES_MAN ; d - const REPTILE ; e - const NO_EGGS ; f - +; wBaseEggGroups values + const_def 1 + const EGG_MONSTER ; 1 + const EGG_WATER_1 ; 2 (Amphibian) + const EGG_BUG ; 3 + const EGG_FLYING ; 4 + const EGG_GROUND ; 5 (Field) + const EGG_FAIRY ; 6 + const EGG_PLANT ; 7 (Grass) + const EGG_HUMANSHAPE ; 8 (Human-Like) + const EGG_WATER_3 ; 9 (Invertebrate) + const EGG_MINERAL ; a + const EGG_INDETERMINATE ; b (Amorphous) + const EGG_WATER_2 ; c (Fish) + const EGG_DITTO ; d + const EGG_DRAGON ; e + const EGG_NONE ; f (Undiscovered) ; menu sprites const_value SET 1 diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 49d3df61..2c560067 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 d910abdd..b1451fc0 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 6e7bf197..fe2fed48 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 9908de69..8496cd07 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 eb28fb41..11eecef3 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 59adc8b5..9fceaa2d 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + dn EGG_GROUND, EGG_DRAGON ; egg groups ; tmhm 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 93ac3056..c30f4ce3 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 308ec192..263a6610 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 1522f230..5bbd4e27 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 43faef46..3455dae6 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + dn EGG_WATER_1, EGG_FAIRY ; egg groups ; tmhm 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 a52c4295..a4d78003 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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 49080cd1..c38fce3b 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 48e69bf2..95fd77ac 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 b1e55e97..c35eb2ac 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 64a17058..091824f3 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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 fb5b3e49..5616dd07 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 d7225d19..f12008d5 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index cbbbc6d8..471b76bc 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -15,7 +15,7 @@ dn 5 , 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 ed789286..dc275f5f 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 47eed65a..bfa9d489 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tmhm 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 e7b4c947..bdd60175 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tmhm 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 b3fb9d61..27a01d0b 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + dn EGG_MONSTER, EGG_DRAGON ; egg groups ; tmhm 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 01520d57..81dded4f 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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 77a4c2f4..e6a05fc0 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FISH, FISH ; egg groups + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tmhm 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 a13b62c3..ee4d307e 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 fd73735c..660406ba 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -1,4 +1,4 @@ - db CLEFAIRY ; 035 + db CLEEGG_FAIRY ; 035 db 70, 45, 48, 35, 60, 65 ; hp atk def spd sat sdf @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 26a759bb..00c6974c 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 c79d029c..699e1e67 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 5b3715ac..359274e0 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tmhm 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 4d6668af..4f5e9399 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 9294169a..1bdefd1d 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 659088e4..7446ec02 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 fa984aa2..fcbf1a6d 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 520c01f0..1b9b7329 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 21acdf83..74d34fef 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 9a3c10d1..e637583b 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 0987777b..6671e852 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn LADIES_MAN, LADIES_MAN ; egg groups + dn EGG_DITTO, EGG_DITTO ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 7533cd7e..5ebfd9b0 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 43fa6b1f..d15aa2cf 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 46f88617..3d35d273 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 c24fce1c..1ec503f4 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 67ec4f8d..b4477035 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 5e5ed4cb..ccddb626 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 98f65c26..85c85b66 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 8fe18766..e6c0e188 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 039583fc..75325001 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 dbad4349..913b4a85 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 8baab2ce..63288164 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + dn EGG_GROUND, EGG_DRAGON ; egg groups ; tmhm 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 1c26b4e1..06965d32 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 5943a919..bfa385e1 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 021acecd..6f078cfb 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 471f0214..ce4158f3 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 41437c81..3a298275 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 81f65492..791325aa 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, FIELD ; egg groups + dn EGG_FLYING, EGG_GROUND ; egg groups ; tmhm 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 53b2ad91..554f80ec 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 58b1acd3..9b9a2775 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 dc30511e..f055a579 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 95b35dbd..a067f4e6 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 0119a85d..5fe2c06a 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 51ff10b4..4e513228 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 685389c5..35f42e0f 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 890a65d7..0445503b 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 91801ace..2f14a512 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 f67b50bc..9192ef02 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 15e2fa0a..6dcb8f72 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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/golbat.asm b/data/pokemon/base_stats/golbat.asm index c570a40d..222b5f8b 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 74933f44..14fc8e9b 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tmhm 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 b8d1acb4..75fa433e 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 7f46d12f..fc6c5033 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 8bb11dfb..aedfebd3 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + dn EGG_GROUND, EGG_FAIRY ; egg groups ; tmhm 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 c2ba82e9..34ee72ca 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 2ba6ceea..0b18987e 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 204c44af..771e1ecb 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 812bbba2..83ffe38d 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FISH, REPTILE ; egg groups + dn EGG_WATER_2, EGG_DRAGON ; egg groups ; tmhm 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 58f1ce8b..fcc33259 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 e8452229..a84a18cc 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 db2a525d..6c02b2d7 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 09347b00..69711c26 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 82fee958..aa3a1dd7 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 a42b574a..89efe330 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -15,7 +15,7 @@ dn 7 , 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 877acab0..80eef90e 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 6427b1a2..527e8cf4 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + dn EGG_FAIRY, PLANT ; egg groups ; tmhm 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 befd1d25..7b887179 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 41ccd077..be2a23b3 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 c9ad0733..02bb9fb6 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 df8a9903..4ac906c5 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 9d7a0619..c905cd32 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 12cdea23..4ad38664 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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 8e1b984e..71c549f5 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 0638a78a..66f606e5 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 8788264a..0a718796 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + dn EGG_FAIRY, PLANT ; egg groups ; tmhm 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 8d443d80..dcb5a80d 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 2b68b819..05415e49 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tmhm 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 1a3b29d0..5296ec1b 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tmhm 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 7f52d79d..c817b3c7 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 63045d36..287b3f48 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 36a48533..f37ff512 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 ab4a9cea..c3e775ab 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 0b43ea08..aba2d5b6 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 976435bf..fc8f9cd3 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 7423cabb..c6adab31 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 c900263f..9b80c152 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FISH, FISH ; egg groups + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tmhm 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 8e5692e7..4f1b5366 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 db944452..f8e3cac6 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 d7a52aaa..3bf14229 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 e36fcbe7..f3482104 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 e4de9470..b11e985f 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 0c49e55d..6be5b50c 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 eb0511f9..2ab7ecb8 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 e7f6f8cf..8dea2b59 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 2aab5773..e5655ec9 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 ca9d3c17..d627d160 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 6fd2cbf0..ba690903 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 424a4de3..1f15e8ac 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FISH, REPTILE ; egg groups + dn EGG_WATER_2, EGG_DRAGON ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 159fe16d..e9e223e6 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 838abe9c..a505a512 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 b65bb7d3..4007a8c3 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 6820e5ca..ef3f84a9 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 43212660..8cbc7cf6 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + dn EGG_WATER_1, AMPHIBIAN ; egg groups ; tmhm 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 154928f8..3a08afd9 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 a1f560e7..c6c00e50 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + dn EGG_WATER_1, EGG_FAIRY ; egg groups ; tmhm 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 a5ae2aec..2c25c0ba 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 a7d7eaf7..4a2a9e90 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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 f5f50700..376418c8 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 d2f44bd9..ef6d1456 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 187aec2a..a284a233 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 9214f856..1f1845e5 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 5535efb7..cd1c03ef 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 f114425f..c05ec5f1 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 37d651c3..f8d986d1 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 3ceb1140..29c0122f 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups ; tmhm 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 f28a1df4..bb5ee1d6 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 a7a5eb24..44a5f72b 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 7938b0be..8d2df12f 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 edbe86b4..c325b51a 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 af316f97..8e29524f 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 df955f33..2103a7cc 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 1c9aebde..3094a801 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 ad3f2888..fa3d99fd 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 c3c0e568..68ade351 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 14b2812d..9544cdc5 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 acf02cee..715d22e1 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 42cf3645..ca64336a 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + dn EGG_WATER_1, EGG_WATER_2 ; egg groups ; tmhm 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/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index f38e3b22..afd2b9a1 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tmhm 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 3c018d42..275295f8 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + dn EGG_WATER_1, EGG_WATER_3 ; egg groups ; tmhm 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 6cfec315..49483f8d 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 73a24d21..331fdd67 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + dn EGG_BUG, PLANT ; egg groups ; tmhm 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 4003931e..6811e00d 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + dn EGG_BUG, PLANT ; egg groups ; tmhm 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 b0814eb0..e3ead4ad 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 ac5b6343..74622a5c 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 c7559e7e..7878b94d 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 e9d464b2..e0965178 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 13b8ab5e..039c4220 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 46e077ec..c1090f68 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 bf42b19e..798ae457 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + dn EGG_GROUND, EGG_FAIRY ; egg groups ; tmhm 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 3ca0a82e..d4217ec7 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 aefc1f24..6f0634c6 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 2a36b29e..beccb651 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 57115c56..535f2bbc 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + dn EGG_WATER_1, AMPHIBIAN ; egg groups ; tmhm 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 5c517f86..c5fe5db5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + dn EGG_WATER_1, AMPHIBIAN ; egg groups ; tmhm 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 6bfd4e93..bb164e73 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + dn EGG_WATER_1, AMPHIBIAN ; egg groups ; tmhm 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 9d0fb014..efef7492 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + dn EGG_WATER_1, AMPHIBIAN ; egg groups ; tmhm 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 1d1c7069..ac103745 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 87eda75a..241db34c 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 78525cb4..71314b64 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 b0e03c02..c8f4be41 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 30c07395..51f4ab06 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 b34a02db..485d0e77 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 211896fe..c37a6e59 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 230b485a..ec9db3c9 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 2551aa5d..1b636c11 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -1,4 +1,4 @@ - db QWILFISH ; 211 + db QWILEGG_WATER_2 ; 211 db 65, 95, 75, 85, 55, 55 ; hp atk def spd sat sdf @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tmhm 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 a7282d94..ec046cdc 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + dn EGG_GROUND, EGG_FAIRY ; egg groups ; tmhm 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 81fa28fe..7e80f294 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 6c715b25..d4eb628b 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 a731fb90..78c5070a 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 6ebbd34b..8a49bd16 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 f3c07448..d26b125a 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + dn EGG_WATER_1, EGG_WATER_2 ; egg groups ; tmhm 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 f66d5878..20f1497f 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 36394a6b..c6e8a85a 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + dn EGG_MONSTER, EGG_GROUND ; egg groups ; tmhm 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 50d4fe6d..54b0e0e2 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 2fb52d32..765498ed 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 e872b30d..8724dfc6 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 cb0c2a5b..dfaf0c7e 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 6b409f0e..fcf017e9 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + dn EGG_WATER_1, EGG_DRAGON ; egg groups ; tmhm 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 698dfee1..1944ac77 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + dn EGG_WATER_2, EGG_WATER_2 ; egg groups ; tmhm 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 4979ff64..19cb6673 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 9ae3ef9e..4149be6b 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 216cfcf8..7fa79cde 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 883e5db5..c1981261 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 2acb18e2..1d88eef0 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 bc09875b..d8a65fe1 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + dn EGG_FAIRY, PLANT ; egg groups ; tmhm 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 485d702c..422a9578 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 58d512a0..683d9303 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 b5378802..28dfb197 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 3b6093af..c0c19038 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 74d9dcd0..b3c30af7 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index 88ba7c9a..726eadac 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 e72ed8f9..6fb5b7f9 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 ee014a11..09b56d07 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 ae9e8176..9a53ed68 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + dn EGG_GROUND, EGG_FAIRY ; egg groups ; tmhm 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 b879ac4e..14f13ccf 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 5a18dee6..7f06e976 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 e1e247bb..1f04ad02 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 a0f6fba3..5f2d8a30 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 8e8677cb..83a70abc 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 f97f59e0..ad4542e4 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 6571e1a7..919dbf16 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 2aa318ad..c9cdffe1 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 6bd3f7f8..c175838d 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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/swinub.asm b/data/pokemon/base_stats/swinub.asm index 6766a9cb..04aae03e 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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/tauros.asm b/data/pokemon/base_stats/tauros.asm index b0e765d9..4f9fe4f7 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 2a614710..86860369 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 a69a5d43..94bd96f0 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 eef04b97..4cdb0a87 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + dn EGG_WATER_3, EGG_WATER_3 ; egg groups ; tmhm 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 db64500f..d13d20f4 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 0e3d8426..063aafe8 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn AVIAN, FAIRY ; egg groups + dn EGG_FLYING, EGG_FAIRY ; egg groups ; tmhm 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 b1f82008..710ab2c2 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 03c5ea1c..08c4abec 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 9f53a3c4..4ff7de04 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, MONSTER ; egg groups ; tmhm 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 dfa2266e..59888b16 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 dd46de57..4e9803a6 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 8fb96aa7..5605ba3a 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 2f65278f..392313ce 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 87fd8536..58e4f712 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 958d1639..f4956c13 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 3241f028..945abf46 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 b5f228c3..b6ec3719 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + dn EGG_MONSTER, PLANT ; egg groups ; tmhm 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/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 986f75d9..732d9f93 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + dn EGG_MINERAL, EGG_MINERAL ; egg groups ; tmhm 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 e6b12171..30013e03 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + dn EGG_GROUND, FIELD ; egg groups ; tmhm 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 474121e6..cc38f431 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + dn EGG_MONSTER, EGG_WATER_1 ; egg groups ; tmhm 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 2cea5afe..adbb35ac 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 69367e96..bd811b7b 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm 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 73d655f0..bc07dda3 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + dn EGG_FAIRY, EGG_FAIRY ; egg groups ; tmhm 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 de3cb74d..41081e48 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tmhm tmhm diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index 4d5df79d..13a43a77 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + dn EGG_WATER_1, EGG_GROUND ; egg groups ; tmhm 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 742d1c51..389ba687 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 42bc09be..5350ecd9 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -15,7 +15,7 @@ dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + dn EGG_BUG, EGG_BUG ; egg groups ; tmhm 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 4f3925a5..2677908e 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -15,7 +15,7 @@ dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + dn EGG_NONE, EGG_NONE ; egg groups ; tmhm 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 43597502..3330a062 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -15,7 +15,7 @@ dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + dn EGG_FLYING, EGG_FLYING ; egg groups ; tmhm 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 |