diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/bittybat.asm index eb58ac4..96a41a2 100644 --- a/data/pokemon/base_stats/bittybat.asm +++ b/data/pokemon/base_stats/bittybat.asm @@ -17,5 +17,5 @@ dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset - tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING + tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index a65d635..e9ec1e7 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -17,5 +17,5 @@ dn EGG_MONSTER, EGG_PLANT ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH + 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, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index bfc3bba..0145e4d 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -17,5 +17,5 @@ dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset - tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY + tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index f1fb84b..9edd242 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -17,5 +17,5 @@ dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset - tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING + tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 792924b..3e464b9 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -17,5 +17,5 @@ dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tm/hm learnset - tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT + 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, SURF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index d5ff569..a7b58bd 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -17,5 +17,5 @@ dn EGG_MONSTER, EGG_PLANT ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH + 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, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/mime_jr_.asm b/data/pokemon/base_stats/mime_jr_.asm index 0b5ab14..5911a8b 100644 --- a/data/pokemon/base_stats/mime_jr_.asm +++ b/data/pokemon/base_stats/mime_jr_.asm @@ -17,5 +17,5 @@ dn EGG_NONE, EGG_NONE ; egg groups ; tm/hm learnset - tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, 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 + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 64ef481..dfe340d 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -17,5 +17,5 @@ dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tm/hm learnset - tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT + 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, SURF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/smujj.asm b/data/pokemon/base_stats/smujj.asm index 022e9f5..8bf4942 100644 --- a/data/pokemon/base_stats/smujj.asm +++ b/data/pokemon/base_stats/smujj.asm @@ -17,5 +17,5 @@ dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tm/hm learnset - tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT + tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, SURF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 9373e85..d841d1a 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -17,5 +17,5 @@ dn EGG_MONSTER, EGG_PLANT ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH + 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, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 948dbd9..bfbb231 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -17,5 +17,5 @@ dn EGG_FLYING, EGG_FLYING ; egg groups ; tm/hm learnset - tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING + tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index b654c0c..d30d5d8 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -261,6 +261,7 @@ SpinarakEggMoves: dw SONICBOOM dw BATON_PASS dw PURSUIT + dw PIN_MISSILE dw -1 ; end ChinchouEggMoves: @@ -394,6 +395,8 @@ YanmaEggMoves: dw WHIRLWIND dw REVERSAL dw LEECH_LIFE + dw CONFUSION + dw FLAIL dw -1 ; end WooperEggMoves: @@ -481,6 +484,10 @@ QwilfishEggMoves: ShuckleEggMoves: dw SWEET_SCENT + dw MIST + dw MUD_SLAP + dw STRING_SHOT + dw ANCIENTPOWER dw -1 ; end HeracrossEggMoves: diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index a2e6135..e98e07e 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -408,6 +408,7 @@ MachopEggMoves: dw MEDITATE dw ROLLING_KICK dw ENCORE + dw BARRIER dw -1 ; end BellsproutEggMoves: diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index b341ccd..fc217db 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -196,11 +196,15 @@ ChikoritaEvosAttacks: dbw 8, RAZOR_LEAF dbw 12, REFLECT dbw 15, POISONPOWDER - dbw 22, SYNTHESIS - dbw 29, BODY_SLAM - dbw 36, LIGHT_SCREEN - dbw 43, SAFEGUARD - dbw 50, SOLARBEAM + dbw 15, STUN_SPORE ; SW97 + dbw 20, SYNTHESIS + dbw 25, BODY_SLAM + dbw 29, SLEEP_POWDER ; SW97 + dbw 34, LIGHT_SCREEN + dbw 39, GROWTH ; SW97 + dbw 44, SAFEGUARD + dbw 49, MORNING_SUN ; SW97 + dbw 55, SOLARBEAM db 0 ; no more level-up moves BayleefEvosAttacks: @@ -208,32 +212,36 @@ BayleefEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, RAZOR_LEAF - dbw 1, REFLECT dbw 8, RAZOR_LEAF dbw 12, REFLECT dbw 15, POISONPOWDER - dbw 23, SYNTHESIS - dbw 31, BODY_SLAM - dbw 39, LIGHT_SCREEN - dbw 47, SAFEGUARD - dbw 55, SOLARBEAM + dbw 15, STUN_SPORE ; SW97 + dbw 22, SYNTHESIS + dbw 27, BODY_SLAM + dbw 31, SLEEP_POWDER ; SW97 + dbw 38, LIGHT_SCREEN + dbw 43, GROWTH ; SW97 + dbw 48, SAFEGUARD + dbw 55, MORNING_SUN ; SW97 + dbw 61, SOLARBEAM db 0 ; no more level-up moves MeganiumEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, RAZOR_LEAF - dbw 1, REFLECT dbw 8, RAZOR_LEAF dbw 12, REFLECT dbw 15, POISONPOWDER - dbw 23, SYNTHESIS - dbw 31, BODY_SLAM - dbw 41, LIGHT_SCREEN - dbw 51, SAFEGUARD - dbw 61, SOLARBEAM + dbw 15, STUN_SPORE ; SW97 + dbw 22, SYNTHESIS + dbw 27, BODY_SLAM + dbw 31, SLEEP_POWDER ; SW97 + dbw 40, LIGHT_SCREEN + dbw 45, GROWTH ; SW97 + dbw 50, SAFEGUARD + dbw 59, MORNING_SUN ; SW97 + dbw 65, SOLARBEAM db 0 ; no more level-up moves CyndaquilEvosAttacks: @@ -241,12 +249,16 @@ CyndaquilEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, LEER - dbw 6, SMOKESCREEN - dbw 12, EMBER - dbw 19, QUICK_ATTACK - dbw 27, FLAME_WHEEL - dbw 36, SWIFT - dbw 46, FLAMETHROWER + dbw 6, EMBER + dbw 11, SMOKESCREEN + dbw 16, QUICK_ATTACK + dbw 20, FLAME_WHEEL + dbw 25, DEFENSE_CURL ; HGSS + dbw 31, ROLLOUT ; HGSS + dbw 37, SWIFT + dbw 43, FLAMETHROWER + dbw 49, DOUBLE_EDGE ; HGSS + dbw 55, FIRE_BLAST ; TM, substitute for Eruption db 0 ; no more level-up moves QuilavaEvosAttacks: @@ -254,27 +266,32 @@ QuilavaEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, LEER - dbw 1, SMOKESCREEN - dbw 6, SMOKESCREEN - dbw 12, EMBER - dbw 21, QUICK_ATTACK - dbw 31, FLAME_WHEEL - dbw 42, SWIFT - dbw 54, FLAMETHROWER + dbw 6, EMBER + dbw 11, SMOKESCREEN + dbw 18, QUICK_ATTACK + dbw 22, FLAME_WHEEL + dbw 27, DEFENSE_CURL ; HGSS + dbw 35, ROLLOUT ; HGSS + dbw 41, SWIFT + dbw 47, FLAMETHROWER + dbw 55, DOUBLE_EDGE ; HGSS + dbw 61, FIRE_BLAST ; TM, substitute for Eruption db 0 ; no more level-up moves TyphlosionEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, LEER - dbw 1, SMOKESCREEN - dbw 1, EMBER - dbw 6, SMOKESCREEN - dbw 12, EMBER - dbw 21, QUICK_ATTACK - dbw 31, FLAME_WHEEL - dbw 45, SWIFT - dbw 60, FLAMETHROWER + dbw 6, EMBER + dbw 11, SMOKESCREEN + dbw 18, QUICK_ATTACK + dbw 22, FLAME_WHEEL + dbw 27, DEFENSE_CURL ; HGSS + dbw 35, ROLLOUT ; HGSS + dbw 43, SWIFT + dbw 49, FLAMETHROWER + dbw 59, DOUBLE_EDGE ; HGSS + dbw 65, FIRE_BLAST ; TM, substitute for Eruption db 0 ; no more level-up moves TotodileEvosAttacks: @@ -282,13 +299,16 @@ TotodileEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 7, RAGE - dbw 13, WATER_GUN - dbw 20, BITE - dbw 27, SCARY_FACE - dbw 35, SLASH + dbw 8, WATER_GUN + dbw 12, RAGE + dbw 16, BITE + dbw 21, SCARY_FACE + dbw 27, FLAIL ; HGSS + dbw 32, SLASH + dbw 38, CRUNCH ; HGSS dbw 43, SCREECH - dbw 52, HYDRO_PUMP + dbw 49, THRASH ; HGSS + dbw 55, HYDRO_PUMP db 0 ; no more level-up moves CroconawEvosAttacks: @@ -296,139 +316,165 @@ CroconawEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, RAGE - dbw 7, RAGE - dbw 13, WATER_GUN - dbw 21, BITE - dbw 28, SCARY_FACE - dbw 37, SLASH - dbw 45, SCREECH - dbw 55, HYDRO_PUMP + dbw 8, WATER_GUN + dbw 12, RAGE + dbw 16, BITE + dbw 23, SCARY_FACE + dbw 29, FLAIL ; HGSS + dbw 34, SLASH + dbw 42, CRUNCH ; HGSS + dbw 47, SCREECH + dbw 53, THRASH ; HGSS + dbw 61, HYDRO_PUMP db 0 ; no more level-up moves FeraligatrEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, RAGE - dbw 1, WATER_GUN - dbw 7, RAGE - dbw 13, WATER_GUN - dbw 21, BITE - dbw 28, SCARY_FACE - dbw 38, SLASH - dbw 47, SCREECH - dbw 58, HYDRO_PUMP + dbw 8, WATER_GUN + dbw 12, RAGE + dbw 16, BITE + dbw 23, SCARY_FACE + dbw 29, FLAIL ; HGSS + dbw 36, SLASH + dbw 44, CRUNCH ; HGSS + dbw 49, SCREECH + dbw 57, THRASH ; HGSS + dbw 65, HYDRO_PUMP db 0 ; no more level-up moves CubburnEvosAttacks: dbbw EVOLVE_LEVEL, 16, FLAMBEAR db 0 dbw 1, SCRATCH - dbw 5, LEER - dbw 9, EMBER - dbw 14, ROAR - dbw 19, BITE - dbw 25, REST - dbw 31, FLAME_WHEEL + dbw 1, TAIL_WHIP + dbw 7, EMBER + dbw 12, ROAR + dbw 16, BITE + dbw 22, FLAME_WHEEL + dbw 28, REST + dbw 33, FURY_SWIPES dbw 38, SCARY_FACE - dbw 45, FURY_SWIPES - dbw 53, FLAMETHROWER + dbw 42, THRASH + dbw 46, FLAMETHROWER + dbw 50, SLASH + dbw 55, FIRE_BLAST db 0 FlambearEvosAttacks: dbbw EVOLVE_LEVEL, 34, BRUINOUS db 0 dbw 1, SCRATCH - dbw 5, LEER - dbw 9, EMBER - dbw 14, ROAR - dbw 21, BITE - dbw 29, REST - dbw 37, FLAME_WHEEL - dbw 46, SCARY_FACE - dbw 55, FURY_SWIPES - dbw 65, FLAMETHROWER + dbw 1, TAIL_WHIP + dbw 7, EMBER + dbw 12, ROAR + dbw 16, BITE + dbw 24, FLAME_WHEEL + dbw 30, REST + dbw 35, FURY_SWIPES + dbw 42, SCARY_FACE + dbw 46, THRASH + dbw 52, FLAMETHROWER + dbw 56, SLASH + dbw 61, FIRE_BLAST db 0 BruinousEvosAttacks: db 0 dbw 1, SCRATCH - dbw 5, LEER - dbw 9, EMBER - dbw 14, ROAR - dbw 21, BITE - dbw 29, REST - dbw 39, FLAME_WHEEL - dbw 50, SCARY_FACE - dbw 61, FURY_SWIPES - dbw 73, FLAMETHROWER + dbw 1, TAIL_WHIP + dbw 7, EMBER + dbw 12, ROAR + dbw 16, BITE + dbw 24, FLAME_WHEEL + dbw 30, REST + dbw 37, FURY_SWIPES + dbw 44, SCARY_FACE + dbw 48, THRASH + dbw 56, FLAMETHROWER + dbw 60, SLASH + dbw 65, FIRE_BLAST db 0 PalssioEvosAttacks: dbbw EVOLVE_LEVEL, 16, PRESSIO db 0 dbw 1, TACKLE - dbw 5, GROWL - dbw 8, WATER_GUN - dbw 13, BITE - dbw 19, MIST - dbw 25, AURORA_BEAM - dbw 34, SAFEGUARD - dbw 43, BODY_SLAM - dbw 53, HYDRO_PUMP + dbw 1, GROWL + dbw 7, WATER_GUN + dbw 12, BITE + dbw 16, MIST + dbw 22, CONFUSION + dbw 28, AURORA_BEAM + dbw 33, BUBBLEBEAM + dbw 38, HAZE + dbw 42, BODY_SLAM + dbw 46, SAFEGUARD + dbw 50, PSYCHIC_M + dbw 55, HYDRO_PUMP db 0 PressioEvosAttacks: dbbw EVOLVE_LEVEL, 34, DONMARIN db 0 dbw 1, TACKLE - dbw 5, GROWL - dbw 8, WATER_GUN - dbw 13, BITE - dbw 21, MIST + dbw 1, GROWL + dbw 7, WATER_GUN + dbw 12, BITE + dbw 16, MIST + dbw 24, CONFUSION dbw 30, AURORA_BEAM - dbw 40, SAFEGUARD - dbw 51, BODY_SLAM - dbw 63, HYDRO_PUMP + dbw 35, BUBBLEBEAM + dbw 42, HAZE + dbw 46, BODY_SLAM + dbw 52, SAFEGUARD + dbw 56, PSYCHIC_M + dbw 61, HYDRO_PUMP db 0 DonmarinEvosAttacks: db 0 dbw 1, TACKLE - dbw 5, GROWL - dbw 8, WATER_GUN - dbw 13, BITE - dbw 21, MIST + dbw 1, GROWL + dbw 7, WATER_GUN + dbw 12, BITE + dbw 16, MIST + dbw 24, CONFUSION dbw 30, AURORA_BEAM - dbw 43, SAFEGUARD - dbw 57, BODY_SLAM - dbw 72, HYDRO_PUMP + dbw 37, BUBBLEBEAM + dbw 44, HAZE + dbw 48, BODY_SLAM + dbw 56, SAFEGUARD + dbw 60, PSYCHIC_M + dbw 65, HYDRO_PUMP db 0 SentretEvosAttacks: dbbw EVOLVE_LEVEL, 15, FURRET db 0 ; no more evolutions - dbw 1, TACKLE + dbw 1, SCRATCH ; From Furret + dbw 1, FORESIGHT ; HGSS dbw 5, DEFENSE_CURL dbw 11, QUICK_ATTACK dbw 17, FURY_SWIPES - dbw 25, SLAM - dbw 33, REST - dbw 41, AMNESIA + dbw 23, SLAM + dbw 28, REST + dbw 34, AMNESIA + dbw 40, BATON_PASS ; HGSS db 0 ; no more level-up moves FurretEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH - dbw 1, DEFENSE_CURL - dbw 1, QUICK_ATTACK + dbw 1, FORESIGHT ; HGSS dbw 5, DEFENSE_CURL dbw 11, QUICK_ATTACK - dbw 18, FURY_SWIPES - dbw 28, SLAM - dbw 38, REST - dbw 48, AMNESIA + dbw 19, FURY_SWIPES + dbw 25, SLAM + dbw 32, REST + dbw 38, AMNESIA + dbw 46, BATON_PASS ; HGSS db 0 ; no more level-up moves HoothootEvosAttacks: @@ -439,43 +485,45 @@ HoothootEvosAttacks: dbw 6, FORESIGHT dbw 11, PECK dbw 16, HYPNOSIS - dbw 22, MEGAPHONE - dbw 28, TAKE_DOWN - dbw 34, CONFUSION + dbw 20, MEGAPHONE + dbw 25, CONFUSION + dbw 31, TAKE_DOWN + dbw 37, MEAN_LOOK ; SW97 dbw 42, REFLECT - dbw 48, DREAM_EATER - dbw 54, MOONLIGHT ; SW97 + dbw 48, MOONLIGHT ; SW97 + dbw 54, DREAM_EATER db 0 ; no more level-up moves NoctowlEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, FORESIGHT - dbw 1, PECK dbw 6, FORESIGHT dbw 11, PECK dbw 16, HYPNOSIS - dbw 23, MEGAPHONE - dbw 31, TAKE_DOWN - dbw 39, CONFUSION - dbw 49, REFLECT - dbw 57, DREAM_EATER - dbw 64, MOONLIGHT ; SW97 + dbw 20, MEGAPHONE + dbw 27, CONFUSION + dbw 33, TAKE_DOWN + dbw 39, MEAN_LOOK ; SW97 + dbw 46, REFLECT + dbw 52, MOONLIGHT ; SW97 + dbw 58, DREAM_EATER db 0 ; no more level-up moves LedybaEvosAttacks: dbbw EVOLVE_LEVEL, 18, LEDIAN db 0 ; no more evolutions dbw 1, TACKLE - dbw 8, SUPERSONIC - dbw 15, COMET_PUNCH + dbw 6, SUPERSONIC + dbw 12, QUICK_ATTACK ; SW97 + dbw 17, COMET_PUNCH dbw 22, LIGHT_SCREEN dbw 22, REFLECT - dbw 22, SAFEGUARD - dbw 29, BATON_PASS - dbw 36, SWIFT - dbw 43, AGILITY + dbw 27, BATON_PASS + dbw 32, SAFEGUARD + dbw 38, SWIFT + dbw 42, DOUBLE_TEAM ; SW97 + dbw 46, AGILITY dbw 50, DOUBLE_EDGE dbw 55, TRI_ATTACK ; SW97 db 0 ; no more level-up moves @@ -483,49 +531,55 @@ LedybaEvosAttacks: LedianEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, SUPERSONIC - dbw 1, QUICK_ATTACK ; SW97, evo move? - dbw 8, SUPERSONIC - dbw 15, COMET_PUNCH + dbw 6, SUPERSONIC + dbw 12, QUICK_ATTACK ; SW97 + dbw 17, COMET_PUNCH dbw 24, LIGHT_SCREEN dbw 24, REFLECT - dbw 24, SAFEGUARD - dbw 33, BATON_PASS + dbw 29, BATON_PASS + dbw 36, SAFEGUARD dbw 42, SWIFT - dbw 51, AGILITY - dbw 60, DOUBLE_EDGE - dbw 65, TRI_ATTACK ; SW97 + dbw 46, DOUBLE_TEAM ; SW97 + dbw 52, AGILITY + dbw 56, DOUBLE_EDGE + dbw 61, TRI_ATTACK ; SW97 db 0 ; no more level-up moves -SpinarakEvosAttacks: ; put confusion and bite somewhere +SpinarakEvosAttacks: dbbw EVOLVE_LEVEL, 22, ARIADOS db 0 ; no more evolutions dbw 1, POISON_STING dbw 1, STRING_SHOT - dbw 6, SCARY_FACE - dbw 11, CONSTRICT - dbw 17, NIGHT_SHADE - dbw 23, LEECH_LIFE - dbw 30, FURY_SWIPES + dbw 5, SCARY_FACE + dbw 9, CONSTRICT + dbw 14, BITE ; SW97 + dbw 18, NIGHT_SHADE + dbw 22, LEECH_LIFE + dbw 28, FURY_SWIPES + dbw 32, CONFUSION ; SW97 dbw 37, SPIDER_WEB - dbw 45, AGILITY - dbw 53, PSYCHIC_M + dbw 42, SCREECH + dbw 46, CROSS_CUTTER + dbw 50, AGILITY + dbw 55, PSYCHIC_M db 0 ; no more level-up moves AriadosEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_STING dbw 1, STRING_SHOT - dbw 1, SCARY_FACE - dbw 1, CONSTRICT - dbw 6, SCARY_FACE - dbw 11, CONSTRICT - dbw 17, NIGHT_SHADE - dbw 25, LEECH_LIFE - dbw 34, FURY_SWIPES - dbw 43, SPIDER_WEB - dbw 53, AGILITY - dbw 63, PSYCHIC_M + dbw 5, SCARY_FACE + dbw 9, CONSTRICT + dbw 14, BITE ; SW97 + dbw 18, NIGHT_SHADE + dbw 22, LEECH_LIFE + dbw 30, FURY_SWIPES + dbw 34, CONFUSION ; SW97 + dbw 39, SPIDER_WEB + dbw 46, SCREECH + dbw 50, CROSS_CUTTER + dbw 54, AGILITY + dbw 61, PSYCHIC_M db 0 ; no more level-up moves FolageEvosAttacks: @@ -541,27 +595,29 @@ BarreauEvosAttacks: db 0 ; no more evolutions dbw 1, CONFUSION dbw 10, CONFUSION - dbw 13, REFLECT - dbw 13, LIGHT_SCREEN - dbw 18, GUST - dbw 23, WHIRLWIND - dbw 28, PSYBEAM - dbw 34, BARRIER - dbw 40, MIRROR_COAT + dbw 12, REFLECT + dbw 12, LIGHT_SCREEN + dbw 15, GUST + dbw 20, WHIRLWIND + dbw 25, PSYBEAM + dbw 30, BARRIER + dbw 35, MIRROR_COAT + dbw 40, PSYCHIC_M db 0 ; no more level-up moves CrobatEvosAttacks: db 0 ; no more evolutions - dbw 1, SCREECH dbw 1, LEECH_LIFE - dbw 1, SUPERSONIC dbw 6, SUPERSONIC dbw 12, BITE - dbw 19, CONFUSE_RAY - dbw 30, WING_ATTACK - dbw 42, MEAN_LOOK - dbw 55, HAZE - dbw 60, MOONLIGHT ; should be evo move later + dbw 17, CONFUSE_RAY + dbw 22, WING_ATTACK + dbw 24, SCREECH + dbw 31, THRASH ; RG proto + dbw 37, CONFUSION ; RG proto + dbw 41, MEAN_LOOK + dbw 47, HAZE + dbw 53, MOONLIGHT ; SW97 db 0 ; no more level-up moves ChinchouEvosAttacks: @@ -569,27 +625,28 @@ ChinchouEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE dbw 1, THUNDER_WAVE - dbw 5, SUPERSONIC - dbw 13, FLAIL - dbw 17, WATER_GUN - dbw 25, SPARK - dbw 29, CONFUSE_RAY - dbw 37, TAKE_DOWN - dbw 41, HYDRO_PUMP + dbw 6, SUPERSONIC + dbw 12, FLAIL + dbw 18, WATER_GUN + dbw 24, SPARK + dbw 30, BUBBLEBEAM ; HGSS + dbw 35, CONFUSE_RAY + dbw 41, TAKE_DOWN + dbw 47, HYDRO_PUMP db 0 ; no more level-up moves LanturnEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE dbw 1, THUNDER_WAVE - dbw 1, SUPERSONIC - dbw 5, SUPERSONIC - dbw 13, FLAIL - dbw 17, WATER_GUN - dbw 25, SPARK - dbw 33, CONFUSE_RAY + dbw 6, SUPERSONIC + dbw 12, FLAIL + dbw 18, WATER_GUN + dbw 24, SPARK + dbw 32, BUBBLEBEAM ; HGSS + dbw 37, CONFUSE_RAY dbw 45, TAKE_DOWN - dbw 53, HYDRO_PUMP + dbw 51, HYDRO_PUMP db 0 ; no more level-up moves ReroadEvosAttacks: @@ -597,12 +654,16 @@ ReroadEvosAttacks: dbw 1, BUBBLE dbw 1, MEGAPHONE dbw 1, POUND - dbw 7, LICK - dbw 14, HORN_ATTACK - dbw 20, RAIN_DANCE - dbw 27, FURY_ATTACK - dbw 34, ENCORE - dbw 43, HORN_DRILL + dbw 6, LICK + dbw 12, HORN_ATTACK + dbw 18, RAIN_DANCE + dbw 23, SUPERSONIC + dbw 29, FURY_ATTACK + dbw 34, BUBBLEBEAM + dbw 38, SING + dbw 43, ENCORE + dbw 49, SCREECH + dbw 55, HORN_DRILL db 0 ; no more level-up moves PichuEvosAttacks: @@ -613,7 +674,7 @@ PichuEvosAttacks: dbw 6, TAIL_WHIP dbw 8, THUNDER_WAVE dbw 11, SWEET_KISS - dbw 13, SPARK ; SW97 + dbw 15, SPARK ; SW97 db 0 ; no more level-up moves CleffaEvosAttacks: @@ -641,12 +702,17 @@ TogepiEvosAttacks: db 0 ; no more evolutions dbw 1, GROWL dbw 1, CHARM + dbw 1, POISON_STING ; It has poison spines according to 99 proto dex! dbw 7, METRONOME - dbw 18, SWEET_KISS - dbw 25, ENCORE - dbw 31, SAFEGUARD - dbw 38, DOUBLE_EDGE - dbw 43, SPIKE_CANNON ; SW97 + dbw 13, SWEET_KISS + dbw 19, ENCORE + dbw 25, SPIKE_CANNON ; SW97 + dbw 31, ANCIENTPOWER ; FRLG + dbw 37, SAFEGUARD + dbw 43, PROTECT ; SW97 + dbw 49, SKULL_BASH ; SW97 + dbw 55, DOUBLE_EDGE + dbw 61, BATON_PASS ; FRLG db 0 ; no more level-up moves TogeticEvosAttacks: @@ -654,12 +720,17 @@ TogeticEvosAttacks: db 0; no more evolutions dbw 1, GROWL dbw 1, CHARM + dbw 1, POISON_STING ; It has poison spines according to 99 proto dex! dbw 7, METRONOME - dbw 18, SWEET_KISS - dbw 25, ENCORE - dbw 31, SAFEGUARD - dbw 38, DOUBLE_EDGE - dbw 43, SPIKE_CANNON ; SW97 + dbw 13, SWEET_KISS + dbw 19, ENCORE + dbw 25, SPIKE_CANNON ; SW97 + dbw 31, ANCIENTPOWER ; FRLG + dbw 37, SAFEGUARD + dbw 43, PROTECT ; SW97 + dbw 49, SKULL_BASH ; SW97 + dbw 55, DOUBLE_EDGE + dbw 61, BATON_PASS ; FRLG db 0 ; no more level-up moves TogekissEvosAttacks: @@ -668,6 +739,7 @@ TogekissEvosAttacks: dbw 1, EXTREMESPEED dbw 1, METRONOME dbw 1, CHARM + dbw 35, RECOVER ; SW97 db 0 NatuEvosAttacks: @@ -675,12 +747,12 @@ NatuEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, LEER - dbw 1, CONFUSION ; SW97 + dbw 5, CONFUSION ; SW97 dbw 10, NIGHT_SHADE dbw 15, MEAN_LOOK ; SW97 dbw 20, TELEPORT dbw 25, PSYBEAM ; SW97 - dbw 30, FUTURE_SIGHT + ; dbw 30, SYNCHRONIZE dbw 35, PURSUIT ; SW97 dbw 40, CONFUSE_RAY dbw 45, SPITE ; SW97 @@ -696,12 +768,13 @@ QatuEvosAttacks: dbw 10, NIGHT_SHADE dbw 15, MEAN_LOOK ; SW97 dbw 20, TELEPORT - dbw 25, PSYBEAM ; SW97 - dbw 35, FUTURE_SIGHT ; Synchronize - dbw 45, PURSUIT ; SW97 - dbw 50, CONFUSE_RAY - dbw 45, SPITE ; SW97 - dbw 65, PSYCHIC_M + dbw 20, FUTURE_SIGHT + dbw 27, PSYBEAM ; SW97 + ; dbw 32, SYNCHRONIZE + dbw 39, PURSUIT ; SW97 + dbw 44, CONFUSE_RAY + dbw 51, SPITE ; SW97 + dbw 56, PSYCHIC_M db 0 ; no more level-up moves XatuEvosAttacks: @@ -712,12 +785,13 @@ XatuEvosAttacks: dbw 10, NIGHT_SHADE dbw 15, MEAN_LOOK ; SW97 dbw 20, TELEPORT - dbw 25, PSYBEAM ; SW97 - dbw 35, FUTURE_SIGHT ; Synchronize - dbw 45, PURSUIT ; SW97 - dbw 50, CONFUSE_RAY - dbw 45, SPITE ; SW97 - dbw 65, PSYCHIC_M + dbw 20, FUTURE_SIGHT + dbw 27, PSYBEAM ; SW97 + ; dbw 32, SYNCHRONIZE + dbw 39, PURSUIT ; SW97 + dbw 44, CONFUSE_RAY + dbw 51, SPITE ; SW97 + dbw 56, PSYCHIC_M db 0 ; no more level-up moves MoibelleEvoAttacks: @@ -726,28 +800,31 @@ MoibelleEvoAttacks: dbw 1, SCRATCH dbw 1, GROWL dbw 6, TAIL_WHIP - dbw 10, BITE - dbw 14, HEAL_BELL - dbw 19, FAINT_ATTACK - dbw 25, LOVELY_KISS - dbw 25, SWEET_KISS - dbw 34, FURY_SWIPES - dbw 43, ATTRACT - ;dbw 50, COIN_HURL + dbw 11, BITE + dbw 17, HEAL_BELL + dbw 23, FAINT_ATTACK + dbw 29, LOVELY_KISS + dbw 29, SWEET_KISS + dbw 35, FURY_SWIPES + dbw 40, ATTRACT + dbw 46, THIEF + ;dbw 52, COIN_HURL db 0 ; no more level-up moves BelledamEvoAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 7, TAIL_WHIP - dbw 13, HEAL_BELL - dbw 19, FAINT_ATTACK - dbw 25, LOVELY_KISS - dbw 25, SWEET_KISS - dbw 37, FURY_SWIPES - dbw 49, ATTRACT - ;dbw 59, COIN_HURL + dbw 6, TAIL_WHIP + dbw 11, BITE + dbw 17, HEAL_BELL + dbw 25, FAINT_ATTACK + dbw 31, LOVELY_KISS + dbw 31, SWEET_KISS + dbw 39, FURY_SWIPES + dbw 44, ATTRACT + dbw 52, THIEF + ;dbw 58, COIN_HURL db 0 ; no more level-up moves MareepEvosAttacks: @@ -755,14 +832,15 @@ MareepEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, TAIL_WHIP ; SW97 - dbw 9, THUNDERSHOCK + dbw 7, THUNDERSHOCK + dbw 12, TAIL_WHIP ; SW97 dbw 16, THUNDER_WAVE - dbw 23, COTTON_SPORE - dbw 30, LIGHT_SCREEN - dbw 32, THUNDERBOLT ; SW97 - dbw 38, HYPNOSIS ; SW97 - dbw 43, THUNDER + dbw 22, COTTON_SPORE + dbw 28, SWIFT ; SW97 + dbw 34, LIGHT_SCREEN + dbw 40, THUNDERBOLT ; SW97 + dbw 46, HYPNOSIS ; SW97 + dbw 52, THUNDER db 0 ; no more level-up moves FlaaffyEvosAttacks: @@ -770,31 +848,30 @@ FlaaffyEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, TAIL_WHIP ; SW97 - dbw 1, THUNDERSHOCK - dbw 9, THUNDERSHOCK + dbw 7, THUNDERSHOCK + dbw 12, TAIL_WHIP ; SW97 dbw 18, THUNDER_WAVE - dbw 27, COTTON_SPORE - dbw 36, LIGHT_SCREEN - dbw 40, THUNDERBOLT ; SW97 - dbw 43, HYPNOSIS ; SW97 - dbw 50, THUNDER + dbw 24, COTTON_SPORE + dbw 30, SWIFT ; SW97 + dbw 38, LIGHT_SCREEN + dbw 44, THUNDERBOLT ; SW97 + dbw 50, HYPNOSIS ; SW97 + dbw 58, THUNDER db 0 ; no more level-up moves AmpharosEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, THUNDERSHOCK - dbw 1, TAIL_WHIP ; SW97 - dbw 9, THUNDERSHOCK + dbw 7, THUNDERSHOCK + dbw 12, TAIL_WHIP ; SW97 dbw 18, THUNDER_WAVE - dbw 27, COTTON_SPORE - dbw 30, THUNDERPUNCH - dbw 42, LIGHT_SCREEN - dbw 47, THUNDERBOLT ; SW97 - dbw 53, HYPNOSIS ; SW97 - dbw 57, THUNDER + dbw 24, COTTON_SPORE + dbw 30, SWIFT ; SW97 + dbw 40, LIGHT_SCREEN + dbw 46, THUNDERBOLT ; SW97 + dbw 54, HYPNOSIS ; SW97 + dbw 62, THUNDER db 0 ; no more level-up moves BellossomEvosAttacks: @@ -822,51 +899,58 @@ MarillEvosAttacks: dbbw EVOLVE_LEVEL, 18, AZUMARILL db 0 ; no more evolutions dbw 1, TACKLE - dbw 3, DEFENSE_CURL - dbw 6, TAIL_WHIP - dbw 10, WATER_GUN - dbw 15, ROLLOUT - dbw 21, BUBBLEBEAM - dbw 28, DOUBLE_EDGE - dbw 36, RAIN_DANCE + dbw 5, DEFENSE_CURL + dbw 9, TAIL_WHIP + dbw 13, WATER_GUN + dbw 19, ROLLOUT + dbw 25, SLAM ; from Azurill + dbw 30, BUBBLEBEAM + dbw 36, DOUBLE_EDGE + dbw 42, RAIN_DANCE + dbw 48, HYDRO_PUMP ; FRLG db 0 ; no more level-up moves AzumarillEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, DEFENSE_CURL - dbw 1, TAIL_WHIP - dbw 1, WATER_GUN - dbw 3, DEFENSE_CURL - dbw 6, TAIL_WHIP - dbw 10, WATER_GUN - dbw 15, ROLLOUT - dbw 25, BUBBLEBEAM - dbw 36, DOUBLE_EDGE + dbw 5, DEFENSE_CURL + dbw 9, TAIL_WHIP + dbw 13, WATER_GUN + dbw 21, ROLLOUT + dbw 27, SLAM ; from Azurill + dbw 34, BUBBLEBEAM + dbw 40, DOUBLE_EDGE dbw 48, RAIN_DANCE + dbw 54, HYDRO_PUMP ; FRLG db 0 ; no more level-up moves BonslyEvosAttacks: dbbw EVOLVE_LEVEL, 17, SUDOWOODO ; tentative db 0 ; no more evolutions dbw 1, ROCK_THROW - dbw 9, FLAIL - dbw 16, LOW_KICK + dbw 1, HARDEN ; HGSS egg move + dbw 6, FLAIL + dbw 11, LOW_KICK dbw 17, MIMIC - dbw 23, ROCK_SLIDE - dbw 30, FAINT_ATTACK - dbw 37, SLAM + dbw 23, FAINT_ATTACK + dbw 29, ROCK_SLIDE + dbw 35, SLAM + dbw 41, DOUBLE_EDGE ; FRLG + dbw 47, COUNTER ; FRLG move tutor db 0 ; no more level-up moves SudowoodoEvosAttacks: db 0 ; no more evolutions dbw 1, ROCK_THROW - dbw 1, MIMIC - dbw 10, FLAIL - dbw 19, LOW_KICK - dbw 28, ROCK_SLIDE - dbw 37, FAINT_ATTACK - dbw 46, SLAM + dbw 1, HARDEN ; HGSS egg move + dbw 6, FLAIL + dbw 11, LOW_KICK + dbw 17, MIMIC + dbw 25, FAINT_ATTACK + dbw 31, ROCK_SLIDE + dbw 39, SLAM + dbw 45, DOUBLE_EDGE ; FRLG + dbw 53, COUNTER ; FRLG move tutor db 0 ; no more level-up moves PolitoedEvosAttacks: @@ -874,7 +958,7 @@ PolitoedEvosAttacks: dbw 1, WATER_GUN dbw 1, HYPNOSIS dbw 1, DOUBLESLAP - dbw 1, PERISH_SONG + dbw 1, SUPERSONIC ; RG proto dbw 35, PERISH_SONG dbw 51, SWAGGER db 0 ; no more level-up moves @@ -883,15 +967,19 @@ HoppipEvosAttacks: dbbw EVOLVE_LEVEL, 18, SKIPLOOM db 0 ; no more evolutions dbw 1, SPLASH - dbw 5, SYNTHESIS + dbw 1, SYNTHESIS dbw 5, TAIL_WHIP - dbw 10, TACKLE - dbw 13, POISONPOWDER - dbw 15, STUN_SPORE - dbw 17, SLEEP_POWDER - dbw 20, LEECH_SEED - dbw 25, COTTON_SPORE + dbw 8, ABSORB ; SW97 + dbw 12, TACKLE + dbw 16, POISONPOWDER + dbw 17, STUN_SPORE + dbw 18, SLEEP_POWDER + dbw 22, LEECH_SEED + dbw 25, SLAM ; SW97 dbw 30, MEGA_DRAIN + dbw 35, GROWTH ; SW97 + dbw 39, RAZOR_LEAF ; SW97 + dbw 45, COTTON_SPORE db 0 ; no more level-up moves SkiploomEvosAttacks: @@ -899,118 +987,152 @@ SkiploomEvosAttacks: db 0 ; no more evolutions dbw 1, SPLASH dbw 1, SYNTHESIS - dbw 1, TAIL_WHIP - dbw 1, TACKLE - dbw 5, SYNTHESIS dbw 5, TAIL_WHIP - dbw 10, TACKLE - dbw 13, POISONPOWDER - dbw 15, STUN_SPORE - dbw 17, SLEEP_POWDER - dbw 22, LEECH_SEED - dbw 29, COTTON_SPORE - dbw 36, MEGA_DRAIN + dbw 8, ABSORB ; SW97 + dbw 12, TACKLE + dbw 16, POISONPOWDER + dbw 17, STUN_SPORE + dbw 18, SLEEP_POWDER + dbw 24, LEECH_SEED + dbw 27, SLAM ; SW97 + dbw 32, MEGA_DRAIN + dbw 39, GROWTH ; SW97 + dbw 43, RAZOR_LEAF ; SW97 + dbw 49, COTTON_SPORE db 0 ; no more level-up moves JumpluffEvosAttacks: db 0 ; no more evolutions dbw 1, SPLASH dbw 1, SYNTHESIS - dbw 1, TAIL_WHIP - dbw 1, TACKLE - dbw 5, SYNTHESIS dbw 5, TAIL_WHIP - dbw 10, TACKLE - dbw 13, POISONPOWDER - dbw 15, STUN_SPORE - dbw 17, SLEEP_POWDER - dbw 22, LEECH_SEED - dbw 33, COTTON_SPORE - dbw 44, MEGA_DRAIN + dbw 8, ABSORB ; SW97 + dbw 12, TACKLE + dbw 16, POISONPOWDER + dbw 17, STUN_SPORE + dbw 18, SLEEP_POWDER + dbw 24, LEECH_SEED + dbw 27, SLAM ; SW97 + dbw 34, MEGA_DRAIN + dbw 41, GROWTH ; SW97 + dbw 47, RAZOR_LEAF ; SW97 + dbw 53, COTTON_SPORE db 0 ; no more level-up moves -AipomEvosAttacks: ; put swift, encore, and mimic somewhere. maybe thief. +AipomEvosAttacks: dbbw EVOLVE_LEVEL, 32, AMBIPOM db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP dbw 6, SAND_ATTACK dbw 12, BATON_PASS - dbw 19, FURY_SWIPES + dbw 18, FURY_SWIPES + dbw 23, MUD_SLAP ; SW97 dbw 27, SWIFT + dbw 31, MIMIC ; SW97 dbw 36, SCREECH + dbw 41, THIEF ; 99 proto dbw 46, AGILITY + dbw 52, ENCORE ; SW97 db 0 ; no more level-up moves -AmbipomEvosAttacks: ; put swift, encore, and mimic somewhere +AmbipomEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP dbw 6, SAND_ATTACK dbw 12, BATON_PASS - dbw 19, FURY_SWIPES + dbw 18, FURY_SWIPES + dbw 23, MUD_SLAP ; SW97 dbw 27, SWIFT + dbw 31, MIMIC ; SW97 dbw 39, SCREECH - dbw 52, AGILITY + dbw 43, THIEF ; 99 proto + dbw 50, AGILITY + dbw 56, ENCORE ; SW97 db 0 ; no more level-up moves SunkernEvosAttacks: dbbw EVOLVE_LEVEL, 15, SUNBUD db 0 ; no more evolutions dbw 1, ABSORB + dbw 1, POUND ; From Sunflora dbw 4, GROWTH dbw 10, MEGA_DRAIN - dbw 19, SUNNY_DAY + dbw 15, LEECH_SEED ; SW97 + dbw 20, SUNNY_DAY + dbw 26, SING ; SW97 dbw 31, SYNTHESIS - dbw 46, GIGA_DRAIN + dbw 37, ENCORE ; SW97 + dbw 42, GIGA_DRAIN + dbw 48, MORNING_SUN ; SW97 db 0 ; no more level-up moves SunbudEvosAttacks: dbbw EVOLVE_ITEM, SUN_STONE, SUNFLORA db 0 ; no more evolutions dbw 1, ABSORB - dbw 1, POUND + dbw 1, POUND ; From Sunflora dbw 4, GROWTH - dbw 10, RAZOR_LEAF - dbw 21, SUNNY_DAY - dbw 28, SYNTHESIS - dbw 35, PETAL_DANCE - dbw 52, SOLARBEAM + dbw 10, MEGA_DRAIN + dbw 15, LEECH_SEED ; SW97 + dbw 15, RAZOR_LEAF + dbw 22, SUNNY_DAY + dbw 28, SING ; SW97 + dbw 33, SYNTHESIS + dbw 41, ENCORE ; SW97 + dbw 46, GIGA_DRAIN ; From Sunkern + dbw 52, MORNING_SUN ; SW97 + dbw 57, PETAL_DANCE + dbw 63, SOLARBEAM db 0 ; no more level-up moves SunfloraEvosAttacks: db 0 ; no more evolutions dbw 1, ABSORB - dbw 1, POUND + dbw 1, POUND ; From Sunflora dbw 4, GROWTH - dbw 10, RAZOR_LEAF - dbw 21, SUNNY_DAY - dbw 35, PETAL_DANCE - dbw 52, SOLARBEAM + dbw 10, MEGA_DRAIN + dbw 15, LEECH_SEED ; SW97 + dbw 15, RAZOR_LEAF + dbw 22, SUNNY_DAY + dbw 28, SING ; SW97 + dbw 33, SYNTHESIS + dbw 41, ENCORE ; SW97 + dbw 46, GIGA_DRAIN ; From Sunkern + dbw 52, MORNING_SUN ; SW97 + dbw 57, PETAL_DANCE + dbw 63, SOLARBEAM db 0 ; no more level-up moves HippunkEvosAttacks: db 0; no more evolutions + dbw 1, TACKLE dbw 1, CONFUSION - dbw 1, GROWL - dbw 7, BITE - dbw 14, STOMP - dbw 21, AMNESIA - dbw 28, ENCORE - dbw 35, FUTURE_SIGHT - dbw 42, CRUNCH + dbw 6, GROWL + dbw 10, BITE + dbw 15, SUPERSONIC + dbw 20, STOMP + dbw 25, AMNESIA + dbw 29, ENCORE + dbw 34, BEAT_UP + dbw 39, PSYBEAM + dbw 43, PERISH_SONG + dbw 48, CRUNCH + dbw 54, FUTURE_SIGHT db 0 ; no more level-up moves AercrowEvosAttacks: db 0; no more evolutions dbw 1, PECK dbw 1, MEGAPHONE - dbw 8, SUPERSONIC - dbw 14, FLAIL - dbw 21, SCARY_FACE - dbw 28, WING_ATTACK - dbw 35, PETAL_DANCE - dbw 42, FORESIGHT + dbw 7, SUPERSONIC + dbw 13, FLAIL + dbw 19, SCARY_FACE + dbw 24, WING_ATTACK + dbw 30, RAZOR_LEAF + dbw 36, FORESIGHT + dbw 43, PETAL_DANCE dbw 50, RAZOR_WIND db 0 ; no more level-up moves @@ -1018,63 +1140,73 @@ FoxfireEvosAttacks: db 0; no more evolutions dbw 1, EMBER dbw 1, LEER + dbw 6, THUNDERSHOCK dbw 12, FLAME_WHEEL dbw 17, ROAR - dbw 21, BITE - dbw 28, MORNING_SUN - dbw 34, FIRE_SPIN - dbw 40, FLAMETHROWER + dbw 22, QUICK_ATTACK + dbw 28, SPARK + dbw 34, MORNING_SUN + dbw 40, FIRE_SPIN + dbw 46, SUNNY_DAY + dbw 52, FLAMETHROWER + dbw 58, THUNDER db 0 ; no more level-up moves YanmaEvosAttacks: - dbbw EVOLVE_LEVEL, 33, YANMEGA ; to be changed + dbbw EVOLVE_LEVEL, 35, YANMEGA ; to be changed dbbw EVOLVE_LEVEL, 10, PENDING03 ; to be changed db 0 ; no more evolutions dbw 1, TACKLE dbw 1, FORESIGHT - dbw 7, QUICK_ATTACK - dbw 13, DOUBLE_TEAM - dbw 19, SONICBOOM - dbw 25, DETECT - dbw 29, SUPERSONIC - dbw 33, ANCIENTPOWER - dbw 37, SWIFT - dbw 37, WING_ATTACK - dbw 43, SCREECH + dbw 6, QUICK_ATTACK + dbw 12, DOUBLE_TEAM + dbw 17, SONICBOOM + dbw 22, HYPNOSIS ; FRLG + dbw 26, DETECT + dbw 30, SUPERSONIC + dbw 35, ANCIENTPOWER ; HGSS + dbw 38, WING_ATTACK + dbw 42, SWIFT + dbw 48, PURSUIT ; HGSS + dbw 54, SCREECH db 0 ; no more level-up moves YanmegaEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, FORESIGHT - dbw 7, QUICK_ATTACK - dbw 13, DOUBLE_TEAM - dbw 19, SONICBOOM - dbw 25, DETECT - dbw 29, SUPERSONIC - dbw 33, ANCIENTPOWER - dbw 37, SLASH - dbw 37, WING_ATTACK - dbw 43, SCREECH + dbw 6, QUICK_ATTACK + dbw 12, DOUBLE_TEAM + dbw 17, SONICBOOM + dbw 22, HYPNOSIS ; FRLG + dbw 26, DETECT + dbw 30, SUPERSONIC + dbw 35, ANCIENTPOWER ; HGSS + dbw 40, WING_ATTACK + dbw 44, SWIFT + dbw 52, PURSUIT ; HGSS + dbw 58, SCREECH + dbw 63, SLASH db 0 ; no more level-up moves Pending03EvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, FORESIGHT - dbw 1, CONFUSION - dbw 1, FLAIL - dbw 7, QUICK_ATTACK - dbw 13, DOUBLE_TEAM - dbw 19, SONICBOOM - dbw 25, DETECT - dbw 29, SUPERSONIC - dbw 33, POISONPOWDER - dbw 33, SLEEP_POWDER - dbw 33, STUN_SPORE - dbw 37, SLASH - dbw 37, WING_ATTACK - dbw 43, SCREECH + dbw 6, QUICK_ATTACK + dbw 12, DOUBLE_TEAM + dbw 17, SONICBOOM + dbw 22, HYPNOSIS ; FRLG + dbw 26, DETECT + dbw 30, SUPERSONIC + dbw 35, POISONPOWDER + dbw 35, SLEEP_POWDER + dbw 35, STUN_SPORE + dbw 40, WING_ATTACK + dbw 44, SWIFT + dbw 52, PURSUIT ; HGSS + dbw 58, SCREECH + dbw 63, SLAM db 0 ; no more level-up moves WooperEvosAttacks: @@ -1083,10 +1215,14 @@ WooperEvosAttacks: dbw 1, WATER_GUN dbw 1, POUND ; SW97 dbw 1, TAIL_WHIP - dbw 11, SLAM ; uhh put mud slap and maybe some other stuff around here + dbw 6, MUD_SLAP ; SW97 + dbw 11, SLAM + dbw 15, DEFENSE_CURL ; SW97 dbw 21, AMNESIA - dbw 31, EARTHQUAKE - dbw 41, RAIN_DANCE + dbw 27, REST ; SW97 + dbw 33, EARTHQUAKE + dbw 39, RAIN_DANCE + dbw 45, SNORE ; SW97 dbw 51, MIST dbw 51, HAZE db 0 ; no more level-up moves @@ -1094,14 +1230,18 @@ WooperEvosAttacks: QuagsireEvosAttacks: db 0 ; no more evolutions dbw 1, WATER_GUN - dbw 1, TAIL_WHIP dbw 1, POUND ; SW97 - dbw 11, SLAM ; yeah put mud slap around here + dbw 1, TAIL_WHIP + dbw 6, MUD_SLAP ; SW97 + dbw 11, SLAM + dbw 15, DEFENSE_CURL ; SW97 dbw 23, AMNESIA - dbw 35, EARTHQUAKE - dbw 47, RAIN_DANCE - dbw 59, MIST - dbw 59, HAZE + dbw 29, REST ; SW97 + dbw 37, EARTHQUAKE + dbw 43, RAIN_DANCE + dbw 51, SNORE ; SW97 + dbw 57, MIST + dbw 57, HAZE db 0 ; no more level-up moves EspeonEvosAttacks: @@ -1110,7 +1250,8 @@ EspeonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, CONFUSION - dbw 23, QUICK_ATTACK + dbw 20, HYPNOSIS ; 99 Proto + dbw 25, QUICK_ATTACK dbw 30, SWIFT dbw 36, PSYBEAM dbw 42, PSYCH_UP @@ -1124,6 +1265,7 @@ UmbreonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, PURSUIT + dbw 20, THIEF ; 99 Proto dbw 23, QUICK_ATTACK dbw 30, CONFUSE_RAY dbw 36, FAINT_ATTACK @@ -1138,12 +1280,13 @@ LeafeonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, ABSORB - dbw 23, QUICK_ATTACK + dbw 20, SYNTHESIS + dbw 25, QUICK_ATTACK dbw 30, GROWTH dbw 36, RAZOR_LEAF dbw 42, TAKE_DOWN - dbw 47, SYNTHESIS - dbw 52, SOLARBEAM + dbw 47, SOLARBEAM + dbw 52, SWORDS_DANCE ; HGSS db 0 ; no more level-up moves GlaceonEvosAttacks: @@ -1152,9 +1295,10 @@ GlaceonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, AURORA_BEAM - dbw 23, QUICK_ATTACK - dbw 30, MIST - dbw 36, HAZE + dbw 20, MIST + dbw 25, QUICK_ATTACK + dbw 30, HAZE + dbw 36, MIRROR_COAT ; HGSS dbw 42, TAKE_DOWN dbw 47, BLIZZARD dbw 52, BARRIER @@ -1166,11 +1310,12 @@ SylveonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, POUND ; DISARMING_VOICE - dbw 23, QUICK_ATTACK + dbw 20, CHARM + dbw 25, QUICK_ATTACK dbw 30, POUND ; DRAINING_KISS dbw 36, POUND ; DAZZLING_GLEAM dbw 42, SWIFT - dbw 47, CHARM + dbw 47, PSYCH_UP ; XY dbw 52, LIGHT_SCREEN db 0 ; no more level-up moves @@ -1179,13 +1324,15 @@ MurkrowEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, SAND_ATTACK ; SW97 - dbw 8, FORESIGHT ; SW97 - dbw 11, PURSUIT + dbw 7, FORESIGHT ; SW97 + dbw 12, PURSUIT dbw 16, HAZE + dbw 22, FURY_ATTACK ; SW97 dbw 26, NIGHT_SHADE dbw 31, FAINT_ATTACK dbw 36, SPIKES ; SW97 dbw 41, MEAN_LOOK + dbw 45, DETECT ; SW97 dbw 50, PERISH_SONG ; SW97 db 0 ; no more level-up moves @@ -1196,6 +1343,7 @@ HonchkrowEvosAttacks: dbw 1, HAZE dbw 1, WING_ATTACK dbw 25, SWAGGER + dbw 35, PERISH_SONG ; SW97 db 0 ; no more level-up moves SlowkingEvosAttacks: @@ -1203,12 +1351,16 @@ SlowkingEvosAttacks: dbw 1, CURSE dbw 1, TACKLE dbw 6, GROWL + dbw 10, BIDE ; RG proto dbw 15, WATER_GUN dbw 20, CONFUSION + dbw 25, PSYCH_UP ; FRLG dbw 29, DISABLE dbw 34, HEADBUTT - dbw 43, SWAGGER - dbw 48, PSYCHIC_M + dbw 37, SWAGGER ; FRLG + dbw 41, SUPERSONIC ; RG proto + dbw 45, AMNESIA + dbw 52, PSYCHIC_M db 0 ; no more level-up moves MisdreavusEvosAttacks: @@ -1216,13 +1368,14 @@ MisdreavusEvosAttacks: db 0 ; no more evolutions dbw 1, GROWL dbw 1, PSYWAVE - dbw 6, SPITE - dbw 12, CONFUSE_RAY - dbw 19, MEAN_LOOK - dbw 27, PSYBEAM - dbw 36, PAIN_SPLIT - dbw 46, PERISH_SONG - dbw 50, SAFEGUARD ; SW99 + dbw 7, SPITE + dbw 13, CONFUSE_RAY + dbw 20, MEAN_LOOK + dbw 26, PSYBEAM + dbw 33, PAIN_SPLIT + dbw 40, SHADOW_BALL ; HGSS + dbw 47, PERISH_SONG + dbw 53, SAFEGUARD ; 99 proto db 0 ; no more level-up moves MismagiusEvosAttacks: @@ -1232,6 +1385,7 @@ MismagiusEvosAttacks: dbw 1, SPITE dbw 1, CONFUSE_RAY dbw 25, PSYCH_UP + dbw 35, SAFEGUARD ; 99 proto db 0 ; no more level-up moves StromenEvosAttacks: @@ -1239,13 +1393,16 @@ StromenEvosAttacks: db 0 ; no more evolutions dbw 1, LEECH_LIFE dbw 8, DISABLE - dbw 16, DESTINY_BOND - dbw 25, SPITE - dbw 35, CONFUSION - dbw 46, NIGHT_SHADE - dbw 58, SUBSTITUTE - dbw 71, PSYCHIC_M - dbw 85, PAIN_SPLIT + dbw 14, DESTINY_BOND + dbw 19, SPITE + dbw 25, CONFUSION + dbw 30, BEAT_UP + dbw 36, NIGHT_SHADE + dbw 40, SUBSTITUTE + dbw 44, FAINT_ATTACK + dbw 50, PSYCHIC_M + dbw 54, PAIN_SPLIT + dbw 60, SHADOW_BALL dbw 100, CURSE db 0 ; no more level-up moves @@ -1253,18 +1410,23 @@ PhandarinEvosAttacks: db 0 ; no more evolutions dbw 1, LEECH_LIFE dbw 8, DISABLE - dbw 16, SPLASH - dbw 25, SPITE - dbw 35, POUND ; DRAINING_KISS - dbw 46, NIGHT_SHADE - dbw 58, SUBSTITUTE - dbw 71, POUND ; DAZZLING_GLEAM - dbw 85, PAIN_SPLIT + dbw 14, SPLASH + dbw 19, SPITE + dbw 25, CONFUSION + dbw 30, POUND ; DRAINING_KISS + dbw 36, NIGHT_SHADE + dbw 40, SUBSTITUTE + dbw 44, POUND ; DAZZLING_GLEAM + dbw 50, PSYCHIC_M + dbw 54, PAIN_SPLIT + dbw 60, SHADOW_BALL + dbw 100, RETURN db 0 ; no more level-up moves UnownEvosAttacks: db 0 ; no more evolutions dbw 1, HIDDEN_POWER + dbw 25, PSYWAVE ; SW97 db 0 ; no more level-up moves WynautEvosAttacks: @@ -1277,6 +1439,7 @@ WynautEvosAttacks: dbw 15, MIRROR_COAT dbw 15, SAFEGUARD dbw 15, DESTINY_BOND + dbw 20, MIMIC ; Event & FRLG Tutor db 0 ; no more level-up moves WobbuffetEvosAttacks: @@ -1285,6 +1448,7 @@ WobbuffetEvosAttacks: dbw 1, MIRROR_COAT dbw 1, SAFEGUARD dbw 1, DESTINY_BOND + dbw 40, MEAN_LOOK ; to make Wobbuffet actually function db 0 ; no more level-up moves BipullaEvosAttacks: @@ -1294,10 +1458,10 @@ BipullaEvosAttacks: dbw 1, GROWL dbw 7, CONFUSION dbw 13, LICK - dbw 20, AGILITY - dbw 27, BATON_PASS - dbw 35, PSYBEAM - dbw 42, CRUNCH + dbw 19, AGILITY + dbw 25, BATON_PASS + dbw 31, PSYBEAM + dbw 37, CRUNCH dbw 45, PSYCHIC_M db 0 ; no more level-up moves @@ -1307,48 +1471,48 @@ GirafarigEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, DOUBLE_KICK ; SW97 dbw 1, SAND_ATTACK ; SW97 dbw 7, CONFUSION dbw 13, LICK - dbw 17, STOMP - dbw 22, AGILITY - dbw 32, BATON_PASS - dbw 44, PSYBEAM - dbw 55, CRUNCH - dbw 62, PSYCHIC_M + dbw 19, AGILITY + dbw 24, STOMP + dbw 27, BATON_PASS + dbw 33, DOUBLE_KICK ; SW97 + dbw 39, PSYBEAM + dbw 45, CRUNCH + dbw 51, PSYCHIC_M db 0 ; no more level-up moves FarigirafEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, DOUBLE_KICK ; SW97 dbw 1, SAND_ATTACK ; SW97 dbw 7, CONFUSION dbw 13, LICK - dbw 17, STOMP - dbw 22, AGILITY - dbw 32, BATON_PASS - dbw 44, PSYBEAM - dbw 56, CRUNCH - dbw 65, PSYCHIC_M + dbw 19, AGILITY + dbw 24, STOMP + dbw 27, BATON_PASS + dbw 33, DOUBLE_KICK ; SW97 + dbw 39, PSYBEAM + dbw 47, CRUNCH + dbw 55, PSYCHIC_M db 0 ; no more level-up moves EmordromeEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, SPITE - dbw 1, DOUBLE_KICK ; SW97 dbw 1, SAND_ATTACK ; SW97 dbw 7, CONFUSION dbw 13, LICK - dbw 17, STOMP - dbw 22, AGILITY - dbw 32, BATON_PASS - dbw 44, SHADOW_BALL - dbw 56, CRUNCH - dbw 65, DESTINY_BOND + dbw 19, AGILITY + dbw 24, STOMP + dbw 27, BATON_PASS + dbw 33, DOUBLE_KICK ; SW97 + dbw 39, SHADOW_BALL + dbw 47, CRUNCH + dbw 55, DESTINY_BOND db 0 ; no more level-up moves PinecoEvosAttacks: @@ -1356,27 +1520,33 @@ PinecoEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, PROTECT - dbw 8, SELFDESTRUCT - dbw 15, TAKE_DOWN - dbw 22, RAPID_SPIN - dbw 29, BIDE + dbw 7, SELFDESTRUCT + dbw 12, RAPID_SPIN + dbw 18, BIDE + dbw 24, TAKE_DOWN + dbw 30, THRASH ; 99 proto egg move dbw 36, EXPLOSION - dbw 43, SPIKES - dbw 50, DOUBLE_EDGE + dbw 42, BODY_SLAM ; FRLG tutor + dbw 48, SPIKES + dbw 54, DOUBLE_EDGE + dbw 60, FLAIL ; Egg move, to parallel Forretress db 0 ; no more level-up moves ForretressEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, PROTECT - dbw 1, SELFDESTRUCT - dbw 8, SELFDESTRUCT - dbw 15, TAKE_DOWN - dbw 22, RAPID_SPIN - dbw 29, BIDE - dbw 39, EXPLOSION - dbw 49, SPIKES - dbw 59, DOUBLE_EDGE + dbw 7, SELFDESTRUCT + dbw 12, RAPID_SPIN + dbw 18, BIDE + dbw 24, TAKE_DOWN + dbw 30, THRASH ; 99 proto egg move + dbw 31, PIN_MISSILE ; Egg move, it's BAFFLING it never got this via LU + dbw 38, EXPLOSION + dbw 44, SPIKE_CANNON ; Vibes, it just fits + dbw 50, SPIKES + dbw 58, DOUBLE_EDGE + dbw 64, ZAP_CANNON ; FRLG db 0 ; no more level-up moves DunsparceEvosAttacks: @@ -1384,52 +1554,65 @@ DunsparceEvosAttacks: db 0 ; no more evolutions dbw 1, RAGE dbw 5, DEFENSE_CURL - dbw 13, GLARE - dbw 18, SPITE + dbw 11, GLARE + dbw 17, ROLLOUT ; FRLG + dbw 21, SPITE dbw 26, PURSUIT dbw 30, SCREECH - dbw 38, TAKE_DOWN + dbw 36, TAKE_DOWN + dbw 42, DIG ; HGSS + dbw 48, FLAIL ; FRLG + dbw 54, DOUBLE_EDGE ; From Dudunsparce db 0 ; no more level-up moves DudunsparceEvosAttacks: db 0 ; no more evolutions dbw 1, RAGE dbw 5, DEFENSE_CURL - dbw 13, GLARE - dbw 18, SPITE + dbw 11, GLARE + dbw 17, ROLLOUT ; FRLG + dbw 21, SPITE dbw 26, PURSUIT dbw 30, SCREECH - dbw 33, HORN_DRILL - dbw 41, TAKE_DOWN - dbw 48, DOUBLE_EDGE - dbw 56, GUST + dbw 33, HORN_DRILL ; Event + substitute for Hyper Drill + dbw 38, TAKE_DOWN + dbw 44, DIG ; HGSS + dbw 52, FLAIL ; FRLG + dbw 58, DOUBLE_EDGE + dbw 64, GUST db 0 ; no more level-up moves GligarEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_STING dbw 6, SAND_ATTACK - dbw 13, HARDEN - dbw 20, QUICK_ATTACK + dbw 12, HARDEN + dbw 18, QUICK_ATTACK + dbw 23, FURY_CUTTER ; HGSS dbw 28, FAINT_ATTACK - dbw 36, SLASH - dbw 44, SCREECH - dbw 52, GUILLOTINE + dbw 34, SLASH + dbw 39, SCREECH + dbw 44, SWORDS_DANCE ; HGSS + dbw 49, CROSS_CUTTER + dbw 55, GUILLOTINE db 0 ; no more level-up moves SteelixEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, SCREECH - dbw 10, BIND - dbw 14, ROCK_THROW - dbw 23, HARDEN - dbw 27, RAGE + dbw 8, BIND + dbw 13, ROCK_THROW + dbw 17, HARDEN + dbw 23, RAGE + dbw 27, DRAGONBREATH ; FRLG + dbw 31, ROCK_HEAD dbw 36, SANDSTORM - dbw 40, SLAM - dbw 45, DIG - dbw 49, CRUNCH - dbw 55, IRON_TAIL ; make this an evo move + dbw 38, IRON_TAIL ; FRLG + dbw 42, SLAM + dbw 47, DIG ; SW97 + dbw 55, DOUBLE_EDGE ; FRLG + dbw 60, CRUNCH db 0 ; no more level-up moves SnubbullEvosAttacks: @@ -1438,16 +1621,17 @@ SnubbullEvosAttacks: dbw 1, TACKLE dbw 1, SCARY_FACE dbw 4, TAIL_WHIP - dbw 8, CHARM + dbw 9, CHARM dbw 13, BITE - dbw 19, LICK - dbw 23, SING ; SW97 - dbw 26, ROAR + dbw 18, LICK + dbw 22, SING ; SW97 + dbw 26, SWEET_KISS ; SW97 + dbw 30, ROAR dbw 34, RAGE - dbw 43, TAKE_DOWN - dbw 48, SAFEGUARD ; SW97 - dbw 53, SWEET_KISS ; SW97 - dbw 60, DOUBLE_EDGE ; SW97 + dbw 40, TAKE_DOWN + dbw 44, THRASH ; 99 proto + dbw 49, CRUNCH ; FRLG + dbw 54, DOUBLE_EDGE ; SW97 db 0 ; no more level-up moves GranbullEvosAttacks: @@ -1455,73 +1639,82 @@ GranbullEvosAttacks: dbw 1, TACKLE dbw 1, SCARY_FACE dbw 4, TAIL_WHIP - dbw 8, CHARM + dbw 9, CHARM dbw 13, BITE - dbw 19, LICK - dbw 23, SING ; SW97 - dbw 28, ROAR - dbw 38, RAGE - dbw 51, TAKE_DOWN - dbw 56, SAFEGUARD ; SW97 - dbw 62, SWEET_KISS ; SW97 - dbw 71, DOUBLE_EDGE ; SW97 + dbw 18, LICK + dbw 22, SING ; SW97 + dbw 28, SWEET_KISS ; SW97 + dbw 32, ROAR + dbw 36, RAGE + dbw 44, TAKE_DOWN + dbw 48, THRASH ; 99 proto + dbw 53, CRUNCH ; FRLG + dbw 60, DOUBLE_EDGE ; SW97 db 0 ; no more level-up moves CaretorkerEvosAttacks: db 0 ; no more evolutions dbw 1, GUST dbw 1, GROWL - dbw 10, SING + dbw 7, SING + dbw 13, WING_ATTACK dbw 19, FLAIL dbw 23, SAFEGUARD ; dbw 29, DISARMING_VOICE dbw 35, WHIRLWIND - dbw 41, SOFTBOILED + dbw 41, PROTECT ; dbw 47, DAZZLING_GLEAM + dbw 53, SOFTBOILED db 0 ; no more level-up moves QwilfishEvosAttacks: dbbw EVOLVE_ITEM, THUNDERSTONE, KAZAPPELIN dbbw EVOLVE_ITEM, POISON_STONE, QWILFATHER db 0 ; no more evolutions - dbw 1, SPIKES dbw 1, TACKLE dbw 1, POISON_STING - dbw 10, HARDEN - dbw 10, MINIMIZE - dbw 19, WATER_GUN - dbw 28, PIN_MISSILE - dbw 37, TAKE_DOWN - dbw 46, HYDRO_PUMP + dbw 5, HARDEN + dbw 11, WATER_GUN + dbw 16, MINIMIZE + dbw 20, ROLLOUT ; HGSS + dbw 26, SPIKES + dbw 32, PIN_MISSILE + dbw 38, SMOKESCREEN ; SW97 + dbw 44, TAKE_DOWN + dbw 50, HYDRO_PUMP + dbw 56, DESTINY_BOND ; FRLG db 0 ; no more level-up moves KazappelinEvosAttacks: db 0 ; no more evolutions - dbw 1, POISON_STING dbw 1, SELFDESTRUCT - dbw 1, SMOKESCREEN - dbw 7, TAIL_WHIP - dbw 14, WATER_GUN - dbw 22, MINIMIZE - dbw 31, THUNDER_WAVE - dbw 41, PIN_MISSILE - dbw 52, TAKE_DOWN - dbw 64, HYDRO_PUMP - dbw 72, EXPLOSION + dbw 1, POISON_STING + dbw 5, TAIL_WHIP + dbw 11, WATER_GUN + dbw 16, MINIMIZE + dbw 20, SPARK + dbw 26, THUNDER_WAVE + dbw 32, PIN_MISSILE + dbw 38, SMOKESCREEN + dbw 44, TAKE_DOWN + dbw 50, HYDRO_PUMP + dbw 56, EXPLOSION db 0 ; no more level-up moves QwilfatherEvosAttacks: db 0 ; no more evolutions - dbw 1, SPIKES dbw 1, TACKLE dbw 1, POISON_STING - dbw 10, HARDEN - dbw 10, MINIMIZE - dbw 19, WATER_GUN - dbw 28, PIN_MISSILE - dbw 37, TAKE_DOWN - dbw 46, HYDRO_PUMP - dbw 52, SLUDGE_BOMB + dbw 5, HARDEN + dbw 11, WATER_GUN + dbw 16, MINIMIZE + dbw 20, ROLLOUT ; HGSS + dbw 26, SPIKES + dbw 32, PIN_MISSILE + dbw 38, SMOKESCREEN ; SW97 + dbw 44, TAKE_DOWN + dbw 50, HYDRO_PUMP + dbw 56, DESTINY_BOND ; FRLG db 0 ; no more level-up moves ScizorEvosAttacks: @@ -1530,18 +1723,20 @@ ScizorEvosAttacks: dbw 1, LEER dbw 6, FOCUS_ENERGY dbw 12, PURSUIT - dbw 18, FALSE_SWIPE - dbw 24, AGILITY + dbw 17, FALSE_SWIPE + dbw 22, FURY_CUTTER ; SW97 + dbw 26, AGILITY dbw 30, METAL_CLAW dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM - dbw 54, FURY_CUTTER ; SW97 + dbw 54, CROSS_CUTTER db 0 ; no more level-up moves ShuckleEvosAttacks: dbbw EVOLVE_ITEM, ANTIQUE_POT, POCKLE db 0 ; no more evolutions + dbw 1, TACKLE ; from Pockle dbw 1, CONSTRICT dbw 1, WITHDRAW dbw 9, WRAP @@ -1553,6 +1748,7 @@ ShuckleEvosAttacks: PockleEvosAttacks: db 0 ; no more evolutions + dbw 1, TACKLE dbw 1, CONSTRICT dbw 1, WITHDRAW dbw 9, WRAP @@ -1566,29 +1762,34 @@ HeracrossEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, LEER - dbw 1, REFLECT ; SW99 dbw 6, HORN_ATTACK dbw 12, ENDURE - dbw 19, FURY_ATTACK - dbw 26, MEGAPHONE - dbw 33, COUNTER - dbw 40, TAKE_DOWN - dbw 47, REVERSAL - dbw 54, MEGAHORN + dbw 18, FURY_ATTACK + dbw 24, MEGAPHONE + dbw 30, COUNTER + dbw 36, KARATE_CHOP ; FRLG, substitute for Brick Break + dbw 42, REFLECT ; 99 proto + dbw 48, TAKE_DOWN + dbw 54, REVERSAL + dbw 60, MEGAHORN db 0 ; no more level-up moves -SneaselEvosAttacks: ; put thief, pursuit, etc somewhere +SneaselEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 9, QUICK_ATTACK - dbw 17, SCREECH - dbw 25, FAINT_ATTACK - dbw 33, FURY_SWIPES - dbw 41, AGILITY + dbw 6, QUICK_ATTACK + dbw 11, SCREECH + dbw 17, RAZOR_WIND ; It's a goddam Kamaitachi for FUCKS SA- + dbw 23, THIEF ; 99 proto + dbw 28, FURY_SWIPES + dbw 34, FAINT_ATTACK + dbw 39, ICY_WIND ; FRLG + dbw 45, PURSUIT ; SW97 dbw 49, SLASH - dbw 57, BEAT_UP - dbw 65, METAL_CLAW + dbw 55, AGILITY + dbw 59, METAL_CLAW + dbw 65, BEAT_UP db 0 ; no more level-up moves TeddiursaEvosAttacks: @@ -1597,12 +1798,14 @@ TeddiursaEvosAttacks: dbw 1, SCRATCH dbw 1, LEER dbw 8, LICK - dbw 15, FURY_SWIPES - dbw 22, FAINT_ATTACK - dbw 29, REST - dbw 36, SLASH + dbw 14, FURY_SWIPES + dbw 20, FAINT_ATTACK + dbw 25, REST + dbw 31, SLASH + dbw 37, MOONLIGHT ; from BM Ursaluna dbw 43, SNORE - dbw 50, THRASH + dbw 48, THRASH + dbw 54, DOUBLE_EDGE ; PLA db 0 ; no more level-up moves UrsaringEvosAttacks: @@ -1610,15 +1813,15 @@ UrsaringEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, LICK - dbw 1, FURY_SWIPES dbw 8, LICK - dbw 15, FURY_SWIPES - dbw 22, FAINT_ATTACK - dbw 29, REST - dbw 39, SLASH - dbw 49, SNORE - dbw 59, THRASH + dbw 14, FURY_SWIPES + dbw 20, FAINT_ATTACK + dbw 25, REST + dbw 33, SLASH + dbw 39, MOONLIGHT ; from BM Ursaluna + dbw 45, SNORE + dbw 52, THRASH + dbw 58, DOUBLE_EDGE ; PLA db 0 ; no more level-up moves UrsalunaEvosAttacks: @@ -1626,14 +1829,15 @@ UrsalunaEvosAttacks: dbw 1, SCRATCH dbw 1, LEER dbw 8, LICK - dbw 15, FURY_SWIPES - dbw 22, FAINT_ATTACK - dbw 29, REST - dbw 39, SLASH - dbw 44, MOONLIGHT - dbw 49, SNORE - dbw 54, EARTHQUAKE - dbw 59, THRASH + dbw 14, FURY_SWIPES + dbw 20, FAINT_ATTACK + dbw 25, REST + dbw 33, SLASH + dbw 39, MOONLIGHT ; from BM Ursaluna + dbw 45, SNORE + dbw 52, THRASH + dbw 58, DOUBLE_EDGE + dbw 64, EARTHQUAKE db 0 ; no more level-up moves SlugmaEvosAttacks: @@ -1641,38 +1845,45 @@ SlugmaEvosAttacks: db 0 ; no more evolutions dbw 1, SMOG dbw 8, EMBER - dbw 15, ROCK_THROW - dbw 22, HARDEN - dbw 29, AMNESIA - dbw 36, FLAMETHROWER - dbw 43, ROCK_SLIDE - dbw 50, BODY_SLAM + dbw 14, ROCK_THROW + dbw 20, HARDEN + dbw 26, RECOVER ; HGSS + dbw 32, ANCIENTPOWER ; HGSS + dbw 38, FLAMETHROWER + dbw 44, AMNESIA + dbw 49, ROCK_SLIDE + dbw 55, BODY_SLAM db 0 ; no more level-up moves MagcargoEvosAttacks: db 0 ; no more evolutions dbw 1, SMOG - dbw 1, EMBER - dbw 1, ROCK_THROW dbw 8, EMBER - dbw 15, ROCK_THROW - dbw 22, HARDEN - dbw 29, AMNESIA - dbw 36, FLAMETHROWER - dbw 48, ROCK_SLIDE - dbw 60, BODY_SLAM + dbw 14, ROCK_THROW + dbw 20, HARDEN + dbw 26, RECOVER ; HGSS + dbw 32, ANCIENTPOWER ; HGSS + dbw 38, FLAMETHROWER + dbw 46, AMNESIA + dbw 51, ROCK_SLIDE + dbw 59, BODY_SLAM db 0 ; no more level-up moves SwinubEvosAttacks: dbbw EVOLVE_LEVEL, 33, PILOSWINE db 0 ; no more evolutions dbw 1, TACKLE - dbw 10, POWDER_SNOW - dbw 19, ENDURE - dbw 28, TAKE_DOWN + dbw 8, POWDER_SNOW + dbw 14, MUD_SLAP ; HGSS + dbw 20, ENDURE + dbw 26, MAGNITUDE ; Vibes + dbw 30, ICY_WIND ; HGSS + dbw 34, TAKE_DOWN dbw 37, MIST - dbw 46, BLIZZARD - dbw 55, AMNESIA + dbw 40, ANCIENTPOWER ; HGSS + dbw 46, EARTHQUAKE ; HGSS + dbw 52, BLIZZARD + dbw 57, AMNESIA db 0 ; no more level-up moves PiloswineEvosAttacks: @@ -1680,45 +1891,54 @@ PiloswineEvosAttacks: dbbw EVOLVE_LEVEL, 42, HIRSUSWINE db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, HORN_ATTACK - dbw 10, POWDER_SNOW - dbw 19, ENDURE - dbw 28, TAKE_DOWN - dbw 33, FURY_ATTACK - dbw 42, ANCIENTPOWER - dbw 47, MIST + dbw 8, POWDER_SNOW + dbw 14, MUD_SLAP ; HGSS + dbw 20, ENDURE + dbw 26, MAGNITUDE ; Vibes + dbw 30, ICY_WIND ; HGSS + dbw 33, FURY_ATTACK + dbw 36, TAKE_DOWN + dbw 39, MIST + dbw 42, ANCIENTPOWER ; HGSS + dbw 50, EARTHQUAKE ; HGSS dbw 56, BLIZZARD - dbw 70, AMNESIA + dbw 61, AMNESIA db 0 ; no more level-up moves MamoswineEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, HORN_ATTACK - dbw 10, POWDER_SNOW - dbw 19, ENDURE - dbw 28, TAKE_DOWN - dbw 33, FURY_ATTACK + dbw 8, POWDER_SNOW + dbw 14, MUD_SLAP + dbw 20, ENDURE + dbw 26, MAGNITUDE ; Vibes + dbw 30, ICY_WIND + dbw 33, FURY_ATTACK + dbw 36, TAKE_DOWN + dbw 39, MIST dbw 42, ANCIENTPOWER - dbw 49, MIST - dbw 53, EARTHQUAKE - dbw 58, BLIZZARD - dbw 65, SCARY_FACE - dbw 73, AMNESIA + dbw 54, EARTHQUAKE + dbw 60, BLIZZARD + dbw 64, SCARY_FACE + dbw 69, AMNESIA db 0 ; no more level-up moves HirsuswineEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, HORN_ATTACK - dbw 10, POWDER_SNOW - dbw 19, ENDURE - dbw 28, TAKE_DOWN - dbw 33, FURY_ATTACK + dbw 8, POWDER_SNOW + dbw 14, MUD_SLAP ; HGSS + dbw 20, ENDURE + dbw 26, MAGNITUDE ; Vibes + dbw 30, ICY_WIND ; HGSS + dbw 33, FURY_ATTACK + dbw 36, TAKE_DOWN + dbw 39, MIST dbw 42, HORN_DRILL - dbw 49, MIST - dbw 58, BLIZZARD - dbw 73, AMNESIA + dbw 54, EARTHQUAKE ; HGSS + dbw 60, BLIZZARD + dbw 64, ROAR + dbw 69, AMNESIA db 0 ; no more level-up moves CorsolaEvosAttacks: @@ -1726,122 +1946,149 @@ CorsolaEvosAttacks: dbw 1, TACKLE dbw 7, HARDEN dbw 13, BUBBLE - dbw 19, RECOVER - dbw 25, BUBBLEBEAM - dbw 31, SPIKE_CANNON - dbw 37, MIRROR_COAT - dbw 43, ANCIENTPOWER + dbw 19, BARRIER ; 99 proto egg move + dbw 25, RECOVER + dbw 31, BUBBLEBEAM + dbw 37, SPIKE_CANNON + dbw 43, MIRROR_COAT + dbw 49, ANCIENTPOWER + dbw 55, LIGHT_SCREEN ; 99 proto db 0 ; no more level-up moves RemoraidEvosAttacks: dbbw EVOLVE_LEVEL, 25, OCTILLERY db 0 ; no more evolutions dbw 1, WATER_GUN - dbw 11, LOCK_ON - dbw 22, PSYBEAM - dbw 22, AURORA_BEAM - dbw 22, BUBBLEBEAM - dbw 33, FOCUS_ENERGY - dbw 44, ICE_BEAM - dbw 55, HYPER_BEAM - dbw 60, ZAP_CANNON ; SW97 - dbw 66, HYDRO_PUMP ; SW97 + dbw 7, LOCK_ON + dbw 13, PSYBEAM + dbw 19, AURORA_BEAM + dbw 25, BUBBLEBEAM + dbw 30, PROTECT ; SW97 + dbw 35, OCTAZOOKA ; from Octillery + dbw 41, FOCUS_ENERGY + dbw 46, ICE_BEAM + dbw 52, HYDRO_PUMP ; 99 proto + dbw 58, ZAP_CANNON ; SW97 + dbw 64, HYPER_BEAM db 0 ; no more level-up moves OctilleryEvosAttacks: db 0 ; no more evolutions dbw 1, WATER_GUN - dbw 11, CONSTRICT - dbw 22, PSYBEAM - dbw 22, AURORA_BEAM - dbw 22, BUBBLEBEAM - dbw 25, OCTAZOOKA - dbw 38, FOCUS_ENERGY - dbw 54, ICE_BEAM + dbw 1, CONSTRICT + dbw 7, LOCK_ON + dbw 13, PSYBEAM + dbw 19, AURORA_BEAM + dbw 25, BUBBLEBEAM + dbw 25, WRAP ; SW97 + dbw 32, PROTECT ; SW97 + dbw 37, OCTAZOOKA + dbw 43, FOCUS_ENERGY + dbw 50, ICE_BEAM + dbw 56, HYDRO_PUMP ; 99 proto + dbw 62, ZAP_CANNON ; SW97 dbw 70, HYPER_BEAM - dbw 77, ZAP_CANNON ; SW97 - dbw 80, HYDRO_PUMP ; SW97 db 0 ; no more level-up moves StricheelEvosAttacks: dbbw EVOLVE_LEVEL, 30, LURREEL db 0 ; no more evolutions dbw 1, TACKLE - dbw 6, LEER - dbw 12, WRAP - dbw 18, WATER_GUN - dbw 24, SLAM - dbw 30, FAINT_ATTACK - dbw 36, SCARY_FACE - dbw 42, PURSUIT - dbw 48, SPARK - dbw 54, HYDRO_PUMP + dbw 1, LEER + dbw 5, WRAP + dbw 9, WATER_GUN + dbw 15, PURSUIT + dbw 21, SPARK + dbw 26, SCARY_FACE + dbw 32, SLAM + dbw 37, BATON_PASS + dbw 42, FAINT_ATTACK + dbw 48, DOUBLE_TEAM + dbw 54, THRASH + dbw 60, HYDRO_PUMP db 0 ; no more level-up moves LurreelEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 6, LEER - dbw 12, WRAP - dbw 18, WATER_GUN - dbw 24, SLAM - dbw 30, FAINT_ATTACK - dbw 30, CRUNCH - dbw 39, SCARY_FACE - dbw 48, PURSUIT - dbw 57, SPARK - dbw 66, HYDRO_PUMP + dbw 1, LEER + dbw 5, WRAP + dbw 9, WATER_GUN + dbw 15, PURSUIT + dbw 21, SPARK + dbw 26, SCARY_FACE + dbw 30, BITE + dbw 34, SLAM + dbw 39, BATON_PASS + dbw 44, FAINT_ATTACK + dbw 52, DOUBLE_TEAM + dbw 58, THRASH + dbw 64, HYDRO_PUMP + dbw 68, CRUNCH db 0 ; no more level-up moves -DelibirdEvosAttacks: ; SW97-style learnset +DelibirdEvosAttacks: db 0 ; no more evolutions dbw 1, PRESENT - dbw 1, POUND - dbw 1, GROWL - dbw 9, POWDER_SNOW - dbw 18, DOUBLESLAP - dbw 27, ENCORE - dbw 36, ENCORE - dbw 49, BLIZZARD + dbw 1, POUND ; SW97 + dbw 7, GROWL ; SW97 + dbw 13, PECK ; Vibes + dbw 19, POWDER_SNOW ; SW97 + dbw 25, DOUBLESLAP ; SW97 + dbw 31, ENCORE ; SW97 + dbw 37, ICY_WIND ; Future egg move + dbw 43, ATTRACT ; XD purification move + dbw 49, DRILL_PECK ; Future level-up move + dbw 55, BLIZZARD ; SW97 db 0 ; no more level-up moves -MantykeEvosAttacks: ; review w/ sw97 learnset +MantykeEvosAttacks: dbbw EVOLVE_LEVEL, 30, MANTINE ; to be changed db 0 ; no more evolutions dbw 1, TACKLE dbw 1, BUBBLE - dbw 10, SUPERSONIC - dbw 18, BUBBLEBEAM + dbw 6, SUPERSONIC + dbw 10, WATER_GUN ; SW97 + dbw 14, FLAIL ; SW97 + dbw 19, BUBBLEBEAM dbw 25, TAKE_DOWN - dbw 32, AGILITY - dbw 40, WING_ATTACK - dbw 49, CONFUSE_RAY + dbw 29, WING_ATTACK + dbw 34, AGILITY + dbw 39, CONFUSE_RAY + dbw 45, THRASH ; SW97 + dbw 51, HYDRO_PUMP ; SW97 db 0 ; no more level-up moves MantineEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, BUBBLE - dbw 10, SUPERSONIC - dbw 18, BUBBLEBEAM + dbw 6, SUPERSONIC + dbw 10, WATER_GUN ; SW97 + dbw 14, FLAIL ; SW97 + dbw 19, BUBBLEBEAM dbw 25, TAKE_DOWN - dbw 32, AGILITY - dbw 40, WING_ATTACK - dbw 49, CONFUSE_RAY + dbw 29, WING_ATTACK + dbw 36, AGILITY + dbw 41, CONFUSE_RAY + dbw 49, THRASH ; SW97 + dbw 55, HYDRO_PUMP ; SW97 db 0 ; no more level-up moves SkarmoryEvosAttacks: db 0 ; no more evolutions dbw 1, LEER dbw 1, PECK - dbw 1, SAND_ATTACK - dbw 13, MUD_SLAP ; SW97 - dbw 19, SWIFT - dbw 23, HARDEN ; SW97 - dbw 25, AGILITY - dbw 37, FURY_ATTACK - dbw 49, STEEL_WING - dbw 54, PROTECT ; SW97 + dbw 8, SAND_ATTACK + dbw 12, SWIFT + dbw 17, MUD_SLAP ; SW97 + dbw 22, WING_ATTACK ; Future level-up move + dbw 26, AGILITY + dbw 32, FURY_ATTACK + dbw 38, PROTECT ; SW97 + dbw 44, STEEL_WING + dbw 50, SLASH ; HGSS + dbw 56, SKY_ATTACK ; XD move tutor db 0 ; no more level-up moves HoundourEvosAttacks: @@ -1849,44 +2096,46 @@ HoundourEvosAttacks: db 0 ; no more evolutions dbw 1, LEER dbw 1, EMBER - dbw 1, SWIFT ; SW97 dbw 7, ROAR dbw 13, SMOG - dbw 20, BITE + dbw 19, BITE dbw 23, SCARY_FACE ; SW97 - dbw 27, FAINT_ATTACK - dbw 31, BONEMERANG ; SW97 - dbw 35, FLAMETHROWER - dbw 43, CRUNCH + dbw 28, FAINT_ATTACK + dbw 32, SWIFT ; SW97 + dbw 36, FLAMETHROWER + dbw 42, BONEMERANG ; SW97 + dbw 48, CRUNCH db 0 ; no more level-up moves HoundoomEvosAttacks: db 0 ; no more evolutions dbw 1, LEER dbw 1, EMBER - dbw 1, SWIFT ; SW97 dbw 7, ROAR dbw 13, SMOG - dbw 20, BITE - dbw 26, SCARY_FACE ; SW97 + dbw 19, BITE + dbw 23, SCARY_FACE ; SW97 dbw 30, FAINT_ATTACK - dbw 37, BONEMERANG ; SW97 - dbw 41, FLAMETHROWER - dbw 52, CRUNCH + dbw 34, SWIFT ; SW97 + dbw 40, FLAMETHROWER + dbw 46, BONEMERANG ; SW97 + dbw 54, CRUNCH db 0 ; no more level-up moves KingdraEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE - dbw 1, SMOKESCREEN - dbw 1, LEER - dbw 1, WATER_GUN - dbw 8, SMOKESCREEN - dbw 15, LEER - dbw 22, WATER_GUN - dbw 29, TWISTER - dbw 40, AGILITY - dbw 51, HYDRO_PUMP + dbw 7, SMOKESCREEN + dbw 12, LEER + dbw 18, QUICK_ATTACK ; SW97 + dbw 24, WATER_GUN + dbw 29, FOCUS_ENERGY ; HGSS + dbw 32, PIN_MISSILE ; SW97 + dbw 36, TWISTER + dbw 41, BUBBLEBEAM ; HGSS + dbw 47, AGILITY + dbw 54, DRAGONBREATH ; SW97 + dbw 60, HYDRO_PUMP db 0 ; no more level-up moves PhanpyEvosAttacks: @@ -1894,26 +2143,35 @@ PhanpyEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 9, DEFENSE_CURL - dbw 17, FLAIL - dbw 21, STOMP ; SW97 - dbw 25, TAKE_DOWN - dbw 33, ROLLOUT - dbw 41, ENDURE + dbw 8, DEFENSE_CURL + dbw 12, FLAIL + dbw 17, ROLLOUT + dbw 22, MAGNITUDE ; HGSS, from Donphan + dbw 26, STOMP ; SW97 + dbw 31, TAKE_DOWN + dbw 35, PROTECT ; SW97 + dbw 40, ENDURE + dbw 44, RAPID_SPIN ; from Donphan dbw 49, DOUBLE_EDGE + dbw 55, EARTHQUAKE ; from Donphan db 0 ; no more level-up moves DonphanEvosAttacks: db 0 ; no more evolutions dbw 1, HORN_ATTACK dbw 1, GROWL - dbw 9, DEFENSE_CURL - dbw 17, FLAIL - dbw 21, STOMP ; SW97 + dbw 8, DEFENSE_CURL + dbw 12, FLAIL + dbw 17, ROLLOUT + dbw 22, MAGNITUDE ; HGSS dbw 25, FURY_ATTACK - dbw 33, ROLLOUT - dbw 41, RAPID_SPIN - dbw 49, EARTHQUAKE + dbw 28, STOMP ; SW97 + dbw 33, TAKE_DOWN ; from Phanpy + dbw 37, PROTECT ; SW97 + dbw 44, ENDURE ; from Phanpy + dbw 48, RAPID_SPIN + dbw 53, DOUBLE_EDGE ; from Phanpy + dbw 61, EARTHQUAKE db 0 ; no more level-up moves Porygon2EvosAttacks: @@ -1923,13 +2181,13 @@ Porygon2EvosAttacks: dbw 1, TACKLE dbw 1, CONVERSION dbw 9, AGILITY - dbw 12, PSYBEAM - dbw 20, RECOVER - dbw 24, DEFENSE_CURL - dbw 32, LOCK_ON - dbw 36, TRI_ATTACK - dbw 44, ZAP_CANNON - dbw 50, HYPER_BEAM ; SW97 + dbw 15, PSYBEAM + dbw 21, RECOVER + dbw 27, DEFENSE_CURL + dbw 33, LOCK_ON + dbw 39, TRI_ATTACK + dbw 45, ZAP_CANNON + dbw 51, HYPER_BEAM ; SW97 db 0 ; no more level-up moves PorygonZEvosAttacks: @@ -1938,13 +2196,13 @@ PorygonZEvosAttacks: dbw 1, TACKLE dbw 1, CONVERSION dbw 9, AGILITY - dbw 12, PSYBEAM - dbw 20, RECOVER - dbw 24, METRONOME - dbw 32, LOCK_ON - dbw 36, TRI_ATTACK - dbw 44, ZAP_CANNON - dbw 50, HYPER_BEAM ; SW97 + dbw 15, PSYBEAM + dbw 21, RECOVER + dbw 27, METRONOME + dbw 33, LOCK_ON + dbw 39, TRI_ATTACK + dbw 45, ZAP_CANNON + dbw 51, HYPER_BEAM ; SW97 db 0 ; no more level-up moves StantlerEvosAttacks: @@ -1952,24 +2210,30 @@ StantlerEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 8, LEER - dbw 15, HYPNOSIS - dbw 23, STOMP - dbw 31, SAND_ATTACK - dbw 40, TAKE_DOWN - dbw 49, CONFUSE_RAY + dbw 13, CONFUSION ; PLA + dbw 18, HYPNOSIS + dbw 24, STOMP + dbw 29, SAND_ATTACK + dbw 35, TAKE_DOWN + dbw 41, CONFUSE_RAY + dbw 47, PSYBEAM ; substitute for Extrasensory + dbw 53, DOUBLE_EDGE ; PLA + dbw 59, MEGAHORN ; from Wyrdeer db 0 ; no more level-up moves WyrdeerEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 8, LEER - dbw 15, HYPNOSIS - dbw 23, STOMP - dbw 31, SAND_ATTACK - dbw 40, TAKE_DOWN - dbw 49, CONFUSE_RAY - dbw 55, PSYBEAM - dbw 62, MEGAHORN + dbw 13, CONFUSION ; PLA + dbw 18, HYPNOSIS + dbw 24, STOMP + dbw 29, SAND_ATTACK + dbw 35, TAKE_DOWN + dbw 41, CONFUSE_RAY + dbw 47, PSYBEAM ; substitute for Extrasensory + dbw 53, DOUBLE_EDGE ; PLA + dbw 59, MEGAHORN db 0 ; no more level-up moves SmeargleEvosAttacks: @@ -1990,14 +2254,17 @@ GrenmarEvosAttacks: db 0 dbw 1, TACKLE dbw 1, DEFENSE_CURL - dbw 9, TAIL_WHIP + dbw 7, BUBBLE + dbw 12, TAIL_WHIP dbw 17, WATER_GUN - dbw 25, BARRAGE - dbw 33, FLAME_WHEEL - dbw 41, SMOG - dbw 49, TAKE_DOWN - dbw 57, HYDRO_PUMP - db 0 + dbw 23, BARRAGE + dbw 29, FLAME_WHEEL + dbw 33, SMOG + dbw 37, BUBBLEBEAM + dbw 43, TAKE_DOWN + dbw 49, FIRE_SPIN + dbw 55, HYDRO_PUMP + db 0 ; no more level-up moves TyrogueEvosAttacks: dbbbw EVOLVE_STAT, 20, ATK_LT_DEF, HITMONCHAN @@ -2010,14 +2277,17 @@ TyrogueEvosAttacks: HitmontopEvosAttacks: db 0 ; no more evolutions dbw 1, ROLLING_KICK - dbw 7, FOCUS_ENERGY - dbw 13, PURSUIT - dbw 19, QUICK_ATTACK - dbw 25, RAPID_SPIN - dbw 31, COUNTER - dbw 37, AGILITY - dbw 43, DETECT - dbw 49, TRIPLE_KICK + dbw 5, FOCUS_ENERGY + dbw 10, QUICK_ATTACK + dbw 15, PURSUIT + dbw 20, RAPID_SPIN + dbw 25, DOUBLE_KICK ; KEP + dbw 30, COUNTER + dbw 35, JUMP_KICK ; KEP + dbw 40, AGILITY + dbw 45, TRIPLE_KICK + dbw 50, MEGA_KICK ; KEP + dbw 55, DETECT db 0 ; no more level-up moves SmoochumEvosAttacks: @@ -2025,14 +2295,17 @@ SmoochumEvosAttacks: db 0 ; no more evolutions dbw 1, POUND dbw 1, LICK - dbw 9, SWEET_KISS - dbw 13, POWDER_SNOW - dbw 21, CONFUSION - dbw 25, SING - dbw 33, MEAN_LOOK - dbw 37, PSYCHIC_M - dbw 45, PERISH_SONG - dbw 49, BLIZZARD + dbw 7, SWEET_KISS + dbw 12, POWDER_SNOW + dbw 17, CONFUSION + dbw 22, SING + dbw 26, PSYWAVE ; 99 proto + dbw 31, MEAN_LOOK + dbw 36, LOVELY_KISS ; from Jynx + dbw 40, PSYCHIC_M + dbw 44, SAFEGUARD ; 99 proto + dbw 50, PERISH_SONG + dbw 56, BLIZZARD db 0 ; no more level-up moves ElebebiEvosAttacks: @@ -2050,58 +2323,66 @@ ElekidEvosAttacks: db 0 ; no more evolutions dbw 1, QUICK_ATTACK dbw 1, LEER - dbw 9, THUNDERPUNCH - dbw 17, LIGHT_SCREEN - dbw 25, SWIFT - dbw 33, SCREECH - dbw 41, THUNDERBOLT - dbw 49, THUNDER + dbw 7, THUNDERSHOCK ; SW97 + dbw 13, THUNDER_WAVE ; SW97 + dbw 17, LOW_KICK ; From Elebebi + dbw 21, SPARK ; SW97 + dbw 26, SWIFT + dbw 30, THUNDERPUNCH + dbw 36, SCREECH + dbw 42, THUNDERBOLT + dbw 48, LIGHT_SCREEN + dbw 54, THUNDER db 0 ; no more level-up moves MagbyEvosAttacks: dbbw EVOLVE_LEVEL, 30, MAGMAR db 0 ; no more evolutions - dbw 1, EMBER - dbw 7, LEER - dbw 13, SMOG - dbw 19, FIRE_PUNCH - dbw 25, SMOKESCREEN - dbw 31, SUNNY_DAY - dbw 37, FLAMETHROWER - dbw 43, CONFUSE_RAY - dbw 49, FIRE_BLAST + dbw 1, TACKLE ; SW97 + dbw 1, LEER + dbw 7, EMBER + dbw 13, SMOKESCREEN + dbw 17, SMOG + dbw 21, FLAME_WHEEL ; SW97 + dbw 26, CONFUSE_RAY + dbw 30, FIRE_PUNCH + dbw 36, FAINT_ATTACK ; HGSS + dbw 42, FLAMETHROWER + dbw 48, SUNNY_DAY + dbw 54, FIRE_BLAST db 0 ; no more level-up moves MiltankEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP ; SW97 - dbw 4, GROWL - dbw 8, DEFENSE_CURL - dbw 13, STOMP + dbw 5, GROWL + dbw 9, DEFENSE_CURL + dbw 14, STOMP dbw 19, MILK_DRINK - dbw 23, CHARM ; SW97 - dbw 26, BIDE + dbw 24, CHARM ; SW97 + dbw 29, BIDE dbw 34, ROLLOUT - dbw 39, RAGE ; SW97 - dbw 43, BODY_SLAM - dbw 53, HEAL_BELL - dbw 60, TAKE_DOWN ; SW97 + dbw 40, RAGE ; 99 proto + dbw 45, BODY_SLAM + dbw 51, HEAL_BELL + dbw 57, TAKE_DOWN ; SW97 db 0 ; no more level-up moves BlisseyEvosAttacks: db 0 ; no more evolutions dbw 1, POUND - dbw 4, GROWL + dbw 1, GROWL dbw 7, TAIL_WHIP - dbw 10, SOFTBOILED - dbw 13, DOUBLESLAP - dbw 18, MINIMIZE - dbw 23, SING - dbw 28, EGG_BOMB - dbw 33, DEFENSE_CURL - dbw 40, LIGHT_SCREEN - dbw 47, DOUBLE_EDGE + dbw 12, SOFTBOILED + dbw 17, DOUBLESLAP + dbw 22, MINIMIZE + dbw 27, SING + dbw 32, EGG_BOMB + dbw 36, DEFENSE_CURL + dbw 43, PAIN_SPLIT ; SW97 + dbw 48, LIGHT_SCREEN + dbw 56, DOUBLE_EDGE db 0 ; no more level-up moves WaruchuEvosAttacks: @@ -2109,54 +2390,62 @@ WaruchuEvosAttacks: dbw 1, THUNDERSHOCK dbw 1, THUNDER_WAVE dbw 7, LEER - dbw 11, PURSUIT - dbw 16, COMET_PUNCH - dbw 20, BEAT_UP - dbw 24, SPARK - dbw 28, SWIFT - dbw 33, THUNDERPUNCH - dbw 40, CRUNCH + dbw 12, QUICK_ATTACK + dbw 16, PURSUIT + dbw 21, COMET_PUNCH + dbw 27, BEAT_UP + dbw 33, SPARK + dbw 38, SWIFT + dbw 44, THUNDERPUNCH + dbw 50, CRUNCH + dbw 55, THUNDER db 0 ; no more level-up moves SoneggEvosAttacks: db 0 ; no more evolutions - TODO: ADD GENDERED EVOLUTION (L23) dbw 1, PECK dbw 1, MEGAPHONE - dbw 8, TACKLE - dbw 10, SING + dbw 7, SING + dbw 11, GUST dbw 16, METRONOME dbw 21, WING_ATTACK - dbw 26, SUPERSONIC - dbw 29, ENCORE - dbw 35, DOUBLE_EDGE + dbw 27, SUPERSONIC + dbw 32, ENCORE + dbw 38, MIRROR_MOVE + dbw 44, EGG_BOMB + dbw 50, DOUBLE_EDGE db 0 ; no more level-up moves CacawphonyEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, MEGAPHONE - dbw 1, SCREECH - dbw 8, TACKLE - dbw 10, SING + dbw 7, SING + dbw 11, GUST dbw 16, METRONOME dbw 21, WING_ATTACK + dbw 23, SCREECH dbw 29, SUPERSONIC - dbw 35, ENCORE - dbw 44, DOUBLE_EDGE + dbw 34, ENCORE + dbw 40, MIRROR_MOVE + dbw 48, EGG_BOMB + dbw 54, DOUBLE_EDGE db 0 ; no more level-up moves TrebirEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, MEGAPHONE - dbw 1, PERISH_SONG - dbw 8, TACKLE - dbw 10, SING + dbw 7, SING + dbw 11, GUST dbw 16, METRONOME dbw 21, WING_ATTACK + dbw 23, PERISH_SONG dbw 29, SUPERSONIC - dbw 35, ENCORE - dbw 44, PERISH_SONG + dbw 34, ENCORE + dbw 40, MIRROR_MOVE + dbw 48, EGG_BOMB + dbw 54, HEAL_BELL db 0 ; no more level-up moves SakurazeEvosAttacks: @@ -2166,23 +2455,27 @@ SakurazeEvosAttacks: dbw 8, LEECH_SEED dbw 14, RAZOR_LEAF dbw 20, SUNNY_DAY - dbw 26, PETAL_DANCE - dbw 32, TAKE_DOWN - dbw 38, SYNTHESIS - dbw 44, SOLARBEAM + dbw 26, FLAME_WHEEL + dbw 32, PETAL_DANCE + dbw 38, TAKE_DOWN + dbw 44, SYNTHESIS + dbw 50, SOLARBEAM db 0 ; no more level-up moves -TanobiEvosAttacks: ; TODO: review moveset, it's fighting/steel +TanobiEvosAttacks: db 0 ; no more evolutions - dbw 1, EMBER + ; dbw 1, UPPERCUT dbw 1, LEER dbw 7, QUICK_ATTACK - dbw 12, FLAME_WHEEL - dbw 20, AGILITY - dbw 27, FIRE_SPIN - dbw 34, SPIKES + dbw 12, ROLLING_KICK + dbw 18, AGILITY + dbw 23, SWIFT + dbw 28, JUMP_KICK + dbw 32, DETECT + dbw 36, SPIKES dbw 41, METAL_CLAW - dbw 48, SLASH + dbw 47, SLASH + dbw 53, HI_JUMP_KICK db 0 ; no more level-up moves TrustanEvosAttacks: @@ -2190,13 +2483,14 @@ TrustanEvosAttacks: dbw 1, TACKLE dbw 1, GROWL dbw 7, EMBER - dbw 12, SMOKESCREEN - dbw 17, QUICK_ATTACK - dbw 20, FLAME_WHEEL - dbw 27, FURY_SWIPES - dbw 34, TAKE_DOWN - dbw 40, SCREECH - dbw 46, DOUBLE_EDGE + dbw 13, SMOKESCREEN + dbw 18, QUICK_ATTACK + dbw 24, FLAME_WHEEL + dbw 29, THIEF + dbw 35, FURY_SWIPES + dbw 41, TAKE_DOWN + dbw 46, SCREECH + dbw 52, DOUBLE_EDGE db 0 ; no more level-up moves KuwaguardEvosAttacks: @@ -2205,9 +2499,13 @@ KuwaguardEvosAttacks: dbw 1, STRING_SHOT dbw 7, GUST dbw 13, PIN_MISSILE - dbw 22, HARDEN + dbw 19, HARDEN + dbw 25, FURY_CUTTER dbw 31, QUICK_ATTACK - dbw 43, WING_ATTACK + dbw 37, BIND + dbw 43, PROTECT + dbw 49, WING_ATTACK + dbw 55, CROSS_CUTTER db 0 ; no more level-up moves TonquitoEvosAttacks: @@ -2216,9 +2514,13 @@ TonquitoEvosAttacks: dbw 1, GROWTH dbw 7, ABSORB dbw 13, GUST - dbw 22, MEGA_DRAIN - dbw 31, BATON_PASS - dbw 43, GIGA_DRAIN + dbw 19, LEER + dbw 25, FURY_ATTACK + dbw 31, MEGA_DRAIN + dbw 37, BATON_PASS + dbw 43, FAINT_ATTACK + dbw 49, PURSUIT + dbw 55, GIGA_DRAIN db 0 ; no more level-up moves MolambinoEvosAttacks: @@ -2230,9 +2532,10 @@ MolambinoEvosAttacks: dbw 19, WATER_GUN dbw 24, MORNING_SUN dbw 29, BUBBLEBEAM - dbw 34, THRASH - dbw 39, HYDRO_PUMP - ; dbw 45, DAZZLING_GLEAM ; move not yet implemented + dbw 35, DOUBLE_TEAM + dbw 41, THRASH + dbw 47, HYDRO_PUMP + ; dbw 53, DAZZLING_GLEAM ; move not yet implemented db 0 ; no more level-up moves LuanboEvosAttacks: @@ -2242,11 +2545,12 @@ LuanboEvosAttacks: ; dbw 7, DRAINING_KISS ; move not yet implemented dbw 13, FLAIL dbw 19, WATER_GUN - dbw 25, MORNING_SUN - dbw 32, BUBBLEBEAM - dbw 39, THRASH - dbw 46, HYDRO_PUMP - ; dbw 54, DAZZLING_GLEAM ; move not yet implemented + dbw 26, MORNING_SUN + dbw 31, BUBBLEBEAM + dbw 37, DOUBLE_TEAM + dbw 45, THRASH + dbw 51, HYDRO_PUMP + ; dbw 57, DAZZLING_GLEAM ; move not yet implemented db 0 ; no more level-up moves GranboEvosAttacks: @@ -2256,25 +2560,28 @@ GranboEvosAttacks: ; dbw 7, DRAINING_KISS ; move not yet implemented dbw 13, FLAIL dbw 19, WATER_GUN - dbw 25, MORNING_SUN - dbw 32, BUBBLEBEAM - dbw 43, THRASH - dbw 52, HYDRO_PUMP - ; dbw 63, DAZZLING_GLEAM ; move not yet implemented + dbw 26, MORNING_SUN + dbw 31, BUBBLEBEAM + dbw 39, DOUBLE_TEAM + dbw 47, THRASH + dbw 55, HYDRO_PUMP + ; dbw 61, DAZZLING_GLEAM ; move not yet implemented db 0 ; no more level-up moves AngoreEvosAttacks: db 0 ; no more evolutions - dbw 1, TACKLE - dbw 6, LEER - dbw 12, RAGE - dbw 18, WATER_GUN - dbw 24, BITE - dbw 30, SLAM - dbw 36, SCARY_FACE + dbw 1, BITE + dbw 1, LEER + dbw 7, WATER_GUN + dbw 13, ROAR + dbw 19, RAGE + dbw 25, SLAM + dbw 31, SCARY_FACE + dbw 37, TAKE_DOWN dbw 42, THRASH dbw 48, IRON_TAIL dbw 54, HYDRO_PUMP + dbw 60, DOUBLE_EDGE db 0 ; no more level-up moves EucalaEvosAttacks: @@ -2283,13 +2590,14 @@ EucalaEvosAttacks: dbw 1, GROWL dbw 8, FURY_SWIPES dbw 14, RAZOR_LEAF - dbw 23, RAPID_SPIN - dbw 29, SCREECH - dbw 34, POISONPOWDER - dbw 34, STUN_SPORE - dbw 34, SLEEP_POWDER - dbw 40, THRASH - dbw 45, PETAL_DANCE + dbw 20, RAPID_SPIN + dbw 26, SCREECH + dbw 32, SLAM + dbw 38, POISONPOWDER + dbw 38, STUN_SPORE + dbw 38, SLEEP_POWDER + dbw 44, THRASH + dbw 50, PETAL_DANCE db 0 ; no more level-up moves KiwookedEvosAttacks: @@ -2297,24 +2605,29 @@ KiwookedEvosAttacks: dbw 1, PECK dbw 1, LEER dbw 7, SAND_ATTACK - dbw 13, GUST - dbw 19, MAGNITUDE - dbw 28, WHIRLWIND - dbw 34, FORESIGHT - dbw 39, FURY_ATTACK - dbw 45, DRILL_PECK + dbw 13, MUD_SLAP + dbw 19, GUST + dbw 25, MAGNITUDE + dbw 31, WHIRLWIND + dbw 37, FURY_ATTACK + dbw 43, FORESIGHT + dbw 49, DRILL_PECK + dbw 55, MEGA_KICK db 0 ; no more level-up moves CyclorpEvosAttacks: db 0 ; no more evolutions dbw 1, VICEGRIP dbw 1, STRING_SHOT - dbw 13, POISON_STING - dbw 24, PIN_MISSILE - dbw 31, FAINT_ATTACK - dbw 37, HARDEN - dbw 41, SLASH - dbw 45, CRUNCH + dbw 8, POISON_STING + dbw 14, PIN_MISSILE + dbw 20, HARDEN + dbw 26, FURY_SWIPES + dbw 32, FAINT_ATTACK + dbw 38, ACID + dbw 44, CROSS_CUTTER + dbw 50, SLASH + dbw 56, CRUNCH db 0 ; no more level-up moves KitsenEvosAttacks: @@ -2323,12 +2636,13 @@ KitsenEvosAttacks: dbw 1, SPITE dbw 8, MINIMIZE dbw 13, GUST - dbw 20, CONFUSE_RAY - dbw 26, CURSE - dbw 31, HYPNOSIS - dbw 35, THIEF - dbw 38, DESTINY_BOND - dbw 43, FUTURE_SIGHT + dbw 19, QUICK_ATTACK + dbw 24, CONFUSE_RAY + dbw 30, CURSE + dbw 36, HYPNOSIS + dbw 42, THIEF + dbw 48, DESTINY_BOND + dbw 54, FUTURE_SIGHT db 0 ; no more level-up moves WispiritEvosAttacks: @@ -2338,23 +2652,29 @@ WispiritEvosAttacks: dbw 8, EMBER dbw 14, SAFEGUARD dbw 20, NIGHT_SHADE - dbw 27, FIRE_SPIN - dbw 34, DESTINY_BOND - dbw 43, PERISH_SONG + dbw 26, FIRE_SPIN + dbw 32, ENCORE + dbw 38, PERISH_SONG + dbw 43, FLAMETHROWER + dbw 49, CONFUSE_RAY + dbw 55, DESTINY_BOND db 0 ; no more level-up moves CoatlEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, GUST - dbw 5, TRANSFORM - dbw 11, GROWTH + dbw 6, TRANSFORM + dbw 12, GROWTH dbw 18, TWISTER - dbw 25, FLAIL - dbw 32, MORNING_SUN - dbw 38, FORESIGHT - dbw 43, HEAL_BELL - dbw 50, OUTRAGE + dbw 24, FLAIL + dbw 30, SUNNY_DAY + dbw 30, MORNING_SUN + dbw 36, FORESIGHT + dbw 42, DRAGONBREATH + dbw 48, HEAL_BELL + dbw 54, SOLARBEAM + dbw 60, OUTRAGE db 0 ; no more level-up moves MimearEvosAttacks: @@ -2363,10 +2683,13 @@ MimearEvosAttacks: dbw 1, GROWL ; dbw 8, FAIRY_WIND ; move not yet implemented dbw 13, CHARM - ; dbw 21, DRAINING_KISS ; move not yet implemented - dbw 32, MIRROR_COAT - dbw 37, SAFEGUARD - ; dbw 43, DAZZLING_GLEAM ; move not yet implemented + dbw 19, QUICK_ATTACK + dbw 25, FORESIGHT + ; dbw 31, DRAINING_KISS ; move not yet implemented + dbw 37, AMNESIA + dbw 43, MIRROR_COAT + dbw 49, SAFEGUARD + ; dbw 55, DAZZLING_GLEAM ; move not yet implemented db 0 ; no more level-up moves InoshikaEvosAttacks: @@ -2374,24 +2697,29 @@ InoshikaEvosAttacks: dbw 1, TACKLE dbw 1, LEER dbw 7, ROCK_THROW - dbw 13, STOMP + dbw 14, STOMP dbw 21, ROLLOUT dbw 28, HORN_ATTACK - dbw 35, ROCK_HEAD - dbw 42, DOUBLE_EDGE - dbw 50, SKULL_BASH + dbw 35, TAKE_DOWN + dbw 42, ROCK_HEAD + dbw 49, DOUBLE_EDGE + dbw 55, SKULL_BASH db 0 ; no more level-up moves RuddernautEvosAttacks: db 0 ; no more evolutions dbw 1, WATER_GUN - dbw 7, GUST - dbw 14, RAGE - dbw 21, BUBBLEBEAM - dbw 28, AGILITY - dbw 35, TWISTER - dbw 42, FUTURE_SIGHT - dbw 49, HYDRO_PUMP + dbw 1, TAIL_WHIP + dbw 7, CONFUSION + dbw 14, GUST + dbw 21, RAGE + dbw 28, BUBBLEBEAM + dbw 35, AGILITY + dbw 42, PSYBEAM + dbw 49, TWISTER + dbw 56, FUTURE_SIGHT + dbw 63, PSYCHIC_M + dbw 70, HYDRO_PUMP db 0 ; no more level-up moves XylodonEvosAttacks: @@ -2399,28 +2727,36 @@ XylodonEvosAttacks: db 0 dbw 1, HEADBUTT dbw 1, WITHDRAW - dbw 7, ROCK_THROW - dbw 13, ROAR - dbw 21, TAKE_DOWN - dbw 29, ROCK_SLIDE - dbw 36, THRASH - dbw 43, ANCIENTPOWER - dbw 50, ROCK_HEAD + dbw 6, ROCK_THROW + dbw 11, ROAR + dbw 17, TAKE_DOWN + dbw 22, SUPERSONIC + dbw 27, SING + dbw 32, ROCK_HEAD + dbw 38, SLAM + dbw 44, ANCIENTPOWER + dbw 49, THRASH + dbw 54, SCREECH + dbw 60, ROCK_SLIDE db 0 ; no more level-up moves XylofinEvosAttacks: db 0 ; no more evolutions dbw 1, HEADBUTT dbw 1, WITHDRAW - dbw 7, ROCK_THROW - dbw 13, ROAR - dbw 21, TAKE_DOWN - dbw 29, ROCK_SLIDE - dbw 36, THRASH + dbw 6, ROCK_THROW + dbw 11, ROAR + dbw 17, TAKE_DOWN + dbw 22, SUPERSONIC + dbw 27, SING + dbw 32, ROCK_HEAD + dbw 38, SLAM dbw 40, IRON_TAIL - dbw 48, ANCIENTPOWER - dbw 55, ROCK_HEAD - dbw 62, HYDRO_PUMP + dbw 46, ANCIENTPOWER + dbw 51, THRASH + dbw 58, SCREECH + dbw 64, ROCK_SLIDE + dbw 70, HYDRO_PUMP db 0 ; no more level-up moves DokuroarEvosAttacks: @@ -2430,10 +2766,13 @@ DokuroarEvosAttacks: dbw 7, SPITE dbw 14, NIGHT_SHADE dbw 21, ANCIENTPOWER - dbw 28, SLASH - dbw 35, ROCK_HEAD - dbw 42, DESTINY_BOND - dbw 49, ROCK_SLASH + dbw 28, BONE_CLUB + dbw 35, SLASH + dbw 42, ROCK_HEAD + dbw 49, BONE_RUSH + dbw 56, DESTINY_BOND + dbw 63, TAKE_DOWN + dbw 70, ROCK_SLASH db 0 ; no more level-up moves ScreamTailEvosAttacks: @@ -2600,13 +2939,15 @@ RaikouEvosAttacks: dbw 1, FOCUS_ENERGY ; SW97 dbw 1, BITE dbw 1, LEER - dbw 11, THUNDERSHOCK - dbw 21, ROAR - dbw 31, QUICK_ATTACK - dbw 41, SPARK ; fit tbolt around here - dbw 51, REFLECT ; and detect - dbw 61, CRUNCH - dbw 71, THUNDER + dbw 5, ROAR + dbw 15, THUNDERSHOCK + dbw 25, QUICK_ATTACK + dbw 35, SPARK + dbw 45, DETECT ; SW97 + dbw 55, THUNDERBOLT + dbw 65, REFLECT + dbw 75, CRUNCH + dbw 85, THUNDER db 0 ; no more level-up moves EnteiEvosAttacks: @@ -2615,28 +2956,34 @@ EnteiEvosAttacks: dbw 1, FOCUS_ENERGY ; SW97 dbw 1, BITE dbw 1, LEER - dbw 11, EMBER - dbw 21, ROAR - dbw 31, FIRE_SPIN - dbw 41, STOMP ; fit endure and quick attack around here - dbw 51, FLAMETHROWER - dbw 61, SWAGGER - dbw 71, FIRE_BLAST + dbw 5, ROAR + dbw 15, EMBER + dbw 25, QUICK_ATTACK ; SW97 + dbw 35, FIRE_SPIN + dbw 45, STOMP + dbw 55, FLAMETHROWER + dbw 65, ENDURE ; SW97 + dbw 75, SWAGGER + dbw 85, FIRE_BLAST db 0 ; no more level-up moves -SuicuneEvosAttacks: ; try to fit water gun and roar into this without fucking up the boss fight +SuicuneEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH ; SW97 dbw 1, FOCUS_ENERGY ; SW97 dbw 1, BITE dbw 1, LEER - dbw 11, BUBBLEBEAM - dbw 21, RAIN_DANCE - dbw 31, GUST - dbw 41, AURORA_BEAM - dbw 51, MIST ; fit mind reader and quick attack around here - dbw 61, MIRROR_COAT - dbw 71, HYDRO_PUMP + dbw 5, ROAR + dbw 5, WATER_GUN + dbw 15, BUBBLEBEAM + dbw 25, QUICK_ATTACK ; SW97 + dbw 25, RAIN_DANCE + dbw 35, GUST + dbw 45, AURORA_BEAM + dbw 55, MIND_READER ; SW97 + dbw 65, MIST + dbw 75, MIRROR_COAT + dbw 85, HYDRO_PUMP db 0 ; no more level-up moves LarvitarEvosAttacks: @@ -2651,7 +2998,8 @@ LarvitarEvosAttacks: dbw 36, SCARY_FACE dbw 43, CRUNCH dbw 50, EARTHQUAKE - dbw 57, HYPER_BEAM + dbw 57, ROCK_HEAD + dbw 64, HYPER_BEAM db 0 ; no more level-up moves PupitarEvosAttacks: @@ -2659,65 +3007,70 @@ PupitarEvosAttacks: db 0 ; no more evolutions dbw 1, BITE dbw 1, LEER - dbw 1, SANDSTORM - dbw 1, SCREECH dbw 8, SANDSTORM dbw 15, SCREECH dbw 22, ROCK_SLIDE dbw 29, THRASH dbw 38, SCARY_FACE - dbw 47, CRUNCH - dbw 56, EARTHQUAKE - dbw 65, HYPER_BEAM + dbw 45, CRUNCH + dbw 54, EARTHQUAKE + dbw 61, ROCK_HEAD + dbw 70, HYPER_BEAM db 0 ; no more level-up moves TyranitarEvosAttacks: db 0 ; no more evolutions dbw 1, BITE dbw 1, LEER - dbw 1, SANDSTORM - dbw 1, SCREECH dbw 8, SANDSTORM dbw 15, SCREECH dbw 22, ROCK_SLIDE dbw 29, THRASH dbw 38, SCARY_FACE - dbw 47, CRUNCH - dbw 61, EARTHQUAKE + dbw 45, CRUNCH + dbw 54, EARTHQUAKE + dbw 65, ROCK_HEAD dbw 75, HYPER_BEAM db 0 ; no more level-up moves LugiaEvosAttacks: db 0 ; no more evolutions - dbw 1, AEROBLAST - dbw 11, SAFEGUARD - dbw 22, GUST - dbw 33, RECOVER - dbw 44, HYDRO_PUMP - dbw 55, RAIN_DANCE + dbw 1, WING_ATTACK ; SW97, from Ho-Oh + dbw 1, LEER ; SW97, from Ho-Oh + dbw 1, SCARY_FACE ; SW97, from Ho-Oh + dbw 8, WHIRLWIND + dbw 16, GUST + dbw 24, SAFEGUARD + dbw 32, TWISTER ; HGSS tutor + dbw 40, RECOVER + dbw 48, RAIN_DANCE + dbw 54, HYDRO_PUMP dbw 60, AEROBLAST ; (allows it to have its signature move when caught) - dbw 66, SWIFT - dbw 77, WHIRLWIND - dbw 88, ANCIENTPOWER - dbw 99, FUTURE_SIGHT + dbw 68, PSYCHIC_M ; TM & substitute for Extrasensory + dbw 75, SWIFT + dbw 80, ANCIENTPOWER + dbw 88, FUTURE_SIGHT + dbw 96, SKY_ATTACK ; HGSS db 0 ; no more level-up moves HoOhEvosAttacks: db 0 ; no more evolutions dbw 1, WING_ATTACK ; SW97 dbw 1, LEER ; SW97 - dbw 1, SCARY_FACE ; SW97 - these won't be learned normally... - dbw 1, SACRED_FIRE - dbw 11, SAFEGUARD - dbw 22, GUST - dbw 33, RECOVER ; try to fit lscreen, ref, and sky attack around the learnset - dbw 44, FIRE_BLAST - dbw 55, SUNNY_DAY - dbw 60, SACRED_FIRE ; (allows it to have its signature move when caught) - dbw 66, SWIFT - dbw 77, WHIRLWIND - dbw 88, ANCIENTPOWER - dbw 99, FUTURE_SIGHT + dbw 1, SCARY_FACE ; SW97 + dbw 8, WHIRLWIND + dbw 16, GUST + dbw 24, SAFEGUARD + dbw 32, LIGHT_SCREEN ; SW97 + dbw 40, RECOVER + dbw 48, SUNNY_DAY + dbw 54, FIRE_BLAST + dbw 60, SACRED_FIRE + dbw 68, REFLECT ; SW97 + dbw 74, SWIFT + dbw 80, ANCIENTPOWER + dbw 88, FUTURE_SIGHT + dbw 96, SKY_ATTACK ; SW97 db 0 ; no more level-up moves HyoshuYangEvosAttacks: diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index ee99218..91931c5 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -219,17 +219,19 @@ BulbasaurEvosAttacks: dbbw EVOLVE_LEVEL, 16, IVYSAUR db 0 ; no more evolutions dbw 1, TACKLE - dbw 4, GROWL + dbw 1, GROWL dbw 7, LEECH_SEED dbw 10, VINE_WHIP dbw 15, POISONPOWDER dbw 15, SLEEP_POWDER dbw 15, STUN_SPORE ; RG proto & SW97 dbw 20, RAZOR_LEAF - dbw 25, SWEET_SCENT + dbw 26, SWEET_SCENT dbw 32, GROWTH - dbw 39, SYNTHESIS - dbw 46, SOLARBEAM + dbw 38, SYNTHESIS + dbw 44, PETAL_DANCE ; RG proto + dbw 49, TOXIC ; KEP + dbw 55, SOLARBEAM db 0 ; no more level-up moves IvysaurEvosAttacks: @@ -237,37 +239,35 @@ IvysaurEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, LEECH_SEED - dbw 4, GROWL dbw 7, LEECH_SEED dbw 10, VINE_WHIP dbw 15, POISONPOWDER dbw 15, SLEEP_POWDER dbw 15, STUN_SPORE ; RG proto & SW97 dbw 22, RAZOR_LEAF - dbw 29, SWEET_SCENT - dbw 38, GROWTH - dbw 47, SYNTHESIS - dbw 56, SOLARBEAM + dbw 28, SWEET_SCENT + dbw 34, GROWTH + dbw 42, SYNTHESIS + dbw 48, PETAL_DANCE ; RG proto + dbw 53, TOXIC ; KEP + dbw 61, SOLARBEAM db 0 ; no more level-up moves VenusaurEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, LEECH_SEED - dbw 1, VINE_WHIP - dbw 4, GROWL dbw 7, LEECH_SEED dbw 10, VINE_WHIP dbw 15, POISONPOWDER dbw 15, SLEEP_POWDER dbw 15, STUN_SPORE ; RG proto & SW97 dbw 22, RAZOR_LEAF - dbw 29, SWEET_SCENT - dbw 36, PETAL_DANCE ; RG proto - dbw 41, GROWTH - dbw 53, SYNTHESIS + dbw 28, SWEET_SCENT + dbw 34, GROWTH + dbw 44, SYNTHESIS + dbw 50, PETAL_DANCE ; RG proto + dbw 55, TOXIC ; KEP & TM dbw 65, SOLARBEAM db 0 ; no more level-up moves @@ -277,14 +277,16 @@ CharmanderEvosAttacks: dbw 1, SCRATCH dbw 1, GROWL dbw 7, EMBER - dbw 9, METAL_CLAW ; FRLG - dbw 13, SMOKESCREEN + dbw 10, METAL_CLAW ; FRLG + dbw 14, SMOKESCREEN dbw 19, RAGE dbw 25, SCARY_FACE dbw 31, FLAMETHROWER + dbw 34, SEISMIC_TOSS ; KEP & RBY TM dbw 37, SLASH dbw 43, DRAGON_RAGE dbw 49, FIRE_SPIN + dbw 55, FIRE_BLAST ; KEP & TM db 0 ; no more level-up moves CharmeleonEvosAttacks: @@ -293,65 +295,69 @@ CharmeleonEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 1, EMBER - dbw 9, METAL_CLAW ; FRLG - dbw 13, SMOKESCREEN - dbw 20, RAGE + dbw 7, EMBER + dbw 10, METAL_CLAW ; FRLG + dbw 14, SMOKESCREEN + dbw 21, RAGE dbw 27, SCARY_FACE - dbw 34, FLAMETHROWER + dbw 33, FLAMETHROWER + dbw 36, SEISMIC_TOSS ; KEP & RBY TM dbw 41, SLASH - dbw 48, DRAGON_RAGE - dbw 55, FIRE_SPIN + dbw 47, DRAGON_RAGE + dbw 53, FIRE_SPIN + dbw 61, FIRE_BLAST ; KEP & TM db 0 ; no more level-up moves CharizardEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 1, EMBER - dbw 1, SMOKESCREEN - dbw 9, METAL_CLAW ; FRLG - dbw 13, SMOKESCREEN - dbw 20, RAGE + dbw 7, EMBER + dbw 10, METAL_CLAW ; FRLG + dbw 14, SMOKESCREEN + dbw 21, RAGE dbw 27, SCARY_FACE - dbw 34, FLAMETHROWER + dbw 33, FLAMETHROWER + dbw 36, SEISMIC_TOSS ; KEP & RBY TM dbw 36, WING_ATTACK - dbw 44, SLASH - dbw 54, DRAGON_RAGE - dbw 64, FIRE_SPIN + dbw 43, SLASH + dbw 49, DRAGON_RAGE + dbw 55, FIRE_SPIN + dbw 65, FIRE_BLAST ; KEP & TM db 0 ; no more level-up moves CharmadaEvosAttacks: db 0 ; no more evolutions - dbw 1, METAL_CLAW + dbw 1, SCRATCH dbw 1, GROWL - dbw 1, EMBER - dbw 1, SMOKESCREEN dbw 7, EMBER - dbw 13, SMOKESCREEN - dbw 20, RAGE + dbw 10, METAL_CLAW + dbw 14, SMOKESCREEN + dbw 21, RAGE dbw 27, SCARY_FACE - dbw 34, FLAMETHROWER + dbw 33, FLAMETHROWER dbw 36, IRON_TAIL - dbw 44, SPARK - dbw 54, DRAGON_RAGE - dbw 64, FIRE_SPIN + dbw 41, SPARK + dbw 49, DRAGON_RAGE + dbw 55, FIRE_SPIN + dbw 65, FIRE_BLAST db 0 ; no more level-up moves SquirtleEvosAttacks: - dbbw EVOLVE_LEVEL, 16, WARTORTLE ; Give this man Curse + dbbw EVOLVE_LEVEL, 16, WARTORTLE ; Completely retooled to RB proto & Totartle db 0 ; no more evolutions dbw 1, TACKLE - dbw 4, TAIL_WHIP - dbw 7, BUBBLE - dbw 10, WITHDRAW - dbw 13, WATER_GUN - dbw 18, BITE - dbw 23, RAPID_SPIN - dbw 28, PROTECT - dbw 33, RAIN_DANCE - dbw 40, SKULL_BASH - dbw 47, HYDRO_PUMP + dbw 1, TAIL_WHIP + dbw 7, ABSORB ; New! + dbw 11, WITHDRAW + dbw 14, BUBBLEBEAM ; RG proto + dbw 17, COMET_PUNCH ; RG proto + dbw 22, RAPID_SPIN + dbw 26, MEGA_DRAIN ; New! + dbw 31, STOMP ; RG proto + dbw 36, SYNTHESIS ; New! + dbw 41, PETAL_DANCE ; New! + dbw 47, WATERFALL ; New! db 0 ; no more level-up moves WartortleEvosAttacks: @@ -359,37 +365,34 @@ WartortleEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, BUBBLE - dbw 4, TAIL_WHIP - dbw 7, BUBBLE - dbw 10, WITHDRAW - dbw 13, WATER_GUN - dbw 19, BITE - dbw 25, RAPID_SPIN - dbw 31, PROTECT - dbw 37, RAIN_DANCE - dbw 45, SKULL_BASH - dbw 53, HYDRO_PUMP + dbw 7, ABSORB ; New! + dbw 11, WITHDRAW + dbw 14, BUBBLEBEAM ; RG proto + dbw 19, COMET_PUNCH ; RG proto + dbw 24, RAPID_SPIN + dbw 28, MEGA_DRAIN ; New! + dbw 35, STOMP ; RG proto + dbw 40, SYNTHESIS ; New! + dbw 45, PETAL_DANCE ; New! + dbw 53, WATERFALL ; New! db 0 ; no more level-up moves TotartleEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, BUBBLE - dbw 1, WITHDRAW - dbw 4, TAIL_WHIP - dbw 7, BUBBLE - dbw 10, WITHDRAW - dbw 13, WATER_GUN - dbw 19, BITE - dbw 25, RAPID_SPIN - dbw 31, PROTECT - dbw 36, COMET_PUNCH - dbw 40, RAIN_DANCE - dbw 51, SKULL_BASH - dbw 62, HYDRO_PUMP - dbw 67, PETAL_DANCE + dbw 7, ABSORB ; New! + dbw 11, WITHDRAW + dbw 14, BUBBLEBEAM ; RG proto + dbw 19, COMET_PUNCH ; RG proto + dbw 24, RAPID_SPIN + dbw 28, MEGA_DRAIN ; New! + dbw 35, STOMP ; RG proto + dbw 36, MEGA_PUNCH ; RG proto + dbw 42, SYNTHESIS ; New! + dbw 47, PETAL_DANCE ; New! + dbw 55, WATERFALL ; New! + dbw 65, BLIZZARD ; RG proto db 0 ; no more level-up moves CaterpieEvosAttacks: @@ -413,10 +416,10 @@ ButterfreeEvosAttacks: dbw 13, POISONPOWDER dbw 14, STUN_SPORE dbw 15, SLEEP_POWDER - dbw 18, SUPERSONIC - dbw 23, WHIRLWIND - dbw 28, GUST - dbw 34, PSYBEAM + dbw 20, SUPERSONIC + dbw 25, WHIRLWIND + dbw 30, GUST + dbw 35, PSYBEAM dbw 40, SAFEGUARD db 0 ; no more level-up moves @@ -463,8 +466,9 @@ PupalEvosAttacks: CarapthorEvosAttacks: db 0 ; no more evolutions - dbw 1, COMET_PUNCH - dbw 10, COMET_PUNCH + dbw 1, COMET_PUNCH ; dbw 1, UPPERCUT + ; dbw 10, UPPERCUT + dbw 12, COMET_PUNCH dbw 15, PIN_MISSILE dbw 20, DEFENSE_CURL dbw 25, SWIFT @@ -478,69 +482,69 @@ KotoraEvosAttacks: dbbw EVOLVE_ITEM, THUNDERSTONE, RAITORA db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 3, TACKLE + dbw 1, TACKLE dbw 7, LEER dbw 13, ROAR dbw 18, QUICK_ATTACK dbw 23, PURSUIT dbw 27, SPARK dbw 31, BITE - dbw 34, SCARY_FACE + dbw 36, SCARY_FACE dbw 42, THUNDER - dbw 49, AGILITY - dbw 54, LIGHT_SCREEN + dbw 48, AGILITY + dbw 53, LIGHT_SCREEN db 0 ; no more level-up moves GaotoraEvosAttacks: dbbw EVOLVE_LEVEL, 36, GAOTORA db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 3, TACKLE + dbw 1, TACKLE dbw 7, LEER dbw 13, ROAR dbw 20, QUICK_ATTACK - dbw 27, PURSUIT - dbw 33, SPARK - dbw 39, BITE - dbw 44, SCARY_FACE - dbw 49, THRASH - dbw 54, THUNDER - dbw 49, AGILITY - dbw 54, LIGHT_SCREEN + dbw 25, PURSUIT + dbw 29, SPARK + dbw 35, BITE + dbw 40, SCARY_FACE + dbw 46, THRASH + dbw 50, THUNDER + dbw 56, AGILITY + dbw 61, LIGHT_SCREEN db 0 ; no more level-up moves GorotoraEvosAttacks: db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 3, TACKLE + dbw 1, TACKLE dbw 7, LEER dbw 13, ROAR dbw 20, QUICK_ATTACK - dbw 27, PURSUIT - dbw 33, SPARK + dbw 25, PURSUIT + dbw 29, SPARK + dbw 35, BITE dbw 36, BODY_SLAM - dbw 42, BITE - dbw 50, SCARY_FACE - dbw 58, THRASH - dbw 66, THUNDER - dbw 78, AGILITY - dbw 84, LIGHT_SCREEN + dbw 42, SCARY_FACE + dbw 48, THRASH + dbw 52, THUNDER + dbw 60, AGILITY + dbw 65, LIGHT_SCREEN db 0 ; no more level-up moves RaitoraEvosAttacks: db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 3, TACKLE + dbw 1, TACKLE dbw 7, LEER dbw 13, ROAR dbw 20, QUICK_ATTACK - dbw 27, PURSUIT - dbw 33, SPARK - dbw 39, BITE - dbw 44, SCARY_FACE - dbw 54, THUNDER - dbw 63, AGILITY - dbw 70, LIGHT_SCREEN + dbw 26, PURSUIT + dbw 30, SPARK + dbw 36, BITE + dbw 40, SCARY_FACE + dbw 46, THUNDER + dbw 51, AGILITY + dbw 57, LIGHT_SCREEN db 0 ; no more level-up moves PidgeyEvosAttacks: @@ -551,45 +555,43 @@ PidgeyEvosAttacks: dbw 9, GUST dbw 15, QUICK_ATTACK dbw 19, MUD_SLAP ; SW97 - dbw 21, WHIRLWIND - dbw 26, SING ; RG proto - dbw 29, WING_ATTACK + dbw 23, WHIRLWIND + dbw 27, SING ; RG proto + dbw 32, WING_ATTACK dbw 37, AGILITY - dbw 47, MIRROR_MOVE + dbw 43, MIRROR_MOVE + dbw 49, SKY_ATTACK ; LGPE db 0 ; no more level-up moves PidgeottoEvosAttacks: dbbw EVOLVE_LEVEL, 36, PIDGEOT db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, SAND_ATTACK - dbw 1, GUST dbw 5, SAND_ATTACK dbw 9, GUST dbw 15, QUICK_ATTACK - dbw 19, MUD_SLAP ; SW97 - dbw 23, WHIRLWIND - dbw 26, SING ; RG proto - dbw 33, WING_ATTACK - dbw 43, AGILITY - dbw 55, MIRROR_MOVE + dbw 21, MUD_SLAP ; SW97 + dbw 25, WHIRLWIND + dbw 29, SING ; RG proto + dbw 36, WING_ATTACK + dbw 41, AGILITY + dbw 47, MIRROR_MOVE + dbw 55, SKY_ATTACK ; LGPE db 0 ; no more level-up moves PidgeotEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, SAND_ATTACK - dbw 1, GUST - dbw 1, QUICK_ATTACK dbw 5, SAND_ATTACK dbw 9, GUST dbw 15, QUICK_ATTACK - dbw 19, MUD_SLAP ; SW97 - dbw 23, WHIRLWIND - dbw 26, SING ; RG proto - dbw 33, WING_ATTACK - dbw 46, AGILITY - dbw 61, MIRROR_MOVE + dbw 21, MUD_SLAP ; SW97 + dbw 25, WHIRLWIND + dbw 29, SING ; RG proto + dbw 36, WING_ATTACK + dbw 43, AGILITY + dbw 49, MIRROR_MOVE + dbw 57, SKY_ATTACK ; LGPE db 0 ; no more level-up moves RattataEvosAttacks: @@ -597,25 +599,28 @@ RattataEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 7, QUICK_ATTACK - dbw 13, HYPER_FANG + dbw 6, QUICK_ATTACK + dbw 11, GROWL ; RG proto + dbw 15, HYPER_FANG dbw 20, FOCUS_ENERGY - dbw 27, PURSUIT - dbw 34, SUPER_FANG - dbw 40, SLASH ; RG proto + dbw 25, PURSUIT + dbw 30, SUPER_FANG + dbw 36, THRASH ; RG proto + dbw 42, SLASH ; RG proto db 0 ; no more level-up moves RaticateEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, QUICK_ATTACK - dbw 7, QUICK_ATTACK - dbw 13, HYPER_FANG - dbw 20, SCARY_FACE - dbw 30, PURSUIT - dbw 40, SUPER_FANG - dbw 47, SLASH ; RG proto + dbw 6, QUICK_ATTACK + dbw 11, GROWL ; RG proto + dbw 15, HYPER_FANG + dbw 20, FOCUS_ENERGY + dbw 27, PURSUIT + dbw 32, SUPER_FANG + dbw 40, THRASH ; RG proto + dbw 46, SLASH ; RG proto db 0 ; no more level-up moves SpearowEvosAttacks: @@ -625,26 +630,26 @@ SpearowEvosAttacks: dbw 1, GROWL dbw 7, LEER dbw 13, FURY_ATTACK - dbw 18, WING_ATTACK ; RG proto - dbw 25, PURSUIT + dbw 19, PURSUIT + dbw 25, WING_ATTACK ; RG proto dbw 31, MIRROR_MOVE dbw 37, DRILL_PECK dbw 43, AGILITY + dbw 49, DOUBLE_TEAM ; SW97 db 0 ; no more level-up moves FearowEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, GROWL - dbw 1, LEER - dbw 1, FURY_ATTACK dbw 7, LEER dbw 13, FURY_ATTACK - dbw 18, WING_ATTACK ; RG proto - dbw 26, PURSUIT - dbw 32, MIRROR_MOVE - dbw 40, DRILL_PECK + dbw 19, PURSUIT + dbw 27, WING_ATTACK ; RG proto + dbw 33, MIRROR_MOVE + dbw 39, DRILL_PECK dbw 47, AGILITY + dbw 53, DOUBLE_TEAM ; SW97 db 0 ; no more level-up moves EkansEvosAttacks: @@ -654,24 +659,26 @@ EkansEvosAttacks: dbw 1, LEER dbw 9, POISON_STING dbw 15, BITE - dbw 23, GLARE - dbw 29, SCREECH + dbw 21, GLARE + dbw 27, SCREECH + dbw 32, HEADBUTT ; RG proto dbw 37, ACID dbw 43, HAZE + dbw 49, TOXIC ; RG proto db 0 ; no more level-up moves ArbokEvosAttacks: db 0 ; no more evolutions dbw 1, WRAP dbw 1, LEER - dbw 1, POISON_STING - dbw 1, BITE dbw 9, POISON_STING dbw 15, BITE - dbw 25, GLARE - dbw 33, SCREECH - dbw 43, ACID - dbw 51, HAZE + dbw 21, GLARE + dbw 29, SCREECH + dbw 34, HEADBUTT ; RG proto + dbw 39, ACID + dbw 47, HAZE + dbw 51, TOXIC ; RG proto db 0 ; no more level-up moves PikachuEvosAttacks: @@ -680,35 +687,55 @@ PikachuEvosAttacks: dbw 1, THUNDERSHOCK dbw 1, GROWL dbw 6, TAIL_WHIP - dbw 8, THUNDER_WAVE - dbw 11, QUICK_ATTACK - dbw 13, SPARK ; SW97 - dbw 15, DOUBLE_TEAM - dbw 20, SLAM - dbw 26, THUNDERBOLT + dbw 9, THUNDER_WAVE + dbw 12, QUICK_ATTACK + dbw 16, SPARK ; SW97 + dbw 20, DOUBLE_TEAM + dbw 24, SLAM + dbw 28, THUNDERBOLT dbw 33, AGILITY + dbw 37, SWIFT ; RB dbw 41, THUNDER - dbw 50, LIGHT_SCREEN + dbw 47, LIGHT_SCREEN db 0 ; no more level-up moves RaichuEvosAttacks: - dbbw EVOLVE_TRADE, -1, GOROCHU + dbbw EVOLVE_TRADE, -1, GOROCHU ; due to being a starter, moveset update db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 1, TAIL_WHIP - dbw 1, QUICK_ATTACK - dbw 1, THUNDERBOLT + dbw 1, GROWL + dbw 6, TAIL_WHIP + dbw 9, THUNDER_WAVE + dbw 12, QUICK_ATTACK + dbw 16, SPARK ; SW97 + dbw 20, DOUBLE_TEAM + dbw 24, SLAM + dbw 28, THUNDERBOLT + dbw 33, AGILITY + dbw 37, SWIFT ; RB + dbw 41, THUNDER + dbw 47, LIGHT_SCREEN db 0 ; no more level-up moves GorochuEvosAttacks: db 0 ; no more evolutions dbw 1, THUNDERSHOCK - dbw 1, TAIL_WHIP - dbw 1, QUICK_ATTACK - dbw 1, THUNDERBOLT - dbw 53, SAND_ATTACK - dbw 57, FOCUS_ENERGY - dbw 60, LEER + dbw 1, GROWL + dbw 6, TAIL_WHIP + dbw 9, THUNDER_WAVE + dbw 12, QUICK_ATTACK + dbw 16, SPARK + dbw 20, DOUBLE_TEAM + dbw 24, SLAM + dbw 28, THUNDERBOLT + dbw 33, AGILITY + dbw 37, SWIFT + dbw 41, THUNDER + dbw 47, LIGHT_SCREEN + dbw 52, SAND_ATTACK + dbw 55, FOCUS_ENERGY + dbw 58, LEER + dbw 61, BELLY_DRUM dbw 65, HORN_DRILL db 0 ; no more level-up moves @@ -719,39 +746,45 @@ SandshrewEvosAttacks: dbw 1, MUD_SLAP ; SW97 dbw 6, DEFENSE_CURL dbw 11, SAND_ATTACK - dbw 17, POISON_STING - dbw 23, SLASH - dbw 30, SWIFT - dbw 37, FURY_SWIPES - dbw 45, SANDSTORM + dbw 15, POISON_STING + dbw 20, FURY_SWIPES + dbw 26, ROLLOUT ; HGSS + dbw 30, SLASH + dbw 34, SWIFT + dbw 40, SANDSTORM + dbw 46, SWORDS_DANCE ; LGPE + dbw 51, EARTHQUAKE ; LGPE & KEP db 0 ; no more level-up moves SandslashEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, MUD_SLAP ; SW97 - dbw 1, DEFENSE_CURL - dbw 1, SAND_ATTACK dbw 6, DEFENSE_CURL dbw 11, SAND_ATTACK - dbw 17, POISON_STING - dbw 24, SLASH - dbw 33, SWIFT - dbw 42, FURY_SWIPES - dbw 52, SANDSTORM + dbw 15, POISON_STING + dbw 20, FURY_SWIPES + dbw 28, ROLLOUT ; HGSS + dbw 32, SLASH + dbw 36, SWIFT + dbw 44, SANDSTORM + dbw 50, SWORDS_DANCE ; LGPE + dbw 55, EARTHQUAKE ; LGPE & KEP db 0 ; no more level-up moves NidoranFEvosAttacks: dbbw EVOLVE_LEVEL, 16, NIDORINA db 0 ; no more evolutions dbw 1, GROWL - dbw 1, TACKLE - dbw 8, SCRATCH + dbw 1, SCRATCH + dbw 8, SAND_ATTACK ; RG proto dbw 12, DOUBLE_KICK dbw 17, POISON_STING dbw 23, TAIL_WHIP - dbw 30, BITE - dbw 38, FURY_SWIPES + dbw 29, BITE + dbw 35, FURY_SWIPES + dbw 41, GLARE ; RG proto + dbw 47, CRUNCH ; FRLG db 0 ; no more level-up moves NidorinaEvosAttacks: @@ -760,36 +793,41 @@ NidorinaEvosAttacks: dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions dbw 1, GROWL - dbw 1, TACKLE - dbw 8, SCRATCH + dbw 1, SCRATCH + dbw 8, SAND_ATTACK ; RG proto dbw 12, DOUBLE_KICK dbw 19, POISON_STING - dbw 27, TAIL_WHIP - dbw 36, BITE - dbw 46, FURY_SWIPES + dbw 25, TAIL_WHIP + dbw 31, BITE + dbw 39, FURY_SWIPES + dbw 45, GLARE ; RG proto + dbw 51, CRUNCH ; FRLG db 0 ; no more level-up moves NidoqueenEvosAttacks: db 0 ; no more evolutions - dbw 1, TACKLE + dbw 1, SAND_ATTACK dbw 1, SCRATCH dbw 1, DOUBLE_KICK dbw 1, TAIL_WHIP dbw 23, BODY_SLAM - dbw 30, ATTRACT ; SW97 + dbw 36, ATTRACT ; SW97 + dbw 43, VITAL_THROW ; Substitute for Superpower db 0 ; no more level-up moves NidoranMEvosAttacks: dbbw EVOLVE_LEVEL, 16, NIDORINO db 0 ; no more evolutions dbw 1, LEER - dbw 1, TACKLE + dbw 1, PECK ; FRLG dbw 8, HORN_ATTACK dbw 12, DOUBLE_KICK dbw 17, POISON_STING dbw 23, FOCUS_ENERGY - dbw 30, FURY_ATTACK - dbw 38, HORN_DRILL + dbw 29, ROAR ; RG proto + dbw 35, FURY_ATTACK + dbw 41, SLASH ; RG proto + dbw 47, HORN_DRILL db 0 ; no more level-up moves NidorinoEvosAttacks: @@ -797,23 +835,26 @@ NidorinoEvosAttacks: dbbw EVOLVE_LEVEL, 36, NIDOKING dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions - dbw 1, LEER - dbw 1, TACKLE + dbw 1, PECK ; FRLG dbw 8, HORN_ATTACK dbw 12, DOUBLE_KICK dbw 19, POISON_STING - dbw 27, FOCUS_ENERGY - dbw 36, FURY_ATTACK - dbw 46, HORN_DRILL + dbw 25, FOCUS_ENERGY + dbw 31, ROAR ; RG proto + dbw 39, FURY_ATTACK + dbw 45, SLASH ; RG proto + dbw 51, HORN_DRILL db 0 ; no more level-up moves NidokingEvosAttacks: db 0 ; no more evolutions - dbw 1, TACKLE + dbw 1, PECK ; FRLG dbw 1, HORN_ATTACK dbw 1, DOUBLE_KICK dbw 1, POISON_STING dbw 23, THRASH + dbw 36, ATTRACT ; SW97 + dbw 43, MEGAHORN ; FRLG db 0 ; no more level-up moves NidoreignEvosAttacks: @@ -823,6 +864,8 @@ NidoreignEvosAttacks: dbw 1, POISON_STING dbw 1, TOXIC dbw 23, ROCK_HEAD + dbw 36, BODY_SLAM + dbw 43, SKULL_BASH db 0 ; no more level-up moves ClefairyEvosAttacks: @@ -834,10 +877,12 @@ ClefairyEvosAttacks: dbw 8, SING dbw 13, DOUBLESLAP dbw 19, MINIMIZE - dbw 26, DEFENSE_CURL - dbw 34, METRONOME - dbw 43, MOONLIGHT - dbw 53, LIGHT_SCREEN + dbw 24, DEFENSE_CURL + dbw 28, TAKE_DOWN ; RG proto + dbw 33, METRONOME + dbw 39, BODY_SLAM ; KEP + dbw 45, MOONLIGHT + dbw 51, LIGHT_SCREEN db 0 ; no more level-up moves ClefableEvosAttacks: @@ -855,10 +900,13 @@ VulpiiiEvosAttacks: dbw 1, TAIL_WHIP dbw 7, QUICK_ATTACK dbw 13, ROAR - dbw 17, CONFUSE_RAY - dbw 21, SAFEGUARD - dbw 25, FLAMETHROWER - dbw 29, FIRE_SPIN + dbw 17, DOUBLE_TEAM ; SW97 + dbw 21, CONFUSE_RAY + dbw 25, SAFEGUARD + dbw 29, FLAMETHROWER + dbw 33, FORESIGHT ; SW97 + dbw 37, FIRE_SPIN + dbw 41, CURSE ; 99 Proto db 0 ; no more level-up moves VulpixEvosAttacks: @@ -868,10 +916,13 @@ VulpixEvosAttacks: dbw 1, TAIL_WHIP dbw 7, QUICK_ATTACK dbw 13, ROAR - dbw 19, CONFUSE_RAY - dbw 25, SAFEGUARD - dbw 31, FLAMETHROWER - dbw 37, FIRE_SPIN + dbw 19, DOUBLE_TEAM ; SW97 + dbw 23, CONFUSE_RAY + dbw 27, SAFEGUARD + dbw 33, FLAMETHROWER + dbw 37, FORESIGHT ; SW97 + dbw 41, FIRE_SPIN + dbw 47, CURSE ; 99 Proto db 0 ; no more level-up moves NinetalesEvosAttacks: @@ -887,14 +938,17 @@ JigglypuffEvosAttacks: dbbw EVOLVE_ITEM, MOON_STONE, WIGGLYTUFF db 0 ; no more evolutions dbw 1, SING + dbw 1, MIMIC ; FRLG dbw 4, DEFENSE_CURL dbw 9, POUND dbw 14, DISABLE dbw 19, ROLLOUT dbw 24, DOUBLESLAP dbw 29, REST - dbw 34, BODY_SLAM - dbw 39, DOUBLE_EDGE + dbw 34, COUNTER ; RG proto + dbw 39, BODY_SLAM + dbw 44, DOUBLE_EDGE + dbw 49, PAIN_SPLIT ; SW97 db 0 ; no more level-up moves WigglytuffEvosAttacks: @@ -911,10 +965,12 @@ BittybatEvosAttacks: dbw 1, LEECH_LIFE dbw 6, SUPERSONIC dbw 12, BITE - dbw 17, CONFUSE_RAY - dbw 23, WING_ATTACK - dbw 30, MEAN_LOOK - dbw 38, HAZE + dbw 15, CONFUSE_RAY + dbw 20, WING_ATTACK + dbw 26, THRASH ; RG proto + dbw 31, CONFUSION ; RG proto + dbw 35, MEAN_LOOK + dbw 41, HAZE db 0 ; no more level-up moves ZubatEvosAttacks: @@ -923,25 +979,28 @@ ZubatEvosAttacks: dbw 1, LEECH_LIFE dbw 6, SUPERSONIC dbw 12, BITE - dbw 19, CONFUSE_RAY - dbw 27, WING_ATTACK - dbw 36, MEAN_LOOK - dbw 46, HAZE + dbw 17, CONFUSE_RAY + dbw 22, WING_ATTACK + dbw 28, THRASH ; RG proto + dbw 35, CONFUSION ; RG proto + dbw 39, MEAN_LOOK + dbw 45, HAZE db 0 ; no more level-up moves GolbatEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT dbbw EVOLVE_LEVEL, 44, CROBAT ; do we need it this time? db 0 ; no more evolutions - dbw 1, SCREECH dbw 1, LEECH_LIFE - dbw 1, SUPERSONIC dbw 6, SUPERSONIC dbw 12, BITE - dbw 19, CONFUSE_RAY - dbw 30, WING_ATTACK - dbw 42, MEAN_LOOK - dbw 55, HAZE + dbw 17, CONFUSE_RAY + dbw 22, WING_ATTACK + dbw 24, SCREECH + dbw 31, THRASH ; RG proto + dbw 37, CONFUSION ; RG proto + dbw 41, MEAN_LOOK + dbw 47, HAZE db 0 ; no more level-up moves OddishEvosAttacks: @@ -953,8 +1012,11 @@ OddishEvosAttacks: dbw 16, STUN_SPORE dbw 18, SLEEP_POWDER dbw 23, ACID + dbw 28, MEGA_DRAIN ; HGSS dbw 32, MOONLIGHT - dbw 39, PETAL_DANCE + dbw 36, GROWTH ; SW97 + dbw 40, PETAL_DANCE + dbw 46, GIGA_DRAIN ; HGSS db 0 ; no more level-up moves GloomEvosAttacks: @@ -962,15 +1024,16 @@ GloomEvosAttacks: dbbw EVOLVE_ITEM, SUN_STONE, BELLOSSOM db 0 ; no more evolutions dbw 1, ABSORB - dbw 1, SWEET_SCENT - dbw 1, POISONPOWDER dbw 7, SWEET_SCENT dbw 14, POISONPOWDER dbw 16, STUN_SPORE dbw 18, SLEEP_POWDER - dbw 24, ACID - dbw 35, MOONLIGHT + dbw 25, ACID + dbw 30, MEGA_DRAIN ; HGSS + dbw 34, MOONLIGHT + dbw 40, GROWTH ; SW97 dbw 44, PETAL_DANCE + dbw 50, GIGA_DRAIN ; HGSS db 0 ; no more level-up moves VileplumeEvosAttacks: @@ -979,6 +1042,7 @@ VileplumeEvosAttacks: dbw 1, SWEET_SCENT dbw 1, STUN_SPORE dbw 1, PETAL_DANCE + dbw 55, SLUDGE_BOMB ; TM, made to match Bellossom db 0 ; no more level-up moves ParasporEvosAttacks: @@ -990,36 +1054,42 @@ ParasporEvosAttacks: dbw 13, POISONPOWDER dbw 17, LEECH_LIFE dbw 21, SPORE - dbw 25, SLASH + dbw 25, FURY_SWIPES ; SW97 dbw 29, GROWTH - dbw 33, GIGA_DRAIN + dbw 33, SLASH + dbw 37, GIGA_DRAIN + dbw 41, CROSS_CUTTER db 0 ; no more level-up moves ParasEvosAttacks: dbbw EVOLVE_LEVEL, 24, PARASECT db 0 ; no more evolutions + dbw 1, ABSORB ; RG proto dbw 1, SCRATCH dbw 7, STUN_SPORE dbw 13, POISONPOWDER dbw 19, LEECH_LIFE - dbw 25, SPORE - dbw 31, SLASH - dbw 37, GROWTH - dbw 43, GIGA_DRAIN + dbw 23, SPORE + dbw 27, FURY_SWIPES ; SW97 + dbw 33, GROWTH + dbw 37, SLASH + dbw 41, GIGA_DRAIN + dbw 47, CROSS_CUTTER db 0 ; no more level-up moves ParasectEvosAttacks: db 0 ; no more evolutions + dbw 1, ABSORB ; RG proto dbw 1, SCRATCH - dbw 1, STUN_SPORE - dbw 1, POISONPOWDER dbw 7, STUN_SPORE dbw 13, POISONPOWDER dbw 19, LEECH_LIFE - dbw 28, SPORE - dbw 37, SLASH - dbw 46, GROWTH - dbw 55, GIGA_DRAIN + dbw 23, SPORE + dbw 29, FURY_SWIPES ; SW97 + dbw 35, GROWTH + dbw 39, SLASH + dbw 45, GIGA_DRAIN + dbw 51, CROSS_CUTTER db 0 ; no more level-up moves VenonatEvosAttacks: @@ -1029,13 +1099,14 @@ VenonatEvosAttacks: dbw 1, DISABLE dbw 1, FORESIGHT dbw 9, SUPERSONIC - dbw 17, CONFUSION + dbw 15, CONFUSION dbw 20, POISONPOWDER dbw 25, LEECH_LIFE - dbw 28, STUN_SPORE + dbw 29, STUN_SPORE dbw 33, PSYBEAM - dbw 36, SLEEP_POWDER - dbw 41, PSYCHIC_M + dbw 37, SLEEP_POWDER + dbw 41, AGILITY ; RG proto + dbw 46, PSYCHIC_M db 0 ; no more level-up moves VenomothEvosAttacks: @@ -1043,58 +1114,61 @@ VenomothEvosAttacks: dbw 1, TACKLE dbw 1, DISABLE dbw 1, FORESIGHT - dbw 1, SUPERSONIC dbw 9, SUPERSONIC - dbw 17, CONFUSION + dbw 15, CONFUSION dbw 20, POISONPOWDER dbw 25, LEECH_LIFE - dbw 28, STUN_SPORE + dbw 29, STUN_SPORE dbw 31, GUST - dbw 36, PSYBEAM - dbw 42, SLEEP_POWDER - dbw 52, PSYCHIC_M + dbw 35, PSYBEAM + dbw 39, SLEEP_POWDER + dbw 45, AGILITY ; RG proto + dbw 50, PSYCHIC_M db 0 ; no more level-up moves DiglettEvosAttacks: dbbw EVOLVE_LEVEL, 26, DUGTRIO db 0 ; no more evolutions dbw 1, SCRATCH - dbw 1, MUD_SLAP ; SW97 - dbw 5, GROWL + dbw 1, GROWL dbw 9, MAGNITUDE - dbw 17, DIG - dbw 25, SAND_ATTACK + dbw 15, DIG + dbw 21, MUD_SLAP ; SW97 + dbw 27, SAND_ATTACK dbw 33, SLASH - dbw 41, EARTHQUAKE - dbw 49, FISSURE + dbw 39, EARTHQUAKE + dbw 45, SANDSTORM ; SW97 + dbw 51, FISSURE db 0 ; no more level-up moves DugtrioEvosAttacks: db 0 ; no more evolutions - dbw 1, TRI_ATTACK - dbw 1, MUD_SLAP ; SW97 dbw 1, SCRATCH dbw 1, GROWL - dbw 5, GROWL dbw 9, MAGNITUDE - dbw 17, DIG - dbw 25, SAND_ATTACK - dbw 37, SLASH - dbw 49, EARTHQUAKE - dbw 61, FISSURE + dbw 15, DIG + dbw 21, MUD_SLAP ; SW97 + dbw 27, SAND_ATTACK + dbw 30, TRI_ATTACK + dbw 35, SLASH + dbw 41, EARTHQUAKE + dbw 49, SANDSTORM ; SW97 + dbw 55, FISSURE db 0 ; no more level-up moves CoinpurEvosAttacks: - dbbw EVOLVE_LEVEL, 14, MEOWTH ; Consideration: Day, Meowth, night, Moibelle. May be excessive. + dbbw EVOLVE_LEVEL, 14, MEOWTH db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL dbw 5, PAY_DAY - dbw 11, BITE - dbw 18, FAINT_ATTACK + dbw 8, BITE + dbw 13, QUICK_ATTACK ; RG proto + dbw 19, FAINT_ATTACK dbw 25, SCREECH dbw 31, FURY_SWIPES dbw 37, SLASH + dbw 42, DOUBLE_TEAM ; KEP db 0 ; no more level-up moves MeowthEvosAttacks: @@ -1102,38 +1176,47 @@ MeowthEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 11, BITE - dbw 20, PAY_DAY - dbw 28, FAINT_ATTACK - dbw 35, SCREECH - dbw 41, FURY_SWIPES - dbw 46, SLASH + dbw 5, PAY_DAY + dbw 8, BITE + dbw 13, QUICK_ATTACK ; RG proto + dbw 21, FAINT_ATTACK + dbw 27, SCREECH + dbw 33, FURY_SWIPES + dbw 41, SLASH + dbw 46, DOUBLE_TEAM ; KEP + dbw 52, BODY_SLAM ; RBY TM db 0 ; no more level-up moves PersianEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 1, BITE - dbw 11, BITE - dbw 20, PAY_DAY - dbw 29, FAINT_ATTACK - dbw 38, SCREECH - dbw 46, FURY_SWIPES - dbw 53, SLASH + dbw 5, PAY_DAY + dbw 8, BITE + dbw 13, QUICK_ATTACK ; RG proto + dbw 21, FAINT_ATTACK + dbw 27, SCREECH + dbw 35, FURY_SWIPES + dbw 43, SLASH + dbw 50, DOUBLE_TEAM ; KEP + dbw 56, BODY_SLAM ; RBY TM + ; dbw 61, COIN_HURL db 0 ; no more level-up moves PerrserkerEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL - dbw 11, METAL_CLAW - dbw 20, PAY_DAY - dbw 29, SWAGGER - dbw 38, SCREECH - dbw 46, FURY_SWIPES - dbw 53, SLASH - dbw 63, THRASH + dbw 5, PAY_DAY + dbw 8, METAL_CLAW + dbw 13, QUICK_ATTACK + dbw 21, SWAGGER + dbw 27, SCREECH + dbw 35, FURY_SWIPES + dbw 43, SLASH + dbw 50, DOUBLE_TEAM + dbw 56, THRASH + ; dbw 61, COIN_HURL db 0 ; no more level-up moves PsyduckEvosAttacks: @@ -1142,12 +1225,15 @@ PsyduckEvosAttacks: dbw 1, SCRATCH dbw 5, TAIL_WHIP dbw 10, DISABLE - dbw 12, WATER_GUN ; SW97 - dbw 16, CONFUSION - dbw 23, SCREECH - dbw 31, PSYCH_UP - dbw 37, PSYBEAM ; RG prototype - dbw 40, FURY_SWIPES + dbw 14, WATER_GUN ; SW97 + dbw 19, CONFUSION + dbw 23, FURY_SWIPES + dbw 27, AMNESIA ; Stadium & HGSS + dbw 31, GLARE ; RG proto + dbw 35, PSYCH_UP + dbw 39, SCREECH + dbw 42, PSYBEAM ; RG proto + dbw 46, SLASH ; RG proto dbw 50, HYDRO_PUMP db 0 ; no more level-up moves @@ -1157,50 +1243,53 @@ WeirduckEvosAttacks: dbw 1, SCRATCH dbw 5, TAIL_WHIP dbw 10, DISABLE - dbw 12, WATER_GUN ; SW97 - dbw 16, CONFUSION - dbw 25, SCREECH - dbw 28, AMNESIA - dbw 31, GLARE - dbw 34, PSYCH_UP - dbw 37, PSYBEAM ; RG prototype - dbw 42, FURY_SWIPES - dbw 54, HYDRO_PUMP + dbw 14, WATER_GUN ; SW97 + dbw 19, CONFUSION + dbw 22, SUPERSONIC + dbw 25, FURY_SWIPES + dbw 29, AMNESIA + dbw 33, GLARE + dbw 39, PSYCH_UP + dbw 43, SCREECH + dbw 46, PSYBEAM ; RG proto + dbw 52, SLASH ; RG proto + dbw 56, HYDRO_PUMP db 0 ; no more level-up moves GolduckEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH - dbw 1, TAIL_WHIP - dbw 1, DISABLE - dbw 1, CONFUSION dbw 5, TAIL_WHIP dbw 10, DISABLE - dbw 12, WATER_GUN ; SW97 - dbw 16, CONFUSION - dbw 23, SCREECH - dbw 31, PSYCH_UP - dbw 37, PSYBEAM ; RG prototype - dbw 44, FURY_SWIPES - dbw 58, HYDRO_PUMP + dbw 14, WATER_GUN ; SW97 + dbw 19, CONFUSION + dbw 22, SUPERSONIC ; RG proto & KEP + dbw 25, FURY_SWIPES + dbw 29, AMNESIA ; Stadium & HGSS + dbw 33, GLARE ; RG proto + dbw 41, PSYCH_UP + dbw 45, SCREECH + dbw 48, PSYBEAM ; RG proto + dbw 56, SLASH ; RG proto + dbw 60, HYDRO_PUMP db 0 ; no more level-up moves -; these guys get like every fighting move in the rg proto and they should here but i am too stupid MankeyEvosAttacks: dbbw EVOLVE_LEVEL, 28, PRIMEAPE db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, RAGE ; SW97 + ; dbw 1, UPPERCUT dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES - dbw 24, ROCK_HEAD - dbw 27, FOCUS_ENERGY + dbw 25, ROCK_HEAD + dbw 29, FOCUS_ENERGY dbw 33, SEISMIC_TOSS - dbw 39, CROSS_CHOP - dbw 45, SCREECH - dbw 51, THRASH + dbw 38, COUNTER ; RG proto + dbw 44, CROSS_CHOP + dbw 49, SCREECH + dbw 55, THRASH db 0 ; no more level-up moves PrimeapeEvosAttacks: @@ -1208,37 +1297,39 @@ PrimeapeEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, LOW_KICK - dbw 1, RAGE + ; dbw 1, UPPERCUT dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES - dbw 24, ROCK_HEAD - dbw 27, FOCUS_ENERGY + dbw 25, ROCK_HEAD dbw 28, RAGE - dbw 36, SEISMIC_TOSS - dbw 45, CROSS_CHOP - dbw 54, SCREECH - dbw 63, THRASH + dbw 31, FOCUS_ENERGY + dbw 35, SEISMIC_TOSS + dbw 40, COUNTER ; RG proto + dbw 48, CROSS_CHOP + dbw 53, SCREECH + dbw 59, THRASH db 0 ; no more level-up moves AnnihilapeEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER - dbw 1, LOW_KICK - dbw 1, RAGE + dbw 1, SPITE + ; dbw 1, UPPERCUT dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES - dbw 24, ROCK_HEAD - dbw 27, FOCUS_ENERGY + dbw 25, ROCK_HEAD dbw 28, RAGE - dbw 36, SEISMIC_TOSS - dbw 45, CROSS_CHOP - dbw 54, SCREECH - dbw 63, THRASH - dbw 72, SPITE + dbw 31, FOCUS_ENERGY + dbw 35, SEISMIC_TOSS + dbw 40, COUNTER ; RG proto + dbw 44, NIGHT_SHADE + dbw 48, CROSS_CHOP + dbw 53, SCREECH + dbw 59, THRASH + dbw 65, SHADOW_BALL db 0 ; no more level-up moves PupperonEvosAttacks: @@ -1247,7 +1338,7 @@ PupperonEvosAttacks: dbw 1, BITE dbw 1, ROAR dbw 9, EMBER - dbw 16, LEER + dbw 15, LEER dbw 19, QUICK_ATTACK dbw 22, TAKE_DOWN dbw 28, FLAME_WHEEL @@ -1261,12 +1352,12 @@ GrowlitheEvosAttacks: dbw 1, BITE dbw 1, ROAR dbw 9, EMBER - dbw 18, LEER - dbw 21, QUICK_ATTACK - dbw 26, TAKE_DOWN - dbw 34, FLAME_WHEEL - dbw 42, AGILITY - dbw 50, FLAMETHROWER + dbw 15, LEER + dbw 21, QUICK_ATTACK ; SW97 + dbw 24, TAKE_DOWN + dbw 32, FLAME_WHEEL + dbw 38, AGILITY + dbw 46, FLAMETHROWER db 0 ; no more level-up moves ArcanineEvosAttacks: @@ -1276,10 +1367,10 @@ ArcanineEvosAttacks: dbw 1, TAKE_DOWN dbw 1, FLAME_WHEEL dbw 50, EXTREMESPEED - dbw 60, SACRED_FIRE ; SW97 lmfao + dbw 60, SACRED_FIRE ; SW97 db 0 ; no more level-up moves -PoliwagEvosAttacks: ; should get amnesia +PoliwagEvosAttacks: dbbw EVOLVE_LEVEL, 25, POLIWHIRL db 0 ; no more evolutions dbw 1, BUBBLE @@ -1287,9 +1378,11 @@ PoliwagEvosAttacks: ; should get amnesia dbw 13, WATER_GUN dbw 19, DOUBLESLAP dbw 25, RAIN_DANCE - dbw 31, BODY_SLAM - dbw 37, BELLY_DRUM - dbw 43, HYDRO_PUMP + dbw 31, LOW_KICK ; SW97 + dbw 37, BODY_SLAM + dbw 43, BELLY_DRUM + dbw 49, AMNESIA ; RBY + dbw 55, HYDRO_PUMP db 0 ; no more level-up moves PoliwhirlEvosAttacks: @@ -1298,15 +1391,16 @@ PoliwhirlEvosAttacks: dbbw EVOLVE_ITEM, HEART_STONE, POLITOED db 0 ; no more evolutions dbw 1, BUBBLE - dbw 1, HYPNOSIS - dbw 1, WATER_GUN dbw 7, HYPNOSIS dbw 13, WATER_GUN dbw 19, DOUBLESLAP - dbw 27, RAIN_DANCE - dbw 35, BODY_SLAM - dbw 43, BELLY_DRUM - dbw 51, HYDRO_PUMP + dbw 25, RAIN_DANCE + dbw 25, COMET_PUNCH ; RG proto + dbw 33, LOW_KICK ; SW97 + dbw 39, BODY_SLAM + dbw 45, BELLY_DRUM + dbw 53, AMNESIA ; RBY + dbw 59, HYDRO_PUMP db 0 ; no more level-up moves PoliwrathEvosAttacks: @@ -1329,29 +1423,33 @@ KadabraEvosAttacks: dbbw EVOLVE_TRADE, -1, ALAKAZAM db 0 ; no more evolutions dbw 1, TELEPORT - dbw 1, KINESIS dbw 1, CONFUSION dbw 16, CONFUSION - dbw 18, DISABLE - dbw 21, PSYBEAM - dbw 26, RECOVER - dbw 31, FUTURE_SIGHT - dbw 38, PSYCHIC_M - dbw 45, REFLECT + dbw 20, KINESIS + dbw 24, DISABLE + dbw 28, PSYBEAM + dbw 32, MEDITATE ; RG proto + dbw 37, RECOVER + dbw 42, FUTURE_SIGHT + ; dbw 46, SYNCHRONIZE + dbw 50, PSYCHIC_M + dbw 56, REFLECT db 0 ; no more level-up moves AlakazamEvosAttacks: db 0 ; no more evolutions dbw 1, TELEPORT - dbw 1, KINESIS dbw 1, CONFUSION dbw 16, CONFUSION - dbw 18, DISABLE - dbw 21, PSYBEAM - dbw 26, RECOVER - dbw 31, FUTURE_SIGHT - dbw 38, PSYCHIC_M - dbw 45, REFLECT + dbw 20, KINESIS + dbw 24, DISABLE + dbw 28, PSYBEAM + dbw 32, MEDITATE ; RG proto + dbw 37, RECOVER + dbw 42, FUTURE_SIGHT + ; dbw 46, SYNCHRONIZE + dbw 50, PSYCHIC_M + dbw 56, REFLECT db 0 ; no more level-up moves MachopEvosAttacks: @@ -1359,14 +1457,17 @@ MachopEvosAttacks: db 0 ; no more evolutions dbw 1, LOW_KICK dbw 1, LEER + ; dbw 1, UPPERCUT dbw 7, FOCUS_ENERGY dbw 13, KARATE_CHOP dbw 19, SEISMIC_TOSS - dbw 25, FORESIGHT - dbw 31, VITAL_THROW + dbw 23, COMET_PUNCH ; RG proto & SW97 + dbw 28, FORESIGHT + dbw 33, VITAL_THROW dbw 37, CROSS_CHOP dbw 43, SCARY_FACE dbw 49, SUBMISSION + dbw 54, DYNAMICPUNCH ; FRLG db 0 ; no more level-up moves MachokeEvosAttacks: @@ -1374,30 +1475,34 @@ MachokeEvosAttacks: db 0 ; no more evolutions dbw 1, LOW_KICK dbw 1, LEER - dbw 1, FOCUS_ENERGY - dbw 8, FOCUS_ENERGY - dbw 15, KARATE_CHOP + ; dbw 1, UPPERCUT + dbw 7, FOCUS_ENERGY + dbw 13, KARATE_CHOP dbw 19, SEISMIC_TOSS - dbw 25, FORESIGHT - dbw 34, VITAL_THROW - dbw 43, CROSS_CHOP - dbw 52, SCARY_FACE - dbw 61, SUBMISSION + dbw 23, COMET_PUNCH ; RG proto & SW97 + dbw 28, FORESIGHT + dbw 35, VITAL_THROW + dbw 39, CROSS_CHOP + dbw 45, SCARY_FACE + dbw 53, SUBMISSION + dbw 58, DYNAMICPUNCH ; FRLG db 0 ; no more level-up moves MachampEvosAttacks: db 0 ; no more evolutions dbw 1, LOW_KICK dbw 1, LEER - dbw 1, FOCUS_ENERGY - dbw 8, FOCUS_ENERGY - dbw 15, KARATE_CHOP + ; dbw 1, UPPERCUT + dbw 7, FOCUS_ENERGY + dbw 13, KARATE_CHOP dbw 19, SEISMIC_TOSS - dbw 25, FORESIGHT - dbw 34, VITAL_THROW - dbw 43, CROSS_CHOP - dbw 52, SCARY_FACE - dbw 61, SUBMISSION + dbw 23, COMET_PUNCH ; RG proto & SW97 + dbw 28, FORESIGHT + dbw 35, VITAL_THROW + dbw 39, CROSS_CHOP + dbw 45, SCARY_FACE + dbw 53, SUBMISSION + dbw 58, DYNAMICPUNCH ; FRLG db 0 ; no more level-up moves BellsproutEvosAttacks: @@ -1411,9 +1516,9 @@ BellsproutEvosAttacks: dbw 19, STUN_SPORE dbw 23, ACID dbw 27, FALSE_SWIPE ; SW97 - dbw 30, SWEET_SCENT + dbw 33, SWEET_SCENT dbw 37, RAZOR_LEAF - dbw 45, SLAM + dbw 42, SLAM db 0 ; no more level-up moves WeepinbellEvosAttacks: @@ -1421,18 +1526,16 @@ WeepinbellEvosAttacks: dbbw EVOLVE_ITEM, POISON_STONE, BELLIGNAN db 0 ; no more evolutions dbw 1, VINE_WHIP - dbw 1, GROWTH - dbw 1, WRAP dbw 6, GROWTH dbw 11, WRAP dbw 15, SLEEP_POWDER dbw 17, POISONPOWDER dbw 19, STUN_SPORE - dbw 24, ACID + dbw 25, ACID dbw 29, FALSE_SWIPE ; SW97 - dbw 33, SWEET_SCENT - dbw 42, RAZOR_LEAF - dbw 54, SLAM + dbw 35, SWEET_SCENT + dbw 41, RAZOR_LEAF + dbw 46, SLAM db 0 ; no more level-up moves VictreebelEvosAttacks: @@ -1442,7 +1545,7 @@ VictreebelEvosAttacks: dbw 1, SWEET_SCENT dbw 1, RAZOR_LEAF dbw 40, SLEEP_POWDER - dbw 48, GIGA_DRAIN ; vibes cus bellignan + dbw 48, GIGA_DRAIN ; TM, to match Bellignan db 0 ; no more level-up moves BellignanEvosAttacks: @@ -1462,8 +1565,8 @@ TentacoolEvosAttacks: dbw 1, WATER_GUN ; SW97 dbw 6, SUPERSONIC dbw 12, CONSTRICT - dbw 19, ACID - dbw 25, BUBBLEBEAM + dbw 18, ACID + dbw 24, BUBBLEBEAM dbw 30, WRAP dbw 36, BARRIER dbw 43, SCREECH @@ -1473,28 +1576,27 @@ TentacoolEvosAttacks: TentacruelEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_STING - dbw 1, SUPERSONIC - dbw 1, CONSTRICT dbw 1, WATER_GUN ; SW97 dbw 6, SUPERSONIC dbw 12, CONSTRICT - dbw 19, ACID - dbw 25, BUBBLEBEAM - dbw 30, WRAP + dbw 18, ACID + dbw 24, BUBBLEBEAM + dbw 32, WRAP dbw 38, BARRIER dbw 47, SCREECH - dbw 55, HYDRO_PUMP + dbw 53, HYDRO_PUMP db 0 ; no more level-up moves ToedscoolEvosAttacks: dbbw EVOLVE_LEVEL, 30, TOEDSCRUEL db 0 ; no more evolutions dbw 1, MUD_SLAP + dbw 1, TACKLE ; SV dbw 6, SUPERSONIC dbw 12, CONSTRICT - dbw 19, ABSORB - dbw 25, POISONPOWDER - dbw 25, STUN_SPORE + dbw 18, ABSORB + dbw 24, POISONPOWDER + dbw 24, STUN_SPORE dbw 30, WRAP dbw 36, SPORE dbw 43, SCREECH @@ -1504,15 +1606,16 @@ ToedscoolEvosAttacks: ToedscruelEvosAttacks: db 0 ; no more evolutions dbw 1, MUD_SLAP - dbw 1, SUPERSONIC - dbw 1, CONSTRICT - dbw 19, ABSORB - dbw 25, POISONPOWDER - dbw 25, STUN_SPORE - dbw 30, WRAP + dbw 1, TACKLE ; SV + dbw 6, SUPERSONIC + dbw 12, CONSTRICT + dbw 18, ABSORB + dbw 24, POISONPOWDER + dbw 24, STUN_SPORE + dbw 32, WRAP dbw 38, SPORE dbw 47, SCREECH - dbw 55, GIGA_DRAIN + dbw 53, GIGA_DRAIN db 0 ; no more level-up moves BlottleEvosAttacks: @@ -1520,30 +1623,30 @@ BlottleEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, SMOKESCREEN - dbw 7, BUBBLE - dbw 11, WRAP + dbw 6, BUBBLE + dbw 12, WRAP ; dbw 15, FAIRY_WIND - dbw 20, HYPNOSIS + dbw 19, HYPNOSIS dbw 24, OCTAZOOKA - dbw 29, SUPERSONIC - ;dbw 33, DAZZLE_GLEAM - dbw 38, HAZE - dbw 43, HYDRO_PUMP + dbw 30, SUPERSONIC + ;dbw 36, DAZZLE_GLEAM + dbw 43, HAZE + dbw 49, HYDRO_PUMP db 0 PendrakenEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, SMOKESCREEN - dbw 7, BUBBLE - dbw 11, WRAP + dbw 6, BUBBLE + dbw 12, WRAP ; dbw 15, FAIRY_WIND - dbw 20, HYPNOSIS + dbw 19, HYPNOSIS dbw 24, OCTAZOOKA - dbw 29, SUPERSONIC - ;dbw 35, DAZZLE_GLEAM - dbw 42, HAZE - dbw 49, HYDRO_PUMP + dbw 32, SUPERSONIC + ;dbw 38, DAZZLE_GLEAM + dbw 47, HAZE + dbw 53, HYDRO_PUMP db 0 GeodudeEvosAttacks: @@ -1555,57 +1658,60 @@ GeodudeEvosAttacks: dbw 16, MAGNITUDE dbw 21, SELFDESTRUCT dbw 26, HARDEN - dbw 31, ROLLOUT - dbw 36, EARTHQUAKE + dbw 30, MEGA_PUNCH ; RG proto + dbw 34, ROLLOUT + dbw 37, EARTHQUAKE dbw 41, EXPLOSION dbw 46, ROCK_HEAD + dbw 52, FISSURE ; RG proto db 0 ; no more level-up moves GravelerEvosAttacks: dbbw EVOLVE_TRADE, -1, GOLEM db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, DEFENSE_CURL - dbw 1, ROCK_THROW dbw 6, DEFENSE_CURL dbw 11, ROCK_THROW dbw 16, MAGNITUDE dbw 21, SELFDESTRUCT - dbw 27, HARDEN - dbw 34, ROLLOUT + dbw 28, HARDEN + dbw 32, MEGA_PUNCH ; RG proto + dbw 36, ROLLOUT dbw 41, EARTHQUAKE - dbw 48, EXPLOSION - dbw 55, ROCK_HEAD + dbw 45, EXPLOSION + dbw 50, ROCK_HEAD + dbw 58, FISSURE ; RG proto db 0 ; no more level-up moves GolemEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, DEFENSE_CURL - dbw 1, ROCK_THROW - dbw 1, MAGNITUDE dbw 6, DEFENSE_CURL dbw 11, ROCK_THROW dbw 16, MAGNITUDE dbw 21, SELFDESTRUCT - dbw 27, HARDEN - dbw 34, ROLLOUT + dbw 28, HARDEN + dbw 32, MEGA_PUNCH ; RG proto + dbw 36, ROLLOUT dbw 41, EARTHQUAKE - dbw 48, EXPLOSION - dbw 55, ROCK_HEAD + dbw 45, EXPLOSION + dbw 50, ROCK_HEAD + dbw 58, FISSURE ; RG proto db 0 ; no more level-up moves KoltaEvosAttacks: dbbw EVOLVE_LEVEL, 20, PONYTA db 0 dbw 1, TACKLE - dbw 4, GROWL - dbw 8, TAIL_WHIP + dbw 1, GROWL + dbw 4, TAIL_WHIP + dbw 8, QUICK_ATTACK ; FRLG dbw 13, EMBER dbw 19, STOMP - dbw 24, FIRE_SPIN + dbw 24, FLAME_WHEEL ; HGSS dbw 30, TAKE_DOWN - dbw 37, AGILITY + dbw 36, FIRE_SPIN + dbw 40, AGILITY dbw 45, FIRE_BLAST db 0 ; no more level-up moves @@ -1613,31 +1719,32 @@ PonytaEvosAttacks: dbbw EVOLVE_LEVEL, 40, RAPIDASH db 0 ; no more evolutions dbw 1, TACKLE - dbw 4, GROWL - dbw 8, TAIL_WHIP + dbw 1, GROWL + dbw 4, TAIL_WHIP + dbw 8, QUICK_ATTACK ; FRLG dbw 13, EMBER dbw 19, STOMP - dbw 26, FIRE_SPIN - dbw 34, TAKE_DOWN - dbw 43, AGILITY - dbw 53, FIRE_BLAST + dbw 26, FLAME_WHEEL ; HGSS + dbw 32, TAKE_DOWN + dbw 38, FIRE_SPIN + dbw 44, AGILITY + dbw 49, FIRE_BLAST db 0 ; no more level-up moves RapidashEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, TAIL_WHIP - dbw 1, EMBER - dbw 4, GROWL - dbw 8, TAIL_WHIP + dbw 4, TAIL_WHIP + dbw 8, QUICK_ATTACK ; FRLG dbw 13, EMBER dbw 19, STOMP - dbw 26, FIRE_SPIN - dbw 34, TAKE_DOWN + dbw 26, FLAME_WHEEL ; HGSS + dbw 32, TAKE_DOWN + dbw 38, FIRE_SPIN dbw 40, FURY_ATTACK - dbw 47, AGILITY - dbw 61, FIRE_BLAST + dbw 46, AGILITY + dbw 53, FIRE_BLAST db 0 ; no more level-up moves BalumbaEvosAttacks: @@ -1646,11 +1753,13 @@ BalumbaEvosAttacks: dbw 1, GROWL ; dbw 6, DRAIN_KISS ; dbw 12, DISARM_VOICE - dbw 19, GUST - dbw 25, SWEET_KISS - dbw 31, CONFUSE_RAY - dbw 37, CHARM - ; dbw 43, DAZZLE_GLEAM + dbw 18, GUST + dbw 24, SWEET_KISS + dbw 30, CONFUSE_RAY + dbw 36, CHARM + dbw 42, WHIRLWIND + ; dbw 48, DAZZLE_GLEAM + ; dbw 54, WIND_RIDE db 0 SlowpokeEvosAttacks: @@ -1661,10 +1770,13 @@ SlowpokeEvosAttacks: dbw 1, CURSE dbw 1, TACKLE dbw 6, GROWL + dbw 10, BIDE ; RG proto dbw 15, WATER_GUN dbw 20, CONFUSION + dbw 25, PSYCH_UP ; FRLG dbw 29, DISABLE dbw 34, HEADBUTT + dbw 39, SUPERSONIC ; RG proto dbw 43, AMNESIA dbw 48, PSYCHIC_M db 0 ; no more level-up moves @@ -1673,16 +1785,17 @@ SlowbroEvosAttacks: db 0 ; no more evolutions dbw 1, CURSE dbw 1, TACKLE - dbw 1, GROWL - dbw 1, WATER_GUN dbw 6, GROWL + dbw 10, BIDE ; RG proto dbw 15, WATER_GUN dbw 20, CONFUSION + dbw 25, PSYCH_UP ; FRLG dbw 29, DISABLE dbw 34, HEADBUTT dbw 37, WITHDRAW - dbw 46, AMNESIA - dbw 54, PSYCHIC_M + dbw 41, SUPERSONIC ; RG proto + dbw 45, AMNESIA + dbw 52, PSYCHIC_M db 0 ; no more level-up moves MagnemiteEvosAttacks: @@ -1690,13 +1803,15 @@ MagnemiteEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 6, THUNDERSHOCK - dbw 11, SUPERSONIC + dbw 10, SUPERSONIC dbw 16, SONICBOOM - dbw 21, THUNDER_WAVE - dbw 27, LOCK_ON - dbw 33, SWIFT - dbw 39, SCREECH - dbw 45, ZAP_CANNON + dbw 20, THUNDER_WAVE + dbw 23, SPARK ; FRLG + dbw 27, LIGHT_SCREEN ; LGPE + dbw 31, LOCK_ON + dbw 36, SWIFT + dbw 41, SCREECH + dbw 47, ZAP_CANNON db 0 ; no more level-up moves MagnetiteEvosAttacks: @@ -1706,47 +1821,48 @@ MagnetiteEvosAttacks: dbw 6, THUNDERSHOCK dbw 11, SUPERSONIC dbw 16, SONICBOOM - dbw 22, THUNDER_WAVE - dbw 26, SPARK - dbw 30, LOCK_ON - dbw 38, SWIFT - dbw 46, SCREECH - dbw 54, ZAP_CANNON + dbw 23, THUNDER_WAVE + dbw 25, SPARK + dbw 29, LIGHT_SCREEN + dbw 33, LOCK_ON + dbw 40, SWIFT + dbw 45, SCREECH + dbw 51, ZAP_CANNON db 0 ; no more level-up moves MagnetonEvosAttacks: - dbbw EVOLVE_ITEM, THUNDERSTONE, MAGNEZONE ; could add magnetic area but it's so fuckin bleh dude oh my god + dbbw EVOLVE_ITEM, THUNDERSTONE, MAGNEZONE db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, THUNDERSHOCK - dbw 1, SUPERSONIC - dbw 1, SONICBOOM dbw 6, THUNDERSHOCK dbw 11, SUPERSONIC dbw 16, SONICBOOM - dbw 21, THUNDER_WAVE - dbw 27, LOCK_ON - dbw 35, TRI_ATTACK - dbw 38, SWIFT ; hey put that back. meanie. - dbw 43, SCREECH - dbw 53, ZAP_CANNON + dbw 23, THUNDER_WAVE + dbw 25, SPARK ; FRLG + dbw 29, LIGHT_SCREEN ; LGPE + dbw 30, TRI_ATTACK + dbw 35, LOCK_ON + dbw 42, SWIFT ; hey put that back. meanie. + dbw 47, SCREECH + dbw 55, ZAP_CANNON db 0 ; no more level-up moves MagnezoneEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, THUNDERSHOCK - dbw 1, SUPERSONIC - dbw 1, SONICBOOM dbw 6, THUNDERSHOCK dbw 11, SUPERSONIC dbw 16, SONICBOOM - dbw 22, THUNDER_WAVE - dbw 30, LOCK_ON - dbw 40, SWIFT - dbw 40, TRI_ATTACK - dbw 50, SCREECH - dbw 60, ZAP_CANNON + dbw 23, THUNDER_WAVE + dbw 25, SPARK ; FRLG + dbw 29, LIGHT_SCREEN ; LGPE + dbw 30, TRI_ATTACK + dbw 35, LOCK_ON + dbw 42, SWIFT + dbw 47, SCREECH + dbw 55, ZAP_CANNON + dbw 59, BARRIER ; HGSS + dbw 65, MIRROR_COAT ; HGSS db 0 ; no more level-up moves GavillainEvosAttacks: @@ -1761,7 +1877,8 @@ GavillainEvosAttacks: dbw 30, SCREECH dbw 34, GLARE dbw 39, DRAGONBREATH - dbw 46, CONFUSE_RAY + dbw 45, CONFUSE_RAY + dbw 51, CRUNCH db 0 CheepEvosAttacks: @@ -1774,11 +1891,11 @@ CheepEvosAttacks: dbw 16, BUBBLEBEAM dbw 20, LOW_KICK dbw 26, JUMP_KICK - dbw 31, SEISMIC_TOSS + dbw 31, DRILL_PECK dbw 36, WATERFALL - dbw 40, HI_JUMP_KICK - dbw 45, HYDRO_PUMP - dbw 49, DRILL_PECK + dbw 42, SEISMIC_TOSS + dbw 48, HI_JUMP_KICK + dbw 54, HYDRO_PUMP db 0 ; no more level-up moves JabettaEvosAttacks: @@ -1790,11 +1907,11 @@ JabettaEvosAttacks: dbw 16, BUBBLEBEAM dbw 20, LOW_KICK dbw 26, JUMP_KICK - dbw 33, SEISMIC_TOSS - dbw 40, WATERFALL - dbw 46, HI_JUMP_KICK - dbw 53, HYDRO_PUMP - dbw 59, DRILL_PECK + dbw 33, DRILL_PECK + dbw 38, WATERFALL + dbw 46, SEISMIC_TOSS + dbw 52, HI_JUMP_KICK + dbw 60, HYDRO_PUMP db 0 ; no more level-up moves RibbitoEvosAttacks: @@ -1806,8 +1923,8 @@ RibbitoEvosAttacks: dbw 13, MEDITATE dbw 19, WATER_GUN dbw 24, FAINT_ATTACK - dbw 31, SUBSTITUTE - dbw 35, VITAL_THROW + dbw 30, SUBSTITUTE + dbw 36, VITAL_THROW dbw 42, BELLY_DRUM dbw 48, HYDRO_PUMP db 0 ; no more level-up moves @@ -1820,10 +1937,10 @@ CroakozunaEvosAttacks: dbw 13, MEDITATE dbw 19, WATER_GUN dbw 24, FAINT_ATTACK - dbw 34, SUBSTITUTE - dbw 41, VITAL_THROW - dbw 51, BELLY_DRUM - dbw 60, HYDRO_PUMP + dbw 32, SUBSTITUTE + dbw 38, VITAL_THROW + dbw 46, BELLY_DRUM + dbw 52, HYDRO_PUMP db 0 ; no more level-up moves FarfetchDEvosAttacks: @@ -1832,13 +1949,14 @@ FarfetchDEvosAttacks: dbw 1, PECK dbw 7, SAND_ATTACK dbw 13, LEER - dbw 19, FURY_ATTACK + dbw 18, FURY_ATTACK dbw 23, WING_ATTACK ; SW97 - dbw 25, SWORDS_DANCE - dbw 31, AGILITY - dbw 37, SLASH - dbw 44, FALSE_SWIPE + dbw 29, SWORDS_DANCE + dbw 35, AGILITY + dbw 40, DRILL_PECK ; KEP, from Luxwan + dbw 44, SLASH dbw 50, FURY_CUTTER ; SW97 + dbw 55, FALSE_SWIPE db 0 ; no more level-up moves LuxwanEvosAttacks: @@ -1846,13 +1964,14 @@ LuxwanEvosAttacks: dbw 1, PECK dbw 7, SAND_ATTACK dbw 13, LEER - dbw 19, FURY_ATTACK + dbw 18, FURY_ATTACK dbw 23, WING_ATTACK ; SW97 - dbw 25, SWORDS_DANCE - dbw 31, AGILITY - dbw 37, SLASH - dbw 44, FALSE_SWIPE + dbw 29, SWORDS_DANCE + dbw 35, AGILITY + dbw 40, DRILL_PECK + dbw 44, SLASH dbw 50, FURY_CUTTER + dbw 55, FALSE_SWIPE db 0 ; no more level-up moves DoduoEvosAttacks: @@ -1861,56 +1980,60 @@ DoduoEvosAttacks: dbw 1, PECK dbw 1, GROWL dbw 9, PURSUIT - dbw 13, FURY_ATTACK - dbw 21, TRI_ATTACK - dbw 25, RAGE - dbw 33, DRILL_PECK - dbw 37, AGILITY + dbw 14, FURY_ATTACK + dbw 22, QUICK_ATTACK ; HGSS + dbw 26, RAGE + dbw 30, DRILL_PECK + dbw 37, TRI_ATTACK + dbw 41, AGILITY + dbw 45, THRASH ; LGPE + dbw 54, JUMP_KICK ; LGPE db 0 ; no more level-up moves DodrioEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, GROWL - dbw 1, PURSUIT - dbw 1, FURY_ATTACK dbw 9, PURSUIT - dbw 13, FURY_ATTACK - dbw 21, TRI_ATTACK - dbw 25, RAGE - dbw 38, DRILL_PECK - dbw 47, AGILITY + dbw 14, FURY_ATTACK + dbw 22, QUICK_ATTACK ; HGSS + dbw 26, RAGE + dbw 30, DRILL_PECK + dbw 39, TRI_ATTACK + dbw 43, AGILITY + dbw 49, THRASH ; LGPE + dbw 58, JUMP_KICK ; LGPE db 0 ; no more level-up moves SeelEvosAttacks: dbbw EVOLVE_LEVEL, 34, DEWGONG db 0 ; no more evolutions dbw 1, HEADBUTT - dbw 1, POWDER_SNOW ; SW97 - dbw 5, GROWL - dbw 10, SING ; SW97 - dbw 16, AURORA_BEAM + dbw 1, GROWL + dbw 10, POWDER_SNOW ; SW97 + dbw 16, ICY_WIND ; FRLG dbw 21, REST + dbw 27, AURORA_BEAM dbw 32, TAKE_DOWN - dbw 37, ICE_BEAM - dbw 48, SAFEGUARD - dbw 52, LIGHT_SCREEN ; SW97 + dbw 38, SING ; SW97 + dbw 44, ICE_BEAM + dbw 49, SAFEGUARD + dbw 55, LIGHT_SCREEN ; SW97 db 0 ; no more level-up moves DewgongEvosAttacks: db 0 ; no more evolutions dbw 1, HEADBUTT dbw 1, GROWL - dbw 1, AURORA_BEAM - dbw 1, POWDER_SNOW ; SW97 - dbw 5, GROWL - dbw 10, SING ; SW97 - dbw 16, AURORA_BEAM + dbw 10, POWDER_SNOW ; SW97 + dbw 16, ICY_WIND ; FRLG dbw 21, REST + dbw 27, AURORA_BEAM dbw 32, TAKE_DOWN - dbw 43, ICE_BEAM - dbw 48, SAFEGUARD ; WHY WAS THIS L60 - dbw 55, LIGHT_SCREEN ; SW97 + dbw 40, SING ; SW97 + dbw 46, ICE_BEAM + dbw 53, SAFEGUARD + dbw 59, LIGHT_SCREEN ; SW97 db 0 ; no more level-up moves SmujjEvosAttacks: @@ -1919,12 +2042,13 @@ SmujjEvosAttacks: dbw 1, POISON_GAS dbw 1, POUND dbw 5, HARDEN - dbw 7, ACID ; SW97 dbw 10, DISABLE - dbw 16, SLUDGE - dbw 21, MINIMIZE - dbw 27, SCREECH + dbw 16, ACID ; SW97 + dbw 20, MINIMIZE + dbw 25, SLUDGE + dbw 30, SCREECH dbw 34, ACID_ARMOR + dbw 38, SUPERSONIC ; RG proto dbw 42, SLUDGE_BOMB db 0 ; no more level-up moves @@ -1934,28 +2058,29 @@ GrimerEvosAttacks: dbw 1, POISON_GAS dbw 1, POUND dbw 5, HARDEN - dbw 7, ACID ; SW97 dbw 10, DISABLE - dbw 16, SLUDGE - dbw 23, MINIMIZE - dbw 31, SCREECH - dbw 40, ACID_ARMOR - dbw 50, SLUDGE_BOMB + dbw 16, ACID ; SW97 + dbw 20, MINIMIZE + dbw 27, SLUDGE + dbw 32, SCREECH + dbw 38, ACID_ARMOR + dbw 42, SUPERSONIC ; RG proto + dbw 48, SLUDGE_BOMB db 0 ; no more level-up moves MukEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_GAS dbw 1, POUND - dbw 1, HARDEN dbw 5, HARDEN - dbw 7, ACID ; SW97 dbw 10, DISABLE - dbw 16, SLUDGE - dbw 23, MINIMIZE - dbw 31, SCREECH - dbw 45, ACID_ARMOR - dbw 60, SLUDGE_BOMB + dbw 16, ACID ; SW97 + dbw 20, MINIMIZE + dbw 27, SLUDGE + dbw 32, SCREECH + dbw 38, ACID_ARMOR + dbw 44, SUPERSONIC ; RG proto + dbw 52, SLUDGE_BOMB db 0 ; no more level-up moves ShellderEvosAttacks: @@ -1964,20 +2089,24 @@ ShellderEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, WITHDRAW - dbw 1, SMOKESCREEN ; RG prototype - dbw 9, SUPERSONIC - dbw 17, AURORA_BEAM - dbw 25, PROTECT - dbw 33, LEER - dbw 41, CLAMP - dbw 49, ICE_BEAM + dbw 1, SMOKESCREEN ; RG proto + dbw 7, SUPERSONIC + dbw 12, AURORA_BEAM + dbw 18, SONICBOOM ; RG proto + dbw 23, LEER + dbw 27, ENDURE ; SW97 + dbw 31, CLAMP + dbw 36, PROTECT + dbw 41, SCREECH ; RG proto + dbw 46, CONFUSE_RAY ; RG proto + dbw 51, ICE_BEAM db 0 ; no more level-up moves CloysterEvosAttacks: db 0 ; no more evolutions dbw 1, WITHDRAW dbw 1, SUPERSONIC - dbw 1, SMOKESCREEN ; RG prototype + dbw 1, SMOKESCREEN ; RG proto dbw 1, AURORA_BEAM dbw 9, PROTECT dbw 33, SPIKES @@ -1987,9 +2116,10 @@ CloysterEvosAttacks: DisturbanEvosAttacks: db 0 ; no more evolutions dbw 1, WITHDRAW - dbw 1, SUPERSONIC - dbw 1, BITE - dbw 1, POISON_GAS + dbw 1, SMOG + dbw 1, BODY_SLAM + dbw 1, SMOKESCREEN + dbw 9, POISON_GAS dbw 33, SPIKES dbw 41, CRUNCH db 0 ; no more level-up moves @@ -2000,12 +2130,15 @@ GastlyEvosAttacks: dbw 1, HYPNOSIS dbw 1, LICK dbw 8, SPITE - dbw 13, MEAN_LOOK + dbw 12, MEAN_LOOK dbw 16, CURSE - dbw 21, NIGHT_SHADE + dbw 20, NIGHT_SHADE + dbw 24, POISON_GAS ; SW97 dbw 28, CONFUSE_RAY dbw 33, DREAM_EATER - dbw 36, DESTINY_BOND + dbw 37, DESTINY_BOND + dbw 43, NIGHTMARE ; SW97 + dbw 49, SHADOW_BALL ; FRLG db 0 ; no more level-up moves HaunterEvosAttacks: @@ -2013,28 +2146,32 @@ HaunterEvosAttacks: db 0 ; no more evolutions dbw 1, HYPNOSIS dbw 1, LICK - dbw 1, SPITE dbw 8, SPITE - dbw 13, MEAN_LOOK + dbw 12, MEAN_LOOK dbw 16, CURSE - dbw 21, NIGHT_SHADE - dbw 31, CONFUSE_RAY - dbw 39, DREAM_EATER - dbw 48, DESTINY_BOND + dbw 20, NIGHT_SHADE + dbw 24, POISON_GAS ; SW97 + dbw 30, CONFUSE_RAY + dbw 35, DREAM_EATER + dbw 41, DESTINY_BOND + dbw 47, NIGHTMARE ; SW97 + dbw 55, SHADOW_BALL ; FRLG db 0 ; no more level-up moves GengarEvosAttacks: db 0 ; no more evolutions dbw 1, HYPNOSIS dbw 1, LICK - dbw 1, SPITE dbw 8, SPITE - dbw 13, MEAN_LOOK + dbw 12, MEAN_LOOK dbw 16, CURSE - dbw 21, NIGHT_SHADE - dbw 31, CONFUSE_RAY - dbw 39, DREAM_EATER - dbw 48, DESTINY_BOND + dbw 20, NIGHT_SHADE + dbw 24, POISON_GAS ; SW97 + dbw 30, CONFUSE_RAY + dbw 35, DREAM_EATER + dbw 41, DESTINY_BOND + dbw 47, NIGHTMARE ; SW97 + dbw 55, SHADOW_BALL ; FRLG db 0 ; no more level-up moves OnixEvosAttacks: @@ -2043,14 +2180,16 @@ OnixEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, SCREECH - dbw 10, BIND - dbw 14, ROCK_THROW - dbw 23, HARDEN - dbw 27, RAGE + dbw 8, BIND + dbw 13, ROCK_THROW + dbw 17, HARDEN + dbw 23, RAGE + dbw 27, DRAGONBREATH ; FRLG dbw 31, ROCK_HEAD dbw 36, SANDSTORM dbw 40, SLAM dbw 45, DIG ; SW97 + dbw 51, DOUBLE_EDGE ; FRLG db 0 ; no more level-up moves DrowzeeEvosAttacks: ; mean look and cray could be here @@ -2058,30 +2197,35 @@ DrowzeeEvosAttacks: ; mean look and cray could be here db 0 ; no more evolutions dbw 1, POUND dbw 1, HYPNOSIS - dbw 10, DISABLE - dbw 18, CONFUSION - dbw 25, HEADBUTT - dbw 31, POISON_GAS - dbw 36, MEDITATE - dbw 40, PSYCHIC_M - dbw 43, PSYCH_UP - dbw 45, FUTURE_SIGHT + dbw 8, DISABLE + dbw 16, CONFUSION + dbw 20, HEADBUTT + dbw 25, POISON_GAS + dbw 30, DREAM_EATER ; LGPE + dbw 34, CONFUSE_RAY ; SW97 + dbw 39, MEDITATE + dbw 44, PSYCHIC_M + dbw 48, MEAN_LOOK ; SW97 + dbw 52, PSYCH_UP + dbw 56, FUTURE_SIGHT db 0 ; no more level-up moves HypnoEvosAttacks: db 0 ; no more evolutions dbw 1, POUND dbw 1, HYPNOSIS - dbw 1, DISABLE - dbw 1, CONFUSION - dbw 10, DISABLE - dbw 18, CONFUSION - dbw 25, HEADBUTT - dbw 33, POISON_GAS - dbw 40, MEDITATE - dbw 49, PSYCHIC_M - dbw 55, PSYCH_UP - dbw 60, FUTURE_SIGHT + dbw 8, DISABLE + dbw 16, CONFUSION + dbw 20, HEADBUTT + dbw 25, POISON_GAS + dbw 32, DREAM_EATER ; LGPE + dbw 36, CONFUSE_RAY ; SW97 + dbw 41, MEDITATE + dbw 48, PSYCHIC_M + dbw 52, MEAN_LOOK ; SW97 + dbw 56, PSYCH_UP + dbw 62, FUTURE_SIGHT + dbw 65, NIGHTMARE ; FRLG db 0 ; no more level-up moves KrabbyEvosAttacks: @@ -2089,58 +2233,64 @@ KrabbyEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE dbw 5, LEER - dbw 12, VICEGRIP - dbw 14, WATER_GUN ; SW97 + dbw 11, VICEGRIP dbw 16, HARDEN - dbw 23, STOMP - dbw 27, GUILLOTINE - dbw 34, PROTECT - dbw 41, CRABHAMMER + dbw 20, WATER_GUN ; SW97 + dbw 24, STOMP + dbw 30, FALSE_SWIPE ; SW97 + dbw 35, GUILLOTINE + dbw 39, PROTECT + dbw 44, CRABHAMMER + dbw 49, FLAIL ; FRLG db 0 ; no more level-up moves KinglerEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE - dbw 1, LEER - dbw 1, VICEGRIP dbw 5, LEER - dbw 12, VICEGRIP - dbw 14, WATER_GUN ; SW97 + dbw 11, VICEGRIP dbw 16, HARDEN - dbw 23, STOMP - dbw 27, GUILLOTINE - dbw 38, PROTECT - dbw 49, CRABHAMMER + dbw 20, WATER_GUN ; SW97 + dbw 24, STOMP + dbw 28, METAL_CLAW ; FRLG + dbw 32, FALSE_SWIPE ; SW97 + dbw 37, GUILLOTINE + dbw 41, PROTECT + dbw 48, CRABHAMMER + dbw 53, FLAIL ; FRLG db 0 ; no more level-up moves VoltorbEvosAttacks: ; spark and twave should be here somewhere dbbw EVOLVE_LEVEL, 30, ELECTRODE db 0 ; no more evolutions dbw 1, TACKLE - dbw 9, SCREECH + dbw 7, SCREECH + dbw 12, THUNDER_WAVE ; SW97 dbw 17, SONICBOOM - dbw 23, SELFDESTRUCT - dbw 29, ROLLOUT - dbw 33, LIGHT_SCREEN + dbw 22, SELFDESTRUCT + dbw 27, ROLLOUT + dbw 33, SPARK ; FRLG dbw 37, SWIFT - dbw 39, EXPLOSION - dbw 41, MIRROR_COAT + dbw 40, LIGHT_SCREEN + dbw 44, EXPLOSION + dbw 50, MIRROR_COAT + dbw 56, THUNDER ; PLA db 0 ; no more level-up moves ElectrodeEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, SCREECH - dbw 1, SONICBOOM - dbw 1, SELFDESTRUCT - dbw 9, SCREECH + dbw 7, SCREECH + dbw 12, THUNDER_WAVE ; SW97 dbw 17, SONICBOOM - dbw 23, SELFDESTRUCT - dbw 29, ROLLOUT - dbw 34, LIGHT_SCREEN - dbw 40, SWIFT - dbw 44, EXPLOSION - dbw 48, MIRROR_COAT + dbw 22, SELFDESTRUCT + dbw 27, ROLLOUT + dbw 35, SPARK ; FRLG + dbw 39, SWIFT + dbw 42, LIGHT_SCREEN + dbw 48, EXPLOSION + dbw 54, MIRROR_COAT + dbw 60, THUNDER ; PLA db 0 ; no more level-up moves ExeggcuteEvosAttacks: @@ -2148,14 +2298,16 @@ ExeggcuteEvosAttacks: db 0 ; no more evolutions dbw 1, BARRAGE dbw 1, HYPNOSIS - dbw 1, SWEET_SCENT ; SW97 - dbw 7, REFLECT - dbw 13, LEECH_SEED - dbw 19, CONFUSION - dbw 25, STUN_SPORE - dbw 31, POISONPOWDER - dbw 37, SLEEP_POWDER - dbw 43, SOLARBEAM + dbw 6, REFLECT + dbw 11, SWEET_SCENT ; SW97 + dbw 16, LEECH_SEED + dbw 22, CONFUSION + dbw 27, STUN_SPORE + dbw 32, POISONPOWDER + dbw 38, PSYBEAM ; LGPE + dbw 44, SLEEP_POWDER + dbw 50, SOLARBEAM + dbw 56, SOFTBOILED ; 99 proto egg move db 0 ; no more level-up moves ExeggutorEvosAttacks: @@ -2166,6 +2318,7 @@ ExeggutorEvosAttacks: dbw 1, SWEET_SCENT ; SW97 dbw 19, STOMP dbw 31, EGG_BOMB + dbw 55, SOLARBEAM ; to match Alolan Eggy db 0 ; no more level-up moves CuboneEvosAttacks: @@ -2182,74 +2335,73 @@ CuboneEvosAttacks: dbw 33, FALSE_SWIPE dbw 37, THRASH dbw 41, BONE_RUSH + dbw 46, DOUBLE_EDGE db 0 ; no more level-up moves MarowakEvosAttacks: dbbw EVOLVE_ITEM, HEART_STONE, GUARDIA db 0 ; no more evolutions dbw 1, GROWL - dbw 1, TAIL_WHIP - dbw 1, BONE_CLUB - dbw 1, HEADBUTT dbw 5, TAIL_WHIP dbw 9, BONE_CLUB dbw 13, HEADBUTT dbw 17, LEER dbw 21, FOCUS_ENERGY dbw 25, BONEMERANG - dbw 32, RAGE - dbw 39, FALSE_SWIPE - dbw 46, THRASH - dbw 53, BONE_RUSH + dbw 31, RAGE + dbw 35, FALSE_SWIPE + dbw 41, THRASH + dbw 45, BONE_RUSH + dbw 52, DOUBLE_EDGE db 0 ; no more level-up moves GuardiaEvosAttacks: db 0 ; no more evolutions dbw 1, GROWL - dbw 1, TAIL_WHIP - dbw 1, BONE_CLUB - dbw 1, HEADBUTT dbw 5, TAIL_WHIP dbw 9, BONE_CLUB dbw 13, HEADBUTT dbw 17, LEER dbw 21, FOCUS_ENERGY dbw 25, BONEMERANG - dbw 32, RAGE - dbw 39, FALSE_SWIPE - dbw 46, THRASH - dbw 53, BONE_RUSH + dbw 31, RAGE + dbw 35, FALSE_SWIPE + dbw 41, THRASH + dbw 45, BONE_RUSH + dbw 52, DOUBLE_EDGE db 0 ; no more level-up moves HitmonleeEvosAttacks: db 0 ; no more evolutions dbw 1, DOUBLE_KICK - dbw 6, MEDITATE - dbw 11, ROLLING_KICK - dbw 16, JUMP_KICK - dbw 21, FOCUS_ENERGY - dbw 26, HI_JUMP_KICK - dbw 31, MIND_READER - dbw 36, FORESIGHT - dbw 41, ENDURE - dbw 46, MEGA_KICK - dbw 51, REVERSAL + dbw 5, MEDITATE + dbw 10, ROLLING_KICK + dbw 15, FOCUS_ENERGY + dbw 20, JUMP_KICK + dbw 25, MIND_READER + dbw 30, KARATE_CHOP ; Substitute for Brick Break + dbw 35, FORESIGHT + dbw 40, HI_JUMP_KICK + dbw 45, ENDURE + dbw 50, MEGA_KICK + dbw 55, REVERSAL db 0 ; no more level-up moves HitmonchanEvosAttacks: db 0 ; no more evolutions dbw 1, COMET_PUNCH - ; dbw 1, UPPERCUT get this implemented - dbw 7, AGILITY - dbw 13, PURSUIT + dbw 6, AGILITY + ; dbw 11, UPPERCUT + dbw 16, SONICBOOM ; Street Fighter II + dbw 20, MACH_PUNCH dbw 26, THUNDERPUNCH dbw 26, ICE_PUNCH dbw 26, FIRE_PUNCH - dbw 32, MACH_PUNCH - dbw 38, MEGA_PUNCH - dbw 44, DETECT - dbw 50, COUNTER - dbw 53, DYNAMICPUNCH ; SW97 + dbw 32, PURSUIT + dbw 38, DETECT + dbw 44, DYNAMICPUNCH ; SW97 + dbw 50, MEGA_PUNCH + dbw 55, COUNTER db 0 ; no more level-up moves LickitungEvosAttacks: @@ -2262,10 +2414,10 @@ LickitungEvosAttacks: dbw 13, DEFENSE_CURL dbw 19, STOMP dbw 25, WRAP - dbw 31, DISABLE - dbw 37, SLAM - dbw 43, SCREECH - dbw 50, AMNESIA ; SW97 + dbw 30, DISABLE + dbw 36, SLAM + dbw 42, SCREECH + dbw 48, AMNESIA ; SW97 db 0 ; no more level-up moves LickilickyEvosAttacks: @@ -2275,28 +2427,28 @@ LickilickyEvosAttacks: dbw 13, DEFENSE_CURL dbw 19, STOMP dbw 25, WRAP - dbw 31, DISABLE + dbw 30, DISABLE dbw 32, ROLLOUT - dbw 40, SLAM - dbw 49, SCREECH - dbw 54, AMNESIA ; SW97 + dbw 38, SLAM + dbw 44, SCREECH + dbw 52, AMNESIA ; SW97 db 0 ; no more level-up moves LickilordEvosAttacks: ; SW97 learnset + some poison stuff db 0 ; no more evolutions dbw 1, ACID dbw 1, LICK - dbw 1, WRAP - dbw 1, SLAM + dbw 1, TOXIC dbw 7, SUPERSONIC - dbw 14, DISABLE - dbw 22, STOMP - dbw 30, TOXIC - dbw 33, WRAP - dbw 41, DEFENSE_CURL - dbw 52, SLAM - dbw 64, AMNESIA - dbw 77, SCREECH + dbw 13, DEFENSE_CURL + dbw 19, STOMP + dbw 25, WRAP + dbw 30, DISABLE + dbw 34, SWAGGER + dbw 38, SLAM + dbw 44, SCREECH + dbw 52, AMNESIA + dbw 57, SLUDGE_BOMB db 0 ; no more level-up moves KoffingEvosAttacks: @@ -2304,30 +2456,28 @@ KoffingEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_GAS dbw 1, TACKLE - dbw 9, SMOG - dbw 17, SELFDESTRUCT - dbw 21, SLUDGE + dbw 8, SMOG + dbw 13, SELFDESTRUCT + dbw 19, SLUDGE dbw 25, SMOKESCREEN - dbw 33, HAZE - dbw 41, EXPLOSION - dbw 45, DESTINY_BOND - dbw 50, SLUDGE_BOMB ; SW97 + dbw 31, HAZE + dbw 37, SLUDGE_BOMB ; SW97 + dbw 43, EXPLOSION + dbw 49, DESTINY_BOND db 0 ; no more level-up moves WeezingEvosAttacks: db 0 ; no more evolutions dbw 1, POISON_GAS dbw 1, TACKLE - dbw 1, SMOG - dbw 1, SELFDESTRUCT - dbw 9, SMOG - dbw 17, SELFDESTRUCT - dbw 21, SLUDGE + dbw 8, SMOG + dbw 13, SELFDESTRUCT + dbw 19, SLUDGE dbw 25, SMOKESCREEN - dbw 33, HAZE - dbw 44, EXPLOSION - dbw 51, DESTINY_BOND - dbw 60, SLUDGE_BOMB ; SW97 + dbw 31, HAZE + dbw 39, SLUDGE_BOMB ; SW97 + dbw 45, EXPLOSION + dbw 53, DESTINY_BOND db 0 ; no more level-up moves RhyhornEvosAttacks: @@ -2335,29 +2485,32 @@ RhyhornEvosAttacks: db 0 ; no more evolutions dbw 1, HORN_ATTACK dbw 1, TAIL_WHIP - dbw 1, MUD_SLAP ; SW97 + dbw 7, MUD_SLAP ; SW97 dbw 13, STOMP dbw 19, FURY_ATTACK + dbw 25, ENDURE ; SW97 dbw 31, SCARY_FACE - dbw 37, HORN_DRILL + dbw 37, TAKE_DOWN dbw 43, ROCK_HEAD - dbw 49, TAKE_DOWN + dbw 49, HORN_DRILL dbw 55, EARTHQUAKE + dbw 61, MEGAHORN ; FRLG db 0 ; no more level-up moves RhydonEvosAttacks: db 0 ; no more evolutions dbw 1, HORN_ATTACK dbw 1, TAIL_WHIP - dbw 1, STOMP - dbw 1, MUD_SLAP ; SW97 + dbw 7, MUD_SLAP ; SW97 dbw 13, STOMP dbw 19, FURY_ATTACK + dbw 25, ENDURE ; SW97 dbw 31, SCARY_FACE - dbw 37, HORN_DRILL - dbw 48, ROCK_HEAD - dbw 54, TAKE_DOWN - dbw 65, EARTHQUAKE + dbw 37, TAKE_DOWN + dbw 43, ROCK_HEAD + dbw 49, HORN_DRILL + dbw 55, EARTHQUAKE + dbw 61, MEGAHORN ; FRLG db 0 ; no more level-up moves HappinyEvosAttacks: @@ -2374,31 +2527,33 @@ ChanseyEvosAttacks: dbbw EVOLVE_LEVEL, 45, BLISSEY db 0 ; no more evolutions dbw 1, POUND - dbw 5, GROWL - dbw 9, TAIL_WHIP - dbw 13, SOFTBOILED + dbw 1, GROWL + dbw 7, TAIL_WHIP + dbw 12, SOFTBOILED dbw 17, DOUBLESLAP - dbw 23, MINIMIZE - dbw 29, SING - dbw 35, EGG_BOMB - dbw 41, DEFENSE_CURL - dbw 49, LIGHT_SCREEN - dbw 57, DOUBLE_EDGE + dbw 22, MINIMIZE + dbw 27, SING + dbw 32, EGG_BOMB + dbw 36, DEFENSE_CURL + dbw 41, PAIN_SPLIT ; SW97 + dbw 46, LIGHT_SCREEN + dbw 52, DOUBLE_EDGE db 0 ; no more level-up moves BurgelaEvosAttacks: dbbw EVOLVE_LEVEL, 22, TANGELA db 0 ; no more evolutions dbw 1, CONSTRICT - dbw 4, SLEEP_POWDER + dbw 5, SLEEP_POWDER dbw 10, ABSORB - dbw 13, POISONPOWDER + dbw 15, POISONPOWDER dbw 19, VINE_WHIP - dbw 23, BIND - dbw 27, MEGA_DRAIN - dbw 28, STUN_SPORE - dbw 32, SLAM - dbw 36, GROWTH + dbw 24, BIND + dbw 28, MEGA_DRAIN + dbw 33, STUN_SPORE + dbw 38, SLAM + dbw 43, GROWTH + dbw 48, GIGA_DRAIN db 0 ; no more level-up moves TangelaEvosAttacks: @@ -2406,124 +2561,135 @@ TangelaEvosAttacks: dbbw EVOLVE_ITEM, DUSK_STONE, JUNGELA db 0 ; no more evolutions dbw 1, CONSTRICT - dbw 4, SLEEP_POWDER + dbw 5, SLEEP_POWDER dbw 10, ABSORB - dbw 13, POISONPOWDER + dbw 15, POISONPOWDER dbw 19, VINE_WHIP - dbw 25, BIND - dbw 31, MEGA_DRAIN - dbw 34, STUN_SPORE - dbw 40, SLAM - dbw 46, GROWTH + dbw 26, BIND + dbw 30, MEGA_DRAIN + dbw 35, STUN_SPORE + dbw 42, SLAM + dbw 47, GROWTH + dbw 52, GIGA_DRAIN ; Later gen level-up & TM db 0 ; no more level-up moves TangrowthEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT - dbw 4, SLEEP_POWDER + dbw 5, SLEEP_POWDER dbw 10, ABSORB - dbw 13, POISONPOWDER + dbw 15, POISONPOWDER dbw 19, VINE_WHIP - dbw 25, BIND - dbw 31, MEGA_DRAIN - dbw 34, STUN_SPORE - dbw 40, SLAM + dbw 26, BIND + dbw 30, MEGA_DRAIN + dbw 35, STUN_SPORE + dbw 42, SLAM dbw 44, ANCIENTPOWER - dbw 51, GROWTH + dbw 49, GROWTH + dbw 56, GIGA_DRAIN ; Later gen level-up & TM db 0 ; no more level-up moves -JungelaEvosAttacks: ; SW97 learnset + Giga Drain +JungelaEvosAttacks: db 0 ; no more evolutions - dbw 1, VINE_WHIP dbw 1, CONSTRICT - dbw 1, FAINT_ATTACK - dbw 1, NIGHT_SHADE - dbw 7, ABSORB - dbw 14, BIND - dbw 22, GROWTH - dbw 30, GIGA_DRAIN - dbw 36, SLEEP_POWDER - dbw 41, STUN_SPORE - dbw 46, POISONPOWDER - dbw 52, NIGHT_SHADE - dbw 64, SLAM + dbw 1, BITE + dbw 5, SLEEP_POWDER + dbw 10, ABSORB + dbw 15, POISONPOWDER + dbw 19, VINE_WHIP + dbw 26, BIND + dbw 30, MEGA_DRAIN + dbw 35, STUN_SPORE + dbw 42, SLAM + dbw 44, PURSUIT + dbw 49, GROWTH + dbw 56, GIGA_DRAIN ; Later gen level-up & TM + dbw 62, CRUNCH db 0 ; no more level-up moves KangaskhanEvosAttacks: db 0 ; no more evolutions dbw 1, COMET_PUNCH - dbw 1, PROTECT ; SW97 dbw 7, LEER dbw 13, BITE dbw 19, TAIL_WHIP dbw 25, MEGA_PUNCH - dbw 31, RAGE - dbw 37, ENDURE - dbw 43, DIZZY_PUNCH - dbw 49, REVERSAL + dbw 31, PROTECT ; SW97 + dbw 37, RAGE + dbw 43, ENDURE + dbw 49, DIZZY_PUNCH + dbw 55, REVERSAL db 0 ; no more level-up moves HorseaEvosAttacks: dbbw EVOLVE_LEVEL, 32, SEADRA db 0 ; no more evolutions dbw 1, BUBBLE - dbw 8, SMOKESCREEN - dbw 15, LEER - dbw 18, PIN_MISSILE ; SW97 - dbw 22, WATER_GUN - dbw 29, TWISTER - dbw 36, AGILITY - dbw 43, HYDRO_PUMP + dbw 7, SMOKESCREEN + dbw 12, LEER + dbw 18, QUICK_ATTACK ; SW97 + dbw 24, WATER_GUN + dbw 29, FOCUS_ENERGY ; HGSS + dbw 34, TWISTER + dbw 39, BUBBLEBEAM ; HGSS + dbw 45, AGILITY + dbw 50, DRAGONBREATH ; SW97 + dbw 56, HYDRO_PUMP db 0 ; no more level-up moves SeadraEvosAttacks: dbbw EVOLVE_TRADE, DRAGON_SCALE, KINGDRA db 0 ; no more evolutions dbw 1, BUBBLE - dbw 1, SMOKESCREEN - dbw 1, LEER - dbw 1, WATER_GUN - dbw 8, SMOKESCREEN - dbw 15, LEER - dbw 18, PIN_MISSILE ; SW97 - dbw 22, WATER_GUN - dbw 29, TWISTER - dbw 40, AGILITY - dbw 51, HYDRO_PUMP - dbw 60, DRAGONBREATH + dbw 7, SMOKESCREEN + dbw 12, LEER + dbw 18, QUICK_ATTACK ; SW97 + dbw 24, WATER_GUN + dbw 29, FOCUS_ENERGY ; HGSS + dbw 32, PIN_MISSILE ; SW97 + dbw 36, TWISTER + dbw 41, BUBBLEBEAM ; HGSS + dbw 47, AGILITY + dbw 54, DRAGONBREATH ; SW97 + dbw 60, HYDRO_PUMP db 0 ; no more level-up moves BlastykeEvosAttacks: dbbw EVOLVE_LEVEL, 36, BLASTOISE dbw 1, TACKLE - dbw 4, TAIL_WHIP + dbw 1, TAIL_WHIP dbw 7, BUBBLE dbw 10, WITHDRAW - dbw 13, WATER_GUN + dbw 14, WATER_GUN dbw 19, BITE - dbw 25, RAPID_SPIN - dbw 31, PROTECT - dbw 38, RAIN_DANCE - dbw 47, SKULL_BASH + dbw 24, RAPID_SPIN + dbw 29, BUBBLEBEAM + dbw 33, HEADBUTT + dbw 37, RAIN_DANCE + dbw 41, IRON_TAIL + dbw 45, CURSE + dbw 50, SKULL_BASH dbw 56, HYDRO_PUMP + dbw 61, HYPER_BEAM db 0 ; no more level-up moves BlastoiseEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, BUBBLE - dbw 1, WITHDRAW - dbw 4, TAIL_WHIP dbw 7, BUBBLE dbw 10, WITHDRAW - dbw 13, WATER_GUN + dbw 14, WATER_GUN dbw 19, BITE - dbw 25, RAPID_SPIN - dbw 31, PROTECT - dbw 42, RAIN_DANCE - dbw 55, SKULL_BASH - dbw 68, HYDRO_PUMP + dbw 24, RAPID_SPIN + dbw 29, BUBBLEBEAM ; LGPE + dbw 33, HEADBUTT ; LGPE + dbw 39, RAIN_DANCE + dbw 43, IRON_TAIL ; TM + dbw 47, CURSE ; 99 proto + dbw 54, SKULL_BASH + dbw 60, HYDRO_PUMP + dbw 65, HYPER_BEAM ; TM db 0 ; no more level-up moves OrfryEvosAttacks: @@ -2531,12 +2697,15 @@ OrfryEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, TAIL_WHIP - dbw 7, SUPERSONIC - dbw 12, HORN_ATTACK - dbw 16, FURY_ATTACK - dbw 26, WATERFALL - dbw 30, HORN_DRILL - dbw 34, AGILITY + dbw 10, SUPERSONIC + dbw 15, HORN_ATTACK + dbw 22, FLAIL + dbw 25, FURY_ATTACK + dbw 31, WATERFALL + dbw 35, THRASH ; RG proto + dbw 40, AGILITY + dbw 45, HORN_DRILL + dbw 49, HYDRO_PUMP ; RG proto db 0 ; no more level-up moves GoldeenEvosAttacks: @@ -2547,39 +2716,47 @@ GoldeenEvosAttacks: dbw 10, SUPERSONIC dbw 15, HORN_ATTACK dbw 24, FLAIL - dbw 29, FURY_ATTACK - dbw 38, WATERFALL - dbw 43, HORN_DRILL - dbw 52, AGILITY + dbw 27, FURY_ATTACK + dbw 33, WATERFALL + dbw 39, THRASH ; RG proto + dbw 44, AGILITY + dbw 49, HORN_DRILL + dbw 55, HYDRO_PUMP ; RG proto + dbw 59, MEGAHORN ; FRLG db 0 ; no more level-up moves SeakingEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, TAIL_WHIP - dbw 1, TAIL_WHIP dbw 10, SUPERSONIC dbw 15, HORN_ATTACK dbw 24, FLAIL - dbw 29, FURY_ATTACK - dbw 41, WATERFALL - dbw 49, HORN_DRILL - dbw 61, AGILITY + dbw 27, FURY_ATTACK + dbw 33, WATERFALL + dbw 41, THRASH ; RG proto + dbw 46, AGILITY + dbw 51, HORN_DRILL + dbw 59, HYDRO_PUMP ; RG proto + dbw 63, MEGAHORN ; FRLG db 0 ; no more level-up moves -StaryuEvosAttacks: ; aurorabeam? +StaryuEvosAttacks: dbbw EVOLVE_ITEM, WATER_STONE, STARMIE db 0 ; no more evolutions dbw 1, TACKLE dbw 1, HARDEN - dbw 7, WATER_GUN - dbw 13, RAPID_SPIN - dbw 19, RECOVER + dbw 5, WATER_GUN + dbw 10, RAPID_SPIN + dbw 15, SUPERSONIC ; Unused Egg move + dbw 20, RECOVER dbw 25, SWIFT - dbw 31, BUBBLEBEAM - dbw 37, MINIMIZE - dbw 43, LIGHT_SCREEN - dbw 50, HYDRO_PUMP + dbw 30, BUBBLEBEAM + dbw 35, AURORA_BEAM ; Unused Egg move + dbw 40, MINIMIZE + ; dbw 45, SYNCHRONIZE + dbw 50, LIGHT_SCREEN + dbw 55, HYDRO_PUMP db 0 ; no more level-up moves StarmieEvosAttacks: @@ -2589,6 +2766,7 @@ StarmieEvosAttacks: dbw 1, RECOVER dbw 1, BUBBLEBEAM dbw 37, CONFUSE_RAY + dbw 43, BARRIER ; Unused Egg move db 0 ; no more level-up moves MimeJrEvosAttacks: @@ -2606,6 +2784,7 @@ MimeJrEvosAttacks: dbw 36, PSYBEAM dbw 41, BATON_PASS dbw 46, SAFEGUARD + dbw 52, PSYCHIC_M ; FRLG db 0 ; no more level-up moves MrMimeEvosAttacks: @@ -2614,13 +2793,15 @@ MrMimeEvosAttacks: dbw 6, CONFUSION dbw 11, SUBSTITUTE dbw 16, MEDITATE - dbw 21, DOUBLESLAP - dbw 26, LIGHT_SCREEN - dbw 26, REFLECT - dbw 31, ENCORE - dbw 36, PSYBEAM - dbw 41, BATON_PASS - dbw 46, SAFEGUARD + dbw 18, MIMIC + dbw 23, DOUBLESLAP + dbw 28, LIGHT_SCREEN + dbw 28, REFLECT + dbw 33, ENCORE + dbw 40, PSYBEAM + dbw 45, BATON_PASS + dbw 51, SAFEGUARD + dbw 58, PSYCHIC_M ; FRLG db 0 ; no more level-up moves ScytherEvosAttacks: @@ -2632,13 +2813,14 @@ ScytherEvosAttacks: dbw 1, LEER dbw 6, FOCUS_ENERGY dbw 12, PURSUIT - dbw 18, FALSE_SWIPE - dbw 24, AGILITY + dbw 17, FALSE_SWIPE + dbw 22, FURY_CUTTER ; SW97 + dbw 26, AGILITY dbw 30, WING_ATTACK dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM - dbw 54, FURY_CUTTER ; SW97 + dbw 54, CROSS_CUTTER db 0 ; no more level-up moves KleavorEvosAttacks: @@ -2647,44 +2829,47 @@ KleavorEvosAttacks: dbw 1, LEER dbw 6, FOCUS_ENERGY dbw 12, PURSUIT - dbw 18, FALSE_SWIPE - dbw 24, AGILITY + dbw 17, FALSE_SWIPE + dbw 22, FURY_CUTTER ; SW97 + dbw 26, AGILITY dbw 30, ROCK_SLASH dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM - dbw 54, FURY_CUTTER ; SW97 + dbw 54, CROSS_CUTTER db 0 ; no more level-up moves JynxEvosAttacks: db 0 ; no more evolutions dbw 1, POUND dbw 1, LICK - dbw 1, LOVELY_KISS - dbw 1, POWDER_SNOW - dbw 9, LOVELY_KISS - dbw 13, POWDER_SNOW - dbw 21, DOUBLESLAP - dbw 25, ICE_PUNCH - dbw 35, MEAN_LOOK - dbw 41, BODY_SLAM - dbw 51, PERISH_SONG - dbw 57, BLIZZARD + dbw 7, SWEET_KISS ; from Smoochum + dbw 12, POWDER_SNOW + dbw 17, CONFUSION + dbw 22, SING + dbw 26, PSYWAVE ; 99 proto + dbw 33, MEAN_LOOK + dbw 38, LOVELY_KISS + dbw 42, PSYCHIC_M + dbw 48, SAFEGUARD ; 99 proto + dbw 54, PERISH_SONG + dbw 60, BLIZZARD db 0 ; no more level-up moves BuuEvosAttacks: db 0 dbw 1, AURORA_BEAM dbw 6, LEER - dbw 11, ICE_PUNCH - dbw 16, MIST - dbw 21, DIZZY_PUNCH - dbw 27, FAINT_ATTACK - dbw 32, DISABLE - dbw 39, PURSUIT - dbw 45, HAZE - dbw 51, ICE_BEAM - dbw 58, BLIZZARD + dbw 13, MIST + dbw 20, DIZZY_PUNCH + dbw 26, FAINT_ATTACK + dbw 30, ICE_PUNCH + dbw 34, DISABLE + dbw 38, PURSUIT + dbw 42, HAZE + dbw 48, ICE_BEAM + dbw 54, THRASH ; RBY Jynx + dbw 60, BLIZZARD db 0 ElectabuzzEvosAttacks: @@ -2692,61 +2877,67 @@ ElectabuzzEvosAttacks: db 0 ; no more evolutions dbw 1, QUICK_ATTACK dbw 1, LEER - dbw 1, THUNDERPUNCH - dbw 9, THUNDERPUNCH - dbw 17, LIGHT_SCREEN - dbw 25, SWIFT - dbw 36, SCREECH - dbw 47, THUNDERBOLT - dbw 53, THUNDER_WAVE ; SW97 - dbw 58, THUNDER + dbw 7, THUNDERSHOCK ; SW97 + dbw 13, THUNDER_WAVE ; SW97 + dbw 17, LOW_KICK ; From Elebebi + dbw 21, SPARK ; SW97 + dbw 26, SWIFT + dbw 30, THUNDERPUNCH + dbw 38, SCREECH + dbw 44, THUNDERBOLT + dbw 52, LIGHT_SCREEN + dbw 60, THUNDER db 0 ; no more level-up moves ElectivireEvosAttacks: db 0 ; no more evolutions dbw 1, QUICK_ATTACK dbw 1, LEER - dbw 1, LOW_KICK - dbw 9, THUNDERPUNCH - dbw 17, LIGHT_SCREEN - dbw 25, SWIFT - dbw 36, SCREECH - dbw 47, THUNDERBOLT - dbw 53, THUNDER_WAVE ; SW97 - dbw 58, THUNDER + dbw 7, THUNDERSHOCK ; SW97 + dbw 13, THUNDER_WAVE ; SW97 + dbw 17, LOW_KICK ; From Elebebi + dbw 21, SPARK ; SW97 + dbw 26, SWIFT + dbw 30, THUNDERPUNCH + dbw 38, SCREECH + dbw 44, THUNDERBOLT + dbw 52, LIGHT_SCREEN + dbw 60, THUNDER + dbw 65, DOUBLE_EDGE ; HGSS, Substitute for Giga Impact db 0 ; no more level-up moves MagmarEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, MAGMORTAR db 0 ; no more evolutions - dbw 1, EMBER + dbw 1, TACKLE ; SW97 dbw 1, LEER - dbw 1, SMOG - dbw 1, FIRE_PUNCH - dbw 7, LEER - dbw 13, SMOG - dbw 19, FIRE_PUNCH - dbw 25, SMOKESCREEN - dbw 33, SUNNY_DAY - dbw 41, FLAMETHROWER - dbw 49, CONFUSE_RAY - dbw 57, FIRE_BLAST + dbw 7, EMBER + dbw 13, SMOKESCREEN + dbw 17, SMOG + dbw 21, FLAME_WHEEL ; SW97 + dbw 26, CONFUSE_RAY + dbw 30, FIRE_PUNCH + dbw 38, FAINT_ATTACK ; HGSS + dbw 44, FLAMETHROWER + dbw 52, SUNNY_DAY + dbw 60, FIRE_BLAST db 0 ; no more level-up moves MagmortarEvosAttacks: db 0 ; no more evolutions - dbw 1, EMBER + dbw 1, TACKLE ; SW97 dbw 1, LEER - dbw 1, SMOG - dbw 1, FIRE_PUNCH - dbw 7, LEER - dbw 13, SMOG - dbw 19, FIRE_PUNCH - dbw 25, SMOKESCREEN - dbw 33, SUNNY_DAY - dbw 41, FLAMETHROWER - dbw 49, CONFUSE_RAY - dbw 57, FIRE_BLAST + dbw 7, EMBER + dbw 13, SMOKESCREEN + dbw 17, SMOG + dbw 21, FLAME_WHEEL ; SW97 + dbw 26, CONFUSE_RAY + dbw 30, FIRE_PUNCH + dbw 38, FAINT_ATTACK ; HGSS + dbw 44, FLAMETHROWER + dbw 52, SUNNY_DAY + dbw 60, FIRE_BLAST + dbw 65, HYPER_BEAM ; HGSS db 0 ; no more level-up moves PinsirEvosAttacks: @@ -2759,10 +2950,10 @@ PinsirEvosAttacks: dbw 19, SEISMIC_TOSS dbw 25, HARDEN dbw 31, CROSS_CUTTER - dbw 34, SLASH ; SW97, RBY dbw 37, SUBMISSION dbw 43, SWORDS_DANCE dbw 49, GUILLOTINE + dbw 55, SLASH ; SW97, RBY db 0 ; no more level-up moves TriculesEvosAttacks: @@ -2773,26 +2964,28 @@ TriculesEvosAttacks: dbw 19, SEISMIC_TOSS dbw 25, HARDEN dbw 31, CROSS_CUTTER - dbw 34, SLASH ; SW97, RBY dbw 37, SUBMISSION dbw 42, METAL_CLAW dbw 43, SWORDS_DANCE dbw 49, GUILLOTINE + dbw 55, SLASH ; SW97, RBY + dbw 60, MEGAHORN ; due to its connection to Heracross (and giant horn) db 0 ; no more level-up moves TaurosEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 4, TAIL_WHIP + dbw 1, TAIL_WHIP dbw 8, RAGE dbw 13, HORN_ATTACK dbw 19, SCARY_FACE - dbw 23, STOMP ; SW97 - dbw 26, PURSUIT - dbw 34, REST + dbw 24, PURSUIT + dbw 29, STOMP ; SW97 + dbw 34, LEER ; SW97 + dbw 38, REST dbw 43, THRASH - dbw 53, TAKE_DOWN - dbw 60, SWAGGER ; SW97 + dbw 49, SWAGGER ; SW97 + dbw 55, TAKE_DOWN db 0 ; no more level-up moves MagikarpEvosAttacks: @@ -2809,10 +3002,12 @@ GyaradosEvosAttacks: dbw 20, BITE dbw 25, DRAGON_RAGE dbw 30, LEER - dbw 35, TWISTER - dbw 40, HYDRO_PUMP - dbw 45, RAIN_DANCE - dbw 50, HYPER_BEAM + dbw 35, WATERFALL ; LGPE + dbw 40, TWISTER + dbw 45, HYDRO_PUMP + dbw 50, RAIN_DANCE + dbw 55, OUTRAGE ; LGPE + dbw 60, HYPER_BEAM db 0 ; no more level-up moves MagipreyEvosAttacks: @@ -2830,9 +3025,11 @@ TerradosEvosAttacks: dbw 25, MAGNITUDE dbw 30, ROAR dbw 35, CRUNCH - dbw 40, EARTHQUAKE - dbw 45, SANDSTORM - dbw 50, FISSURE + dbw 40, SCREECH + dbw 45, EARTHQUAKE + dbw 50, SANDSTORM + dbw 55, OUTRAGE + dbw 60, FISSURE db 0 ; no more level-up moves LaprasEvosAttacks: @@ -2840,14 +3037,14 @@ LaprasEvosAttacks: dbw 1, WATER_GUN dbw 1, GROWL dbw 1, SING - dbw 1, HAZE ; SW97 dbw 8, MIST dbw 15, BODY_SLAM - dbw 22, CONFUSE_RAY - dbw 29, PERISH_SONG - dbw 36, ICE_BEAM - dbw 43, RAIN_DANCE - dbw 50, SAFEGUARD + dbw 21, CONFUSE_RAY + dbw 27, PERISH_SONG + dbw 33, HAZE ; SW97 + dbw 39, ICE_BEAM + dbw 45, RAIN_DANCE + dbw 51, SAFEGUARD dbw 57, HYDRO_PUMP db 0 ; no more level-up moves @@ -2860,7 +3057,7 @@ DittoEvosAttacks: MimmeoEvosAttacks: db 0 ; no more evolutions dbw 1, TRANSFORM - dbw 30, MIST + dbw 30, PSYCH_UP ; copies stat boosts, thematically sound dbw 40, LIGHT_SCREEN dbw 50, REFLECT db 0 ; no more level-up moves @@ -2870,7 +3067,9 @@ EeveeEvosAttacks: dbbw EVOLVE_ITEM, WATER_STONE, VAPOREON dbbw EVOLVE_ITEM, FIRE_STONE, FLAREON dbbw EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON + dbbw EVOLVE_ITEM, HEART_STONE, ESPEON dbbw EVOLVE_HAPPINESS, TR_NITE, UMBREON + dbbw EVOLVE_ITEM, POISON_STONE, UMBREON dbbw EVOLVE_ITEM, LEAF_STONE, LEAFEON dbbw EVOLVE_ITEM, ICE_STONE, GLACEON dbbw EVOLVE_ITEM, MOON_STONE, SYLVEON @@ -2879,22 +3078,22 @@ EeveeEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, GROWL - dbw 19, MUD_SLAP ; SW97 - dbw 23, QUICK_ATTACK + dbw 20, MUD_SLAP ; SW97 + dbw 25, QUICK_ATTACK dbw 30, BITE dbw 36, BATON_PASS dbw 42, TAKE_DOWN - dbw 50, FOCUS_ENERGY ; RBY, GS + dbw 47, FOCUS_ENERGY ; RBY, GS db 0 ; no more level-up moves VaporeonEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, MIST ; SW97 dbw 8, SAND_ATTACK dbw 16, WATER_GUN - dbw 23, QUICK_ATTACK + dbw 20, MIST ; SW97 + dbw 25, QUICK_ATTACK dbw 30, BITE dbw 36, AURORA_BEAM dbw 42, HAZE @@ -2908,7 +3107,8 @@ JolteonEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, THUNDERSHOCK - dbw 23, QUICK_ATTACK + dbw 20, SWIFT ; TM + dbw 25, QUICK_ATTACK dbw 30, DOUBLE_KICK dbw 36, PIN_MISSILE dbw 42, THUNDER_WAVE @@ -2920,10 +3120,10 @@ FlareonEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP - dbw 1, RAGE ; SW97 dbw 8, SAND_ATTACK dbw 16, EMBER - dbw 23, QUICK_ATTACK + dbw 20, RAGE ; SW97 + dbw 25, QUICK_ATTACK dbw 30, BITE dbw 36, FIRE_SPIN dbw 42, SMOG @@ -2938,13 +3138,13 @@ PorygonEvosAttacks: dbw 1, TACKLE dbw 1, CONVERSION dbw 9, AGILITY - dbw 12, PSYBEAM - dbw 20, RECOVER - dbw 24, SHARPEN - dbw 32, LOCK_ON - dbw 36, TRI_ATTACK - dbw 44, ZAP_CANNON - dbw 50, HYPER_BEAM ; SW97 + dbw 15, PSYBEAM + dbw 21, RECOVER + dbw 27, SHARPEN + dbw 33, LOCK_ON + dbw 39, TRI_ATTACK + dbw 45, ZAP_CANNON + dbw 51, HYPER_BEAM ; SW97 db 0 ; no more level-up moves OmanyteEvosAttacks: @@ -2952,28 +3152,31 @@ OmanyteEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, WITHDRAW - dbw 1, HORN_ATTACK ; SW97 - dbw 1, BIND ; SW97 - dbw 13, BITE + dbw 8, BITE + dbw 14, ROCK_THROW ; KEP & Event dbw 19, WATER_GUN - dbw 31, LEER - dbw 37, PROTECT + dbw 25, HORN_ATTACK ; SW97 + dbw 31, BIND ; SW97 + dbw 37, LEER + dbw 43, PROTECT dbw 49, ANCIENTPOWER - dbw 55, HYDRO_PUMP + dbw 55, SPIKE_CANNON ; SW97 + dbw 61, HYDRO_PUMP db 0 ; no more level-up moves OmastarEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, WITHDRAW - dbw 1, HORN_ATTACK ; SW97 - dbw 1, BIND ; SW97 - dbw 13, BITE + dbw 8, BITE + dbw 14, ROCK_THROW ; KEP & Event dbw 19, WATER_GUN - dbw 31, LEER - dbw 37, PROTECT - dbw 40, SPIKE_CANNON - dbw 54, ANCIENTPOWER + dbw 25, HORN_ATTACK ; SW97 + dbw 31, BIND ; SW97 + dbw 37, LEER + dbw 45, PROTECT + dbw 51, ANCIENTPOWER + dbw 59, SPIKE_CANNON ; SW97 dbw 65, HYDRO_PUMP db 0 ; no more level-up moves @@ -2982,63 +3185,66 @@ KabutoEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, HARDEN - dbw 1, WATER_GUN ; SW97 - dbw 10, ABSORB - dbw 19, LEER - dbw 23, SLASH ; SW97 - dbw 28, SAND_ATTACK - dbw 37, ENDURE - dbw 46, MEGA_DRAIN - dbw 55, ANCIENTPOWER - dbw 60, HYDRO_PUMP ; SW97, RBY + dbw 1, LEER + dbw 8, ABSORB + dbw 14, ROCK_THROW ; KEP & Event + dbw 19, WATER_GUN ; SW97 + dbw 25, SAND_ATTACK + dbw 31, ENDURE + dbw 37, MEGA_DRAIN + dbw 43, SLASH ; SW97 + dbw 49, ANCIENTPOWER + dbw 55, HYDRO_PUMP ; SW97, RBY + dbw 59, ROCK_SLASH db 0 ; no more level-up moves KabutopsEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, HARDEN - dbw 1, ABSORB - dbw 1, WATER_GUN ; SW97 - dbw 10, ABSORB - dbw 19, LEER - dbw 23, SLASH ; SW97 - dbw 28, SAND_ATTACK - dbw 37, ENDURE - dbw 40, SLASH - dbw 51, MEGA_DRAIN - dbw 58, ROCK_SLASH - dbw 65, ANCIENTPOWER - dbw 70, HYDRO_PUMP ; SW97, RBY + dbw 1, LEER + dbw 8, ABSORB + dbw 14, ROCK_THROW ; KEP & Event + dbw 19, WATER_GUN ; SW97 + dbw 25, SAND_ATTACK + dbw 31, ENDURE + dbw 37, MEGA_DRAIN + dbw 45, SLASH + dbw 51, ANCIENTPOWER + dbw 59, HYDRO_PUMP ; SW97, RBY + dbw 65, ROCK_SLASH db 0 ; no more level-up moves FeradactylEvosAttacks: dbbw EVOLVE_LEVEL, 40, AERODACTYL db 0 ; no more evolutions dbw 1, TAKE_DOWN - dbw 1, GUST ; SW97 - dbw 1, LEER ; SW97 - dbw 8, AGILITY - dbw 15, BITE - dbw 22, SUPERSONIC - dbw 28, ANCIENTPOWER + dbw 8, GUST ; SW97 + dbw 14, BITE + dbw 21, LEER ; SW97 + dbw 28, SUPERSONIC + dbw 32, ANCIENTPOWER dbw 36, SCARY_FACE - dbw 43, ROCK_HEAD - dbw 50, HYPER_BEAM + dbw 42, ROCK_SLIDE ; Funny & TM + dbw 48, AGILITY + dbw 54, ROCK_HEAD + dbw 61, HYPER_BEAM db 0 ; no more level-up moves AerodactylEvosAttacks: db 0 ; no more evolutions dbw 1, TAKE_DOWN - dbw 1, GUST ; SW97 - dbw 1, LEER ; SW97 - dbw 8, AGILITY - dbw 15, BITE - dbw 22, SUPERSONIC - dbw 28, ANCIENTPOWER + dbw 8, GUST ; SW97 + dbw 14, BITE + dbw 21, LEER ; SW97 + dbw 28, SUPERSONIC + dbw 32, ANCIENTPOWER dbw 36, SCARY_FACE dbw 40, WING_ATTACK - dbw 48, ROCK_HEAD - dbw 60, HYPER_BEAM + dbw 44, ROCK_SLIDE ; Funny & TM + dbw 50, AGILITY + dbw 58, ROCK_HEAD + dbw 65, HYPER_BEAM db 0 ; no more level-up moves DecillaEvosAttacks: @@ -3047,12 +3253,14 @@ DecillaEvosAttacks: dbw 1, TACKLE dbw 1, GROWL dbw 8, SUBSTITUTE - dbw 17, SCREECH - dbw 26, ROCK_THROW - dbw 35, ROAR - dbw 46, ROCK_SLIDE - dbw 51, ROCK_SLASH - dbw 57, HYPER_BEAM + dbw 15, SCREECH + dbw 22, ROCK_THROW + dbw 29, DRAGONBREATH + dbw 36, ROAR + dbw 43, ROCK_SLIDE + dbw 50, CURSE + dbw 57, ROCK_SLASH + dbw 64, HYPER_BEAM db 0 ; no more level-up moves GawarhedEvosAttacks: @@ -3060,88 +3268,95 @@ GawarhedEvosAttacks: dbw 1, TACKLE dbw 1, GROWL dbw 8, SUBSTITUTE - dbw 17, SCREECH - dbw 26, ROCK_THROW - dbw 35, ROAR + dbw 15, SCREECH + dbw 22, ROCK_THROW + dbw 29, DRAGONBREATH + dbw 36, ROAR dbw 40, OUTRAGE - dbw 51, ROCK_SLIDE - dbw 61, ROCK_SLASH - dbw 67, HYPER_BEAM + dbw 45, ROCK_SLIDE + dbw 54, CURSE + dbw 63, ROCK_SLASH + dbw 70, HYPER_BEAM db 0 ; no more level-up moves MunchlaxEvosAttacks: - db EVOLVE_HAPPINESS, TR_ANYTIME, SNORLAX + dbbw EVOLVE_HAPPINESS, TR_ANYTIME, SNORLAX db 0 ; no more evolutions - db 1, TACKLE - db 1, METRONOME - db 8, AMNESIA - db 15, DEFENSE_CURL - db 22, BELLY_DRUM - db 29, HEADBUTT - db 36, SCREECH - db 36, REST - db 43, BODY_SLAM - db 50, ROLLOUT - db 57, HYPER_BEAM + dbw 1, TACKLE + dbw 1, METRONOME + dbw 8, AMNESIA + dbw 15, DEFENSE_CURL + dbw 21, BELLY_DRUM + dbw 27, HEADBUTT + dbw 33, REST ; FRLG + dbw 39, SNORE + dbw 45, BODY_SLAM + dbw 51, SLEEP_TALK ; SW97 + dbw 57, ROLLOUT + dbw 63, DOUBLE_EDGE ; SW97 + dbw 70, HYPER_BEAM db 0 ; no more level-up moves SnorlaxEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE + dbw 1, METRONOME ; From Munchlax dbw 8, AMNESIA dbw 15, DEFENSE_CURL - dbw 22, BELLY_DRUM - dbw 29, HEADBUTT - dbw 36, SNORE - dbw 36, REST - dbw 43, BODY_SLAM - dbw 50, ROLLOUT - dbw 57, HYPER_BEAM + dbw 21, BELLY_DRUM + dbw 27, HEADBUTT + dbw 33, REST ; FRLG + dbw 39, SNORE + dbw 45, BODY_SLAM + dbw 51, SLEEP_TALK ; SW97 + dbw 57, ROLLOUT + dbw 63, DOUBLE_EDGE ; SW97 + dbw 70, HYPER_BEAM db 0 ; no more level-up moves ArticunoEvosAttacks: db 0 ; no more evolutions dbw 1, GUST - dbw 1, LEER ; SW97 dbw 1, POWDER_SNOW - dbw 1, HAZE ; SW97 - dbw 13, MIST - dbw 20, AURORA_BEAM ; SW97 + dbw 5, MIST + dbw 15, AURORA_BEAM ; SW97 dbw 25, AGILITY - dbw 37, MIND_READER - dbw 49, ICE_BEAM - dbw 61, REFLECT - dbw 73, BLIZZARD - dbw 80, SAFEGUARD ; SW97 + dbw 35, MIND_READER + dbw 45, HAZE ; SW97 + dbw 55, ICE_BEAM + dbw 65, SAFEGUARD ; SW97 + dbw 75, REFLECT + dbw 85, BLIZZARD db 0 ; no more level-up moves ZapdosEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, THUNDERSHOCK - dbw 1, SCARY_FACE ; SW97 - dbw 1, LEER ; SW97 - dbw 13, THUNDER_WAVE + dbw 5, THUNDER_WAVE + dbw 15, LEER ; SW97 dbw 25, AGILITY - dbw 37, DETECT - dbw 49, DRILL_PECK - dbw 61, LIGHT_SCREEN - dbw 73, THUNDER + dbw 35, DETECT + dbw 45, DRILL_PECK + dbw 55, THUNDERBOLT ; LGPE + dbw 65, SCARY_FACE ; SW97 + dbw 75, LIGHT_SCREEN + dbw 85, THUNDER db 0 ; no more level-up moves -MoltresEvosAttacks: ; this fucker got recover once and im really tempted to add it in +MoltresEvosAttacks: db 0 ; no more evolutions dbw 1, WING_ATTACK dbw 1, EMBER - dbw 1, LEER ; SW97, RBY - dbw 1, SCARY_FACE ; SW97 - dbw 13, FIRE_SPIN + dbw 5, LEER ; SW97, RBY + dbw 15, FIRE_SPIN dbw 25, AGILITY - dbw 37, ENDURE - dbw 49, FLAMETHROWER - dbw 61, SAFEGUARD - dbw 73, SKY_ATTACK - dbw 80, SACRED_FIRE ; SW97 ayooooo + dbw 35, ENDURE + dbw 45, RECOVER ; 99 proto & hehehehehe + dbw 55, FLAMETHROWER + dbw 65, SAFEGUARD + dbw 75, SKY_ATTACK + dbw 85, SACRED_FIRE ; SW97 db 0 ; no more level-up moves SqueamataEvosAttacks: @@ -3149,14 +3364,15 @@ SqueamataEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP - dbw 8, LEER + dbw 8, TWISTER dbw 15, BITE dbw 22, DRAGON_RAGE - dbw 29, DRAGONBREATH - dbw 36, GLARE - dbw 43, CRUNCH - dbw 50, SLASH - dbw 57, OUTRAGE + dbw 29, FURY_SWIPES + dbw 36, DRAGONBREATH + dbw 43, GLARE + dbw 50, MORNING_SUN + dbw 57, SLASH + dbw 64, OUTRAGE db 0 ; no more level-up moves MinistareEvosAttacks: @@ -3164,27 +3380,29 @@ MinistareEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP - dbw 8, LEER + dbw 8, TWISTER dbw 15, BITE dbw 22, DRAGON_RAGE - dbw 29, DRAGONBREATH - dbw 38, GLARE - dbw 47, CRUNCH - dbw 56, SLASH - dbw 65, OUTRAGE + dbw 29, FURY_SWIPES + dbw 38, DRAGONBREATH + dbw 45, GLARE + dbw 54, MORNING_SUN + dbw 61, SLASH + dbw 70, OUTRAGE db 0 ; no more level-up moves IguanarchEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP - dbw 8, LEER + dbw 8, TWISTER dbw 15, BITE dbw 22, DRAGON_RAGE - dbw 29, DRAGONBREATH - dbw 38, GLARE - dbw 47, CRUNCH - dbw 61, SLASH + dbw 29, FURY_SWIPES + dbw 38, DRAGONBREATH + dbw 45, GLARE + dbw 54, MORNING_SUN + dbw 65, SLASH dbw 75, OUTRAGE db 0 ; no more level-up moves @@ -3201,8 +3419,9 @@ DratiniEvosAttacks: dbw 29, SLAM dbw 36, AGILITY dbw 43, SAFEGUARD - dbw 50, OUTRAGE - dbw 57, HYPER_BEAM + dbw 50, THUNDER ; RG proto + dbw 57, OUTRAGE + dbw 64, HYPER_BEAM db 0 ; no more level-up moves DragonairEvosAttacks: @@ -3210,36 +3429,38 @@ DragonairEvosAttacks: db 0 ; no more evolutions dbw 1, WRAP dbw 1, LEER - dbw 1, THUNDER_WAVE - dbw 1, TWISTER + dbw 1, POUND ; SW97 + dbw 1, WATER_GUN ; SW97 dbw 8, THUNDER_WAVE dbw 15, TWISTER dbw 22, DRAGON_RAGE dbw 29, SLAM dbw 38, AGILITY - dbw 47, SAFEGUARD - dbw 56, OUTRAGE - dbw 65, HYPER_BEAM + dbw 45, SAFEGUARD + dbw 54, THUNDER ; RG proto + dbw 61, OUTRAGE + dbw 70, HYPER_BEAM db 0 ; no more level-up moves DragoniteEvosAttacks: db 0 ; no more evolutions dbw 1, WRAP dbw 1, LEER - dbw 1, THUNDER_WAVE - dbw 1, TWISTER + dbw 1, POUND ; SW97 + dbw 1, WATER_GUN ; SW97 dbw 8, THUNDER_WAVE dbw 15, TWISTER dbw 22, DRAGON_RAGE dbw 29, SLAM dbw 38, AGILITY - dbw 47, SAFEGUARD - dbw 55, WING_ATTACK - dbw 61, OUTRAGE + dbw 45, SAFEGUARD + dbw 54, THUNDER ; RG proto + dbw 55, WING_ATTACK ; FRLG + dbw 65, OUTRAGE dbw 75, HYPER_BEAM db 0 ; no more level-up moves -MewtwoEvosAttacks: ; could get psybeam +MewtwoEvosAttacks: db 0 ; no more evolutions dbw 1, CONFUSION dbw 1, DISABLE diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 8f770fa..980209a 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -291,7 +291,7 @@ EvolveAfterBattle_MasterLoop: ld [wTempSpecies], a xor a ld [wMonType], a - call LearnEvolutionMove + ; call LearnEvolutionMove call LearnLevelMoves ld a, [wTempSpecies] call SetSeenAndCaughtMon @@ -357,49 +357,50 @@ EvolveAfterBattle_MasterLoop: ; BUG: Does not take in the designated move correctly, resulting in strange behaviour usually seen when GetMoveIDFromIndex takes an 8-bit index. ; Comments proceeding -LearnEvolutionMove: - ld a, [wTempSpecies] - ld [wCurPartySpecies], a - call GetPokemonIndexFromID - ld b, h - ld c, l - ld hl, EvolutionMoves - add hl, bc - add hl, bc - dec hl - dec hl - ld a, [hli] - ld h, [hl] - ld l, a ; Moves through the table by going up according to the Pokemon's ID, storing the equivalent move in hl. This is fine. - or h ; hl == 0? - ret z +; LearnEvolutionMove: + ; ld a, [wTempSpecies] + ; ld [wCurPartySpecies], a + ; call GetPokemonIndexFromID + ; ld b, h + ; ld c, l + ; ld hl, EvolutionMoves + ; add hl, bc + ; add hl, bc + ; dec hl + ; dec hl + ; ld a, [hli] + ; ld h, [hl] + ; ld l, a ; Moves through the table by going up according to the Pokemon's ID, storing the equivalent move in hl. This is fine. + ; or h ; hl == 0? + ; ret z - call GetMoveIDFromIndex ; grabs what's in hl (the move) and converts it to 8-bit...or something like that. anyway, it should return in register a. - push hl ; I don't actually know why it does this. Removing it produces manmade horrors beyond my comprehension, so it isn't part of the current problem. - ld d, a ; preserve a - ld hl, wPartyMon1Moves - ld a, [wCurPartyMon] - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld b, NUM_MOVES -.check_move - ld a, [hli] - cp d ; use preserved a to check if a move is there - jr z, .has_move - dec b - jr nz, .check_move - ld a, d ; take the preserved a and reload - ld [wPutativeTMHMMove], a ; proceed to learn the move with adequate preprep - ld [wNamedObjectIndex], a - call GetMoveName - call CopyName1 - predef LearnMove - ld a, [wCurPartySpecies] - ld [wTempSpecies], a -.has_move - pop hl - ret + ; call GetMoveIDFromIndex ; grabs what's in hl (the move) and converts it to 8-bit...or something like that. anyway, it should return in register a. + ; push hl ; I don't actually know why it does this. Removing it produces manmade horrors beyond my comprehension, so it isn't part of the current problem. + ; ld d, a ; preserve a + ; ld hl, wPartyMon1Moves + ; ld a, [wCurPartyMon] + ; ld bc, PARTYMON_STRUCT_LENGTH + ; call AddNTimes + ; ld b, NUM_MOVES +; .check_move + ; ld a, [hli] + ; cp d ; use preserved a to check if a move is there + ; jr z, .has_move + ; dec b + ; jr nz, .check_move + ; ld a, d ; take the preserved a and reload + ; ld [wPutativeTMHMMove], a ; proceed to learn the move with adequate preprep + ; ld [wNamedObjectIndex], a + ; call GetMoveName + ; call CopyName1 + ; predef LearnMove + ; ld a, [wCurPartySpecies] + ; ld [wTempSpecies], a +; .has_move + ; pop hl + ; ret ; so wtf is going on + UpdateSpeciesNameIfNotNicknamed: ld a, [wCurSpecies] push af