diff options
Diffstat (limited to 'data/pokemon')
518 files changed, 2366 insertions, 2547 deletions
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index d7824f196..890c46f20 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -3,20 +3,19 @@ db 25, 20, 15, 90, 105, 55 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 200 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 26eac4ded..29e406504 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 130, 60, 75 ; hp atk def spd sat sdf - db ROCK, FLYING + db ROCK, FLYING ; type db 45 ; catch rate db 202 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 0bd6954f4..12edacca2 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -3,20 +3,19 @@ db 55, 70, 55, 85, 40, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 35ebdf9af..5de640d73 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -3,20 +3,19 @@ db 55, 50, 45, 120, 135, 85 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 50 ; catch rate db 186 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index b391238d3..e4ef4bd0a 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 55, 115, 90 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 52341c37d..b90c83b1c 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -3,20 +3,19 @@ db 60, 85, 69, 80, 65, 79 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 90 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 299086c9d..92f9b0233 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -3,20 +3,19 @@ db 90, 110, 80, 95, 100, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 213 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 78697127c..ca8076a20 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -3,20 +3,19 @@ db 70, 90, 70, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index e637c47f4..1189afec1 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -3,20 +3,19 @@ db 90, 85, 100, 85, 95, 125 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 1681d3be2..d76e1bd72 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -3,20 +3,19 @@ db 100, 50, 80, 50, 50, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index 50ee3044c..1228b4d49 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -3,20 +3,19 @@ db 60, 62, 80, 60, 63, 80 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 3fa11d8eb..8e371d790 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -3,20 +3,19 @@ db 65, 80, 40, 75, 45, 80 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 45 ; catch rate db 159 ; base exp - db NO_ITEM ; item 1 - db POISON_BARB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, POISON_BARB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 3f3f06870..328959a5f 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 90, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 5e75e6e89..099dc7142 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -3,20 +3,19 @@ db 50, 75, 35, 40, 70, 30 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 84 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 7e2f1697e..9cb62420a 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -3,20 +3,19 @@ db 79, 83, 100, 78, 85, 105 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 789649a40..8e6256843 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -3,20 +3,19 @@ db 255, 10, 10, 55, 75, 135 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 2795d8035..f4178d8ae 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -3,20 +3,19 @@ db 45, 49, 49, 45, 65, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index 1feee4f58..f2c125ac4 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -3,20 +3,19 @@ db 60, 45, 50, 70, 80, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db SILVERPOWDER ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SILVERPOWDER ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index a10790541..d7525ee53 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -3,20 +3,19 @@ db 45, 30, 35, 45, 20, 20 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 255 ; catch rate db 53 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index aabadba4f..8943dc8bc 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, GRASS + db PSYCHIC, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index d51f67d4f..78ec783ae 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -3,20 +3,19 @@ db 250, 05, 05, 50, 35, 105 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index d978c6ad5..237f7d72b 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 2fa9b9526..6f60c22a8 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 5d86b975b..832757a7e 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 0476ba558..639e51377 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -3,20 +3,19 @@ db 45, 49, 65, 45, 49, 65 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index a5b3ded3a..3bad12e41 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -3,20 +3,19 @@ db 75, 38, 38, 67, 56, 56 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 4da3c73df..dc627f02c 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -3,20 +3,19 @@ db 95, 70, 73, 60, 85, 90 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 129 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 5e4def0ca..71c8ac9a7 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -3,20 +3,19 @@ db 70, 45, 48, 35, 60, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 68 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 89fa91a45..923b339b9 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -3,20 +3,19 @@ db 50, 25, 28, 15, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 37 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 3f3c13b6a..7dfc72ff9 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -3,20 +3,19 @@ db 50, 95, 180, 70, 85, 45 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 60 ; catch rate db 203 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 8f1e836ff..e5f2536f8 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -3,20 +3,19 @@ db 55, 55, 85, 35, 65, 85 ; hp atk def spd sat sdf - db WATER, ROCK + db WATER, ROCK ; type db 60 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 34d7d10c5..11b39ab2d 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -3,20 +3,19 @@ db 85, 90, 80, 130, 70, 80 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 6c76b19b1..8b0fa482f 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -3,20 +3,19 @@ db 65, 80, 80, 58, 59, 63 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 451f52133..a44eea42e 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -3,20 +3,19 @@ db 50, 50, 95, 35, 40, 50 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 190 ; catch rate db 87 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index a1b07cb91..8170baa48 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 0b38e8b97..636541752 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -3,20 +3,19 @@ db 45, 55, 45, 75, 65, 45 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 45 ; catch rate db 183 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index ae6aa1941..7abfad876 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -3,20 +3,19 @@ db 90, 70, 80, 70, 70, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 75 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 1153cbcac..7027030e6 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -3,20 +3,19 @@ db 10, 55, 25, 95, 35, 45 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 81 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 89d92ab7a..4528b5381 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -3,20 +3,19 @@ db 48, 48, 48, 48, 48, 48 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 35 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn LADIES_MAN, LADIES_MAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_DITTO, EGG_DITTO ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 9065dcbde..dbdb095e2 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -3,20 +3,19 @@ db 60, 110, 70, 100, 60, 60 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 158 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index f844ccb07..668740723 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -3,20 +3,19 @@ db 35, 85, 45, 75, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 190 ; catch rate db 96 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index a5995c3fb..4d1e58f14 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -3,20 +3,19 @@ db 90, 120, 120, 50, 60, 60 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 0478bd6a1..a876a54de 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -3,20 +3,19 @@ db 61, 84, 65, 70, 70, 70 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index d8ae9add9..6d088437f 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -3,20 +3,19 @@ db 91, 134, 95, 80, 100, 100 ; hp atk def spd sat sdf - db DRAGON, FLYING + db DRAGON, FLYING ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 0d5ccd5fd..2e8b2a226 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -3,20 +3,19 @@ db 41, 64, 45, 50, 50, 50 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 7dd4855a3..d00ea31b3 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -3,20 +3,19 @@ db 60, 48, 45, 42, 43, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 190 ; catch rate db 102 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index 9430a6669..ec1fb51f5 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -3,20 +3,19 @@ db 35, 80, 50, 120, 50, 70 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 50 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 8eef16241..6ebebf36c 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -3,20 +3,19 @@ db 100, 70, 70, 45, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 95f67cf2b..9a267c70a 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -3,20 +3,19 @@ db 55, 55, 50, 55, 45, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 92 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index feed64b34..997125e31 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -3,20 +3,19 @@ db 35, 60, 44, 55, 40, 54 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 255 ; catch rate db 62 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 472e4487c..b9524d571 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -3,20 +3,19 @@ db 65, 83, 57, 105, 95, 85 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 72bc666e9..ec4714cd3 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -3,20 +3,19 @@ db 60, 50, 70, 140, 80, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 60 ; catch rate db 150 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index e53dcc23c..ba7abf250 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -3,20 +3,19 @@ db 45, 63, 37, 95, 65, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 4e4b7b3f8..7085e8990 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -3,20 +3,19 @@ db 115, 115, 85, 100, 90, 75 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 0bc50fb6d..4763ce9e9 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 110, 130, 95 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 0547333ad..34c132fde 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -3,20 +3,19 @@ db 60, 40, 80, 40, 60, 45 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 90 ; catch rate db 98 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 409eb8a1d..b9df54bad 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -3,20 +3,19 @@ db 95, 95, 85, 55, 125, 65 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 45 ; catch rate db 212 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 35d76b0a9..b08bd8135 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -3,20 +3,19 @@ db 52, 65, 55, 60, 58, 62 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db STICK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, STICK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 7ef9936d8..294aa8b4d 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -3,20 +3,19 @@ db 65, 90, 65, 100, 61, 61 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index 41efb2edd..acdbc4126 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -3,20 +3,19 @@ db 85, 105, 100, 78, 79, 83 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index b20dc4774..3ce3116cf 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -3,20 +3,19 @@ db 70, 55, 55, 45, 80, 60 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index f1d4c8a69..a57bf46e3 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -3,20 +3,19 @@ db 65, 130, 60, 65, 95, 110 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 198 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 9c5a885aa..24eded41f 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -3,20 +3,19 @@ db 75, 90, 140, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 75 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index b26a82e2e..c63f0a664 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -3,20 +3,19 @@ db 85, 76, 64, 90, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db BERRY ; item 1 - db GOLD_BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, GOLD_BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index 7e46be055..3845f1991 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -3,20 +3,19 @@ db 30, 35, 30, 80, 100, 35 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 190 ; catch rate db 95 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 4176aa330..33faaa3f7 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -3,20 +3,19 @@ db 60, 65, 60, 110, 130, 75 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 45 ; catch rate db 190 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 35e5d22a7..f084e0b84 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -3,20 +3,19 @@ db 40, 80, 100, 20, 30, 30 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 255 ; catch rate db 86 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 7e67b19a6..2e2c7812a 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -3,20 +3,19 @@ db 70, 80, 65, 85, 90, 65 ; hp atk def spd sat sdf - db NORMAL, PSYCHIC + db NORMAL, PSYCHIC ; type db 60 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index e16bf7043..ae609d5d2 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -3,20 +3,19 @@ db 65, 75, 105, 85, 35, 65 ; hp atk def spd sat sdf - db GROUND, FLYING + db GROUND, FLYING ; type db 60 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 128b1fe81..87941e18a 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -3,20 +3,19 @@ db 60, 65, 70, 40, 85, 75 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 2de7278ca..071df7e59 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -3,20 +3,19 @@ db 75, 80, 70, 90, 65, 75 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index bc165c7a5..eb432d38b 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -3,20 +3,19 @@ db 45, 67, 60, 63, 35, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 111 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index e3e5ea1aa..8a0acfebd 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -3,20 +3,19 @@ db 80, 82, 78, 85, 95, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 174 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index bda102404..bb973d0b9 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -3,20 +3,19 @@ db 80, 110, 130, 45, 55, 65 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index 9c572cf7b..05c268003 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -3,20 +3,19 @@ db 90, 120, 75, 45, 60, 60 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 75 ; catch rate db 178 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index b6be8cb5c..97c4699c0 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -3,20 +3,19 @@ db 55, 95, 115, 35, 45, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 120 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b1536bb3c..72eb064e3 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -3,20 +3,19 @@ db 80, 80, 50, 25, 40, 50 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index e3cfa7faa..84113f0fb 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -3,20 +3,19 @@ db 55, 70, 45, 60, 70, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 91 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index eb4f51f08..0e4d5ca6e 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -3,20 +3,19 @@ db 95, 125, 79, 81, 60, 100 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 45 ; catch rate db 214 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 5c31fd2a9..1ce4557bc 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -3,20 +3,19 @@ db 45, 50, 45, 95, 115, 55 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 90 ; catch rate db 126 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index f27efbe0d..699fc40a8 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -3,20 +3,19 @@ db 80, 125, 75, 85, 40, 95 ; hp atk def spd sat sdf - db BUG, FIGHTING + db BUG, FIGHTING ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index b8e7da73b..49d92287c 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -3,20 +3,19 @@ db 50, 105, 79, 76, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 140 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index a5759f92d..a8b11274a 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -3,20 +3,19 @@ db 50, 120, 53, 87, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 139 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index a36b7fc58..6a383b07c 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -3,20 +3,19 @@ db 50, 95, 95, 70, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 910ea5a9f..d2a7627cb 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -3,20 +3,19 @@ db 106, 130, 90, 90, 110, 154 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 220 ; base exp - db SACRED_ASH ; item 1 - db SACRED_ASH ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db SACRED_ASH, SACRED_ASH ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index b52e929e9..29293fc6a 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -3,20 +3,19 @@ db 60, 30, 30, 50, 36, 56 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index c6e1a86dc..da08514ef 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -3,20 +3,19 @@ db 35, 35, 40, 50, 35, 55 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 255 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index c3d75a927..dd3c085a8 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -3,20 +3,19 @@ db 30, 40, 70, 60, 70, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 83 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 1f3b4f903..6bb11aa86 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -3,20 +3,19 @@ db 75, 90, 50, 95, 110, 80 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 45 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index b064b3e0d..3eac9dafd 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -3,20 +3,19 @@ db 45, 60, 30, 65, 80, 50 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 120 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 83aab91c8..e9761fe8d 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -3,20 +3,19 @@ db 85, 73, 70, 67, 73, 115 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 75 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 8745ecafb..687171369 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -3,20 +3,19 @@ db 90, 30, 15, 15, 40, 20 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 39 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 8e7c7c9c4..870a4b675 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -3,20 +3,19 @@ db 60, 62, 63, 60, 80, 80 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index f785f0228..5a3066a56 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -3,20 +3,19 @@ db 115, 45, 20, 20, 45, 25 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 76 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index a6636ebba..3984d9d93 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 130, 110, 95 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index c40d2c559..61a8b7fe2 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -3,20 +3,19 @@ db 75, 55, 70, 110, 55, 85 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 45 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 5696b83ee..1a7149d35 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -3,20 +3,19 @@ db 65, 50, 35, 95, 115, 95 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 137 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 60022586f..f9ac24011 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -3,20 +3,19 @@ db 30, 80, 90, 55, 55, 45 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 119 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index b56cb1db8..c6d755694 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -3,20 +3,19 @@ db 60, 115, 105, 80, 65, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 201 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index e3ce05321..9a7f7f841 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 105, 120, 70 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 100 ; catch rate db 145 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 4c8304dd2..20c0db908 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -3,20 +3,19 @@ db 45, 25, 50, 35, 25, 25 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 120 ; catch rate db 71 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 3724e29eb..f56401af5 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -3,20 +3,19 @@ db 105, 95, 80, 90, 40, 80 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 175 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index d217fa612..930f30b7b 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -3,20 +3,19 @@ db 75, 95, 95, 85, 95, 95 ; hp atk def spd sat sdf - db WATER, DRAGON + db WATER, DRAGON ; type db 45 ; catch rate db 207 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index 82549ca88..3362dc4f0 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -3,20 +3,19 @@ db 55, 130, 115, 75, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 206 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 8408f4ad8..13f297f0f 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -3,20 +3,19 @@ db 40, 65, 95, 35, 60, 45 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index f4d78962a..5b8214773 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -3,20 +3,19 @@ db 30, 105, 90, 50, 25, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 115 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index ea97a9722..140d85dc4 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -3,20 +3,19 @@ db 125, 58, 58, 67, 76, 76 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 75 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 4ba001dfd..dbbaa0203 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -3,20 +3,19 @@ db 130, 85, 80, 60, 85, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 45 ; catch rate db 219 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index d9c18d1bc..fc595d973 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -3,20 +3,19 @@ db 50, 64, 50, 41, 45, 50 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 1f0cb4fd9..ac8e998b7 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -3,20 +3,19 @@ db 55, 35, 50, 85, 55, 110 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index e78d4efe4..7ec0cf21b 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -3,20 +3,19 @@ db 40, 20, 30, 55, 40, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 43d60ec6c..71b61380f 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -3,20 +3,19 @@ db 90, 55, 75, 30, 60, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 127 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 7ad2f23a1..db3c17b29 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -3,20 +3,19 @@ db 106, 90, 130, 110, 90, 154 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 41b168234..5595336c7 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -3,20 +3,19 @@ db 90, 130, 80, 55, 65, 85 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 193 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 8b98ea1de..ebbd9e3a8 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -3,20 +3,19 @@ db 80, 100, 70, 45, 50, 60 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 90 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index cb1b2f7c5..51446b53f 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -3,20 +3,19 @@ db 70, 80, 50, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 180 ; catch rate db 88 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index 132387f32..1d029bd65 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -3,20 +3,19 @@ db 45, 75, 37, 83, 70, 55 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 117 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index aa2008cd1..472e67895 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -3,20 +3,19 @@ db 50, 50, 120, 30, 80, 80 ; hp atk def spd sat sdf - db FIRE, ROCK + db FIRE, ROCK ; type db 75 ; catch rate db 154 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index e5524543f..16e0cebc9 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -3,20 +3,19 @@ db 20, 10, 55, 80, 15, 20 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 20 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 595df7ab7..a01e0387b 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -3,20 +3,19 @@ db 65, 95, 57, 93, 100, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 167 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 42bdc18a7..5a34e2bbc 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -3,20 +3,19 @@ db 25, 35, 70, 45, 95, 55 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 190 ; catch rate db 89 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 5cac867be..620171c17 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -3,20 +3,19 @@ db 50, 60, 95, 70, 120, 70 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 41aaac8a9..c56672f7b 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -3,20 +3,19 @@ db 40, 80, 35, 70, 35, 45 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index bec060cb6..7b5cd54a9 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -3,20 +3,19 @@ db 65, 40, 70, 70, 80, 140 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 8388d7f8c..7ed0d477e 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -3,20 +3,19 @@ db 55, 40, 40, 35, 65, 45 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index b6fcc62e5..28f936745 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -3,20 +3,19 @@ db 70, 20, 50, 40, 20, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index cc03dc697..264814f55 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -3,20 +3,19 @@ db 60, 80, 110, 45, 50, 80 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 75 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index eaca626d4..b5e67957f 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -3,20 +3,19 @@ db 80, 82, 100, 80, 83, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 114f76899..bd51fbc19 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 90, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 69 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index f2b33f831..335e894e3 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -3,20 +3,19 @@ db 50, 20, 55, 30, 25, 25 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 120 ; catch rate db 72 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 4d70413d0..aa9ed7012 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 0e9636223..348603b84 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -3,20 +3,19 @@ db 106, 110, 90, 130, 154, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db BERSERK_GENE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, BERSERK_GENE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index c751a2f9c..471e45208 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -3,20 +3,19 @@ db 95, 80, 105, 100, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 200 ; base exp - db MOOMOO_MILK ; item 1 - db MOOMOO_MILK ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db MOOMOO_MILK, MOOMOO_MILK ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index d1824eaa2..821cb37ac 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -3,20 +3,19 @@ db 60, 60, 60, 85, 85, 85 ; hp atk def spd sat sdf - db GHOST, GHOST + db GHOST, GHOST ; type db 45 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db SPELL_TAG ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 22157c073..2635909d1 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -3,20 +3,19 @@ db 90, 100, 90, 90, 125, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 1abc9995f..476483d9e 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -3,20 +3,19 @@ db 40, 45, 65, 90, 100, 120 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db MYSTERYBERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, MYSTERYBERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index a25d85605..48c4e5cd7 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -3,20 +3,19 @@ db 105, 105, 75, 50, 65, 100 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 75 ; catch rate db 157 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 2fada2697..db9c40fa1 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -3,20 +3,19 @@ db 60, 85, 42, 91, 85, 42 ; hp atk def spd sat sdf - db DARK, FLYING + db DARK, FLYING ; type db 30 ; catch rate db 107 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY ; end diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index b9bde658a..6f1076eb7 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -3,20 +3,19 @@ db 40, 50, 45, 70, 70, 45 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 190 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 3d7205af5..af3572a96 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -3,20 +3,19 @@ db 81, 92, 77, 85, 85, 75 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 195 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 4c5ca110e..72eb9336c 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -3,20 +3,19 @@ db 90, 82, 87, 76, 75, 85 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 77925f1df..e3cb1c9b2 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -3,20 +3,19 @@ db 55, 47, 52, 41, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 0f25712dd..8b3d28ddc 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -3,20 +3,19 @@ db 46, 57, 40, 50, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 2385f82ec..d446a0d3b 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -3,20 +3,19 @@ db 70, 62, 67, 56, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 9c94ea824..7ece56a58 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -3,20 +3,19 @@ db 61, 72, 57, 65, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index f23d2e384..cb8f538b0 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -3,20 +3,19 @@ db 73, 76, 75, 100, 81, 100 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 178 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 030dec08e..5ad54adc6 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -3,20 +3,19 @@ db 100, 50, 50, 70, 76, 96 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 6bc2f7d46..c4a9a9c09 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -3,20 +3,19 @@ db 75, 105, 75, 45, 105, 75 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 98f8c96f9..3bb4fb1a3 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -3,20 +3,19 @@ db 45, 50, 55, 30, 75, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 70b88df38..d676205de 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -3,20 +3,19 @@ db 35, 40, 100, 35, 90, 55 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 120 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 659ecc825..33816ae00 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -3,20 +3,19 @@ db 70, 60, 125, 55, 115, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 199 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index befd53abf..6b3183e97 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -3,20 +3,19 @@ db 35, 45, 160, 70, 30, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 46687f928..1cd8aa500 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -3,20 +3,19 @@ db 35, 70, 55, 25, 45, 55 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 190 ; catch rate db 70 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index d40dd4fd9..f5b1a4fe5 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -3,20 +3,19 @@ db 60, 95, 80, 30, 60, 80 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 75 ; catch rate db 128 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index bbfd9beec..c71837785 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -3,20 +3,19 @@ db 65, 70, 60, 115, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 148 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 27794e0b5..27221d4fb 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -3,20 +3,19 @@ db 90, 60, 60, 40, 40, 40 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 35d6a105a..6805a0386 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -3,20 +3,19 @@ db 20, 40, 15, 60, 35, 35 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 42 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 2d117b955..5d935b01d 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -3,20 +3,19 @@ db 83, 80, 75, 91, 70, 70 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 172 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 8e263c4b3..766a2e5cf 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -3,20 +3,19 @@ db 63, 60, 55, 71, 50, 50 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 120 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 123b95d7d..4d9ccb21a 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -3,20 +3,19 @@ db 40, 45, 40, 56, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 55 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 78204ff78..7beb911ff 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -3,20 +3,19 @@ db 35, 55, 30, 90, 50, 40 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 82 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index 3e48aa4c9..077146eca 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -3,20 +3,19 @@ db 100, 100, 80, 50, 60, 60 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 75 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 5754c49a2..fc5e2e591 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -3,20 +3,19 @@ db 50, 65, 90, 15, 35, 35 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 190 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 55927c918..7d7a46257 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -3,20 +3,19 @@ db 65, 125, 100, 85, 55, 70 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 6ad959406..617dc0c7c 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 70, 90, 100 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 3a4d8c051..d3a2722a5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -3,20 +3,19 @@ db 40, 50, 40, 90, 40, 40 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 77 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index d28964ebd..2c2e9dba9 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -3,20 +3,19 @@ db 65, 65, 65, 90, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 120 ; catch rate db 131 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 3b142e061..114cc7c88 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -3,20 +3,19 @@ db 90, 85, 95, 70, 70, 90 ; hp atk def spd sat sdf - db WATER, FIGHTING + db WATER, FIGHTING ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 2c3c3f9cf..0be847fbd 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -3,20 +3,19 @@ db 50, 85, 55, 90, 65, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 152 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index c034acdfb..e8b1f4402 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -3,20 +3,19 @@ db 65, 60, 70, 40, 85, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 130 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 1e9625509..11fd950aa 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -3,20 +3,19 @@ db 85, 80, 90, 60, 105, 95 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 180 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index a7d1ee74a..15da82cb3 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -3,20 +3,19 @@ db 65, 105, 60, 95, 60, 70 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index d2901750b..dd964344b 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -3,20 +3,19 @@ db 50, 52, 48, 55, 65, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 80 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 7ff381195..b4bc6e5e7 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -3,20 +3,19 @@ db 70, 84, 70, 51, 65, 70 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 75a1d24be..c3599d036 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -3,20 +3,19 @@ db 95, 85, 85, 35, 65, 65 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 90 ; catch rate db 137 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 4cb388301..82cf03a7f 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 0cfe4e2d8..16cf03d07 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -3,20 +3,19 @@ db 65, 95, 75, 85, 55, 55 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 45 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index b6723ac0f..6b7727f6b 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -3,20 +3,19 @@ db 60, 90, 55, 100, 90, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 75 ; catch rate db 122 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 47f4f9da3..753800d93 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -3,20 +3,19 @@ db 90, 85, 75, 115, 115, 100 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 291b129f2..9827add2d 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -3,20 +3,19 @@ db 65, 100, 70, 105, 80, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 60 ; catch rate db 192 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 1424f3ffb..8fbcc2e40 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -3,20 +3,19 @@ db 55, 81, 60, 97, 50, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 71498aeac..30c9581ec 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -3,20 +3,19 @@ db 30, 56, 35, 72, 25, 35 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index 8dabbb0a4..a41ce6ce8 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -3,20 +3,19 @@ db 35, 65, 35, 65, 65, 35 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index e885edd75..9b95d9e94 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -3,20 +3,19 @@ db 105, 130, 120, 40, 45, 45 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 60 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index f15f73719..ee691b796 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -3,20 +3,19 @@ db 80, 85, 95, 25, 30, 30 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 120 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 7b172a120..8da9f1a88 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -3,20 +3,19 @@ db 50, 75, 85, 40, 20, 30 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 93 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index d850c9697..f2936e47b 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -3,20 +3,19 @@ db 75, 100, 110, 65, 45, 55 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 90 ; catch rate db 163 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index c841c6301..e59a4bd96 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -3,20 +3,19 @@ db 70, 130, 100, 65, 55, 80 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 25 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index ea7c7cd33..a39f00ec9 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -3,20 +3,19 @@ db 70, 110, 80, 105, 55, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 187 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 3ba5687ce..9793dbc2a 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -3,20 +3,19 @@ db 55, 65, 95, 85, 95, 45 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 155 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 70bee646a..16877fbc4 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -3,20 +3,19 @@ db 80, 92, 65, 68, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 170 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 13edf89bc..8635ff507 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -3,20 +3,19 @@ db 65, 45, 55, 45, 45, 70 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index c3802fa63..bb68d5c50 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -3,20 +3,19 @@ db 35, 46, 34, 20, 35, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 9ca88a03d..c7a39fc88 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -3,20 +3,19 @@ db 30, 65, 100, 40, 45, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 97 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index ec3a3b410..ca4cbc9c2 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -3,20 +3,19 @@ db 20, 10, 230, 05, 10, 230 ; hp atk def spd sat sdf - db BUG, ROCK + db BUG, ROCK ; type db 190 ; catch rate db 80 ; base exp - db BERRY ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 4d0b5f3de..73fc39741 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -3,20 +3,19 @@ db 65, 80, 140, 70, 40, 70 ; hp atk def spd sat sdf - db STEEL, FLYING + db STEEL, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 29a7be748..f3ae26958 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -3,20 +3,19 @@ db 55, 45, 50, 80, 45, 65 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 120 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index a9fc61e3a..797dbbf3a 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -3,20 +3,19 @@ db 95, 75, 110, 30, 100, 80 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 59d6c83e4..56e565e5c 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -3,20 +3,19 @@ db 95, 75, 80, 30, 100, 110 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 70 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index cb9bc813b..99d9a60ba 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -3,20 +3,19 @@ db 90, 65, 65, 15, 40, 40 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 190 ; catch rate db 99 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 234e844b9..26e8818c7 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -3,20 +3,19 @@ db 40, 40, 40, 20, 70, 40 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index 2373cb0f0..1a9c891f1 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -3,20 +3,19 @@ db 55, 20, 35, 75, 20, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index f8f5e22f6..7be8e51de 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -3,20 +3,19 @@ db 45, 30, 15, 65, 85, 65 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 87 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 4e24a8ada..2b58b31eb 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -3,20 +3,19 @@ db 55, 95, 55, 115, 35, 75 ; hp atk def spd sat sdf - db DARK, ICE + db DARK, ICE ; type db 60 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db QUICK_CLAW ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, QUICK_CLAW ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9a9e426e9..68b1be600 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -3,20 +3,19 @@ db 160, 110, 65, 30, 65, 110 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 154 ; base exp - db LEFTOVERS ; item 1 - db LEFTOVERS ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db LEFTOVERS, LEFTOVERS ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 6dbca375e..bcfac58e7 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 30, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 63 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index a55e8a17c..98b61b6b7 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -3,20 +3,19 @@ db 40, 60, 30, 70, 31, 31 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index fb2fbb7f3..e02fb6ca1 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -3,20 +3,19 @@ db 40, 60, 40, 30, 40, 40 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 6582f88a8..f09725cb0 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -3,20 +3,19 @@ db 44, 48, 65, 43, 50, 64 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index a8537a1e0..bc3145cd5 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -3,20 +3,19 @@ db 73, 95, 62, 85, 85, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 55c5fcc99..8823bbbe2 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -3,20 +3,19 @@ db 60, 75, 85, 115, 100, 85 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 60 ; catch rate db 207 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index d702faaf2..d999b0d13 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -3,20 +3,19 @@ db 30, 45, 55, 85, 70, 55 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 106 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 6931418c8..e8e620831 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -3,20 +3,19 @@ db 75, 85, 200, 30, 55, 65 ; hp atk def spd sat sdf - db STEEL, GROUND + db STEEL, GROUND ; type db 25 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 40726999d..cd95db096 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -3,20 +3,19 @@ db 70, 100, 115, 30, 30, 65 ; hp atk def spd sat sdf - db ROCK, ROCK + db ROCK, ROCK ; type db 65 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index b199eddd7..b52e0f5d0 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -3,20 +3,19 @@ db 100, 75, 115, 85, 90, 115 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index ec39d0932..aac7603f6 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -3,20 +3,19 @@ db 75, 75, 55, 30, 105, 85 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 120 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index 7e502900c..c646e80db 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -3,20 +3,19 @@ db 30, 30, 30, 30, 30, 30 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 235 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index ee6bd783a..62a330733 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -3,20 +3,19 @@ db 50, 50, 40, 50, 30, 30 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 225 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index a2b5b06a0..2535b6c82 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -3,20 +3,19 @@ db 65, 55, 115, 60, 100, 40 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 166 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 936d60a4d..307033fd2 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -3,20 +3,19 @@ db 75, 100, 95, 110, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 211 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 18c4ede7a..9309d247d 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 40, 50, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index 94dcb42b0..c5ce41e0a 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -3,20 +3,19 @@ db 40, 40, 35, 70, 50, 100 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 190 ; catch rate db 105 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index e922c5938..35037c668 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -3,20 +3,19 @@ db 80, 70, 65, 100, 80, 120 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 60 ; catch rate db 205 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index 0f22863e5..98b5f6bcd 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -3,20 +3,19 @@ db 35, 20, 65, 20, 40, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index ef2f94305..77176266c 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -3,20 +3,19 @@ db 55, 40, 85, 40, 80, 105 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 75 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AVIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FLYING, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 49c7603f6..86830e11e 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -3,20 +3,19 @@ db 50, 65, 64, 43, 44, 48 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index ed6fcf198..181a24661 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index b6ed98dd7..a3bd68aef 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -3,20 +3,19 @@ db 100, 134, 110, 61, 95, 100 ; hp atk def spd sat sdf - db ROCK, DARK + db ROCK, DARK ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 026aab404..fb7e75eb5 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -3,20 +3,19 @@ db 35, 35, 35, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 91 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 0382e69e2..55dc75902 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -3,20 +3,19 @@ db 95, 65, 110, 65, 60, 130 ; hp atk def spd sat sdf - db DARK, DARK + db DARK, DARK ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index ef67b1ce1..248aae9d1 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -3,20 +3,19 @@ db 48, 72, 48, 48, 72, 48 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 225 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 8f2031c77..1cc2f21a8 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -3,20 +3,19 @@ db 90, 130, 75, 55, 75, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 083a67499..8e266396e 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -3,20 +3,19 @@ db 130, 65, 60, 65, 110, 95 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c92c7fbff..43e50bfd4 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -3,20 +3,19 @@ db 70, 65, 60, 90, 90, 75 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 75 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 40a9639b8..77f05af31 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -3,20 +3,19 @@ db 60, 55, 50, 45, 40, 55 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 465b3d0fc..bd7664e57 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -3,20 +3,19 @@ db 80, 82, 83, 80, 100, 100 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index e4e1a24e5..43fe562f9 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 70, 100, 60 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 191 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 3f0d0b996..fff689e49 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 100, 90 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 2767568fa..ad5f16737 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -3,20 +3,19 @@ db 40, 30, 50, 100, 55, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 103 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index e012402a0..1f19771ee 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -3,20 +3,19 @@ db 38, 41, 40, 65, 50, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 63 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index 7df729f3f..20db04447 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -3,20 +3,19 @@ db 59, 63, 80, 58, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 520109245..c2536b316 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 50, 20, 20 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 3dbd2595e..4a4069abb 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -3,20 +3,19 @@ db 65, 90, 50, 55, 85, 45 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 151 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 41c1d4f5d..e18c78bb2 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -3,20 +3,19 @@ db 65, 90, 120, 60, 85, 70 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 60 ; catch rate db 173 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index e2d3bd7e6..0a3498b8f 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -3,20 +3,19 @@ db 140, 70, 45, 45, 75, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 50 ; catch rate db 109 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 393655150..39514450e 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -3,20 +3,19 @@ db 190, 33, 58, 33, 33, 58 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index db3f7f90a..5cc4a6666 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -3,20 +3,19 @@ db 55, 45, 45, 15, 25, 25 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index a5941421e..79bf0bc60 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -3,20 +3,19 @@ db 65, 75, 70, 95, 95, 70 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 75 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 0bff5157a..01918230c 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -3,20 +3,19 @@ db 65, 65, 45, 95, 75, 45 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 75 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 35b557404..a5589ab9a 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -3,20 +3,19 @@ db 90, 90, 85, 100, 125, 90 ; hp atk def spd sat sdf - db ELECTRIC, FLYING + db ELECTRIC, FLYING ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 5da4ceeba..ee3716844 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 55, 30, 40 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index e6f729361..a57eac98c 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -3,7 +3,7 @@ mon_cry: MACRO dw \1, \2, \3 ENDM -PokemonCries:: ; f2787 +PokemonCries:: ; entries correspond to constants/pokemon_constants.asm mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR @@ -260,4 +260,3 @@ PokemonCries:: ; f2787 mon_cry CRY_NIDORAN_M, 0, 0 ; 253 mon_cry CRY_NIDORAN_M, 0, 0 ; 254 mon_cry CRY_NIDORAN_M, 0, 0 ; 255 -; f2d81 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 7381a4262..a66f16737 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -3,7 +3,6 @@ INCLUDE "constants.asm" SECTION "Pokedex Entries 001-064", ROMX -PokedexEntries1:: BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" @@ -72,7 +71,6 @@ KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" SECTION "Pokedex Entries 065-128", ROMX -PokedexEntries2:: AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/machoke.asm" @@ -141,7 +139,6 @@ TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" SECTION "Pokedex Entries 129-192", ROMX -PokedexEntries3:: MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lapras.asm" @@ -210,7 +207,6 @@ SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" SECTION "Pokedex Entries 193-251", ROMX -PokedexEntries4:: YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" diff --git a/data/pokemon/dex_entries/abra.asm b/data/pokemon/dex_entries/abra.asm index be3b263cd..91f55c23f 100644 --- a/data/pokemon/dex_entries/abra.asm +++ b/data/pokemon/dex_entries/abra.asm @@ -1,10 +1,10 @@ -; AbraPokedexEntry: ; 0x1830d5 db "PSI@" ; species name dw 211, 430 ; height, weight db "It hypnotizes" next "itself so that it" next "can teleport away" + page "when it senses" next "danger, even" next "if it is asleep.@" diff --git a/data/pokemon/dex_entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm index d6189500b..48f943c99 100644 --- a/data/pokemon/dex_entries/aerodactyl.asm +++ b/data/pokemon/dex_entries/aerodactyl.asm @@ -1,10 +1,10 @@ -; AerodactylPokedexEntry: ; 0x1cc576 db "FOSSIL@" ; species name dw 511, 1300 ; height, weight db "In prehistoric" next "times, this" next "#MON flew" + page "freely and" next "fearlessly through" next "the skies.@" diff --git a/data/pokemon/dex_entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm index 3fadb9169..4cb0f86ce 100644 --- a/data/pokemon/dex_entries/aipom.asm +++ b/data/pokemon/dex_entries/aipom.asm @@ -1,10 +1,10 @@ -; AipomPokedexEntry: ; 0x1cda11 db "LONG TAIL@" ; species name dw 207, 250 ; height, weight db "It uses its tail" next "to hang on to tree" next "branches. It uses" + page "its momentum to" next "swing from one" next "branch to another.@" diff --git a/data/pokemon/dex_entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm index 1d34fa1f7..e13ef835f 100644 --- a/data/pokemon/dex_entries/alakazam.asm +++ b/data/pokemon/dex_entries/alakazam.asm @@ -1,10 +1,10 @@ -; AlakazamPokedexEntry: ; 0x1b8000 db "PSI@" ; species name dw 411, 1060 ; height, weight db "It has an IQ of" next "5000. It calcu-" next "lates many things" + page "in order to gain" next "the edge in every" next "battle.@" diff --git a/data/pokemon/dex_entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm index 1f48fe322..dd5c18620 100644 --- a/data/pokemon/dex_entries/ampharos.asm +++ b/data/pokemon/dex_entries/ampharos.asm @@ -1,10 +1,10 @@ -; AmpharosPokedexEntry: ; 0x1cd626 db "LIGHT@" ; species name dw 407, 1360 ; height, weight db "When it gets dark," next "the light from its" next "bright, shiny tail" + page "can be seen from" next "far away on the" next "ocean's surface.@" diff --git a/data/pokemon/dex_entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm index c5d5b7704..0ecab500c 100644 --- a/data/pokemon/dex_entries/arbok.asm +++ b/data/pokemon/dex_entries/arbok.asm @@ -1,10 +1,10 @@ -; ArbokPokedexEntry: ; 0x18203d db "COBRA@" ; species name dw 1106, 1430 ; height, weight db "To intimidate" next "foes, it spreads" next "its chest wide and" + page "makes eerie sounds" next "by expelling air" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm index e319bcb6a..2443a1be8 100644 --- a/data/pokemon/dex_entries/arcanine.asm +++ b/data/pokemon/dex_entries/arcanine.asm @@ -1,10 +1,10 @@ -; ArcaninePokedexEntry: ; 0x182f1c db "LEGENDARY@" ; species name dw 603, 3420 ; height, weight db "An ancient picture" next "scroll shows that" next "people were" + page "attracted to its" next "movement as it ran" next "through prairies.@" diff --git a/data/pokemon/dex_entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm index a27d13fef..bdc335f2c 100644 --- a/data/pokemon/dex_entries/ariados.asm +++ b/data/pokemon/dex_entries/ariados.asm @@ -1,10 +1,10 @@ -; AriadosPokedexEntry: ; 0x1cd083 db "LONG LEG@" ; species name dw 307, 740 ; height, weight db "Rather than mak-" next "ing a nest in one" next "specific spot, it" + page "wanders in search" next "of food after" next "darkness falls.@" diff --git a/data/pokemon/dex_entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm index 92b297d28..50439c59b 100644 --- a/data/pokemon/dex_entries/articuno.asm +++ b/data/pokemon/dex_entries/articuno.asm @@ -1,10 +1,10 @@ -; ArticunoPokedexEntry: ; 0x1cc632 db "FREEZE@" ; species name dw 507, 1220 ; height, weight db "Legendary bird" next "#MON. As it" next "flies through the" + page "sky, it cools the" next "air, causing snow" next "to fall.@" diff --git a/data/pokemon/dex_entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm index bdbc83d1d..892ac77e3 100644 --- a/data/pokemon/dex_entries/azumarill.asm +++ b/data/pokemon/dex_entries/azumarill.asm @@ -1,10 +1,10 @@ -; AzumarillPokedexEntry: ; 0x1cd771 db "AQUARABBIT@" ; species name dw 207, 630 ; height, weight db "The bubble-like" next "pattern on its" next "stomach helps it" + page "camouflage itself" next "when it's in the" next "water.@" diff --git a/data/pokemon/dex_entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm index ac66dccd5..534c4c972 100644 --- a/data/pokemon/dex_entries/bayleef.asm +++ b/data/pokemon/dex_entries/bayleef.asm @@ -1,10 +1,10 @@ -; BayleefPokedexEntry: ; 0x1cc9e9 db "LEAF@" ; species name dw 311, 350 ; height, weight db "The scent that" next "wafts from the" next "leaves on its neck" + page "causes anyone who" next "smells it to" next "become energetic.@" diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm index 505396ca1..7dc8f6262 100644 --- a/data/pokemon/dex_entries/beedrill.asm +++ b/data/pokemon/dex_entries/beedrill.asm @@ -1,10 +1,10 @@ -; BeedrillPokedexEntry: ; 0x181c8a db "POISON BEE@" ; species name dw 303, 650 ; height, weight db "It uses sharp," next "poisonous stings" next "to defeat prey," + page "then takes the" next "victim back to its" next "nest for food.@" diff --git a/data/pokemon/dex_entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm index 0d13ed65d..1e90f4b35 100644 --- a/data/pokemon/dex_entries/bellossom.asm +++ b/data/pokemon/dex_entries/bellossom.asm @@ -1,10 +1,10 @@ -; BellossomPokedexEntry: ; 0x1cd69a db "FLOWER@" ; species name dw 104, 130 ; height, weight db "When these dance" next "together, their" next "petals rub against" + page "each other," next "making pretty," next "relaxing sounds.@" diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm index fcd42c125..f279bbefb 100644 --- a/data/pokemon/dex_entries/bellsprout.asm +++ b/data/pokemon/dex_entries/bellsprout.asm @@ -1,10 +1,10 @@ -; BellsproutPokedexEntry: ; 0x1b81a1 db "FLOWER@" ; species name dw 204, 90 ; height, weight db "If it notices" next "anything that" next "moves, it" + page "immediately flings" next "its vine at the" next "object.@" diff --git a/data/pokemon/dex_entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm index ea2a18d05..eeb7cf202 100644 --- a/data/pokemon/dex_entries/blastoise.asm +++ b/data/pokemon/dex_entries/blastoise.asm @@ -1,10 +1,10 @@ -; BlastoisePokedexEntry: ; 0x1819f9 db "SHELLFISH@" ; species name dw 503, 1890 ; height, weight db "It firmly plants" next "its feet on the" next "ground before" + page "shooting water" next "from the jets on" next "its back.@" diff --git a/data/pokemon/dex_entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm index 10151a398..2496478b5 100644 --- a/data/pokemon/dex_entries/blissey.asm +++ b/data/pokemon/dex_entries/blissey.asm @@ -1,10 +1,10 @@ -; BlisseyPokedexEntry: ; 0x1d14f7 db "HAPPINESS@" ; species name dw 411, 1030 ; height, weight db "Biting into one" next "of the delicious" next "eggs that BLISSEY" + page "provides will make" next "everyone around" next "smile with joy.@" diff --git a/data/pokemon/dex_entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm index fdfe39c8c..88fca15ec 100644 --- a/data/pokemon/dex_entries/bulbasaur.asm +++ b/data/pokemon/dex_entries/bulbasaur.asm @@ -1,10 +1,10 @@ -; BulbasaurPokedexEntry: ; 0x181695 db "SEED@" ; species name dw 204, 150 ; height, weight db "While it is young," next "it uses the" next "nutrients that are" + page "stored in the" next "seeds on its back" next "in order to grow.@" diff --git a/data/pokemon/dex_entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm index edf9e2599..9661cce68 100644 --- a/data/pokemon/dex_entries/butterfree.asm +++ b/data/pokemon/dex_entries/butterfree.asm @@ -1,10 +1,10 @@ -; ButterfreePokedexEntry: ; 0x181b45 db "BUTTERFLY@" ; species name dw 307, 710 ; height, weight db "It flits from" next "flower to flower," next "collecting honey." + page "It can even" next "identify distant" next "flowers in bloom.@" diff --git a/data/pokemon/dex_entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm index 940aa014f..2c5d74c8d 100644 --- a/data/pokemon/dex_entries/caterpie.asm +++ b/data/pokemon/dex_entries/caterpie.asm @@ -1,10 +1,10 @@ -; CaterpiePokedexEntry: ; 0x181a60 db "WORM@" ; species name dw 100, 60 ; height, weight db "It crawls into" next "foliage where it" next "camouflages itself" + page "among leaves that" next "are the same color" next "as its body.@" diff --git a/data/pokemon/dex_entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm index 3922d1749..ae0bc0fc0 100644 --- a/data/pokemon/dex_entries/celebi.asm +++ b/data/pokemon/dex_entries/celebi.asm @@ -1,10 +1,10 @@ -; CelebiPokedexEntry: ; 0x1d18cc db "TIMETRAVEL@" ; species name dw 200, 110 ; height, weight db "Revered as a" next "guardian of the" next "forest, CELEBI" + page "appears wherever" next "beautiful forests" next "exist.@" diff --git a/data/pokemon/dex_entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm index fd45cf121..2cc0b278b 100644 --- a/data/pokemon/dex_entries/chansey.asm +++ b/data/pokemon/dex_entries/chansey.asm @@ -1,10 +1,10 @@ -; ChanseyPokedexEntry: ; 0x1b942e db "EGG@" ; species name dw 307, 760 ; height, weight db "People try to" next "catch it for its" next "extremely" + page "nutritious eggs," next "but it rarely can" next "be found.@" diff --git a/data/pokemon/dex_entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm index 53a542fb5..2bd55febe 100644 --- a/data/pokemon/dex_entries/charizard.asm +++ b/data/pokemon/dex_entries/charizard.asm @@ -1,10 +1,10 @@ -; CharizardPokedexEntry: ; 0x1818b3 db "FLAME@" ; species name dw 507, 2000 ; height, weight db "It uses its wings" next "to fly high. The" next "temperature of its" + page "fire increases as" next "it gains exper-" next "ience in battle.@" diff --git a/data/pokemon/dex_entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm index a89b138f8..19ed15cbc 100644 --- a/data/pokemon/dex_entries/charmander.asm +++ b/data/pokemon/dex_entries/charmander.asm @@ -1,10 +1,10 @@ -; CharmanderPokedexEntry: ; 0x1817db db "LIZARD@" ; species name dw 200, 190 ; height, weight db "If it's healthy," next "the flame on the" next "tip of its tail" + page "will burn vigor-" next "ously, even if it" next "gets a bit wet.@" diff --git a/data/pokemon/dex_entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm index 2891764c3..17868516d 100644 --- a/data/pokemon/dex_entries/charmeleon.asm +++ b/data/pokemon/dex_entries/charmeleon.asm @@ -1,10 +1,10 @@ -; CharmeleonPokedexEntry: ; 0x18184a db "FLAME@" ; species name dw 307, 420 ; height, weight db "If it becomes" next "agitated during" next "battle, it spouts" + page "intense flames," next "incinerating its" next "surroundings.@" diff --git a/data/pokemon/dex_entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm index 3ba17e1f8..ecf5f8520 100644 --- a/data/pokemon/dex_entries/chikorita.asm +++ b/data/pokemon/dex_entries/chikorita.asm @@ -1,10 +1,10 @@ -; ChikoritaPokedexEntry: ; 0x1cc988 db "LEAF@" ; species name dw 211, 140 ; height, weight db "It loves to bask" next "in the sunlight." next "It uses the leaf" + page "on its head to" next "seek out warm" next "places.@" diff --git a/data/pokemon/dex_entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm index 22d887859..6074d4995 100644 --- a/data/pokemon/dex_entries/chinchou.asm +++ b/data/pokemon/dex_entries/chinchou.asm @@ -1,10 +1,10 @@ -; ChinchouPokedexEntry: ; 0x1cd165 db "ANGLER@" ; species name dw 108, 260 ; height, weight db "Its antennae, whi-" next "ch evolved from a" next "fin, have both po-" + page "sitive and neg-" next "ative charges flo-" next "wing through them.@" diff --git a/data/pokemon/dex_entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm index 240d70eb5..3ea166487 100644 --- a/data/pokemon/dex_entries/clefable.asm +++ b/data/pokemon/dex_entries/clefable.asm @@ -1,10 +1,10 @@ -; ClefablePokedexEntry: ; 0x182530 db "FAIRY@" ; species name dw 403, 880 ; height, weight db "Said to live in" next "quiet, remote" next "mountains, this" + page "type of fairy has" next "a strong aversion" next "to being seen.@" diff --git a/data/pokemon/dex_entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm index b5973b21a..ff26e3e4a 100644 --- a/data/pokemon/dex_entries/clefairy.asm +++ b/data/pokemon/dex_entries/clefairy.asm @@ -1,10 +1,10 @@ -; ClefairyPokedexEntry: ; 0x1824c8 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "Though rarely" next "seen, it becomes" next "easier to spot," + page "for some reason," next "on the night of a " next "full moon.@" diff --git a/data/pokemon/dex_entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm index 897bb2501..9095f990f 100644 --- a/data/pokemon/dex_entries/cleffa.asm +++ b/data/pokemon/dex_entries/cleffa.asm @@ -1,10 +1,10 @@ -; CleffaPokedexEntry: ; 0x1cd2bc db "STARSHAPE@" ; species name dw 100, 70 ; height, weight db "If the impact site" next "of a meteorite is" next "found, this" + page "#MON is certain" next "to be within the" next "immediate area.@" diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm index b1eaf80b9..7a887838d 100644 --- a/data/pokemon/dex_entries/cloyster.asm +++ b/data/pokemon/dex_entries/cloyster.asm @@ -1,10 +1,10 @@ -; CloysterPokedexEntry: ; 0x1b8ad9 db "BIVALVE@" ; species name dw 411, 2920 ; height, weight db "Even a missile" next "can't break the" next "spikes it uses to" + page "stab opponents." next "They're even hard-" next "er than its shell.@" diff --git a/data/pokemon/dex_entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm index 52fbd0c44..fa073f0d0 100644 --- a/data/pokemon/dex_entries/corsola.asm +++ b/data/pokemon/dex_entries/corsola.asm @@ -1,10 +1,10 @@ -; CorsolaPokedexEntry: ; 0x1d0c68 db "CORAL@" ; species name dw 200, 110 ; height, weight db "The points on its" next "head absorb" next "nutrients from" + page "clean water. They" next "cannot survive in" next "polluted water.@" diff --git a/data/pokemon/dex_entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm index 107683110..2b7e28f76 100644 --- a/data/pokemon/dex_entries/crobat.asm +++ b/data/pokemon/dex_entries/crobat.asm @@ -1,10 +1,10 @@ -; CrobatPokedexEntry: ; 0x1cd0f5 db "BAT@" ; species name dw 511, 1650 ; height, weight db "As a result of its" next "pursuit of faster," next "yet more silent" + page "flight, a new set" next "of wings grew on" next "its hind legs.@" diff --git a/data/pokemon/dex_entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm index 0edcf80cc..0cde70653 100644 --- a/data/pokemon/dex_entries/croconaw.asm +++ b/data/pokemon/dex_entries/croconaw.asm @@ -1,10 +1,10 @@ -; CroconawPokedexEntry: ; 0x1ccc84 db "BIG JAW@" ; species name dw 307, 550 ; height, weight db "The tips of its" next "fangs are slanted" next "backward. Once" + page "those fangs clamp" next "down, the prey has" next "no hope of escape.@" diff --git a/data/pokemon/dex_entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm index 911377864..6c8bed214 100644 --- a/data/pokemon/dex_entries/cubone.asm +++ b/data/pokemon/dex_entries/cubone.asm @@ -1,10 +1,10 @@ -; CubonePokedexEntry: ; 0x1b9068 db "LONELY@" ; species name dw 104, 140 ; height, weight db "It lost its mother" next "after its birth." next "It wears its" + page "mother's skull," next "never revealing" next "its true face.@" diff --git a/data/pokemon/dex_entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm index 47329d37f..2604f4879 100644 --- a/data/pokemon/dex_entries/cyndaquil.asm +++ b/data/pokemon/dex_entries/cyndaquil.asm @@ -1,10 +1,10 @@ -; CyndaquilPokedexEntry: ; 0x1ccabd db "FIRE MOUSE@" ; species name dw 108, 170 ; height, weight db "The fire that" next "spouts from its" next "back burns hottest" + page "when it is angry." next "The flaring flames" next "intimidate foes.@" diff --git a/data/pokemon/dex_entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm index 2c998d8be..47f8e2c90 100644 --- a/data/pokemon/dex_entries/delibird.asm +++ b/data/pokemon/dex_entries/delibird.asm @@ -1,10 +1,10 @@ -; DelibirdPokedexEntry: ; 0x1d0db1 db "DELIVERY@" ; species name dw 211, 350 ; height, weight db "It always carries" next "its food with it," next "wherever it goes." + page "If attacked, it" next "throws its food at" next "the opponent.@" diff --git a/data/pokemon/dex_entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm index a3ff9b6f5..a7a0bf13e 100644 --- a/data/pokemon/dex_entries/dewgong.asm +++ b/data/pokemon/dex_entries/dewgong.asm @@ -1,10 +1,10 @@ -; DewgongPokedexEntry: ; 0x1b8934 db "SEA LION@" ; species name dw 507, 2650 ; height, weight db "It sleeps under" next "shallow ocean" next "waters during the" + page "day, then looks" next "for food at night" next "when it's cold.@" diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm index 469d9311d..c2b6c4671 100644 --- a/data/pokemon/dex_entries/diglett.asm +++ b/data/pokemon/dex_entries/diglett.asm @@ -1,10 +1,10 @@ -; DiglettPokedexEntry: ; 0x182b30 db "MOLE@" ; species name dw 8, 20 ; height, weight db "It digs under-" next "ground and chews" next "on tree roots," + page "sticking its head" next "out only when the" next "sun isn't bright.@" diff --git a/data/pokemon/dex_entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm index 5a838b5b8..ffe394a1b 100644 --- a/data/pokemon/dex_entries/ditto.asm +++ b/data/pokemon/dex_entries/ditto.asm @@ -1,10 +1,10 @@ -; DittoPokedexEntry: ; 0x1cc13c db "TRANSFORM@" ; species name dw 100, 90 ; height, weight db "When it encount-" next "ers another DITTO," next "it will move" + page "faster than normal" next "to duplicate that" next "opponent exactly.@" diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm index ef495b99b..767fd9abe 100644 --- a/data/pokemon/dex_entries/dodrio.asm +++ b/data/pokemon/dex_entries/dodrio.asm @@ -1,10 +1,10 @@ -; DodrioPokedexEntry: ; 0x1b884a db "TRIPLEBIRD@" ; species name dw 511, 1880 ; height, weight db "An enemy that" next "takes its eyes off" next "any of the three" + page "heads--even for a" next "second--will get" next "pecked severely.@" diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm index 124469457..eba65000d 100644 --- a/data/pokemon/dex_entries/doduo.asm +++ b/data/pokemon/dex_entries/doduo.asm @@ -1,10 +1,10 @@ -; DoduoPokedexEntry: ; 0x1b87d7 db "TWIN BIRD@" ; species name dw 407, 860 ; height, weight db "It lives on a" next "grassy plain where" next "it can see a long" + page "way. If it sees an" next "enemy, it runs" next "away at 60 mph.@" diff --git a/data/pokemon/dex_entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm index 4dc489938..eac9c5467 100644 --- a/data/pokemon/dex_entries/donphan.asm +++ b/data/pokemon/dex_entries/donphan.asm @@ -1,10 +1,10 @@ -; DonphanPokedexEntry: ; 0x1d10ac db "ARMOR@" ; species name dw 307, 2650 ; height, weight db "Because this" next "#MON's skin is" next "so tough, a normal" + page "attack won't even" next "leave a scratch on" next "it.@" diff --git a/data/pokemon/dex_entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm index cef4f8f29..915db2c21 100644 --- a/data/pokemon/dex_entries/dragonair.asm +++ b/data/pokemon/dex_entries/dragonair.asm @@ -1,10 +1,10 @@ -; DragonairPokedexEntry: ; 0x1cc7dc db "DRAGON@" ; species name dw 1301, 360 ; height, weight db "It is called the" next "divine #MON." next "When its entire" + page "body brightens" next "slightly, the" next "weather changes.@" diff --git a/data/pokemon/dex_entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm index bbbc6cff0..9db1bf54b 100644 --- a/data/pokemon/dex_entries/dragonite.asm +++ b/data/pokemon/dex_entries/dragonite.asm @@ -1,10 +1,10 @@ -; DragonitePokedexEntry: ; 0x1cc843 db "DRAGON@" ; species name dw 703, 4630 ; height, weight db "It is said that" next "somewhere in the" next "ocean lies an" + page "island where these" next "gather. Only they" next "live there.@" diff --git a/data/pokemon/dex_entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm index ef16aa20c..baa12940e 100644 --- a/data/pokemon/dex_entries/dratini.asm +++ b/data/pokemon/dex_entries/dratini.asm @@ -1,10 +1,10 @@ -; DratiniPokedexEntry: ; 0x1cc761 db "DRAGON@" ; species name dw 511, 70 ; height, weight db "It sheds many lay-" next "ers of skin as it" next "grows larger. Dur-" + page "ing this process," next "it is protected by" next "a rapid waterfall.@" diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm index 34ae54435..fe6f14ba7 100644 --- a/data/pokemon/dex_entries/drowzee.asm +++ b/data/pokemon/dex_entries/drowzee.asm @@ -1,10 +1,10 @@ -; DrowzeePokedexEntry: ; 0x1b8d0a db "HYPNOSIS@" ; species name dw 303, 710 ; height, weight db "When it twitches" next "its nose, it can" next "tell where someone" + page "is sleeping and" next "what that person" next "is dreaming about.@" diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm index 829e2aa09..a12c2984d 100644 --- a/data/pokemon/dex_entries/dugtrio.asm +++ b/data/pokemon/dex_entries/dugtrio.asm @@ -1,10 +1,10 @@ -; DugtrioPokedexEntry: ; 0x182b9d db "MOLE@" ; species name dw 204, 730 ; height, weight db "These DIGLETT" next "triplets dig over" next "60 miles below sea" + page "level. No one" next "knows what it's" next "like underground.@" diff --git a/data/pokemon/dex_entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm index 7a9d812f3..5391438c1 100644 --- a/data/pokemon/dex_entries/dunsparce.asm +++ b/data/pokemon/dex_entries/dunsparce.asm @@ -1,10 +1,10 @@ -; DunsparcePokedexEntry: ; 0x1d0593 db "LAND SNAKE@" ; species name dw 411, 310 ; height, weight db "It hides deep" next "inside caves where" next "no light ever" + page "reaches it and" next "remains virtually" next "motionless there.@" diff --git a/data/pokemon/dex_entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm index 3081a5829..91a3d70bc 100644 --- a/data/pokemon/dex_entries/eevee.asm +++ b/data/pokemon/dex_entries/eevee.asm @@ -1,10 +1,10 @@ -; EeveePokedexEntry: ; 0x1cc1b2 db "EVOLUTION@" ; species name dw 100, 140 ; height, weight db "Its ability to" next "evolve into many" next "forms allows it to" + page "adapt smoothly" next "and perfectly to" next "any environment.@" diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm index 23faa4854..bb2fe9594 100644 --- a/data/pokemon/dex_entries/ekans.asm +++ b/data/pokemon/dex_entries/ekans.asm @@ -1,10 +1,10 @@ -; EkansPokedexEntry: ; 0x181fd4 db "SNAKE@" ; species name dw 607, 150 ; height, weight db "It flutters the" next "tip of its tongue" next "to seek out the" + page "scent of prey," next "then swallows the" next "prey whole.@" diff --git a/data/pokemon/dex_entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm index e6bf15587..0eddf3416 100644 --- a/data/pokemon/dex_entries/electabuzz.asm +++ b/data/pokemon/dex_entries/electabuzz.asm @@ -1,10 +1,10 @@ -; ElectabuzzPokedexEntry: ; 0x1b992a db "ELECTRIC@" ; species name dw 307, 660 ; height, weight db "When two" next "ELECTABUZZ touch," next "they control the" + page "electric currents" next "to communicate" next "their feelings.@" diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm index 48d523c69..2e6378d41 100644 --- a/data/pokemon/dex_entries/electrode.asm +++ b/data/pokemon/dex_entries/electrode.asm @@ -1,10 +1,10 @@ -; ElectrodePokedexEntry: ; 0x1b8f19 db "BALL@" ; species name dw 311, 1470 ; height, weight db "The more energy it" next "charges up, the" next "faster it gets." + page "But this also" next "makes it more" next "likely to explode.@" diff --git a/data/pokemon/dex_entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm index 6a046bda4..a84d24dc0 100644 --- a/data/pokemon/dex_entries/elekid.asm +++ b/data/pokemon/dex_entries/elekid.asm @@ -1,10 +1,10 @@ -; ElekidPokedexEntry: ; 0x1d1398 db "ELECTRIC@" ; species name dw 200, 520 ; height, weight db "It loves violent" next "thunder. The space" next "between its horns" + page "flickers bluish-" next "white when it is" next "charging energy.@" diff --git a/data/pokemon/dex_entries/entei.asm b/data/pokemon/dex_entries/entei.asm index 3784a898c..355bd4ae6 100644 --- a/data/pokemon/dex_entries/entei.asm +++ b/data/pokemon/dex_entries/entei.asm @@ -1,10 +1,10 @@ -; EnteiPokedexEntry: ; 0x1d15dd db "VOLCANO@" ; species name dw 607, 4370 ; height, weight db "This brawny" next "#MON courses" next "around the earth," + page "spouting flames" next "hotter than a" next "volcano's magma.@" diff --git a/data/pokemon/dex_entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm index 059b01fbe..93bde0d8c 100644 --- a/data/pokemon/dex_entries/espeon.asm +++ b/data/pokemon/dex_entries/espeon.asm @@ -1,10 +1,10 @@ -; EspeonPokedexEntry: ; 0x1d0155 db "SUN@" ; species name dw 211, 580 ; height, weight db "The tip of its" next "forked tail" next "quivers when it is" + page "predicting its" next "opponent's next" next "move.@" diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm index 01453955e..27360dc05 100644 --- a/data/pokemon/dex_entries/exeggcute.asm +++ b/data/pokemon/dex_entries/exeggcute.asm @@ -1,10 +1,10 @@ -; ExeggcutePokedexEntry: ; 0x1b8f84 db "EGG@" ; species name dw 104, 60 ; height, weight db "If even one is" next "separated from the" next "group, the energy" + page "bond between the" next "six will make them" next "rejoin instantly.@" diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm index abefffd69..31ba01ae4 100644 --- a/data/pokemon/dex_entries/exeggutor.asm +++ b/data/pokemon/dex_entries/exeggutor.asm @@ -1,10 +1,10 @@ -; ExeggutorPokedexEntry: ; 0x1b8ff6 db "COCONUT@" ; species name dw 607, 2650 ; height, weight db "Living in a good" next "environment makes" next "it grow lots of" + page "heads. A head that" next "drops off becomes" next "an EXEGGCUTE.@" diff --git a/data/pokemon/dex_entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm index c9e756a6a..b5bd3bc98 100644 --- a/data/pokemon/dex_entries/farfetch_d.asm +++ b/data/pokemon/dex_entries/farfetch_d.asm @@ -1,10 +1,10 @@ -; FarfetchDPokedexEntry: ; 0x1b876c db "WILD DUCK@" ; species name dw 207, 330 ; height, weight db "In order to pre-" next "vent their" next "extinction, more" + page "people have made" next "an effort to breed" next "these #MON.@" diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm index 90de6a612..b91c66ed1 100644 --- a/data/pokemon/dex_entries/fearow.asm +++ b/data/pokemon/dex_entries/fearow.asm @@ -1,10 +1,10 @@ -; FearowPokedexEntry: ; 0x181f64 db "BEAK@" ; species name dw 311, 840 ; height, weight db "It uses its long" next "beak to attack. It" next "has a surprisingly" + page "long reach, so it" next "must be treated" next "with caution.@" diff --git a/data/pokemon/dex_entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm index cb3672c92..3c411fe48 100644 --- a/data/pokemon/dex_entries/feraligatr.asm +++ b/data/pokemon/dex_entries/feraligatr.asm @@ -1,10 +1,10 @@ -; FeraligatrPokedexEntry: ; 0x1cccf9 db "BIG JAW@" ; species name dw 707, 1960 ; height, weight db "Although it has a" next "massive body, its" next "powerful hind legs" + page "enable it to move" next "quickly, even on" next "the ground.@" diff --git a/data/pokemon/dex_entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm index 04bcc0668..d408a4706 100644 --- a/data/pokemon/dex_entries/flaaffy.asm +++ b/data/pokemon/dex_entries/flaaffy.asm @@ -1,10 +1,10 @@ -; FlaaffyPokedexEntry: ; 0x1cd5b8 db "WOOL@" ; species name dw 207, 290 ; height, weight db "Because of its" next "rubbery, electric-" next "ity-resistant" + page "skin, it can store" next "lots of electric-" next "ity in its fur.@" diff --git a/data/pokemon/dex_entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm index ba3e0399d..fbab999c4 100644 --- a/data/pokemon/dex_entries/flareon.asm +++ b/data/pokemon/dex_entries/flareon.asm @@ -1,10 +1,10 @@ -; FlareonPokedexEntry: ; 0x1cc2ec db "FLAME@" ; species name dw 211, 550 ; height, weight db "Once it has stored" next "up enough heat," next "this #MON's" + page "body temperature" next "can reach up to" next "1700 degrees.@" diff --git a/data/pokemon/dex_entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm index 8644b4b39..6815f6d31 100644 --- a/data/pokemon/dex_entries/forretress.asm +++ b/data/pokemon/dex_entries/forretress.asm @@ -1,10 +1,10 @@ -; ForretressPokedexEntry: ; 0x1d0524 db "BAGWORM@" ; species name dw 311, 2770 ; height, weight db "Usually found" next "hanging on to a" next "fat tree trunk. It" + page "shoots out bits of" next "its shell when it" next "sees action.@" diff --git a/data/pokemon/dex_entries/furret.asm b/data/pokemon/dex_entries/furret.asm index 653a3dead..b9ec74d2d 100644 --- a/data/pokemon/dex_entries/furret.asm +++ b/data/pokemon/dex_entries/furret.asm @@ -1,10 +1,10 @@ -; FurretPokedexEntry: ; 0x1ccddd db "LONG BODY@" ; species name dw 511, 720 ; height, weight db "It lives in narrow" next "burrows that fit" next "its slim body. The" + page "deeper the nests" next "go, the more maze-" next "like they become.@" diff --git a/data/pokemon/dex_entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm index db7f6d57d..5f5420e02 100644 --- a/data/pokemon/dex_entries/gastly.asm +++ b/data/pokemon/dex_entries/gastly.asm @@ -1,10 +1,10 @@ -; GastlyPokedexEntry: ; 0x1b8b4a db "GAS@" ; species name dw 403, 2 ; height, weight db "It wraps its op-" next "ponent in its gas-" next "like body, slowly" + page "weakening its prey" next "by poisoning it" next "through the skin.@" diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm index e9650fb39..ac85e88f4 100644 --- a/data/pokemon/dex_entries/gengar.asm +++ b/data/pokemon/dex_entries/gengar.asm @@ -1,10 +1,10 @@ -; GengarPokedexEntry: ; 0x1b8c25 db "SHADOW@" ; species name dw 411, 890 ; height, weight db "Hiding in people's" next "shadows at night," next "it absorbs their" + page "heat. The chill it" next "causes makes the" next "victims shake.@" diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm index 389ce042a..ea3c8b79e 100644 --- a/data/pokemon/dex_entries/geodude.asm +++ b/data/pokemon/dex_entries/geodude.asm @@ -1,10 +1,10 @@ -; GeodudePokedexEntry: ; 0x1b83a1 db "ROCK@" ; species name dw 104, 440 ; height, weight db "Proud of their" next "sturdy bodies," next "they bash against" + page "each other in a" next "contest to prove" next "whose is harder.@" diff --git a/data/pokemon/dex_entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm index 527aa9807..caeb13dd7 100644 --- a/data/pokemon/dex_entries/girafarig.asm +++ b/data/pokemon/dex_entries/girafarig.asm @@ -1,10 +1,10 @@ -; GirafarigPokedexEntry: ; 0x1d0446 db "LONG NECK@" ; species name dw 411, 910 ; height, weight db "When it is in" next "danger, its tail" next "uses some sort of" + page "mysterious powers" next "to drive away the" next "enemy.@" diff --git a/data/pokemon/dex_entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm index 43c4c95ce..32ac0a5f5 100644 --- a/data/pokemon/dex_entries/gligar.asm +++ b/data/pokemon/dex_entries/gligar.asm @@ -1,10 +1,10 @@ -; GligarPokedexEntry: ; 0x1d0604 db "FLYSCORPIO@" ; species name dw 307, 1430 ; height, weight db "It builds its nest" next "on a steep cliff." next "When it is done" + page "gliding, it hops" next "along the ground" next "back to its nest.@" diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm index 0552a8d0c..6b2e4e534 100644 --- a/data/pokemon/dex_entries/gloom.asm +++ b/data/pokemon/dex_entries/gloom.asm @@ -1,10 +1,10 @@ -; GloomPokedexEntry: ; 0x1828a6 db "WEED@" ; species name dw 207, 190 ; height, weight db "The smell from its" next "drool-like syrup" next "and the pollen on" + page "its petals is so" next "bad, it may make" next "opponents faint.@" diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm index 434108bf4..d59b9408c 100644 --- a/data/pokemon/dex_entries/golbat.asm +++ b/data/pokemon/dex_entries/golbat.asm @@ -1,10 +1,10 @@ -; GolbatPokedexEntry: ; 0x1827c4 db "BAT@" ; species name dw 503, 1210 ; height, weight db "When it plunges" next "its fangs into its" next "prey, it instantly" + page "draws and gulps" next "down more than ten" next "ounces of blood.@" diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm index 101edf434..075a9b5a2 100644 --- a/data/pokemon/dex_entries/goldeen.asm +++ b/data/pokemon/dex_entries/goldeen.asm @@ -1,10 +1,10 @@ -; GoldeenPokedexEntry: ; 0x1b9626 db "GOLDFISH@" ; species name dw 200, 330 ; height, weight db "During spawning" next "season, they swim" next "gracefully in the" + page "water, searching" next "for their perfect" next "mate.@" diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm index b38cfd2dc..921e4ddb0 100644 --- a/data/pokemon/dex_entries/golduck.asm +++ b/data/pokemon/dex_entries/golduck.asm @@ -1,10 +1,10 @@ -; GolduckPokedexEntry: ; 0x182d55 db "DUCK@" ; species name dw 507, 1690 ; height, weight db "It swims grace-" next "fully along on the" next "quiet, slow-moving" + page "rivers and lakes" next "of which it is so" next "fond.@" diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm index dbb5a8e3d..7d5e9af49 100644 --- a/data/pokemon/dex_entries/golem.asm +++ b/data/pokemon/dex_entries/golem.asm @@ -1,10 +1,10 @@ -; GolemPokedexEntry: ; 0x1b8481 db "MEGATON@" ; species name dw 407, 6620 ; height, weight db "Its rock-like body" next "is so durable," next "even high-powered" + page "dynamite blasts" next "fail to scratch" next "its rugged hide.@" diff --git a/data/pokemon/dex_entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm index 15f3e194c..de6460d8d 100644 --- a/data/pokemon/dex_entries/granbull.asm +++ b/data/pokemon/dex_entries/granbull.asm @@ -1,10 +1,10 @@ -; GranbullPokedexEntry: ; 0x1d074a db "FAIRY@" ; species name dw 407, 1070 ; height, weight db "It can make most" next "any #MON run" next "away simply by" + page "opening its mouth" next "wide to reveal its" next "big fangs.@" diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm index 3bf04148c..26b9db795 100644 --- a/data/pokemon/dex_entries/graveler.asm +++ b/data/pokemon/dex_entries/graveler.asm @@ -1,10 +1,10 @@ -; GravelerPokedexEntry: ; 0x1b840c db "ROCK@" ; species name dw 303, 2320 ; height, weight db "It travels by rol-" next "ling on mountain" next "paths. If it gains" + page "too much speed, it" next "stops by running" next "into huge rocks.@" diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm index bda09cf94..ed76b6249 100644 --- a/data/pokemon/dex_entries/grimer.asm +++ b/data/pokemon/dex_entries/grimer.asm @@ -1,10 +1,10 @@ -; GrimerPokedexEntry: ; 0x1b89a2 db "SLUDGE@" ; species name dw 211, 660 ; height, weight db "When two of these" next "#MON's bodies" next "are combined" + page "together, new" next "poisons are" next "created.@" diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm index cd261d886..af5610cda 100644 --- a/data/pokemon/dex_entries/growlithe.asm +++ b/data/pokemon/dex_entries/growlithe.asm @@ -1,10 +1,10 @@ -; GrowlithePokedexEntry: ; 0x182eaa db "PUPPY@" ; species name dw 204, 420 ; height, weight db "It controls a big" next "territory. If it" next "detects an unknown" + page "smell, it roars" next "loudly to force" next "out the intruder.@" diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm index 767380680..3f3235679 100644 --- a/data/pokemon/dex_entries/gyarados.asm +++ b/data/pokemon/dex_entries/gyarados.asm @@ -1,10 +1,10 @@ -; GyaradosPokedexEntry: ; 0x1cc065 db "ATROCIOUS@" ; species name dw 2104, 5180 ; height, weight db "It appears when-" next "ever there is" next "world conflict," + page "burning down any" next "place it travels" next "through.@" diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm index 6efe4b15c..b03c0996f 100644 --- a/data/pokemon/dex_entries/haunter.asm +++ b/data/pokemon/dex_entries/haunter.asm @@ -1,10 +1,10 @@ -; HaunterPokedexEntry: ; 0x1b8bbd db "GAS@" ; species name dw 503, 2 ; height, weight db "It hides in the" next "dark, planning to" next "take the life of" + page "the next living" next "thing that wanders" next "close by.@" diff --git a/data/pokemon/dex_entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm index ed709b526..25d1e28a6 100644 --- a/data/pokemon/dex_entries/heracross.asm +++ b/data/pokemon/dex_entries/heracross.asm @@ -1,10 +1,10 @@ -; HeracrossPokedexEntry: ; 0x1d0907 db "SINGLEHORN@" ; species name dw 411, 1190 ; height, weight db "With its Herculean" next "powers, it can" next "easily throw arou-" + page "nd an object that" next "is 100 times its" next "own weight.@" diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm index e5686b1a5..8b2f97823 100644 --- a/data/pokemon/dex_entries/hitmonchan.asm +++ b/data/pokemon/dex_entries/hitmonchan.asm @@ -1,10 +1,10 @@ -; HitmonchanPokedexEntry: ; 0x1b91a4 db "PUNCHING@" ; species name dw 407, 1110 ; height, weight db "To increase the" next "strength of all" next "its punch moves," + page "it spins its arms" next "just before making" next "contact.@" diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm index 0215d3bdc..0df1bf2a9 100644 --- a/data/pokemon/dex_entries/hitmonlee.asm +++ b/data/pokemon/dex_entries/hitmonlee.asm @@ -1,10 +1,10 @@ -; HitmonleePokedexEntry: ; 0x1b913f db "KICKING@" ; species name dw 411, 1100 ; height, weight db "It is also called" next "the Kick Master." next "It uses its" + page "elastic legs to" next "execute every" next "known kick.@" diff --git a/data/pokemon/dex_entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm index 14175ec8a..609ccb48a 100644 --- a/data/pokemon/dex_entries/hitmontop.asm +++ b/data/pokemon/dex_entries/hitmontop.asm @@ -1,10 +1,10 @@ -; HitmontopPokedexEntry: ; 0x1d12c0 db "HANDSTAND@" ; species name dw 407, 1060 ; height, weight db "After doing a" next "handstand to" next "throw off the" + page "opponent's timing," next "it presents its" next "fancy kick moves.@" diff --git a/data/pokemon/dex_entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm index 1d74cd058..2bc0abcf0 100644 --- a/data/pokemon/dex_entries/ho_oh.asm +++ b/data/pokemon/dex_entries/ho_oh.asm @@ -1,10 +1,10 @@ -; HoOhPokedexEntry: ; 0x1d185d db "RAINBOW@" ; species name dw 1206, 4390 ; height, weight db "It will reveal" next "itself before a" next "pure-hearted" + page "trainer by shining" next "its bright rain-" next "bow-colored wings.@" diff --git a/data/pokemon/dex_entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm index 88039eea8..1df540fe6 100644 --- a/data/pokemon/dex_entries/hoothoot.asm +++ b/data/pokemon/dex_entries/hoothoot.asm @@ -1,10 +1,10 @@ -; HoothootPokedexEntry: ; 0x1cce58 db "OWL@" ; species name dw 204, 470 ; height, weight db "It begins to hoot" next "at the same time" next "every day. Some" + page "trainers use them" next "in place of" next "clocks.@" diff --git a/data/pokemon/dex_entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm index 734ddc766..3e97be0e2 100644 --- a/data/pokemon/dex_entries/hoppip.asm +++ b/data/pokemon/dex_entries/hoppip.asm @@ -1,10 +1,10 @@ -; HoppipPokedexEntry: ; 0x1cd8b5 db "COTTONWEED@" ; species name dw 104, 10 ; height, weight db "It can be carried" next "away on even the" next "gentlest breeze." + page "It may even float" next "all the way to the" next "next town.@" diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm index dd50057e7..53f6ec71d 100644 --- a/data/pokemon/dex_entries/horsea.asm +++ b/data/pokemon/dex_entries/horsea.asm @@ -1,10 +1,10 @@ -; HorseaPokedexEntry: ; 0x1b9553 db "DRAGON@" ; species name dw 104, 180 ; height, weight db "When they're in a" next "safe location," next "they can be seen" + page "playfully tangling" next "their tails" next "together.@" diff --git a/data/pokemon/dex_entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm index 6a21602f3..a3b8f9cb8 100644 --- a/data/pokemon/dex_entries/houndoom.asm +++ b/data/pokemon/dex_entries/houndoom.asm @@ -1,10 +1,10 @@ -; HoundoomPokedexEntry: ; 0x1d0f66 db "DARK@" ; species name dw 407, 770 ; height, weight db "The pungent-" next "smelling flame" next "that shoots from" + page "its mouth results" next "from toxins burn-" next "ing in its body.@" diff --git a/data/pokemon/dex_entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm index 5fa89fe85..ba89b90d2 100644 --- a/data/pokemon/dex_entries/houndour.asm +++ b/data/pokemon/dex_entries/houndour.asm @@ -1,10 +1,10 @@ -; HoundourPokedexEntry: ; 0x1d0eff db "DARK@" ; species name dw 200, 240 ; height, weight db "Around dawn, its" next "ominous howl" next "echoes through the" + page "area to announce" next "that this is its" next "territory.@" diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm index 2309a6bfa..cfdd29896 100644 --- a/data/pokemon/dex_entries/hypno.asm +++ b/data/pokemon/dex_entries/hypno.asm @@ -1,10 +1,10 @@ -; HypnoPokedexEntry: ; 0x1b8d80 db "HYPNOSIS@" ; species name dw 503, 1670 ; height, weight db "The longer it" next "swings its" next "pendulum, the" + page "longer the effects" next "of its hypnosis" next "last.@" diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm index aa1c1cabf..27d5a8040 100644 --- a/data/pokemon/dex_entries/igglybuff.asm +++ b/data/pokemon/dex_entries/igglybuff.asm @@ -1,10 +1,10 @@ -; IgglybuffPokedexEntry: ; 0x1cd32c db "BALLOON@" ; species name dw 100, 20 ; height, weight db "Instead of walking" next "with its short" next "legs, it moves" + page "around by bouncing" next "on its soft," next "tender body.@" diff --git a/data/pokemon/dex_entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm index 66d16d323..91a672c9e 100644 --- a/data/pokemon/dex_entries/ivysaur.asm +++ b/data/pokemon/dex_entries/ivysaur.asm @@ -1,10 +1,10 @@ -; IvysaurPokedexEntry: ; 0x181702 db "SEED@" ; species name dw 303, 290 ; height, weight db "The bulb on its" next "back grows as it" next "absorbs nutrients." + page "The bulb gives off" next "a pleasant aroma" next "when it blooms.@" diff --git a/data/pokemon/dex_entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm index 01a3b4480..b90ba7316 100644 --- a/data/pokemon/dex_entries/jigglypuff.asm +++ b/data/pokemon/dex_entries/jigglypuff.asm @@ -1,10 +1,10 @@ -; JigglypuffPokedexEntry: ; 0x182673 db "BALLOON@" ; species name dw 108, 120 ; height, weight db "It rolls its cute" next "eyes as it sings a" next "soothing lullaby." + page "Its gentle song" next "puts anyone who" next "hears it to sleep.@" diff --git a/data/pokemon/dex_entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm index 9b9149d9a..4d6be5d57 100644 --- a/data/pokemon/dex_entries/jolteon.asm +++ b/data/pokemon/dex_entries/jolteon.asm @@ -1,10 +1,10 @@ -; JolteonPokedexEntry: ; 0x1cc28b db "LIGHTNING@" ; species name dw 207, 540 ; height, weight db "The negatively" next "charged ions" next "generated in its" + page "fur create a" next "constant sparking" next "noise.@" diff --git a/data/pokemon/dex_entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm index 0aade0b75..8dacd4dff 100644 --- a/data/pokemon/dex_entries/jumpluff.asm +++ b/data/pokemon/dex_entries/jumpluff.asm @@ -1,10 +1,10 @@ -; JumpluffPokedexEntry: ; 0x1cd998 db "COTTONWEED@" ; species name dw 207, 70 ; height, weight db "Even in the fierc-" next "est wind, it can" next "control its fluff" + page "to make its way to" next "any place in the" next "world it wants.@" diff --git a/data/pokemon/dex_entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm index b4b9eac8c..6f6486776 100644 --- a/data/pokemon/dex_entries/jynx.asm +++ b/data/pokemon/dex_entries/jynx.asm @@ -1,10 +1,10 @@ -; JynxPokedexEntry: ; 0x1b98c5 db "HUMANSHAPE@" ; species name dw 407, 900 ; height, weight db "It has several" next "different cry pat-" next "terns, each of" + page "which seems to" next "have its own" next "meaning.@" diff --git a/data/pokemon/dex_entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm index 9231fb9be..8a65e4cb6 100644 --- a/data/pokemon/dex_entries/kabuto.asm +++ b/data/pokemon/dex_entries/kabuto.asm @@ -1,10 +1,10 @@ -; KabutoPokedexEntry: ; 0x1cc497 db "SHELLFISH@" ; species name dw 108, 250 ; height, weight db "Three hundred" next "million years ago," next "it hid on the sea" + page "floor. It also has" next "eyes on its back" next "that glow.@" diff --git a/data/pokemon/dex_entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm index 8f5e1348b..bca687d39 100644 --- a/data/pokemon/dex_entries/kabutops.asm +++ b/data/pokemon/dex_entries/kabutops.asm @@ -1,10 +1,10 @@ -; KabutopsPokedexEntry: ; 0x1cc507 db "SHELLFISH@" ; species name dw 403, 890 ; height, weight db "It was able to" next "swim quickly thro-" next "ugh the water by" + page "compactly folding" next "up its razor-sharp" next "sickles.@" diff --git a/data/pokemon/dex_entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm index 26226724f..01fd96098 100644 --- a/data/pokemon/dex_entries/kadabra.asm +++ b/data/pokemon/dex_entries/kadabra.asm @@ -1,10 +1,10 @@ -; KadabraPokedexEntry: ; 0x18313c db "PSI@" ; species name dw 403, 1250 ; height, weight db "When it closes its" next "eyes, twice as" next "many alpha parti-" + page "cles come out of" next "the surface of its" next "body.@" diff --git a/data/pokemon/dex_entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm index 469e14bf6..3f4a1326d 100644 --- a/data/pokemon/dex_entries/kakuna.asm +++ b/data/pokemon/dex_entries/kakuna.asm @@ -1,10 +1,10 @@ -; KakunaPokedexEntry: ; 0x181c23 db "COCOON@" ; species name dw 200, 220 ; height, weight db "Nearly incapable" next "of movement, it" next "leans against" + page "stout trees while" next "waiting for its" next "evolution.@" diff --git a/data/pokemon/dex_entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm index ec2050845..c1c9d8db5 100644 --- a/data/pokemon/dex_entries/kangaskhan.asm +++ b/data/pokemon/dex_entries/kangaskhan.asm @@ -1,10 +1,10 @@ -; KangaskhanPokedexEntry: ; 0x1b94f6 db "PARENT@" ; species name dw 703, 1760 ; height, weight db "To avoid" next "crushing the" next "baby it carries in" + page "its pouch, it" next "always sleeps" next "standing up.@" diff --git a/data/pokemon/dex_entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm index 555601b51..05e79a86a 100644 --- a/data/pokemon/dex_entries/kingdra.asm +++ b/data/pokemon/dex_entries/kingdra.asm @@ -1,10 +1,10 @@ -; KingdraPokedexEntry: ; 0x1d0fd1 db "DRAGON@" ; species name dw 511, 3350 ; height, weight db "It stores energy" next "by sleeping at" next "underwater depths" + page "at which no other" next "life forms can" next "survive.@" diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm index 25685d517..2c4b17a15 100644 --- a/data/pokemon/dex_entries/kingler.asm +++ b/data/pokemon/dex_entries/kingler.asm @@ -1,10 +1,10 @@ -; KinglerPokedexEntry: ; 0x1b8e45 db "PINCER@" ; species name dw 403, 1320 ; height, weight db "Its oversized claw" next "is very powerful," next "but when it's not" + page "in battle, the" next "claw just gets in" next "the way.@" diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm index 20bde8671..a3fc0da9f 100644 --- a/data/pokemon/dex_entries/koffing.asm +++ b/data/pokemon/dex_entries/koffing.asm @@ -1,10 +1,10 @@ -; KoffingPokedexEntry: ; 0x1b9276 db "POISON GAS@" ; species name dw 200, 20 ; height, weight db "If one gets close" next "enough to it when" next "it expels poison-" + page "ous gas, the gas" next "swirling inside it" next "can be seen.@" diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm index 2435cd64d..0e0081ae6 100644 --- a/data/pokemon/dex_entries/krabby.asm +++ b/data/pokemon/dex_entries/krabby.asm @@ -1,10 +1,10 @@ -; KrabbyPokedexEntry: ; 0x1b8ddd db "RIVER CRAB@" ; species name dw 104, 140 ; height, weight db "If it is unable" next "to find food, it" next "will absorb" + page "nutrients by" next "swallowing a" next "mouthful of sand.@" diff --git a/data/pokemon/dex_entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm index 3aa2b5523..46ea41e89 100644 --- a/data/pokemon/dex_entries/lanturn.asm +++ b/data/pokemon/dex_entries/lanturn.asm @@ -1,10 +1,10 @@ -; LanturnPokedexEntry: ; 0x1cd1de db "LIGHT@" ; species name dw 311, 500 ; height, weight db "This #MON uses" next "the bright part of" next "its body, which" + page "changed from a" next "dorsal fin, to" next "lure prey.@" diff --git a/data/pokemon/dex_entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm index 550d6e12c..e074cfe02 100644 --- a/data/pokemon/dex_entries/lapras.asm +++ b/data/pokemon/dex_entries/lapras.asm @@ -1,10 +1,10 @@ -; LaprasPokedexEntry: ; 0x1cc0cd db "TRANSPORT@" ; species name dw 802, 4850 ; height, weight db "This gentle" next "#MON loves to" next "give people rides" + page "and provides a ve-" next "ry comfortable way" next "to get around.@" diff --git a/data/pokemon/dex_entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm index 14ec08c7b..fa8145626 100644 --- a/data/pokemon/dex_entries/larvitar.asm +++ b/data/pokemon/dex_entries/larvitar.asm @@ -1,10 +1,10 @@ -; LarvitarPokedexEntry: ; 0x1d169c db "ROCK SKIN@" ; species name dw 200, 1590 ; height, weight db "Born deep under-" next "ground, this" next "#MON becomes a" + page "pupa after eating" next "enough dirt to" next "make a mountain.@" diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm index a112aa722..90a21d427 100644 --- a/data/pokemon/dex_entries/ledian.asm +++ b/data/pokemon/dex_entries/ledian.asm @@ -1,10 +1,10 @@ -; LedianPokedexEntry: ; 0x1ccfa0 db "FIVE STAR@" ; species name dw 407, 780 ; height, weight db "In the daytime" next "when it gets warm," next "it curls up inside" + page "a big leaf and" next "drifts off into" next "a deep slumber.@" diff --git a/data/pokemon/dex_entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm index 1e62ab4b1..71ed42a8d 100644 --- a/data/pokemon/dex_entries/ledyba.asm +++ b/data/pokemon/dex_entries/ledyba.asm @@ -1,10 +1,10 @@ -; LedybaPokedexEntry: ; 0x1ccf2c db "FIVE STAR@" ; species name dw 303, 240 ; height, weight db "It is timid and" next "clusters together" next "with others. The" + page "fluid secreted by" next "its feet indicates" next "its location.@" diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm index 0003f14dc..b5aa73af5 100644 --- a/data/pokemon/dex_entries/lickitung.asm +++ b/data/pokemon/dex_entries/lickitung.asm @@ -1,10 +1,10 @@ -; LickitungPokedexEntry: ; 0x1b9210 db "LICKING@" ; species name dw 311, 1440 ; height, weight db "It has a tongue" next "that is over 6'6''" next "long. It uses this" + page "long tongue to" next "lick its body" next "clean.@" diff --git a/data/pokemon/dex_entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm index c15345300..8fa0dcf1f 100644 --- a/data/pokemon/dex_entries/lugia.asm +++ b/data/pokemon/dex_entries/lugia.asm @@ -1,10 +1,10 @@ -; LugiaPokedexEntry: ; 0x1d17e9 db "DIVING@" ; species name dw 1701, 4760 ; height, weight db "It has an incred-" next "ible ability to" next "calm raging sto-" + page "rms. It is said" next "that LUGIA appears" next "when storms start.@" diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm index 0ff42bf5f..2a84a6815 100644 --- a/data/pokemon/dex_entries/machamp.asm +++ b/data/pokemon/dex_entries/machamp.asm @@ -1,10 +1,10 @@ -; MachampPokedexEntry: ; 0x1b8133 db "SUPERPOWER@" ; species name dw 503, 2870 ; height, weight db "With four arms" next "that react more" next "quickly than it" + page "can think, it can" next "execute many" next "punches at once.@" diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm index 53523a832..fa7642ee7 100644 --- a/data/pokemon/dex_entries/machoke.asm +++ b/data/pokemon/dex_entries/machoke.asm @@ -1,10 +1,10 @@ -; MachokePokedexEntry: ; 0x1b80cb db "SUPERPOWER@" ; species name dw 411, 1550 ; height, weight db "This tough #MON" next "always stays in" next "the zone. Its" + page "muscles become" next "thicker after" next "every battle.@" diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm index aba71bc04..d50eb0aa7 100644 --- a/data/pokemon/dex_entries/machop.asm +++ b/data/pokemon/dex_entries/machop.asm @@ -1,10 +1,10 @@ -; MachopPokedexEntry: ; 0x1b8065 db "SUPERPOWER@" ; species name dw 207, 430 ; height, weight db "It trains by" next "lifting rocks in" next "the mountains. It" + page "can even pick up a" next "GRAVELER with" next "ease.@" diff --git a/data/pokemon/dex_entries/magby.asm b/data/pokemon/dex_entries/magby.asm index 53f9e1129..013d96670 100644 --- a/data/pokemon/dex_entries/magby.asm +++ b/data/pokemon/dex_entries/magby.asm @@ -1,10 +1,10 @@ -; MagbyPokedexEntry: ; 0x1d140e db "LIVE COAL@" ; species name dw 204, 470 ; height, weight db "It naturally spits" next "an 1100-degree" next "flame. It is said" + page "when many appear," next "it heralds a" next "volcanic eruption.@" diff --git a/data/pokemon/dex_entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm index 5f1122906..8bbb84593 100644 --- a/data/pokemon/dex_entries/magcargo.asm +++ b/data/pokemon/dex_entries/magcargo.asm @@ -1,10 +1,10 @@ -; MagcargoPokedexEntry: ; 0x1d0b21 db "LAVA@" ; species name dw 207, 1210 ; height, weight db "Its body is as hot" next "as lava and is" next "always billowing." + page "Flames will" next "occasionally burst" next "from its shell.@" diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm index 765840899..2be156fcc 100644 --- a/data/pokemon/dex_entries/magikarp.asm +++ b/data/pokemon/dex_entries/magikarp.asm @@ -1,10 +1,10 @@ -; MagikarpPokedexEntry: ; 0x1cc000 db "FISH@" ; species name dw 211, 220 ; height, weight db "This weak and" next "pathetic #MON" next "gets easily pushed" + page "along rivers when" next "there are strong" next "currents.@" diff --git a/data/pokemon/dex_entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm index 1bfa961f9..f62544b50 100644 --- a/data/pokemon/dex_entries/magmar.asm +++ b/data/pokemon/dex_entries/magmar.asm @@ -1,10 +1,10 @@ -; MagmarPokedexEntry: ; 0x1b9994 db "SPITFIRE@" ; species name dw 403, 980 ; height, weight db "It moves more" next "frequently in hot" next "areas. It can heal" + page "itself by dipping" next "its wound into" next "lava.@" diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm index e7703e050..646bd80f4 100644 --- a/data/pokemon/dex_entries/magnemite.asm +++ b/data/pokemon/dex_entries/magnemite.asm @@ -1,10 +1,10 @@ -; MagnemitePokedexEntry: ; 0x1b869d db "MAGNET@" ; species name dw 100, 130 ; height, weight db "The electricity" next "emitted by the" next "units on each side" + page "of its body cause" next "it to become a" next "strong magnet.@" diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm index 115506ad6..fff66dec7 100644 --- a/data/pokemon/dex_entries/magneton.asm +++ b/data/pokemon/dex_entries/magneton.asm @@ -1,10 +1,10 @@ -; MagnetonPokedexEntry: ; 0x1b870a db "MAGNET@" ; species name dw 303, 1320 ; height, weight db "When many" next "MAGNETON gather" next "together, the" + page "resulting magnetic" next "storm disrupts" next "radio waves.@" diff --git a/data/pokemon/dex_entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm index 59dfc4919..344e6ca0f 100644 --- a/data/pokemon/dex_entries/mankey.asm +++ b/data/pokemon/dex_entries/mankey.asm @@ -1,10 +1,10 @@ -; MankeyPokedexEntry: ; 0x182dbd db "PIG MONKEY@" ; species name dw 108, 620 ; height, weight db "It lives in groups" next "in the treetops." next "If it loses sight" + page "of its group, it" next "becomes infuriated" next "by its loneliness.@" diff --git a/data/pokemon/dex_entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm index 880c4f179..02d4c445a 100644 --- a/data/pokemon/dex_entries/mantine.asm +++ b/data/pokemon/dex_entries/mantine.asm @@ -1,10 +1,10 @@ -; MantinePokedexEntry: ; 0x1d0e25 db "KITE@" ; species name dw 611, 4850 ; height, weight db "It swims along" next "freely, eating" next "things that swim" + page "into its mouth." next "Its whole body is" next "very coarse.@" diff --git a/data/pokemon/dex_entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm index 94f78ee31..3f0492ade 100644 --- a/data/pokemon/dex_entries/mareep.asm +++ b/data/pokemon/dex_entries/mareep.asm @@ -1,10 +1,10 @@ -; MareepPokedexEntry: ; 0x1cd551 db "WOOL@" ; species name dw 200, 170 ; height, weight db "It stores lots of" next "air in its soft" next "fur, allowing it" + page "to stay cool in" next "summer and warm" next "in winter.@" diff --git a/data/pokemon/dex_entries/marill.asm b/data/pokemon/dex_entries/marill.asm index 6afbc2902..1b87ba23c 100644 --- a/data/pokemon/dex_entries/marill.asm +++ b/data/pokemon/dex_entries/marill.asm @@ -1,10 +1,10 @@ -; MarillPokedexEntry: ; 0x1cd705 db "AQUAMOUSE@" ; species name dw 104, 190 ; height, weight db "The fur on its" next "body naturally" next "repels water. It" + page "can stay dry, even" next "when it plays in" next "the water.@" diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm index 01baf04e3..18b3f2e5d 100644 --- a/data/pokemon/dex_entries/marowak.asm +++ b/data/pokemon/dex_entries/marowak.asm @@ -1,10 +1,10 @@ -; MarowakPokedexEntry: ; 0x1b90d2 db "BONEKEEPER@" ; species name dw 303, 990 ; height, weight db "Somewhere in the" next "world is a ceme-" next "tery just for" + page "MAROWAK. It gets" next "its bones from" next "those graves.@" diff --git a/data/pokemon/dex_entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm index dead64ff5..711c12b57 100644 --- a/data/pokemon/dex_entries/meganium.asm +++ b/data/pokemon/dex_entries/meganium.asm @@ -1,10 +1,10 @@ -; MeganiumPokedexEntry: ; 0x1cca54 db "HERB@" ; species name dw 511, 2220 ; height, weight db "Anyone who stands" next "beside it becomes" next "refreshed, just as" + page "if they were" next "relaxing in a" next "sunny forest.@" diff --git a/data/pokemon/dex_entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm index 9fe66977b..9897a3b60 100644 --- a/data/pokemon/dex_entries/meowth.asm +++ b/data/pokemon/dex_entries/meowth.asm @@ -1,10 +1,10 @@ -; MeowthPokedexEntry: ; 0x182c08 db "SCRATCHCAT@" ; species name dw 104, 90 ; height, weight db "It loves things" next "that sparkle. When" next "it sees a shiny" + page "object, the gold" next "coin on its head" next "shines too.@" diff --git a/data/pokemon/dex_entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm index b2c6b78b7..9ee9b8a71 100644 --- a/data/pokemon/dex_entries/metapod.asm +++ b/data/pokemon/dex_entries/metapod.asm @@ -1,10 +1,10 @@ -; MetapodPokedexEntry: ; 0x181ace db "COCOON@" ; species name dw 204, 220 ; height, weight db "This is its pre-" next "evolved form. At" next "this stage, it can" + page "only harden, so it" next "remains motionless" next "to avoid attack.@" diff --git a/data/pokemon/dex_entries/mew.asm b/data/pokemon/dex_entries/mew.asm index 9da7f6a17..66682b14c 100644 --- a/data/pokemon/dex_entries/mew.asm +++ b/data/pokemon/dex_entries/mew.asm @@ -1,10 +1,10 @@ -; MewPokedexEntry: ; 0x1cc915 db "NEW SPECIE@" ; species name dw 104, 90 ; height, weight db "Because it can" next "learn any move," next "some people began" + page "research to see if" next "it is the ancestor" next "of all #MON.@" diff --git a/data/pokemon/dex_entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm index eb41ebb90..c49e553d5 100644 --- a/data/pokemon/dex_entries/mewtwo.asm +++ b/data/pokemon/dex_entries/mewtwo.asm @@ -1,10 +1,10 @@ -; MewtwoPokedexEntry: ; 0x1cc8ae db "GENETIC@" ; species name dw 607, 2690 ; height, weight db "Said to rest qui-" next "etly in an" next "undiscovered cave," + page "this #MON was" next "created solely for" next "battling.@" diff --git a/data/pokemon/dex_entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm index 1f85ef668..660f652bc 100644 --- a/data/pokemon/dex_entries/miltank.asm +++ b/data/pokemon/dex_entries/miltank.asm @@ -1,10 +1,10 @@ -; MiltankPokedexEntry: ; 0x1d1482 db "MILK COW@" ; species name dw 311, 1660 ; height, weight db "In order to milk a" next "MILTANK, one must" next "have a knack for" + page "rhythmically pull-" next "ing up and down" next "on its udders.@" diff --git a/data/pokemon/dex_entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm index c3f1b002a..6e7e510a7 100644 --- a/data/pokemon/dex_entries/misdreavus.asm +++ b/data/pokemon/dex_entries/misdreavus.asm @@ -1,10 +1,10 @@ -; MisdreavusPokedexEntry: ; 0x1d0301 db "SCREECH@" ; species name dw 204, 20 ; height, weight db "It loves to watch" next "people it's scar-" next "ed. It frightens" + page "them by screaming" next "loudly or appear-" next "ing suddenly.@" diff --git a/data/pokemon/dex_entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm index f459d622e..d4ec793d5 100644 --- a/data/pokemon/dex_entries/moltres.asm +++ b/data/pokemon/dex_entries/moltres.asm @@ -1,10 +1,10 @@ -; MoltresPokedexEntry: ; 0x1cc706 db "FLAME@" ; species name dw 607, 1320 ; height, weight db "Legendary bird" next "#MON. It is" next "said to migrate" + page "from the south" next "along with the" next "spring.@" diff --git a/data/pokemon/dex_entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm index dce25be67..d96b9b37b 100644 --- a/data/pokemon/dex_entries/mr__mime.asm +++ b/data/pokemon/dex_entries/mr__mime.asm @@ -1,10 +1,10 @@ -; MrMimePokedexEntry: ; 0x1b97ea db "BARRIER@" ; species name dw 403, 1200 ; height, weight db "It uses the" next "mysterious" next "power it has in" + page "its fingers to" next "solidify air into" next "an invisible wall.@" diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm index 49512c99f..6db1f1867 100644 --- a/data/pokemon/dex_entries/muk.asm +++ b/data/pokemon/dex_entries/muk.asm @@ -1,10 +1,10 @@ -; MukPokedexEntry: ; 0x1b89fc db "SLUDGE@" ; species name dw 311, 660 ; height, weight db "As it moves, a" next "very strong poison" next "leaks from it," + page "making the ground" next "there barren for" next "three years.@" diff --git a/data/pokemon/dex_entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm index 6a0f42145..90d90bfbf 100644 --- a/data/pokemon/dex_entries/murkrow.asm +++ b/data/pokemon/dex_entries/murkrow.asm @@ -1,10 +1,10 @@ -; MurkrowPokedexEntry: ; 0x1d021e db "DARKNESS@" ; species name dw 108, 50 ; height, weight db "It hides any shiny" next "object it finds in" next "a secret location." + page "MURKROW and" next "MEOWTH loot one" next "another's stashes.@" diff --git a/data/pokemon/dex_entries/natu.asm b/data/pokemon/dex_entries/natu.asm index 20958dbff..04c47970c 100644 --- a/data/pokemon/dex_entries/natu.asm +++ b/data/pokemon/dex_entries/natu.asm @@ -1,10 +1,10 @@ -; NatuPokedexEntry: ; 0x1cd47d db "LITTLE BIRD@" ; species name dw 8, 40 ; height, weight db "It is extremely" next "good at climbing" next "tree trunks and" + page "likes to eat the" next "new sprouts on" next "the trees.@" diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm index 97c203064..a260ceadb 100644 --- a/data/pokemon/dex_entries/nidoking.asm +++ b/data/pokemon/dex_entries/nidoking.asm @@ -1,10 +1,10 @@ -; NidokingPokedexEntry: ; 0x182463 db "DRILL@" ; species name dw 407, 1370 ; height, weight db "It uses its thick" next "arms, legs and" next "tail to attack" + page "forcefully. Melee" next "combat is its" next "specialty.@" diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm index c0f711eb4..534546721 100644 --- a/data/pokemon/dex_entries/nidoqueen.asm +++ b/data/pokemon/dex_entries/nidoqueen.asm @@ -1,10 +1,10 @@ -; NidoqueenPokedexEntry: ; 0x18232e db "DRILL@" ; species name dw 403, 1320 ; height, weight db "The hard scales" next "that cover its" next "strong body serve" + page "as excellent" next "protection from" next "any attack.@" diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm index 4e7299b0d..9181edc20 100644 --- a/data/pokemon/dex_entries/nidoran_f.asm +++ b/data/pokemon/dex_entries/nidoran_f.asm @@ -1,10 +1,10 @@ -; NidoranFPokedexEntry: ; 0x18224b db "POISON PIN@" ; species name dw 104, 150 ; height, weight db "Small and very" next "docile, it pro-" next "tects itself with" + page "its small, poison-" next "ous horn when" next "attacked.@" diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm index 8970afc36..51ec0a530 100644 --- a/data/pokemon/dex_entries/nidoran_m.asm +++ b/data/pokemon/dex_entries/nidoran_m.asm @@ -1,10 +1,10 @@ -; NidoranMPokedexEntry: ; 0x182392 db "POISON PIN@" ; species name dw 108, 200 ; height, weight db "It constantly" next "moves its large" next "ears in many" + page "directions in" next "order to detect" next "danger right away.@" diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm index 93c1e164d..e1670a187 100644 --- a/data/pokemon/dex_entries/nidorina.asm +++ b/data/pokemon/dex_entries/nidorina.asm @@ -1,10 +1,10 @@ -; NidorinaPokedexEntry: ; 0x1822b6 db "POISON PIN@" ; species name dw 207, 440 ; height, weight db "It has a docile" next "nature. If it is" next "threatened with" + page "attack, it raises" next "the barbs that are" next "all over its body.@" diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm index 6b1403ad2..3f00ac0a5 100644 --- a/data/pokemon/dex_entries/nidorino.asm +++ b/data/pokemon/dex_entries/nidorino.asm @@ -1,10 +1,10 @@ -; NidorinoPokedexEntry: ; 0x1823fd db "POISON PIN@" ; species name dw 211, 430 ; height, weight db "It is easily" next "agitated and uses" next "its horn for" + page "offense as soon as" next "it notices an" next "attacker.@" diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm index fd3a66ffb..c0295e0f7 100644 --- a/data/pokemon/dex_entries/ninetales.asm +++ b/data/pokemon/dex_entries/ninetales.asm @@ -1,10 +1,10 @@ -; NinetalesPokedexEntry: ; 0x18260c db "FOX@" ; species name dw 307, 440 ; height, weight db "It is said to live" next "a thousand years," next "and each of its" + page "tails is loaded" next "with supernatural" next "powers.@" diff --git a/data/pokemon/dex_entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm index b939cfe05..ed04cb200 100644 --- a/data/pokemon/dex_entries/noctowl.asm +++ b/data/pokemon/dex_entries/noctowl.asm @@ -1,10 +1,10 @@ -; NoctowlPokedexEntry: ; 0x1cceb9 db "OWL@" ; species name dw 503, 900 ; height, weight db "Its extremely soft" next "feathers make no" next "sound in flight." + page "It silently sneaks" next "up on prey without" next "being detected.@" diff --git a/data/pokemon/dex_entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm index 902c1bf9a..66c539155 100644 --- a/data/pokemon/dex_entries/octillery.asm +++ b/data/pokemon/dex_entries/octillery.asm @@ -1,10 +1,10 @@ -; OctilleryPokedexEntry: ; 0x1d0d42 db "JET@" ; species name dw 211, 630 ; height, weight db "Its instinct is to" next "bury itself in" next "holes. It often" + page "steals the nesting" next "holes of others to" next "sleep in them.@" diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm index 84560c113..e8a63d81f 100644 --- a/data/pokemon/dex_entries/oddish.asm +++ b/data/pokemon/dex_entries/oddish.asm @@ -1,10 +1,10 @@ -; OddishPokedexEntry: ; 0x182836 db "WEED@" ; species name dw 108, 120 ; height, weight db "During the day, it" next "stays in the cold" next "underground to" + page "avoid the sun." next "It grows by bath-" next "ing in moonlight.@" diff --git a/data/pokemon/dex_entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm index 9f7948fe0..70c556910 100644 --- a/data/pokemon/dex_entries/omanyte.asm +++ b/data/pokemon/dex_entries/omanyte.asm @@ -1,10 +1,10 @@ -; OmanytePokedexEntry: ; 0x1cc3c1 db "SPIRAL@" ; species name dw 104, 170 ; height, weight db "In prehistoric" next "times, it swam on" next "the sea floor," + page "eating plankton." next "Its fossils are" next "sometimes found.@" diff --git a/data/pokemon/dex_entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm index 65ba92356..f2cc0caba 100644 --- a/data/pokemon/dex_entries/omastar.asm +++ b/data/pokemon/dex_entries/omastar.asm @@ -1,10 +1,10 @@ -; OmastarPokedexEntry: ; 0x1cc42e db "SPIRAL@" ; species name dw 303, 770 ; height, weight db "Its heavy shell" next "allowed it to" next "reach only nearby" + page "food. This could" next "be the reason it" next "is extinct.@" diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm index f0f88fcff..12164c5fb 100644 --- a/data/pokemon/dex_entries/onix.asm +++ b/data/pokemon/dex_entries/onix.asm @@ -1,10 +1,10 @@ -; OnixPokedexEntry: ; 0x1b8c98 db "ROCK SNAKE@" ; species name dw 2810, 4630 ; height, weight db "As it digs through" next "the ground, it" next "absorbs many hard" + page "objects. This is" next "what makes its" next "body so solid.@" diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm index 152e1fcc0..62d473c53 100644 --- a/data/pokemon/dex_entries/paras.asm +++ b/data/pokemon/dex_entries/paras.asm @@ -1,10 +1,10 @@ -; ParasPokedexEntry: ; 0x18297f db "MUSHROOM@" ; species name dw 100, 120 ; height, weight db "The tochukaso" next "growing on this" next "#MON's back" + page "orders it to" next "extract juice from" next "tree trunks.@" diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm index bd912212e..6fbf4f7f9 100644 --- a/data/pokemon/dex_entries/parasect.asm +++ b/data/pokemon/dex_entries/parasect.asm @@ -1,10 +1,10 @@ -; ParasectPokedexEntry: ; 0x1829e2 db "MUSHROOM@" ; species name dw 303, 650 ; height, weight db "When nothing's" next "left to extract" next "from the bug, the" + page "mushrooms on its" next "back leave spores" next "on the bug's egg.@" diff --git a/data/pokemon/dex_entries/persian.asm b/data/pokemon/dex_entries/persian.asm index 7ce74f6f8..9264eeca2 100644 --- a/data/pokemon/dex_entries/persian.asm +++ b/data/pokemon/dex_entries/persian.asm @@ -1,10 +1,10 @@ -; PersianPokedexEntry: ; 0x182c78 db "CLASSY CAT@" ; species name dw 303, 710 ; height, weight db "Behind its lithe," next "elegant appearance" next "lies a barbaric" + page "side. It will tear" next "apart its prey on" next "a mere whim.@" diff --git a/data/pokemon/dex_entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm index a7393e546..c32a6889e 100644 --- a/data/pokemon/dex_entries/phanpy.asm +++ b/data/pokemon/dex_entries/phanpy.asm @@ -1,10 +1,10 @@ -; PhanpyPokedexEntry: ; 0x1d1038 db "LONG NOSE@" ; species name dw 108, 740 ; height, weight db "During the desert-" next "ed morning hours," next "it comes ashore" + page "where it deftly" next "uses its trunk to" next "take a shower.@" diff --git a/data/pokemon/dex_entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm index b31976aaf..2d82c6fb1 100644 --- a/data/pokemon/dex_entries/pichu.asm +++ b/data/pokemon/dex_entries/pichu.asm @@ -1,10 +1,10 @@ -; PichuPokedexEntry: ; 0x1cd243 db "TINY MOUSE@" ; species name dw 100, 40 ; height, weight db "It is unskilled at" next "storing electric" next "power. Any kind of" + page "shock causes it to" next "discharge energy" next "spontaneously.@" diff --git a/data/pokemon/dex_entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm index 16a877427..07df086f2 100644 --- a/data/pokemon/dex_entries/pidgeot.asm +++ b/data/pokemon/dex_entries/pidgeot.asm @@ -1,10 +1,10 @@ -; PidgeotPokedexEntry: ; 0x181dd7 db "BIRD@" ; species name dw 411, 870 ; height, weight db "Its outstanding" next "vision allows it" next "to spot splashing" + page "MAGIKARP, even" next "while flying at" next "3300 feet.@" diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm index 1ab6fde5c..30a1ccebd 100644 --- a/data/pokemon/dex_entries/pidgeotto.asm +++ b/data/pokemon/dex_entries/pidgeotto.asm @@ -1,10 +1,10 @@ -; PidgeottoPokedexEntry: ; 0x181d75 db "BIRD@" ; species name dw 307, 660 ; height, weight db "It slowly flies in" next "a circular pat-" next "tern, all the" + page "while keeping a" next "sharp lookout for" next "prey.@" diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm index 491dfb9b9..cde05eb61 100644 --- a/data/pokemon/dex_entries/pidgey.asm +++ b/data/pokemon/dex_entries/pidgey.asm @@ -1,10 +1,10 @@ -; PidgeyPokedexEntry: ; 0x181cfa db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "It rapidly flaps" next "its wings in the" next "grass, stirring up" + page "a dust cloud that" next "drives insect prey" next "out into the open.@" diff --git a/data/pokemon/dex_entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm index 680e24673..699900f18 100644 --- a/data/pokemon/dex_entries/pikachu.asm +++ b/data/pokemon/dex_entries/pikachu.asm @@ -1,10 +1,10 @@ -; PikachuPokedexEntry: ; 0x1820ad db "MOUSE@" ; species name dw 104, 130 ; height, weight db "When it is anger-" next "ed, it immediately" next "discharges the" + page "energy stored in" next "the pouches in its" next "cheeks.@" diff --git a/data/pokemon/dex_entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm index 326ea4503..1c5aa36c0 100644 --- a/data/pokemon/dex_entries/piloswine.asm +++ b/data/pokemon/dex_entries/piloswine.asm @@ -1,10 +1,10 @@ -; PiloswinePokedexEntry: ; 0x1d0c01 db "SWINE@" ; species name dw 307, 1230 ; height, weight db "Although its legs" next "are short, its" next "rugged hooves" + page "prevent it from" next "slipping, even on" next "icy ground.@" diff --git a/data/pokemon/dex_entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm index 9781b094e..7d8d990b9 100644 --- a/data/pokemon/dex_entries/pineco.asm +++ b/data/pokemon/dex_entries/pineco.asm @@ -1,10 +1,10 @@ -; PinecoPokedexEntry: ; 0x1d04b0 db "BAGWORM@" ; species name dw 200, 160 ; height, weight db "It spits out a" next "fluid that it uses" next "to glue tree bark" + page "to its body. The" next "fluid hardens when" next "it touches air.@" diff --git a/data/pokemon/dex_entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm index c236b3594..331a8d4f5 100644 --- a/data/pokemon/dex_entries/pinsir.asm +++ b/data/pokemon/dex_entries/pinsir.asm @@ -1,10 +1,10 @@ -; PinsirPokedexEntry: ; 0x1b99fb db "STAGBEETLE@" ; species name dw 411, 1210 ; height, weight db "When the tempera-" next "ture drops at" next "night, it sleeps" + page "on treetops or" next "among roots where" next "it is well hidden.@" diff --git a/data/pokemon/dex_entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm index 0dea3d572..a085ad58a 100644 --- a/data/pokemon/dex_entries/politoed.asm +++ b/data/pokemon/dex_entries/politoed.asm @@ -1,10 +1,10 @@ -; PolitoedPokedexEntry: ; 0x1cd84b db "FROG@" ; species name dw 307, 750 ; height, weight db "When it expands" next "its throat to" next "croak out a tune," + page "nearby POLIWAG and" next "POLIWHIRL gather" next "immediately.@" diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm index d21677cc4..9183a15da 100644 --- a/data/pokemon/dex_entries/poliwag.asm +++ b/data/pokemon/dex_entries/poliwag.asm @@ -1,10 +1,10 @@ -; PoliwagPokedexEntry: ; 0x182f91 db "TADPOLE@" ; species name dw 200, 270 ; height, weight db "The swirl on its" next "belly is its" next "insides showing" + page "through the skin." next "It looks clearer" next "after it eats.@" diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm index 69a6ee206..df4e0e6fd 100644 --- a/data/pokemon/dex_entries/poliwhirl.asm +++ b/data/pokemon/dex_entries/poliwhirl.asm @@ -1,10 +1,10 @@ -; PoliwhirlPokedexEntry: ; 0x182ffd db "TADPOLE@" ; species name dw 303, 440 ; height, weight db "Though it is" next "skilled at walk-" next "ing, it prefers to" + page "live underwater" next "where there is" next "less danger.@" diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm index bb3e7dda5..4b4f23389 100644 --- a/data/pokemon/dex_entries/poliwrath.asm +++ b/data/pokemon/dex_entries/poliwrath.asm @@ -1,10 +1,10 @@ -; PoliwrathPokedexEntry: ; 0x183066 db "TADPOLE@" ; species name dw 403, 1190 ; height, weight db "It can use its" next "well-developed" next "arms and legs to" + page "run on the surface" next "of the water for a" next "split second.@" diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm index fa123cde1..0d82b7702 100644 --- a/data/pokemon/dex_entries/ponyta.asm +++ b/data/pokemon/dex_entries/ponyta.asm @@ -1,10 +1,10 @@ -; PonytaPokedexEntry: ; 0x1b84f2 db "FIRE HORSE@" ; species name dw 303, 660 ; height, weight db "Training by" next "jumping over grass" next "that grows longer" + page "every day has made" next "it a world-class" next "jumper.@" diff --git a/data/pokemon/dex_entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm index 9a73c9623..098a96d25 100644 --- a/data/pokemon/dex_entries/porygon.asm +++ b/data/pokemon/dex_entries/porygon.asm @@ -1,10 +1,10 @@ -; PorygonPokedexEntry: ; 0x1cc353 db "VIRTUAL@" ; species name dw 207, 800 ; height, weight db "An artificial" next "#MON created" next "due to extensive" + page "research, it can" next "perform only what" next "is in its program.@" diff --git a/data/pokemon/dex_entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm index 8591e0039..e4f5a2358 100644 --- a/data/pokemon/dex_entries/porygon2.asm +++ b/data/pokemon/dex_entries/porygon2.asm @@ -1,10 +1,10 @@ -; Porygon2PokedexEntry: ; 0x1d110c db "VIRTUAL@" ; species name dw 200, 720 ; height, weight db "This manmade" next "#MON evolved" next "from the latest" + page "technology. It" next "may have unprog-" next "rammed reactions.@" diff --git a/data/pokemon/dex_entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm index 7d7f211cc..3a96c936c 100644 --- a/data/pokemon/dex_entries/primeape.asm +++ b/data/pokemon/dex_entries/primeape.asm @@ -1,10 +1,10 @@ -; PrimeapePokedexEntry: ; 0x182e39 db "PIG MONKEY@" ; species name dw 303, 710 ; height, weight db "It will beat up" next "anyone who makes" next "it mad, even if it" + page "has to chase them" next "until the end of" next "the world.@" diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm index 088b4ff76..6a58bc9f8 100644 --- a/data/pokemon/dex_entries/psyduck.asm +++ b/data/pokemon/dex_entries/psyduck.asm @@ -1,10 +1,10 @@ -; PsyduckPokedexEntry: ; 0x182cee db "DUCK@" ; species name dw 207, 430 ; height, weight db "The only time it" next "can use its psy-" next "chic power is when" + page "its sleeping brain" next "cells happen to" next "wake.@" diff --git a/data/pokemon/dex_entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm index d35e457ad..ae8b5b3a4 100644 --- a/data/pokemon/dex_entries/pupitar.asm +++ b/data/pokemon/dex_entries/pupitar.asm @@ -1,10 +1,10 @@ -; PupitarPokedexEntry: ; 0x1d1709 db "HARD SHELL@" ; species name dw 311, 3350 ; height, weight db "It will not stay" next "still, even while" next "it's a pupa. It" + page "already has arms" next "and legs under its" next "solid shell.@" diff --git a/data/pokemon/dex_entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm index 053058d54..25bb2ab66 100644 --- a/data/pokemon/dex_entries/quagsire.asm +++ b/data/pokemon/dex_entries/quagsire.asm @@ -1,10 +1,10 @@ -; QuagsirePokedexEntry: ; 0x1d00dd db "WATER FISH@" ; species name dw 407, 1650 ; height, weight db "Its body is always" next "slimy. It often" next "bangs its head on" + page "the river bottom" next "as it swims but" next "seems not to care.@" diff --git a/data/pokemon/dex_entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm index aaf8069af..97363c158 100644 --- a/data/pokemon/dex_entries/quilava.asm +++ b/data/pokemon/dex_entries/quilava.asm @@ -1,10 +1,10 @@ -; QuilavaPokedexEntry: ; 0x1ccb33 db "VOLCANO@" ; species name dw 211, 420 ; height, weight db "Before battle, it" next "turns its back on" next "its opponent to" + page "demonstrate how" next "ferociously its" next "fire blazes.@" diff --git a/data/pokemon/dex_entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm index d9529146f..c7405b980 100644 --- a/data/pokemon/dex_entries/qwilfish.asm +++ b/data/pokemon/dex_entries/qwilfish.asm @@ -1,10 +1,10 @@ -; QwilfishPokedexEntry: ; 0x1d07b1 db "BALLOON@" ; species name dw 108, 90 ; height, weight db "When faced with a" next "larger opponent," next "it swallows as" + page "much water as it" next "can to match the" next "opponent's size.@" diff --git a/data/pokemon/dex_entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm index 886aef283..a17a5e9c2 100644 --- a/data/pokemon/dex_entries/raichu.asm +++ b/data/pokemon/dex_entries/raichu.asm @@ -1,10 +1,10 @@ -; RaichuPokedexEntry: ; 0x182117 db "MOUSE@" ; species name dw 207, 660 ; height, weight db "If its electric" next "pouches run empty," next "it raises its tail" + page "to gather electri-" next "city from the" next "atmosphere.@" diff --git a/data/pokemon/dex_entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm index 315eb84ae..4f300635f 100644 --- a/data/pokemon/dex_entries/raikou.asm +++ b/data/pokemon/dex_entries/raikou.asm @@ -1,10 +1,10 @@ -; RaikouPokedexEntry: ; 0x1d156b db "THUNDER@" ; species name dw 603, 3920 ; height, weight db "This rough #MON" next "stores energy" next "inside its body," + page "then sweeps across" next "the land, shooting" next "off electricity.@" diff --git a/data/pokemon/dex_entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm index ae98e2cb8..051e557ef 100644 --- a/data/pokemon/dex_entries/rapidash.asm +++ b/data/pokemon/dex_entries/rapidash.asm @@ -1,10 +1,10 @@ -; RapidashPokedexEntry: ; 0x1b855e db "FIRE HORSE@" ; species name dw 507, 2090 ; height, weight db "It just loves to" next "gallop. The faster" next "it goes, the long-" + page "er the swaying" next "flames of its mane" next "will become.@" diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm index f009c29aa..50898dda3 100644 --- a/data/pokemon/dex_entries/raticate.asm +++ b/data/pokemon/dex_entries/raticate.asm @@ -1,10 +1,10 @@ -; RaticatePokedexEntry: ; 0x181ea3 db "RAT@" ; species name dw 204, 410 ; height, weight db "The webs on its" next "hind legs enable" next "it to cross" + page "rivers. It search-" next "es wide areas for" next "food.@" diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm index 0a066eb74..f9e801b52 100644 --- a/data/pokemon/dex_entries/rattata.asm +++ b/data/pokemon/dex_entries/rattata.asm @@ -1,10 +1,10 @@ -; RattataPokedexEntry: ; 0x181e3d db "RAT@" ; species name dw 100, 80 ; height, weight db "This #MON's" next "impressive vital-" next "ity allows it to" + page "live anywhere. It" next "also multiplies" next "very quickly.@" diff --git a/data/pokemon/dex_entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm index aaa6f1a49..1b9b0e562 100644 --- a/data/pokemon/dex_entries/remoraid.asm +++ b/data/pokemon/dex_entries/remoraid.asm @@ -1,10 +1,10 @@ -; RemoraidPokedexEntry: ; 0x1d0cd3 db "JET@" ; species name dw 200, 260 ; height, weight db "To escape from an" next "attacker, it may" next "shoot water out of" + page "its mouth, then" next "use that force to" next "swim backward.@" diff --git a/data/pokemon/dex_entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm index c820666b3..c81141343 100644 --- a/data/pokemon/dex_entries/rhydon.asm +++ b/data/pokemon/dex_entries/rhydon.asm @@ -1,10 +1,10 @@ -; RhydonPokedexEntry: ; 0x1b93c5 db "DRILL@" ; species name dw 603, 2650 ; height, weight db "By lightly spin-" next "ning its drill-" next "like horn, it can" + page "easily shatter" next "even a diamond in" next "the rough.@" diff --git a/data/pokemon/dex_entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm index b2f26e204..d7dd8d7e1 100644 --- a/data/pokemon/dex_entries/rhyhorn.asm +++ b/data/pokemon/dex_entries/rhyhorn.asm @@ -1,10 +1,10 @@ -; RhyhornPokedexEntry: ; 0x1b935d db "SPIKES@" ; species name dw 303, 2540 ; height, weight db "It can remember" next "only one thing at" next "a time. Once it" + page "starts rushing, it" next "forgets why it" next "started.@" diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm index 2ef83f9c3..570907b31 100644 --- a/data/pokemon/dex_entries/sandshrew.asm +++ b/data/pokemon/dex_entries/sandshrew.asm @@ -1,10 +1,10 @@ -; SandshrewPokedexEntry: ; 0x182184 db "MOUSE@" ; species name dw 200, 260 ; height, weight db "It prefers dry," next "sandy places" next "because it uses" + page "the sand to" next "protect itself" next "when threatened.@" diff --git a/data/pokemon/dex_entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm index fd2492f91..9e7fc454b 100644 --- a/data/pokemon/dex_entries/sandslash.asm +++ b/data/pokemon/dex_entries/sandslash.asm @@ -1,10 +1,10 @@ -; SandslashPokedexEntry: ; 0x1821e7 db "MOUSE@" ; species name dw 303, 650 ; height, weight db "Adept at climbing" next "trees, it rolls" next "into a spiny ball," + page "then attacks its" next "enemies from" next "above.@" diff --git a/data/pokemon/dex_entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm index a000a6586..fa184c6ca 100644 --- a/data/pokemon/dex_entries/scizor.asm +++ b/data/pokemon/dex_entries/scizor.asm @@ -1,10 +1,10 @@ -; ScizorPokedexEntry: ; 0x1d0821 db "SCISSORS@" ; species name dw 511, 2600 ; height, weight db "This #MON's" next "pincers, which" next "contain steel, can" + page "crush any hard" next "object it gets a" next "hold of into bits.@" diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm index ca47c46b6..f2231dd6d 100644 --- a/data/pokemon/dex_entries/scyther.asm +++ b/data/pokemon/dex_entries/scyther.asm @@ -1,10 +1,10 @@ -; ScytherPokedexEntry: ; 0x1b9851 db "MANTIS@" ; species name dw 411, 1230 ; height, weight db "It's very proud of" next "its speed. It" next "moves so fast that" + page "its opponent does" next "not even know what" next "knocked it down.@" diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm index 91731c64a..482302ad6 100644 --- a/data/pokemon/dex_entries/seadra.asm +++ b/data/pokemon/dex_entries/seadra.asm @@ -1,10 +1,10 @@ -; SeadraPokedexEntry: ; 0x1b95b8 db "DRAGON@" ; species name dw 311, 550 ; height, weight db "The male raises" next "the young. If it" next "is approached, it" + page "uses its toxic" next "spikes to fend off" next "the intruder.@" diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm index 0d7d1fe48..1225d0bf8 100644 --- a/data/pokemon/dex_entries/seaking.asm +++ b/data/pokemon/dex_entries/seaking.asm @@ -1,10 +1,10 @@ -; SeakingPokedexEntry: ; 0x1b9690 db "GOLDFISH@" ; species name dw 403, 860 ; height, weight db "When autumn comes," next "the males patrol" next "the area around" + page "their nests in" next "order to protect" next "their offspring.@" diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm index 53d179097..ac5bdbc8a 100644 --- a/data/pokemon/dex_entries/seel.asm +++ b/data/pokemon/dex_entries/seel.asm @@ -1,10 +1,10 @@ -; SeelPokedexEntry: ; 0x1b88bf db "SEA LION@" ; species name dw 307, 1980 ; height, weight db "The light blue fur" next "that covers it" next "keeps it protected" + page "against the cold." next "It loves iceberg-" next "filled oceans.@" diff --git a/data/pokemon/dex_entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm index 9e70418c8..70f1af39e 100644 --- a/data/pokemon/dex_entries/sentret.asm +++ b/data/pokemon/dex_entries/sentret.asm @@ -1,10 +1,10 @@ -; SentretPokedexEntry: ; 0x1ccd6b db "SCOUT@" ; species name dw 207, 130 ; height, weight db "When acting as a" next "lookout, it warns" next "others of danger" + page "by screeching and" next "hitting the ground" next "with its tail.@" diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm index 0c7553c43..43d3c05a8 100644 --- a/data/pokemon/dex_entries/shellder.asm +++ b/data/pokemon/dex_entries/shellder.asm @@ -1,10 +1,10 @@ -; ShellderPokedexEntry: ; 0x1b8a68 db "BIVALVE@" ; species name dw 100, 90 ; height, weight db "Clamping on to an" next "opponent reveals" next "its vulnerable" + page "parts, so it uses" next "this move only as" next "a last resort.@" diff --git a/data/pokemon/dex_entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm index 3795942e3..4eaa349eb 100644 --- a/data/pokemon/dex_entries/shuckle.asm +++ b/data/pokemon/dex_entries/shuckle.asm @@ -1,10 +1,10 @@ -; ShucklePokedexEntry: ; 0x1d088e db "MOLD@" ; species name dw 200, 450 ; height, weight db "The fluid secreted" next "by its toes carves" next "holes in rocks for" + page "nesting and can be" next "mixed with BERRIES" next "to make a drink.@" diff --git a/data/pokemon/dex_entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm index 2558065af..46f0a12fc 100644 --- a/data/pokemon/dex_entries/skarmory.asm +++ b/data/pokemon/dex_entries/skarmory.asm @@ -1,10 +1,10 @@ -; SkarmoryPokedexEntry: ; 0x1d0e8c db "ARMOR BIRD@" ; species name dw 507, 1110 ; height, weight db "The feathers that" next "it sheds are very" next "sharp. It is said" + page "that people once" next "used the feathers" next "as swords.@" diff --git a/data/pokemon/dex_entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm index f6e62266c..2980679e8 100644 --- a/data/pokemon/dex_entries/skiploom.asm +++ b/data/pokemon/dex_entries/skiploom.asm @@ -1,10 +1,10 @@ -; SkiploomPokedexEntry: ; 0x1cd928 db "COTTONWEED@" ; species name dw 200, 20 ; height, weight db "As soon as it" next "rains, it closes" next "its flower and" + page "hides in the shade" next "of a tree to avoid" next "getting wet.@" diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm index fdfb36e98..f48be6761 100644 --- a/data/pokemon/dex_entries/slowbro.asm +++ b/data/pokemon/dex_entries/slowbro.asm @@ -1,10 +1,10 @@ -; SlowbroPokedexEntry: ; 0x1b8635 db "HERMITCRAB@" ; species name dw 503, 1730 ; height, weight db "An attached" next "SHELLDER won't let" next "go because of the" + page "tasty flavor that" next "oozes out of its" next "tail.@" diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm index f52bdb1b7..07a5c4a15 100644 --- a/data/pokemon/dex_entries/slowking.asm +++ b/data/pokemon/dex_entries/slowking.asm @@ -1,10 +1,10 @@ -; SlowkingPokedexEntry: ; 0x1d0292 db "ROYAL@" ; species name dw 607, 1750 ; height, weight db "Every time it ya-" next "wns, SHELLDER" next "injects more poi-" + page "son into it. The" next "poison makes it" next "more intelligent.@" diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm index 2341758f8..0c35e438f 100644 --- a/data/pokemon/dex_entries/slowpoke.asm +++ b/data/pokemon/dex_entries/slowpoke.asm @@ -1,10 +1,10 @@ -; SlowpokePokedexEntry: ; 0x1b85d3 db "DOPEY@" ; species name dw 311, 790 ; height, weight db "It is always so" next "absent-minded that" next "it won't react," + page "even if its" next "flavorful tail is" next "bitten.@" diff --git a/data/pokemon/dex_entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm index ea1fc01f2..d56958540 100644 --- a/data/pokemon/dex_entries/slugma.asm +++ b/data/pokemon/dex_entries/slugma.asm @@ -1,10 +1,10 @@ -; SlugmaPokedexEntry: ; 0x1d0ab8 db "LAVA@" ; species name dw 204, 770 ; height, weight db "These group to-" next "gether in areas" next "that are hotter" + page "than normal. If it" next "cools off, its" next "skin hardens.@" diff --git a/data/pokemon/dex_entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm index 8b265c1ea..98b9f69f3 100644 --- a/data/pokemon/dex_entries/smeargle.asm +++ b/data/pokemon/dex_entries/smeargle.asm @@ -1,10 +1,10 @@ -; SmearglePokedexEntry: ; 0x1d11e0 db "PAINTER@" ; species name dw 311, 1280 ; height, weight db "The color of the" next "mysterious fluid" next "secreted from its" + page "tail is predeter-" next "mined for each" next "SMEARGLE.@" diff --git a/data/pokemon/dex_entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm index b619b1720..74dbc77b8 100644 --- a/data/pokemon/dex_entries/smoochum.asm +++ b/data/pokemon/dex_entries/smoochum.asm @@ -1,10 +1,10 @@ -; SmoochumPokedexEntry: ; 0x1d132b db "KISS@" ; species name dw 104, 130 ; height, weight db "The sensitivity of" next "its lips develops" next "most quickly." + page "It uses them to" next "try to identify" next "unknown objects.@" diff --git a/data/pokemon/dex_entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm index 5c1e70f09..b2cba47fa 100644 --- a/data/pokemon/dex_entries/sneasel.asm +++ b/data/pokemon/dex_entries/sneasel.asm @@ -1,10 +1,10 @@ -; SneaselPokedexEntry: ; 0x1d097a db "SHARP CLAW@" ; species name dw 211, 620 ; height, weight db "This cunning" next "#MON hides" next "under the cover" + page "of darkness," next "waiting to attack" next "its prey.@" diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm index e56651fb8..b006777dd 100644 --- a/data/pokemon/dex_entries/snorlax.asm +++ b/data/pokemon/dex_entries/snorlax.asm @@ -1,10 +1,10 @@ -; SnorlaxPokedexEntry: ; 0x1cc5cf db "SLEEPING@" ; species name dw 611, 10140 ; height, weight db "This #MON's" next "stomach is so" next "strong, even" + page "eating moldy or" next "rotten food will" next "not affect it.@" diff --git a/data/pokemon/dex_entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm index 97b27ed8f..ca8b9bb2d 100644 --- a/data/pokemon/dex_entries/snubbull.asm +++ b/data/pokemon/dex_entries/snubbull.asm @@ -1,10 +1,10 @@ -; SnubbullPokedexEntry: ; 0x1d06e0 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "In truth, it is a" next "cowardly #MON." next "It growls eagerly" + page "in order to hide" next "its fear from its" next "opponent.@" diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm index 16b89d22f..290e721b1 100644 --- a/data/pokemon/dex_entries/spearow.asm +++ b/data/pokemon/dex_entries/spearow.asm @@ -1,10 +1,10 @@ -; SpearowPokedexEntry: ; 0x181f03 db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "To protect its" next "territory, it" next "flies around" + page "ceaselessly," next "making high-" next "pitched cries.@" diff --git a/data/pokemon/dex_entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm index e6e4c7203..8adbd74ef 100644 --- a/data/pokemon/dex_entries/spinarak.asm +++ b/data/pokemon/dex_entries/spinarak.asm @@ -1,10 +1,10 @@ -; SpinarakPokedexEntry: ; 0x1cd012 db "STRINGSPIT@" ; species name dw 108, 190 ; height, weight db "If prey becomes" next "ensnared in its" next "nest of spun" + page "string, it waits" next "motionlessly until" next "it becomes dark.@" diff --git a/data/pokemon/dex_entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm index 6fd442a13..e82e6bd6b 100644 --- a/data/pokemon/dex_entries/squirtle.asm +++ b/data/pokemon/dex_entries/squirtle.asm @@ -1,10 +1,10 @@ -; SquirtlePokedexEntry: ; 0x181926 db "TINYTURTLE@" ; species name dw 108, 200 ; height, weight db "When it feels" next "threatened, it" next "draws its legs" + page "inside its shell" next "and sprays water" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm index 0fce8f2b5..cabe544ff 100644 --- a/data/pokemon/dex_entries/stantler.asm +++ b/data/pokemon/dex_entries/stantler.asm @@ -1,10 +1,10 @@ -; StantlerPokedexEntry: ; 0x1d1174 db "BIG HORN@" ; species name dw 407, 1570 ; height, weight db "The round balls" next "found on the" next "fallen antlers can" + page "be ground into a" next "powder that aids" next "in sleeping.@" diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm index 83393b9c2..c7aa7838a 100644 --- a/data/pokemon/dex_entries/starmie.asm +++ b/data/pokemon/dex_entries/starmie.asm @@ -1,10 +1,10 @@ -; StarmiePokedexEntry: ; 0x1b9776 db "MYSTERIOUS@" ; species name dw 307, 1760 ; height, weight db "It is said that it" next "uses the seven-" next "colored core of" + page "its body to send" next "electric waves" next "into outer space.@" diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm index 9f1fadc9c..f18678d98 100644 --- a/data/pokemon/dex_entries/staryu.asm +++ b/data/pokemon/dex_entries/staryu.asm @@ -1,10 +1,10 @@ -; StaryuPokedexEntry: ; 0x1b9702 db "STARSHAPE@" ; species name dw 207, 760 ; height, weight db "When the stars" next "twinkle at night," next "it floats up from" + page "the sea floor, and" next "its body's center" next "core flickers.@" diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm index 6bbfe6c28..7d9fcc219 100644 --- a/data/pokemon/dex_entries/steelix.asm +++ b/data/pokemon/dex_entries/steelix.asm @@ -1,10 +1,10 @@ -; SteelixPokedexEntry: ; 0x1d067c db "IRON SNAKE@" ; species name dw 3002, 8820 ; height, weight db "The many small" next "metal particles" next "that cover this" + page "#MON's body" next "reflect bright" next "light well.@" diff --git a/data/pokemon/dex_entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm index 060db1d8d..f8250f5f0 100644 --- a/data/pokemon/dex_entries/sudowoodo.asm +++ b/data/pokemon/dex_entries/sudowoodo.asm @@ -1,10 +1,10 @@ -; SudowoodoPokedexEntry: ; 0x1cd7d9 db "IMITATION@" ; species name dw 311, 840 ; height, weight db "If a tree branch" next "shakes when there" next "is no wind, it's a" + page "SUDOWOODO, not a" next "tree. It hides" next "from the rain.@" diff --git a/data/pokemon/dex_entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm index c60c002f7..5b4aa9e27 100644 --- a/data/pokemon/dex_entries/suicune.asm +++ b/data/pokemon/dex_entries/suicune.asm @@ -1,10 +1,10 @@ -; SuicunePokedexEntry: ; 0x1d1642 db "AURORA@" ; species name dw 607, 4120 ; height, weight db "This divine" next "#MON blows" next "around the world," + page "always in search" next "of a pure" next "reservoir.@" diff --git a/data/pokemon/dex_entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm index 2d0e78111..2b162a526 100644 --- a/data/pokemon/dex_entries/sunflora.asm +++ b/data/pokemon/dex_entries/sunflora.asm @@ -1,10 +1,10 @@ -; SunfloraPokedexEntry: ; 0x1cdaef db "SUN@" ; species name dw 207, 190 ; height, weight db "As the hot season" next "approaches, the" next "petals on this" + page "#MON's face" next "become more vivid" next "and lively.@" diff --git a/data/pokemon/dex_entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm index 680e1799e..8264891e4 100644 --- a/data/pokemon/dex_entries/sunkern.asm +++ b/data/pokemon/dex_entries/sunkern.asm @@ -1,10 +1,10 @@ -; SunkernPokedexEntry: ; 0x1cda87 db "SEED@" ; species name dw 100, 40 ; height, weight db "It is very weak." next "Its only means of" next "defense is to" + page "shake its leaves" next "desperately at its" next "attacker.@" diff --git a/data/pokemon/dex_entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm index 3e6d61dc8..44f78aaaa 100644 --- a/data/pokemon/dex_entries/swinub.asm +++ b/data/pokemon/dex_entries/swinub.asm @@ -1,10 +1,10 @@ -; SwinubPokedexEntry: ; 0x1d0b8d db "PIG@" ; species name dw 104, 140 ; height, weight db "It uses the tip of" next "its nose to dig" next "for food. Its nose" + page "is so tough that" next "even frozen ground" next "poses no problem.@" diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm index 4e011b082..6c84cbfd1 100644 --- a/data/pokemon/dex_entries/tangela.asm +++ b/data/pokemon/dex_entries/tangela.asm @@ -1,10 +1,10 @@ -; TangelaPokedexEntry: ; 0x1b948c db "VINE@" ; species name dw 303, 770 ; height, weight db "During battle, it" next "constantly moves" next "the vines that" + page "cover its body in" next "order to annoy its" next "opponent.@" diff --git a/data/pokemon/dex_entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm index bd7851165..04a4b5ce1 100644 --- a/data/pokemon/dex_entries/tauros.asm +++ b/data/pokemon/dex_entries/tauros.asm @@ -1,10 +1,10 @@ -; TaurosPokedexEntry: ; 0x1b9a6f db "WILD BULL@" ; species name dw 407, 1950 ; height, weight db "These violent" next "#MON fight" next "with other mem-" + page "bers of their herd" next "in order to prove" next "their strength.@" diff --git a/data/pokemon/dex_entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm index 35b32c322..1d75c8299 100644 --- a/data/pokemon/dex_entries/teddiursa.asm +++ b/data/pokemon/dex_entries/teddiursa.asm @@ -1,10 +1,10 @@ -; TeddiursaPokedexEntry: ; 0x1d09da db "LITTLE BEAR@" ; species name dw 200, 190 ; height, weight db "It always licks" next "honey. Its palm" next "tastes sweet" + page "because of all the" next "honey it has" next "absorbed.@" diff --git a/data/pokemon/dex_entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm index 5ed4b4fa0..f16523c9d 100644 --- a/data/pokemon/dex_entries/tentacool.asm +++ b/data/pokemon/dex_entries/tentacool.asm @@ -1,10 +1,10 @@ -; TentacoolPokedexEntry: ; 0x1b82d1 db "JELLYFISH@" ; species name dw 211, 1000 ; height, weight db "As it floats along" next "on the waves, it" next "uses its toxic" + page "feelers to stab" next "anything it" next "touches.@" diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm index 27dad758f..c09f892e4 100644 --- a/data/pokemon/dex_entries/tentacruel.asm +++ b/data/pokemon/dex_entries/tentacruel.asm @@ -1,10 +1,10 @@ -; TentacruelPokedexEntry: ; 0x1b8337 db "JELLYFISH@" ; species name dw 503, 1210 ; height, weight db "When its 80 feel-" next "ers absorb water," next "it stretches to" + page "become like a net" next "to entangle its" next "prey.@" diff --git a/data/pokemon/dex_entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm index eb185b1f1..a295acf54 100644 --- a/data/pokemon/dex_entries/togepi.asm +++ b/data/pokemon/dex_entries/togepi.asm @@ -1,10 +1,10 @@ -; TogepiPokedexEntry: ; 0x1cd396 db "SPIKE BALL@" ; species name dw 100, 30 ; height, weight db "It is considered" next "to be a symbol of" next "good luck. Its" + page "shell is said to" next "be filled with" next "happiness.@" diff --git a/data/pokemon/dex_entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm index 7d1519d73..b638aceb3 100644 --- a/data/pokemon/dex_entries/togetic.asm +++ b/data/pokemon/dex_entries/togetic.asm @@ -1,10 +1,10 @@ -; TogeticPokedexEntry: ; 0x1cd402 db "HAPPINESS@" ; species name dw 200, 70 ; height, weight db "Although it does" next "not flap its wings" next "very much, it can" + page "stay up in the air" next "as it tags along" next "after its trainer.@" diff --git a/data/pokemon/dex_entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm index 78a1b761e..8be3ad28c 100644 --- a/data/pokemon/dex_entries/totodile.asm +++ b/data/pokemon/dex_entries/totodile.asm @@ -1,10 +1,10 @@ -; TotodilePokedexEntry: ; 0x1ccc14 db "BIG JAW@" ; species name dw 200, 210 ; height, weight db "This rough critter" next "chomps at any" next "moving object it" + page "sees. Turning your" next "back on it is not" next "recommended.@" diff --git a/data/pokemon/dex_entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm index e11823cf5..52961be46 100644 --- a/data/pokemon/dex_entries/typhlosion.asm +++ b/data/pokemon/dex_entries/typhlosion.asm @@ -1,10 +1,10 @@ -; TyphlosionPokedexEntry: ; 0x1ccba0 db "VOLCANO@" ; species name dw 507, 1750 ; height, weight db "When heat from its" next "body causes the" next "air around it to" + page "shimmer, this is a" next "sign that it is" next "ready to battle.@" diff --git a/data/pokemon/dex_entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm index 9786a6430..4d5a16672 100644 --- a/data/pokemon/dex_entries/tyranitar.asm +++ b/data/pokemon/dex_entries/tyranitar.asm @@ -1,10 +1,10 @@ -; TyranitarPokedexEntry: ; 0x1d177b db "ARMOR@" ; species name dw 607, 4450 ; height, weight db "In just one of its" next "mighty hands, it" next "has the power to" + page "make the ground" next "shake and moun-" next "tains crumble.@" diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm index d8900c160..6571e9f62 100644 --- a/data/pokemon/dex_entries/tyrogue.asm +++ b/data/pokemon/dex_entries/tyrogue.asm @@ -1,10 +1,10 @@ -; TyroguePokedexEntry: ; 0x1d124b db "SCUFFLE@" ; species name dw 204, 460 ; height, weight db "To brush up on its" next "fighting skills," next "it will challenge" + page "anyone. It has a" next "very strong com-" next "petitive spirit.@" diff --git a/data/pokemon/dex_entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm index 483322f18..206ea4070 100644 --- a/data/pokemon/dex_entries/umbreon.asm +++ b/data/pokemon/dex_entries/umbreon.asm @@ -1,10 +1,10 @@ -; UmbreonPokedexEntry: ; 0x1d01af db "MOONLIGHT@" ; species name dw 303, 600 ; height, weight db "On the night of a" next "full moon, or when" next "it gets excited," + page "the ring patterns" next "on its body glow" next "yellow.@" diff --git a/data/pokemon/dex_entries/unown.asm b/data/pokemon/dex_entries/unown.asm index 5be078b8a..60ee3b3de 100644 --- a/data/pokemon/dex_entries/unown.asm +++ b/data/pokemon/dex_entries/unown.asm @@ -1,10 +1,10 @@ -; UnownPokedexEntry: ; 0x1d0373 db "SYMBOL@" ; species name dw 108, 110 ; height, weight db "Because different" next "types of UNOWN" next "exist, it is said" + page "that they must" next "have a variety of" next "abilities.@" diff --git a/data/pokemon/dex_entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm index acf7626f9..c2f070603 100644 --- a/data/pokemon/dex_entries/ursaring.asm +++ b/data/pokemon/dex_entries/ursaring.asm @@ -1,10 +1,10 @@ -; UrsaringPokedexEntry: ; 0x1d0a41 db "HIBERNANT@" ; species name dw 511, 2770 ; height, weight db "Although it has a" next "large body, it is" next "quite skilled at" + page "climbing trees. It" next "eats and sleeps in" next "the treetops.@" diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm index 36617899f..dbbce1177 100644 --- a/data/pokemon/dex_entries/vaporeon.asm +++ b/data/pokemon/dex_entries/vaporeon.asm @@ -1,10 +1,10 @@ -; VaporeonPokedexEntry: ; 0x1cc224 db "BUBBLE JET@" ; species name dw 303, 640 ; height, weight db "As it uses the" next "fins on the tip" next "of its tail to" + page "swim, it blends" next "with the water" next "perfectly.@" diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm index 4ff583940..338f0ed8e 100644 --- a/data/pokemon/dex_entries/venomoth.asm +++ b/data/pokemon/dex_entries/venomoth.asm @@ -1,10 +1,10 @@ -; VenomothPokedexEntry: ; 0x182abf db "POISONMOTH@" ; species name dw 411, 280 ; height, weight db "The scales it" next "scatters will" next "paralyze anyone" + page "who touches them," next "making that person" next "unable to stand.@" diff --git a/data/pokemon/dex_entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm index 8e52b4c82..01e4df353 100644 --- a/data/pokemon/dex_entries/venonat.asm +++ b/data/pokemon/dex_entries/venonat.asm @@ -1,10 +1,10 @@ -; VenonatPokedexEntry: ; 0x182a53 db "INSECT@" ; species name dw 303, 660 ; height, weight db "The small bugs it" next "eats appear only" next "at night, so it" + page "sleeps in a hole" next "in a tree until" next "night falls.@" diff --git a/data/pokemon/dex_entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm index 1b9cc6e43..b5c843c15 100644 --- a/data/pokemon/dex_entries/venusaur.asm +++ b/data/pokemon/dex_entries/venusaur.asm @@ -1,10 +1,10 @@ -; VenusaurPokedexEntry: ; 0x181773 db "SEED@" ; species name dw 607, 2210 ; height, weight db "As it warms it-" next "self and absorbs" next "the sunlight, its" + page "flower petals" next "release a pleasant" next "fragrance.@" diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm index 552051572..b960cf81c 100644 --- a/data/pokemon/dex_entries/victreebel.asm +++ b/data/pokemon/dex_entries/victreebel.asm @@ -1,10 +1,10 @@ -; VictreebelPokedexEntry: ; 0x1b826e db "FLYCATCHER@" ; species name dw 507, 340 ; height, weight db "Once ingested into" next "this #MON's" next "body, even the" + page "hardest object" next "will melt into" next "nothing.@" diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm index cf2ea191d..541fd4da5 100644 --- a/data/pokemon/dex_entries/vileplume.asm +++ b/data/pokemon/dex_entries/vileplume.asm @@ -1,10 +1,10 @@ -; VileplumePokedexEntry: ; 0x182918 db "FLOWER@" ; species name dw 311, 410 ; height, weight db "By shaking its big" next "petals, it scat-" next "ters toxic pollen" + page "into the air," next "turning the air" next "yellow.@" diff --git a/data/pokemon/dex_entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm index 5a532e2d0..ddc0ffa29 100644 --- a/data/pokemon/dex_entries/voltorb.asm +++ b/data/pokemon/dex_entries/voltorb.asm @@ -1,10 +1,10 @@ -; VoltorbPokedexEntry: ; 0x1b8eb0 db "BALL@" ; species name dw 108, 230 ; height, weight db "During the study" next "of this #MON," next "it was discovered" + page "that its compo-" next "nents are not" next "found in nature.@" diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm index f5bbd03a1..0409bb91e 100644 --- a/data/pokemon/dex_entries/vulpix.asm +++ b/data/pokemon/dex_entries/vulpix.asm @@ -1,10 +1,10 @@ -; VulpixPokedexEntry: ; 0x18259b db "FOX@" ; species name dw 200, 220 ; height, weight db "As its body grows" next "larger, its six" next "warm tails become" + page "more beautiful," next "with a more luxur-" next "ious coat of fur.@" diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm index 927af5fd2..f96c6e40d 100644 --- a/data/pokemon/dex_entries/wartortle.asm +++ b/data/pokemon/dex_entries/wartortle.asm @@ -1,10 +1,10 @@ -; WartortlePokedexEntry: ; 0x181993 db "TURTLE@" ; species name dw 303, 500 ; height, weight db "Its long, furry" next "tail is a symbol" next "of longevity," + page "making it quite" next "popular among" next "older people.@" diff --git a/data/pokemon/dex_entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm index 9b81fa11d..c7e9deb00 100644 --- a/data/pokemon/dex_entries/weedle.asm +++ b/data/pokemon/dex_entries/weedle.asm @@ -1,10 +1,10 @@ -; WeedlePokedexEntry: ; 0x181bb4 db "HAIRY BUG@" ; species name dw 100, 70 ; height, weight db "The barb on top of" next "its head secretes" next "a strong poison." + page "It uses this toxic" next "barb to protect" next "itself.@" diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm index 81eb7c215..d53be6604 100644 --- a/data/pokemon/dex_entries/weepinbell.asm +++ b/data/pokemon/dex_entries/weepinbell.asm @@ -1,10 +1,10 @@ -; WeepinbellPokedexEntry: ; 0x1b81fd db "FLYCATCHER@" ; species name dw 303, 140 ; height, weight db "When it's hungry," next "it swings its" next "razor-sharp" + page "leaves, slicing up" next "any unlucky object" next "nearby for food.@" diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm index 1a7b268fd..8e02970d0 100644 --- a/data/pokemon/dex_entries/weezing.asm +++ b/data/pokemon/dex_entries/weezing.asm @@ -1,10 +1,10 @@ -; WeezingPokedexEntry: ; 0x1b92ec db "POISON GAS@" ; species name dw 311, 210 ; height, weight db "When it inhales" next "poisonous gases" next "from garbage, its" + page "body expands, and" next "its insides smell" next "much worse.@" diff --git a/data/pokemon/dex_entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm index 8ba563cce..65e9f49bb 100644 --- a/data/pokemon/dex_entries/wigglytuff.asm +++ b/data/pokemon/dex_entries/wigglytuff.asm @@ -1,10 +1,10 @@ -; WigglytuffPokedexEntry: ; 0x1826e9 db "BALLOON@" ; species name dw 303, 260 ; height, weight db "The rich, fluffy" next "fur that covers" next "its body feels so" + page "good that anyone" next "who feels it can't" next "stop touching it.@" diff --git a/data/pokemon/dex_entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm index 95aae69ab..6dcde2df9 100644 --- a/data/pokemon/dex_entries/wobbuffet.asm +++ b/data/pokemon/dex_entries/wobbuffet.asm @@ -1,10 +1,10 @@ -; WobbuffetPokedexEntry: ; 0x1d03dd db "PATIENT@" ; species name dw 403, 630 ; height, weight db "In order to con-" next "ceal its black" next "tail, it lives in" + page "a dark cave and" next "only moves about" next "at night.@" diff --git a/data/pokemon/dex_entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm index d612f2070..00f97d0d7 100644 --- a/data/pokemon/dex_entries/wooper.asm +++ b/data/pokemon/dex_entries/wooper.asm @@ -1,10 +1,10 @@ -; WooperPokedexEntry: ; 0x1d0078 db "WATER FISH@" ; species name dw 104, 190 ; height, weight db "A mucous" next "membrane covers" next "its body. Touching" + page "it barehanded will" next "cause a shooting" next "pain.@" diff --git a/data/pokemon/dex_entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm index 21a53d8fc..c285b8cb3 100644 --- a/data/pokemon/dex_entries/xatu.asm +++ b/data/pokemon/dex_entries/xatu.asm @@ -1,10 +1,10 @@ -; XatuPokedexEntry: ; 0x1cd4e9 db "MYSTIC@" ; species name dw 411, 330 ; height, weight db "Once it begins to" next "meditate at sun-" next "rise, the entire" + page "day will pass" next "before it will" next "move again.@" diff --git a/data/pokemon/dex_entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm index 9843ad289..4acf0e290 100644 --- a/data/pokemon/dex_entries/yanma.asm +++ b/data/pokemon/dex_entries/yanma.asm @@ -1,10 +1,10 @@ -; YanmaPokedexEntry: ; 0x1d0000 db "CLEAR WING@" ; species name dw 311, 840 ; height, weight db "It can see in all" next "directions without" next "moving its big" + page "eyes, helping it" next "spot attackers and" next "food right away.@" diff --git a/data/pokemon/dex_entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm index ea61198a0..3dfa33530 100644 --- a/data/pokemon/dex_entries/zapdos.asm +++ b/data/pokemon/dex_entries/zapdos.asm @@ -1,10 +1,10 @@ -; ZapdosPokedexEntry: ; 0x1cc697 db "ELECTRIC@" ; species name dw 503, 1160 ; height, weight db "Legendary bird" next "#MON. They say" next "lightning caused" + page "by the flapping of" next "its wings causes" next "summer storms.@" diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm index 8232f8bd6..0f54d51b1 100644 --- a/data/pokemon/dex_entries/zubat.asm +++ b/data/pokemon/dex_entries/zubat.asm @@ -1,10 +1,10 @@ -; ZubatPokedexEntry: ; 0x18275d db "BAT@" ; species name dw 207, 170 ; height, weight db "During the day, it" next "gathers with" next "others and hangs" + page "from the ceilings" next "of old buildings" next "and caves.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index c4ddc7280..6081757e5 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -1,4 +1,4 @@ -PokedexDataPointerTable: ; 0x44378 +PokedexDataPointerTable: ; entries correspond to constants/pokemon_constants.asm dw BulbasaurPokedexEntry dw IvysaurPokedexEntry @@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378 dw LugiaPokedexEntry dw HoOhPokedexEntry dw CelebiPokedexEntry -; 0x4456e diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 8fcb0acd1..b93238cb9 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,6 +1,6 @@ ; Every Pokémon sorted alphabetically by name. -AlphabeticalPokedexOrder: ; 0x40c65 +AlphabeticalPokedexOrder: db ABRA db AERODACTYL db AIPOM @@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65 db YANMA db ZAPDOS db ZUBAT -; 0x40d60 diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index bf7e3d298..853fbe73d 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -1,6 +1,6 @@ ; Every Pokémon sorted in New Pokédex Order. -NewPokedexOrder: ; 0x40d60 +NewPokedexOrder: db CHIKORITA db BAYLEEF db MEGANIUM @@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60 db MEWTWO db MEW db CELEBI -; 0x40e5b diff --git a/data/pokemon/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm index caa9ed7c0..3f4de2d2a 100644 --- a/data/pokemon/egg_move_pointers.asm +++ b/data/pokemon/egg_move_pointers.asm @@ -1,4 +1,4 @@ -EggMovePointers:: ; 0x23b11 +EggMovePointers:: dw BulbasaurEggMoves dw NoEggMoves dw NoEggMoves @@ -254,4 +254,3 @@ endc dw NoEggMoves dw NoEggMoves dw NoEggMoves -; 0x23d07 diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm index 886c47349..1ababff89 100644 --- a/data/pokemon/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -11,12 +11,8 @@ SECTION "Egg Moves", ROMX ; Staryu's egg moves were removed in Crystal, because Staryu is genderless ; and can only breed with Ditto. - INCLUDE "data/pokemon/egg_move_pointers.asm" - -EggMoves:: - BulbasaurEggMoves: db LIGHT_SCREEN db SKULL_BASH diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 2649bb7a1..1ec2f2886 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -3,12 +3,20 @@ INCLUDE "constants.asm" SECTION "Evolutions and Attacks", ROMX +; Evos+attacks data structure: +; - Evolution methods: +; * db EVOLVE_LEVEL, level, species +; * db EVOLVE_ITEM, used item, species +; * db EVOLVE_TRADE, held item (or -1 for none), species +; * db EVOLVE_HAPPINESS, TR_* constant (ANYTIME, MORNDAY, NITE), species +; * db EVOLVE_STAT, level, ATK_*_DEF constant (LT, GT, EQ), species +; - db 0 ; no more evolutions +; - Learnset (in increasing level order): +; * db level, move +; - db 0 ; no more level-up moves INCLUDE "data/pokemon/evos_attacks_pointers.asm" - -EvosAttacks:: - BulbasaurEvosAttacks: db EVOLVE_LEVEL, 16, IVYSAUR db 0 ; no more evolutions @@ -831,7 +839,7 @@ AbraEvosAttacks: db 0 ; no more level-up moves KadabraEvosAttacks: - db EVOLVE_TRADE, $ff, ALAKAZAM + db EVOLVE_TRADE, -1, ALAKAZAM db 0 ; no more evolutions db 1, TELEPORT db 1, KINESIS @@ -875,7 +883,7 @@ MachopEvosAttacks: db 0 ; no more level-up moves MachokeEvosAttacks: - db EVOLVE_TRADE, $ff, MACHAMP + db EVOLVE_TRADE, -1, MACHAMP db 0 ; no more evolutions db 1, LOW_KICK db 1, LEER @@ -989,7 +997,7 @@ GeodudeEvosAttacks: db 0 ; no more level-up moves GravelerEvosAttacks: - db EVOLVE_TRADE, $ff, GOLEM + db EVOLVE_TRADE, -1, GOLEM db 0 ; no more evolutions db 1, TACKLE db 1, DEFENSE_CURL @@ -1248,7 +1256,7 @@ GastlyEvosAttacks: db 0 ; no more level-up moves HaunterEvosAttacks: - db EVOLVE_TRADE, $ff, GENGAR + db EVOLVE_TRADE, -1, GENGAR db 0 ; no more evolutions db 1, HYPNOSIS db 1, LICK diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm index f6582e786..7b27c6a74 100644 --- a/data/pokemon/evos_attacks_pointers.asm +++ b/data/pokemon/evos_attacks_pointers.asm @@ -1,6 +1,6 @@ ; Evolutions and attacks are grouped together since they're both checked at level-up. -EvosAttacksPointers:: ; 0x425b1 +EvosAttacksPointers:: dw BulbasaurEvosAttacks dw IvysaurEvosAttacks dw VenusaurEvosAttacks @@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1 dw LugiaEvosAttacks dw HoOhEvosAttacks dw CelebiEvosAttacks -; 0x427a7 diff --git a/data/pokemon/ezchat_order.asm b/data/pokemon/ezchat_order.asm index 8cb860028..cb9a60d98 100644 --- a/data/pokemon/ezchat_order.asm +++ b/data/pokemon/ezchat_order.asm @@ -93,4 +93,3 @@ EZChat_SortedPokemon: .ro: db VULPIX, -1 .wa: db JUMPLUFF, TOTODILE, MACHOP ;, -1 .end: db -1 -; 11d67e diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm index 9998692ab..306ce31d9 100644 --- a/data/pokemon/rby_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -1,6 +1,6 @@ ; The original base Special stat for each Pokémon from Red/Blue -KantoMonSpecials: ; fb656 +KantoMonSpecials: db 65 ; BULBASAUR db 80 ; IVYSAUR db 100 ; VENUSAUR @@ -152,4 +152,3 @@ KantoMonSpecials: ; fb656 db 100 ; DRAGONITE db 154 ; MEWTWO db 100 ; MEW -; fb6ed diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm index e40ba0273..45efcafa0 100644 --- a/data/pokemon/rby_order.asm +++ b/data/pokemon/gen1_order.asm @@ -1,4 +1,4 @@ -Pokered_MonIndices: ; fb91c +Pokered_MonIndices: db RHYDON db KANGASKHAN db NIDORAN_M @@ -252,4 +252,3 @@ Pokered_MonIndices: ; fb91c db QWILFISH db WOBBUFFET db WOBBUFFET -; fba18 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 360b206a2..f378cbfbe 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,6 +1,6 @@ ; party menu icons -MonMenuIcons: ; 8eac4 +MonMenuIcons: db ICON_BULBASAUR ; BULBASAUR db ICON_BULBASAUR ; IVYSAUR db ICON_BULBASAUR ; VENUSAUR @@ -252,4 +252,3 @@ MonMenuIcons: ; 8eac4 db ICON_LUGIA ; LUGIA db ICON_HO_OH ; HO_OH db ICON_HUMANSHAPE ; CELEBI -; 8ebbf diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index ec2cc3c0b..a3507c203 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -1,4 +1,4 @@ -PokemonPalettes: ; a8ce +PokemonPalettes: ; entries correspond to Pokémon species, two apiece ; 000 @@ -534,5 +534,3 @@ INCLUDE "gfx/pokemon/egg/shiny.pal" ; 255 shiny RGB 23, 23, 23 RGB 17, 17, 17 - -; b0ce diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm new file mode 100644 index 000000000..5b54b84ed --- /dev/null +++ b/data/pokemon/unown_words.asm @@ -0,0 +1,65 @@ +unownword: MACRO +x = 1 +rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 +endr + db -1 +ENDM + +UnownWords: +; entries correspond to UNOWN_* form constants + dw UnownWordA + dw UnownWordA + dw UnownWordB + dw UnownWordC + dw UnownWordD + dw UnownWordE + dw UnownWordF + dw UnownWordG + dw UnownWordH + dw UnownWordI + dw UnownWordJ + dw UnownWordK + dw UnownWordL + dw UnownWordM + dw UnownWordN + dw UnownWordO + dw UnownWordP + dw UnownWordQ + dw UnownWordR + dw UnownWordS + dw UnownWordT + dw UnownWordU + dw UnownWordV + dw UnownWordW + dw UnownWordX + dw UnownWordY + dw UnownWordZ + +UnownWordA: unownword "ANGRY" +UnownWordB: unownword "BEAR" +UnownWordC: unownword "CHASE" +UnownWordD: unownword "DIRECT" +UnownWordE: unownword "ENGAGE" +UnownWordF: unownword "FIND" +UnownWordG: unownword "GIVE" +UnownWordH: unownword "HELP" +UnownWordI: unownword "INCREASE" +UnownWordJ: unownword "JOIN" +UnownWordK: unownword "KEEP" +UnownWordL: unownword "LAUGH" +UnownWordM: unownword "MAKE" +UnownWordN: unownword "NUZZLE" +UnownWordO: unownword "OBSERVE" +UnownWordP: unownword "PERFORM" +UnownWordQ: unownword "QUICKEN" +UnownWordR: unownword "REASSURE" +UnownWordS: unownword "SEARCH" +UnownWordT: unownword "TELL" +UnownWordU: unownword "UNDO" +UnownWordV: unownword "VANISH" +UnownWordW: unownword "WANT" +UnownWordX: unownword "XXXXX" +UnownWordY: unownword "YIELD" +UnownWordZ: unownword "ZOOM" diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm new file mode 100644 index 000000000..2ede9c3f9 --- /dev/null +++ b/data/pokemon/unused_pic_banks.asm @@ -0,0 +1,17 @@ +; This was a table of Pokémon sprite banks in the 1997 G/S prototype. +; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm. + +Unreferenced_MonPicBanks: + ; last mon in bank, bank # + db RAICHU, $15 + 0 + db DUGTRIO, $15 + 1 + db GRAVELER, $15 + 2 + db KRABBY, $15 + 3 + db STARMIE, $15 + 4 + db ARTICUNO, $15 + 5 + db ARIADOS, $15 + 6 ; JARANRA in pokegold-spaceworld + db ESPEON, $15 + 7 ; KOUNYA in pokegold-spaceworld + db OCTILLERY, $15 + 8 ; BOMBSEEKER in pokegold-spaceworld + db LARVITAR, $15 + 9 ; NYULA in pokegold-spaceworld + db $ff, $15 + 10 + db $ff, $15 + 11 |