diff options
| author | Ryan Tandy <ryan@nardis.ca> | 2019-10-12 12:10:39 -0700 |
|---|---|---|
| committer | Ryan Tandy <ryan@nardis.ca> | 2019-10-12 12:10:39 -0700 |
| commit | 351f50a454b7b37521f9a1c6dad3db7a302a89da (patch) | |
| tree | d3ce0d27e34fd5584e23520b36130753ab76d69a | |
| parent | 242428c722a9d92ba20f33389f4a940b04e98568 (diff) | |
Sync base_stats from pokecrystal and include in the build
Remaining differences:
- Move tutor is Crystal exclusive
- Kept hard-coded pic dimensions for now as front pics have not been extracted yet
254 files changed, 1782 insertions, 2033 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 1e1fdd27..89f05180 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,6 +1,38 @@ -BaseData0:: +tmhm: MACRO +; used in data/pokemon/base_stats/*.asm +_tms1 = 0 ; TM01-TM24 (24) +_tms2 = 0 ; TM25-TM48 (24) +_tms3 = 0 ; TM49-TM50 + HM01-HM07 (9/24) +rept _NARG + if DEF(\1_TMNUM) + if \1_TMNUM < 24 + 1 +_tms1 = _tms1 | (1 << ((\1_TMNUM) - 1)) + elif \1_TMNUM < 48 + 1 +_tms2 = _tms2 | (1 << ((\1_TMNUM) - 1 - 24)) + else +_tms3 = _tms3 | (1 << ((\1_TMNUM) - 1 - 48)) + endc + else + fail "\1 is not a TM or HM move" + endc + shift +endr +rept 3 ; TM01-TM24 (24/24) + db _tms1 & $ff +_tms1 = _tms1 >> 8 +endr +rept 3 ; TM25-TM48 (24/24) + db _tms2 & $ff +_tms2 = _tms2 >> 8 +endr +rept 2 ; TM49-TM50 + HM01-HM07 (9/16) + db _tms3 & $ff +_tms3 = _tms3 >> 8 +endr +ENDM + +BaseData:: INCLUDE "data/pokemon/base_stats/bulbasaur.asm" -BaseData1:: INCLUDE "data/pokemon/base_stats/ivysaur.asm" INCLUDE "data/pokemon/base_stats/venusaur.asm" INCLUDE "data/pokemon/base_stats/charmander.asm" diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 2c560067..e43adeec 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 63 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 b1451fc0..6db51a2e 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index fe2fed48..3a3b0c1c 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 8496cd07..6524400b 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 63 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 11eecef3..a3b97118 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 9fceaa2d..d6344a3b 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c30f4ce3..bab03666 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 63 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 263a6610..63480fe9 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 5bbd4e27..7212c293 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 3455dae6..b5567034 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index a4d78003..b2878212 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 c38fce3b..9dbff687 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 53c8b04e..920568cb 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 fd5cbcca..052f6b10 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 95fd77ac..0d45b5a9 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index c35eb2ac..000d774f 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 254 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 091824f3..0262753f 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 5616dd07..57e703b4 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 f12008d5..23a53962 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 471b76bc..49cb349d 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 255 ; 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 dn 5 , 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 dc275f5f..85971c51 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 254 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index bfa9d489..974322b6 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index bdd60175..0f8c537d 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 27a01d0b..df134b0e 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 81dded4f..f49054a2 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 e6a05fc0..a4c1c671 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index ee4d307e..9090dd6e 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 660406ba..e3f32b12 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -1,22 +1,21 @@ - db CLEEGG_FAIRY ; 035 + db CLEFAIRY ; 035 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 191 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 00c6974c..7312f36a 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 191 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 699e1e67..dc180b3e 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 359274e0..3b82a98e 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 4f5e9399..5cbed1f4 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 1bdefd1d..0d3d6666 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 7446ec02..77ac01b3 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index fcbf1a6d..192d92ac 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 1b9b7329..9515ba1c 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 74d34fef..ad7bdaeb 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index e637583b..c0511759 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 6671e852..8df89bee 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 5ebfd9b0..e81dedf2 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 d15aa2cf..e19eb4a3 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 3d35d273..5fd71a0f 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 1ec503f4..5750cc0e 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index b4477035..3905bffc 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index ccddb626..f6cd8647 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 85c85b66..614dd3d8 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 e6c0e188..b7c34d5e 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 75325001..5c08dee2 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 913b4a85..b21f2476 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 63288164..4d5aba91 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 06965d32..c8f08073 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 63 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index bfa385e1..ad1fc975 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index 6f078cfb..a11b000f 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 63 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index ce4158f3..63e96b81 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 3a298275..7913fc16 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 5ded4111..6aad891f 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 dcad8139..f67ecf4a 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 791325aa..73fe033c 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 554f80ec..ee7abe71 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 9b9a2775..c5f1c34e 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index f055a579..cfd2cd68 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index a067f4e6..6889e339 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 5fe2c06a..3e355cd0 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 4e513228..17154603 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 35f42e0f..af34fb33 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 0445503b..272fa90f 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 2f14a512..683dc99f 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 9192ef02..93acd159 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index 6dcb8f72..62fd4192 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 1f2109d5..8d31f6a5 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 222b5f8b..c9897012 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 14fc8e9b..8f02b917 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index 75fa433e..c850e167 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index fc6c5033..b3bb8f53 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index aedfebd3..f763eb07 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index 34ee72ca..83671ba2 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 0b18987e..87edf673 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index 771e1ecb..7f82b027 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 63 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 83ffe38d..051e4821 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_2, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index fcc33259..1e8128be 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index a84a18cc..95e792ba 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 6c02b2d7..7db7064d 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 0 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 69711c26..d482fcf0 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 0 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 aa3a1dd7..290d4920 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 0 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 89efe330..81d72b3d 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 255 ; 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 dn 7 , 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index 80eef90e..b71b049f 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 527e8cf4..1d5fa553 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_FAIRY, PLANT ; egg groups + 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 7b887179..87327a1d 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index be2a23b3..c47e33f6 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index 02bb9fb6..c2d5ad8f 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 4ac906c5..f19dd638 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c905cd32..213c01c9 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 191 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 4ad38664..c9383620 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 71c549f5..30871368 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 191 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index 66f606e5..29cfe9fb 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index 0a718796..754dd125 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_FAIRY, PLANT ; egg groups + 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 dcb5a80d..3e43e23b 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 254 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 05415e49..7d808046 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 5296ec1b..a5ce92bd 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index c817b3c7..da2f3bf4 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 63 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 287b3f48..8b3efd96 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 f37ff512..aa676dfd 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 254 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index c3e775ab..9117d9b8 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index aba2d5b6..d96c28ec 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index fc8f9cd3..c7b65482 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index c6adab31..0b3110bb 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index 9b80c152..d1a7ad07 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 4f1b5366..e887325e 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index f8e3cac6..71aa4d03 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + 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 3bf14229..520667d9 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 f3482104..ef27195c 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 b11e985f..c2feb731 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 6be5b50c..9fa2a759 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 2ab7ecb8..2d1e7932 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 63 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 8dea2b59..b435c956 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 63 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index e5655ec9..fdfbe606 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 63 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index d627d160..fbe1f752 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 63 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index ba690903..c616dbfc 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index 1f15e8ac..b659064e 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 e9e223e6..3d19da38 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 63 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index a505a512..6aa8e104 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 4007a8c3..ea1dbfae 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 255 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index ef3f84a9..0bed9309 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index 8cbc7cf6..6a05afa8 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_WATER_1, AMPHIBIAN ; egg groups + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 3a08afd9..5461beb0 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index c6c00e50..74d32f30 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index 2c25c0ba..e0238145 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index 4a2a9e90..a2a83bbf 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 376418c8..f9ed1478 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index ef6d1456..19b03a8c 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 a284a233..c910fa66 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 1f1845e5..39f1fdbf 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index cd1c03ef..7ab32c84 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 254 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index c05ec5f1..6f346a8a 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index f8d986d1..2c8b22f6 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 29c0122f..5d7d2bad 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index bb5ee1d6..be0b635a 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 44a5f72b..497a3b84 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 8d2df12f..4eaa2677 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c325b51a..a39933a6 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 0 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 8e29524f..a6b7c069 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 254 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 2103a7cc..71d92143 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 254 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 3094a801..62aa5bce 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 0 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index fa3d99fd..9df1dd30 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 254 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 68ade351..3dff4b4c 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 0 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 9544cdc5..d7edc784 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 191 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 715d22e1..118c8f84 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 ca64336a..d5140361 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index e6bf0e39..4fb3f051 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 afd2b9a1..a4286d90 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 275295f8..a9531fc9 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 49483f8d..e95d9882 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 331fdd67..d1c78cf6 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_BUG, PLANT ; egg groups + 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 6811e00d..c671a859 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_BUG, PLANT ; egg groups + 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 e3ead4ad..605f9e70 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 74622a5c..de41f3ed 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 7878b94d..c705e637 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index e0965178..98bd4357 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 039c4220..b6ee7dca 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c1090f68..ef4ac9f7 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 798ae457..cd8d1643 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index d4217ec7..132627f5 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 6f0634c6..0dffedc8 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 beccb651..d2564840 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 535f2bbc..a861fbe8 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_WATER_1, AMPHIBIAN ; egg groups + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index c5fe5db5..513d8a41 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_WATER_1, AMPHIBIAN ; egg groups + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index bb164e73..a19f001d 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_WATER_1, AMPHIBIAN ; egg groups + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index efef7492..52ee3375 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_WATER_1, AMPHIBIAN ; egg groups + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index ac103745..a2dfc95c 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index 241db34c..ae3d5d16 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 255 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 71314b64..b5dc451e 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 255 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index c8f4be41..11875a91 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index 51f4ab06..6ac01bd7 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 485d0e77..b2c2ff44 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + 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 c37a6e59..c00de0f3 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index ec9db3c9..4d956c25 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 1b636c11..152c91d9 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -1,22 +1,21 @@ - db QWILEGG_WATER_2 ; 211 + db QWILFISH ; 211 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index ec046cdc..46c1fc87 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 7e80f294..1d36a7a3 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index d4eb628b..ae62917b 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 78c5070a..275550e0 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 8a49bd16..e6e0286e 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 d26b125a..d6caf7f2 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index 20f1497f..20a43135 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index c6e8a85a..de143249 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 54b0e0e2..7551c0fd 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 765498ed..60cc9e48 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 8724dfc6..55e58b1a 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 dfaf0c7e..f1f22e6c 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 fcf017e9..089bac40 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 1944ac77..db87d60e 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 19cb6673..d1420d46 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index 4149be6b..11f6dba5 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 7fa79cde..fd01675a 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index c1981261..c70d4695 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 1d88eef0..9c93baec 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 d8a65fe1..473202fc 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_FAIRY, PLANT ; egg groups + 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 422a9578..2e256b36 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 683d9303..0c870f4a 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 28dfb197..e8c718b8 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index c0c19038..4f7d84dd 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index b3c30af7..b10d068f 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 726eadac..d8670632 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 254 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 6fb5b7f9..d9c9ae8a 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, 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 + ; 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 ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 09b56d07..411c83ab 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 9a53ed68..907a5483 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 14f13ccf..07b5cf9b 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 7f06e976..1a47348b 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 1f04ad02..91e27c33 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index 5f2d8a30..a8138be7 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 83a70abc..262cd612 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 255 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index ad4542e4..7a98dca2 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 255 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 919dbf16..610a3f79 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c9cdffe1..ca285cab 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c175838d..ee873321 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index a3c4861e..013dc23f 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 816b774e..b5fb9f23 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 127 ; 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 - dn 5, 5 ; frontpic dimensions + db 5 ; unknown 2 + dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 04aae03e..b754a311 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 127 ; 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 - dn 5, 5 ; frontpic dimensions + db 5 ; unknown 2 + dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 036d58b3..2b905a14 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn PLANT, PLANT ; egg groups + 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 4f9fe4f7..49406edb 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 0 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 86860369..3836fdc1 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 94bd96f0..aefb6acb 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index 4cdb0a87..ca9569cf 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm - tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index d13d20f4..e553cbde 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index 063aafe8..589e2784 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FLYING, EGG_FAIRY ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 710ab2c2..49a81790 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 31 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index 08c4abec..eb3308ef 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index 4ff7de04..c1646bc1 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate - dn EGG_MONSTER, MONSTER ; egg groups + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 59888b16..e99b00bc 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 0 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 4e9803a6..badf286f 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 5605ba3a..bf3d0f1f 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 392313ce..2d397e65 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + 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 58e4f712..1b448591 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index f4956c13..2fe61281 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 945abf46..41806ac8 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 b6ec3719..4f2b00eb 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 31 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_MONSTER, PLANT ; egg groups + 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 e400f834..db87ff76 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 c86c15bc..7c536e38 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 732d9f93..e6b83614 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 255 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index 30013e03..7cac4abb 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, FIELD ; egg groups + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; 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 ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index cc38f431..2641c32a 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 31 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index adbb35ac..feb73f77 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 c8d87371..f72242d2 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + 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 bd811b7b..74cb9d0f 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 127 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm - tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index bc07dda3..c2fb6796 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 191 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_FAST ; growth rate dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 41081e48..e04d443a 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 13a43a77..2d2ece7e 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_MEDIUM_FAST ; growth rate dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM + ; 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 ; end diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index 389ba687..d0fe363f 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 5350ecd9..0a12638f 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 127 ; 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 dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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 2677908e..6345b943 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 255 ; 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 dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm - tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT + ; 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 ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 3330a062..ec8be5e5 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 127 ; 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 dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding 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/macros/basestats.asm b/macros/basestats.asm index 25ffcc02..f2fbbee9 100644 --- a/macros/basestats.asm +++ b/macros/basestats.asm @@ -28,39 +28,3 @@ ENDM add_mt: MACRO enum \1_TMNUM ENDM - -tmhm: MACRO -x = 0 -y = 0 -w = 0 - rept _NARG - if def(\1_TMNUM) - if \1_TMNUM < 25 -x = x | (1 << ((\1_TMNUM) - 1)) - else - if \1_TMNUM < 49 -y = y | (1 << ((\1_TMNUM) - 1 - 24)) - else -w = w | (1 << ((\1_TMNUM) - 1 - 48)) - endc - endc - else - fail "\1 is not a TM, HM, or move tutor move" - endc - - shift - endr - - rept 3 - db x & $ff -x = x >> 8 - endr - rept 3 - db y & $ff -y = y >> 8 - endr - rept 2 - db w & $ff -w = w >> 8 - endr -ENDM @@ -1101,8 +1101,12 @@ GetTrainerPic:: DecompressPredef:: dr $518fa, $51b0b -BaseData:: ; 51b0b - dr $51b0b, $53a83 + +INCLUDE "data/pokemon/base_stats.asm" + +Unknown53a6b: + dr $53a6b, $53a83 + UnknownEggPic:: ; 53a83 dr $53a83, $54000 |