From d0bfd179b6e61e9038af02fedc08f5c2aefc7b42 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:50:36 +0100 Subject: [PATCH] moveset audit results as of aug 2 '24 lots of notes for u to look through friendos --- data/pokemon/evos_attacks_johto.asm | 135 ++++++++++++++++++++++---- data/pokemon/evos_attacks_kanto.asm | 145 ++++++++++++++++++++++++---- 2 files changed, 243 insertions(+), 37 deletions(-) diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 7892e87..b2d16c0 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -443,6 +443,7 @@ HoothootEvosAttacks: dbw 34, CONFUSION dbw 42, REFLECT dbw 48, DREAM_EATER + dbw 54, MOONLIGHT ; SW97 db 0 ; no more level-up moves NoctowlEvosAttacks: @@ -459,6 +460,7 @@ NoctowlEvosAttacks: dbw 39, CONFUSION dbw 49, REFLECT dbw 57, DREAM_EATER + dbw 64, MOONLIGHT ; SW97 db 0 ; no more level-up moves LedybaEvosAttacks: @@ -474,12 +476,14 @@ LedybaEvosAttacks: dbw 36, SWIFT dbw 43, AGILITY dbw 50, DOUBLE_EDGE + dbw 55, TRI_ATTACK ; SW97 db 0 ; no more level-up moves 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 24, LIGHT_SCREEN @@ -489,9 +493,10 @@ LedianEvosAttacks: dbw 42, SWIFT dbw 51, AGILITY dbw 60, DOUBLE_EDGE + dbw 65, TRI_ATTACK ; SW97 db 0 ; no more level-up moves -SpinarakEvosAttacks: +SpinarakEvosAttacks: ; put confusion and bite somewhere dbbw EVOLVE_LEVEL, 22, ARIADOS db 0 ; no more evolutions dbw 1, POISON_STING @@ -555,6 +560,7 @@ CrobatEvosAttacks: dbw 30, WING_ATTACK dbw 42, MEAN_LOOK dbw 55, HAZE + dbw 60, MOONLIGHT ; should be evo move later db 0 ; no more level-up moves ChinchouEvosAttacks: @@ -589,6 +595,7 @@ ReroadEvosAttacks: db 0 ; no more evolutions dbw 1, BUBBLE dbw 1, MEGAPHONE + dbw 1, POUND dbw 7, LICK dbw 14, HORN_ATTACK dbw 20, RAIN_DANCE @@ -605,6 +612,7 @@ PichuEvosAttacks: dbw 6, TAIL_WHIP dbw 8, THUNDER_WAVE dbw 11, SWEET_KISS + dbw 13, SPARK ; SW97 db 0 ; no more level-up moves CleffaEvosAttacks: @@ -637,6 +645,7 @@ TogepiEvosAttacks: dbw 25, ENCORE dbw 31, SAFEGUARD dbw 38, DOUBLE_EDGE + dbw 43, SPIKE_CANNON ; SW97 db 0 ; no more level-up moves TogeticEvosAttacks: @@ -649,6 +658,7 @@ TogeticEvosAttacks: dbw 25, ENCORE dbw 31, SAFEGUARD dbw 38, DOUBLE_EDGE + dbw 43, SPIKE_CANNON ; SW97 db 0 ; no more level-up moves TogekissEvosAttacks: @@ -664,10 +674,15 @@ NatuEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, LEER + dbw 1, CONFUSION ; SW97 dbw 10, NIGHT_SHADE + dbw 15, MEAN_LOOK ; SW97 dbw 20, TELEPORT + dbw 25, PSYBEAM ; SW97 dbw 30, FUTURE_SIGHT + dbw 35, PURSUIT ; SW97 dbw 40, CONFUSE_RAY + dbw 45, SPITE ; SW97 dbw 50, PSYCHIC_M db 0 ; no more level-up moves @@ -676,10 +691,15 @@ QatuEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, LEER + dbw 1, CONFUSION ; SW97 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 db 0 ; no more level-up moves @@ -687,11 +707,15 @@ XatuEvosAttacks: db 0 ; no more evolutions dbw 1, PECK dbw 1, LEER - dbw 1, NIGHT_SHADE + dbw 1, CONFUSION ; SW97 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 db 0 ; no more level-up moves @@ -730,11 +754,14 @@ MareepEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL + dbw 1, TAIL_WHIP ; SW97 dbw 9, THUNDERSHOCK dbw 16, THUNDER_WAVE dbw 23, COTTON_SPORE dbw 30, LIGHT_SCREEN - dbw 37, THUNDER + dbw 32, THUNDERBOLT ; SW97 + dbw 38, HYPNOSIS ; SW97 + dbw 43, THUNDER db 0 ; no more level-up moves FlaaffyEvosAttacks: @@ -742,12 +769,15 @@ FlaaffyEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL + dbw 1, TAIL_WHIP ; SW97 dbw 1, THUNDERSHOCK dbw 9, THUNDERSHOCK dbw 18, THUNDER_WAVE dbw 27, COTTON_SPORE dbw 36, LIGHT_SCREEN - dbw 45, THUNDER + dbw 40, THUNDERBOLT ; SW97 + dbw 43, HYPNOSIS ; SW97 + dbw 50, THUNDER db 0 ; no more level-up moves AmpharosEvosAttacks: @@ -755,12 +785,14 @@ AmpharosEvosAttacks: dbw 1, TACKLE dbw 1, GROWL dbw 1, THUNDERSHOCK - dbw 1, THUNDER_WAVE + dbw 1, TAIL_WHIP ; SW97 dbw 9, THUNDERSHOCK 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 db 0 ; no more level-up moves @@ -777,6 +809,7 @@ AzurillEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, MARILL db 0 ; no more evolutions dbw 1, SPLASH + dbw 1, POUND ; SW97 dbw 3, CHARM dbw 6, TAIL_WHIP dbw 10, BUBBLE @@ -895,7 +928,7 @@ JumpluffEvosAttacks: dbw 44, MEGA_DRAIN db 0 ; no more level-up moves -AipomEvosAttacks: +AipomEvosAttacks: ; put swift, encore, and mimic somewhere. maybe thief. dbbw EVOLVE_LEVEL, 32, AMBIPOM db 0 ; no more evolutions dbw 1, SCRATCH @@ -908,7 +941,7 @@ AipomEvosAttacks: dbw 46, AGILITY db 0 ; no more level-up moves -AmbipomEvosAttacks: +AmbipomEvosAttacks: ; put swift, encore, and mimic somewhere db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, TAIL_WHIP @@ -1047,8 +1080,9 @@ WooperEvosAttacks: dbbw EVOLVE_LEVEL, 20, QUAGSIRE db 0 ; no more evolutions dbw 1, WATER_GUN + dbw 1, POUND ; SW97 dbw 1, TAIL_WHIP - dbw 11, SLAM + dbw 11, SLAM ; uhh put mud slap and maybe some other stuff around here dbw 21, AMNESIA dbw 31, EARTHQUAKE dbw 41, RAIN_DANCE @@ -1060,7 +1094,8 @@ QuagsireEvosAttacks: db 0 ; no more evolutions dbw 1, WATER_GUN dbw 1, TAIL_WHIP - dbw 11, SLAM + dbw 1, POUND ; SW97 + dbw 11, SLAM ; yeah put mud slap around here dbw 23, AMNESIA dbw 35, EARTHQUAKE dbw 47, RAIN_DANCE @@ -1142,11 +1177,15 @@ MurkrowEvosAttacks: dbbw EVOLVE_ITEM, DUSK_STONE, HONCHKROW db 0 ; no more evolutions dbw 1, PECK + dbw 1, SAND_ATTACK ; SW97 + dbw 8, FORESIGHT ; SW97 dbw 11, PURSUIT dbw 16, HAZE dbw 26, NIGHT_SHADE dbw 31, FAINT_ATTACK + dbw 36, SPIKES ; SW97 dbw 41, MEAN_LOOK + dbw 50, PERISH_SONG ; SW97 db 0 ; no more level-up moves HonchkrowEvosAttacks: @@ -1182,6 +1221,7 @@ MisdreavusEvosAttacks: dbw 27, PSYBEAM dbw 36, PAIN_SPLIT dbw 46, PERISH_SONG + dbw 50, SAFEGUARD ; SW99 db 0 ; no more level-up moves MismagiusEvosAttacks: @@ -1266,6 +1306,8 @@ 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 @@ -1280,6 +1322,8 @@ 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 @@ -1293,8 +1337,9 @@ FarigirafEvosAttacks: EmordromeEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, GROWL dbw 1, SPITE + dbw 1, DOUBLE_KICK ; SW97 + dbw 1, SAND_ATTACK ; SW97 dbw 7, CONFUSION dbw 13, LICK dbw 17, STOMP @@ -1381,7 +1426,9 @@ SteelixEvosAttacks: dbw 27, RAGE dbw 36, SANDSTORM dbw 40, SLAM + dbw 45, DIG dbw 49, CRUNCH + dbw 55, IRON_TAIL ; make this an evo move db 0 ; no more level-up moves SnubbullEvosAttacks: @@ -1393,9 +1440,13 @@ SnubbullEvosAttacks: dbw 8, CHARM dbw 13, BITE dbw 19, LICK + dbw 23, SING ; SW97 dbw 26, ROAR dbw 34, RAGE dbw 43, TAKE_DOWN + dbw 48, SAFEGUARD ; SW97 + dbw 53, SWEET_KISS ; SW97 + dbw 60, DOUBLE_EDGE ; SW97 db 0 ; no more level-up moves GranbullEvosAttacks: @@ -1406,9 +1457,13 @@ GranbullEvosAttacks: dbw 8, 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 db 0 ; no more level-up moves CaretorkerEvosAttacks: @@ -1443,6 +1498,7 @@ 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 @@ -1479,6 +1535,7 @@ ScizorEvosAttacks: dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM + dbw 54, FURY_CUTTER ; SW97 db 0 ; no more level-up moves ShuckleEvosAttacks: @@ -1508,6 +1565,7 @@ 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 @@ -1518,7 +1576,7 @@ HeracrossEvosAttacks: dbw 54, MEGAHORN db 0 ; no more level-up moves -SneaselEvosAttacks: +SneaselEvosAttacks: ; put thief, pursuit, etc somewhere db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -1685,6 +1743,8 @@ RemoraidEvosAttacks: dbw 33, FOCUS_ENERGY dbw 44, ICE_BEAM dbw 55, HYPER_BEAM + dbw 60, ZAP_CANNON ; SW97 + dbw 66, HYDRO_PUMP ; SW97 db 0 ; no more level-up moves OctilleryEvosAttacks: @@ -1698,6 +1758,8 @@ OctilleryEvosAttacks: dbw 38, FOCUS_ENERGY dbw 54, ICE_BEAM dbw 70, HYPER_BEAM + dbw 77, ZAP_CANNON ; SW97 + dbw 80, HYDRO_PUMP ; SW97 db 0 ; no more level-up moves StricheelEvosAttacks: @@ -1730,12 +1792,19 @@ LurreelEvosAttacks: dbw 66, HYDRO_PUMP db 0 ; no more level-up moves -DelibirdEvosAttacks: +DelibirdEvosAttacks: ; SW97-style learnset 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 db 0 ; no more level-up moves -MantykeEvosAttacks: +MantykeEvosAttacks: ; review w/ sw97 learnset dbbw EVOLVE_LEVEL, 30, MANTINE ; to be changed db 0 ; no more evolutions dbw 1, TACKLE @@ -1764,11 +1833,14 @@ SkarmoryEvosAttacks: db 0 ; no more evolutions dbw 1, LEER dbw 1, PECK - dbw 13, SAND_ATTACK + 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 db 0 ; no more level-up moves HoundourEvosAttacks: @@ -1776,10 +1848,13 @@ 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 23, SCARY_FACE ; SW97 dbw 27, FAINT_ATTACK + dbw 31, BONEMERANG ; SW97 dbw 35, FLAMETHROWER dbw 43, CRUNCH db 0 ; no more level-up moves @@ -1788,10 +1863,13 @@ 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 30, FAINT_ATTACK + dbw 37, BONEMERANG ; SW97 dbw 41, FLAMETHROWER dbw 52, CRUNCH db 0 ; no more level-up moves @@ -1817,6 +1895,7 @@ PhanpyEvosAttacks: dbw 1, GROWL dbw 9, DEFENSE_CURL dbw 17, FLAIL + dbw 21, STOMP ; SW97 dbw 25, TAKE_DOWN dbw 33, ROLLOUT dbw 41, ENDURE @@ -1829,6 +1908,7 @@ DonphanEvosAttacks: dbw 1, GROWL dbw 9, DEFENSE_CURL dbw 17, FLAIL + dbw 21, STOMP ; SW97 dbw 25, FURY_ATTACK dbw 33, ROLLOUT dbw 41, RAPID_SPIN @@ -1848,6 +1928,7 @@ Porygon2EvosAttacks: dbw 32, LOCK_ON dbw 36, TRI_ATTACK dbw 44, ZAP_CANNON + dbw 50, HYPER_BEAM ; SW97 db 0 ; no more level-up moves PorygonZEvosAttacks: @@ -1862,6 +1943,7 @@ PorygonZEvosAttacks: dbw 32, LOCK_ON dbw 36, TRI_ATTACK dbw 44, ZAP_CANNON + dbw 50, HYPER_BEAM ; SW97 db 0 ; no more level-up moves StantlerEvosAttacks: @@ -1992,14 +2074,18 @@ MagbyEvosAttacks: 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 19, MILK_DRINK + dbw 23, CHARM ; SW97 dbw 26, BIDE dbw 34, ROLLOUT + dbw 39, RAGE ; SW97 dbw 43, BODY_SLAM dbw 53, HEAL_BELL + dbw 60, TAKE_DOWN ; SW97 db 0 ; no more level-up moves BlisseyEvosAttacks: @@ -2509,39 +2595,45 @@ WalkingWakeEvosAttacks: RaikouEvosAttacks: db 0 ; no more evolutions + dbw 1, SCRATCH ; SW97 + dbw 1, FOCUS_ENERGY ; SW97 dbw 1, BITE dbw 1, LEER dbw 11, THUNDERSHOCK dbw 21, ROAR dbw 31, QUICK_ATTACK - dbw 41, SPARK - dbw 51, REFLECT + dbw 41, SPARK ; fit tbolt around here + dbw 51, REFLECT ; and detect dbw 61, CRUNCH dbw 71, THUNDER db 0 ; no more level-up moves EnteiEvosAttacks: db 0 ; no more evolutions + dbw 1, SCRATCH ; SW97 + dbw 1, FOCUS_ENERGY ; SW97 dbw 1, BITE dbw 1, LEER dbw 11, EMBER dbw 21, ROAR dbw 31, FIRE_SPIN - dbw 41, STOMP + dbw 41, STOMP ; fit endure and quick attack around here dbw 51, FLAMETHROWER dbw 61, SWAGGER dbw 71, FIRE_BLAST db 0 ; no more level-up moves -SuicuneEvosAttacks: +SuicuneEvosAttacks: ; try to fit water gun and roar into this without fucking up the boss fight 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 + dbw 51, MIST ; fit mind reader and quick attack around here dbw 61, MIRROR_COAT dbw 71, HYDRO_PUMP db 0 ; no more level-up moves @@ -2611,10 +2703,13 @@ LugiaEvosAttacks: 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 + 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) diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 6065305..ee99218 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -224,6 +224,7 @@ BulbasaurEvosAttacks: 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 32, GROWTH @@ -242,6 +243,7 @@ IvysaurEvosAttacks: 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 @@ -260,8 +262,10 @@ VenusaurEvosAttacks: 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 65, SOLARBEAM @@ -273,6 +277,7 @@ CharmanderEvosAttacks: dbw 1, SCRATCH dbw 1, GROWL dbw 7, EMBER + dbw 9, METAL_CLAW ; FRLG dbw 13, SMOKESCREEN dbw 19, RAGE dbw 25, SCARY_FACE @@ -289,7 +294,7 @@ CharmeleonEvosAttacks: dbw 1, SCRATCH dbw 1, GROWL dbw 1, EMBER - dbw 7, EMBER + dbw 9, METAL_CLAW ; FRLG dbw 13, SMOKESCREEN dbw 20, RAGE dbw 27, SCARY_FACE @@ -305,7 +310,7 @@ CharizardEvosAttacks: dbw 1, GROWL dbw 1, EMBER dbw 1, SMOKESCREEN - dbw 7, EMBER + dbw 9, METAL_CLAW ; FRLG dbw 13, SMOKESCREEN dbw 20, RAGE dbw 27, SCARY_FACE @@ -334,7 +339,7 @@ CharmadaEvosAttacks: db 0 ; no more level-up moves SquirtleEvosAttacks: - dbbw EVOLVE_LEVEL, 16, WARTORTLE + dbbw EVOLVE_LEVEL, 16, WARTORTLE ; Give this man Curse db 0 ; no more evolutions dbw 1, TACKLE dbw 4, TAIL_WHIP @@ -433,6 +438,7 @@ BeedrillEvosAttacks: db 0 ; no more evolutions dbw 1, FURY_ATTACK dbw 10, FURY_ATTACK + dbw 12, SUPERSONIC ; RG proto dbw 15, FOCUS_ENERGY dbw 20, TWINEEDLE dbw 25, RAGE @@ -482,6 +488,7 @@ KotoraEvosAttacks: dbw 34, SCARY_FACE dbw 42, THUNDER dbw 49, AGILITY + dbw 54, LIGHT_SCREEN db 0 ; no more level-up moves GaotoraEvosAttacks: @@ -499,6 +506,7 @@ GaotoraEvosAttacks: dbw 49, THRASH dbw 54, THUNDER dbw 49, AGILITY + dbw 54, LIGHT_SCREEN db 0 ; no more level-up moves GorotoraEvosAttacks: @@ -516,6 +524,7 @@ GorotoraEvosAttacks: dbw 58, THRASH dbw 66, THUNDER dbw 78, AGILITY + dbw 84, LIGHT_SCREEN db 0 ; no more level-up moves RaitoraEvosAttacks: @@ -531,6 +540,7 @@ RaitoraEvosAttacks: dbw 44, SCARY_FACE dbw 54, THUNDER dbw 63, AGILITY + dbw 70, LIGHT_SCREEN db 0 ; no more level-up moves PidgeyEvosAttacks: @@ -540,7 +550,9 @@ PidgeyEvosAttacks: dbw 5, SAND_ATTACK 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 37, AGILITY dbw 47, MIRROR_MOVE @@ -555,7 +567,9 @@ PidgeottoEvosAttacks: 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 @@ -570,7 +584,9 @@ PidgeotEvosAttacks: 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 @@ -586,6 +602,7 @@ RattataEvosAttacks: dbw 20, FOCUS_ENERGY dbw 27, PURSUIT dbw 34, SUPER_FANG + dbw 40, SLASH ; RG proto db 0 ; no more level-up moves RaticateEvosAttacks: @@ -598,6 +615,7 @@ RaticateEvosAttacks: dbw 20, SCARY_FACE dbw 30, PURSUIT dbw 40, SUPER_FANG + dbw 47, SLASH ; RG proto db 0 ; no more level-up moves SpearowEvosAttacks: @@ -607,6 +625,7 @@ SpearowEvosAttacks: dbw 1, GROWL dbw 7, LEER dbw 13, FURY_ATTACK + dbw 18, WING_ATTACK ; RG proto dbw 25, PURSUIT dbw 31, MIRROR_MOVE dbw 37, DRILL_PECK @@ -621,6 +640,7 @@ FearowEvosAttacks: 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 @@ -662,6 +682,7 @@ PikachuEvosAttacks: 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 @@ -695,6 +716,7 @@ SandshrewEvosAttacks: dbbw EVOLVE_LEVEL, 22, SANDSLASH db 0 ; no more evolutions dbw 1, SCRATCH + dbw 1, MUD_SLAP ; SW97 dbw 6, DEFENSE_CURL dbw 11, SAND_ATTACK dbw 17, POISON_STING @@ -707,6 +729,7 @@ SandshrewEvosAttacks: 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 @@ -753,6 +776,7 @@ NidoqueenEvosAttacks: dbw 1, DOUBLE_KICK dbw 1, TAIL_WHIP dbw 23, BODY_SLAM + dbw 30, ATTRACT ; SW97 db 0 ; no more level-up moves NidoranMEvosAttacks: @@ -1035,6 +1059,7 @@ DiglettEvosAttacks: dbbw EVOLVE_LEVEL, 26, DUGTRIO db 0 ; no more evolutions dbw 1, SCRATCH + dbw 1, MUD_SLAP ; SW97 dbw 5, GROWL dbw 9, MAGNITUDE dbw 17, DIG @@ -1047,9 +1072,9 @@ DiglettEvosAttacks: DugtrioEvosAttacks: db 0 ; no more evolutions dbw 1, TRI_ATTACK + dbw 1, MUD_SLAP ; SW97 dbw 1, SCRATCH dbw 1, GROWL - dbw 1, MAGNITUDE dbw 5, GROWL dbw 9, MAGNITUDE dbw 17, DIG @@ -1117,9 +1142,11 @@ 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 50, HYDRO_PUMP db 0 ; no more level-up moves @@ -1130,11 +1157,13 @@ 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 db 0 ; no more level-up moves @@ -1147,18 +1176,22 @@ GolduckEvosAttacks: 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 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 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES @@ -1215,6 +1248,7 @@ PupperonEvosAttacks: dbw 1, ROAR dbw 9, EMBER dbw 16, LEER + dbw 19, QUICK_ATTACK dbw 22, TAKE_DOWN dbw 28, FLAME_WHEEL dbw 34, AGILITY @@ -1228,6 +1262,7 @@ GrowlitheEvosAttacks: dbw 1, ROAR dbw 9, EMBER dbw 18, LEER + dbw 21, QUICK_ATTACK dbw 26, TAKE_DOWN dbw 34, FLAME_WHEEL dbw 42, AGILITY @@ -1241,9 +1276,10 @@ ArcanineEvosAttacks: dbw 1, TAKE_DOWN dbw 1, FLAME_WHEEL dbw 50, EXTREMESPEED + dbw 60, SACRED_FIRE ; SW97 lmfao db 0 ; no more level-up moves -PoliwagEvosAttacks: +PoliwagEvosAttacks: ; should get amnesia dbbw EVOLVE_LEVEL, 25, POLIWHIRL db 0 ; no more evolutions dbw 1, BUBBLE @@ -1278,7 +1314,7 @@ PoliwrathEvosAttacks: dbw 1, WATER_GUN dbw 1, HYPNOSIS dbw 1, DOUBLESLAP - dbw 1, SUBMISSION + dbw 1, LOW_KICK ; SW97 dbw 35, SUBMISSION dbw 51, MIND_READER db 0 ; no more level-up moves @@ -1374,6 +1410,7 @@ BellsproutEvosAttacks: dbw 17, POISONPOWDER dbw 19, STUN_SPORE dbw 23, ACID + dbw 27, FALSE_SWIPE ; SW97 dbw 30, SWEET_SCENT dbw 37, RAZOR_LEAF dbw 45, SLAM @@ -1392,6 +1429,7 @@ WeepinbellEvosAttacks: dbw 17, POISONPOWDER dbw 19, STUN_SPORE dbw 24, ACID + dbw 29, FALSE_SWIPE ; SW97 dbw 33, SWEET_SCENT dbw 42, RAZOR_LEAF dbw 54, SLAM @@ -1403,6 +1441,8 @@ VictreebelEvosAttacks: dbw 1, SLEEP_POWDER dbw 1, SWEET_SCENT dbw 1, RAZOR_LEAF + dbw 40, SLEEP_POWDER + dbw 48, GIGA_DRAIN ; vibes cus bellignan db 0 ; no more level-up moves BellignanEvosAttacks: @@ -1419,6 +1459,7 @@ TentacoolEvosAttacks: dbbw EVOLVE_LEVEL, 30, TENTACRUEL db 0 ; no more evolutions dbw 1, POISON_STING + dbw 1, WATER_GUN ; SW97 dbw 6, SUPERSONIC dbw 12, CONSTRICT dbw 19, ACID @@ -1434,6 +1475,7 @@ TentacruelEvosAttacks: dbw 1, POISON_STING dbw 1, SUPERSONIC dbw 1, CONSTRICT + dbw 1, WATER_GUN ; SW97 dbw 6, SUPERSONIC dbw 12, CONSTRICT dbw 19, ACID @@ -1685,12 +1727,13 @@ MagnetonEvosAttacks: 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 db 0 ; no more level-up moves MagnezoneEvosAttacks: -db 0 ; no more evolutions + db 0 ; no more evolutions dbw 1, TACKLE dbw 1, THUNDERSHOCK dbw 1, SUPERSONIC @@ -1790,10 +1833,12 @@ FarfetchDEvosAttacks: dbw 7, SAND_ATTACK dbw 13, LEER dbw 19, FURY_ATTACK + dbw 23, WING_ATTACK ; SW97 dbw 25, SWORDS_DANCE dbw 31, AGILITY dbw 37, SLASH dbw 44, FALSE_SWIPE + dbw 50, FURY_CUTTER ; SW97 db 0 ; no more level-up moves LuxwanEvosAttacks: @@ -1802,6 +1847,7 @@ LuxwanEvosAttacks: dbw 7, SAND_ATTACK dbw 13, LEER dbw 19, FURY_ATTACK + dbw 23, WING_ATTACK ; SW97 dbw 25, SWORDS_DANCE dbw 31, AGILITY dbw 37, SLASH @@ -1840,12 +1886,15 @@ 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 21, REST dbw 32, TAKE_DOWN dbw 37, ICE_BEAM dbw 48, SAFEGUARD + dbw 52, LIGHT_SCREEN ; SW97 db 0 ; no more level-up moves DewgongEvosAttacks: @@ -1853,12 +1902,15 @@ DewgongEvosAttacks: 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 21, REST dbw 32, TAKE_DOWN dbw 43, ICE_BEAM - dbw 60, SAFEGUARD + dbw 48, SAFEGUARD ; WHY WAS THIS L60 + dbw 55, LIGHT_SCREEN ; SW97 db 0 ; no more level-up moves SmujjEvosAttacks: @@ -1867,6 +1919,7 @@ SmujjEvosAttacks: dbw 1, POISON_GAS dbw 1, POUND dbw 5, HARDEN + dbw 7, ACID ; SW97 dbw 10, DISABLE dbw 16, SLUDGE dbw 21, MINIMIZE @@ -1881,6 +1934,7 @@ GrimerEvosAttacks: dbw 1, POISON_GAS dbw 1, POUND dbw 5, HARDEN + dbw 7, ACID ; SW97 dbw 10, DISABLE dbw 16, SLUDGE dbw 23, MINIMIZE @@ -1895,6 +1949,7 @@ MukEvosAttacks: dbw 1, POUND dbw 1, HARDEN dbw 5, HARDEN + dbw 7, ACID ; SW97 dbw 10, DISABLE dbw 16, SLUDGE dbw 23, MINIMIZE @@ -1909,6 +1964,7 @@ 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 @@ -1921,8 +1977,9 @@ CloysterEvosAttacks: db 0 ; no more evolutions dbw 1, WITHDRAW dbw 1, SUPERSONIC + dbw 1, SMOKESCREEN ; RG prototype dbw 1, AURORA_BEAM - dbw 1, PROTECT + dbw 9, PROTECT dbw 33, SPIKES dbw 41, SPIKE_CANNON db 0 ; no more level-up moves @@ -1993,9 +2050,10 @@ OnixEvosAttacks: dbw 31, ROCK_HEAD dbw 36, SANDSTORM dbw 40, SLAM + dbw 45, DIG ; SW97 db 0 ; no more level-up moves -DrowzeeEvosAttacks: +DrowzeeEvosAttacks: ; mean look and cray could be here dbbw EVOLVE_LEVEL, 26, HYPNO db 0 ; no more evolutions dbw 1, POUND @@ -2032,6 +2090,7 @@ KrabbyEvosAttacks: dbw 1, BUBBLE dbw 5, LEER dbw 12, VICEGRIP + dbw 14, WATER_GUN ; SW97 dbw 16, HARDEN dbw 23, STOMP dbw 27, GUILLOTINE @@ -2046,6 +2105,7 @@ KinglerEvosAttacks: dbw 1, VICEGRIP dbw 5, LEER dbw 12, VICEGRIP + dbw 14, WATER_GUN ; SW97 dbw 16, HARDEN dbw 23, STOMP dbw 27, GUILLOTINE @@ -2053,7 +2113,7 @@ KinglerEvosAttacks: dbw 49, CRABHAMMER db 0 ; no more level-up moves -VoltorbEvosAttacks: +VoltorbEvosAttacks: ; spark and twave should be here somewhere dbbw EVOLVE_LEVEL, 30, ELECTRODE db 0 ; no more evolutions dbw 1, TACKLE @@ -2088,6 +2148,7 @@ 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 @@ -2102,6 +2163,7 @@ ExeggutorEvosAttacks: dbw 1, BARRAGE dbw 1, HYPNOSIS dbw 1, CONFUSION + dbw 1, SWEET_SCENT ; SW97 dbw 19, STOMP dbw 31, EGG_BOMB db 0 ; no more level-up moves @@ -2177,6 +2239,7 @@ HitmonleeEvosAttacks: HitmonchanEvosAttacks: db 0 ; no more evolutions dbw 1, COMET_PUNCH + ; dbw 1, UPPERCUT get this implemented dbw 7, AGILITY dbw 13, PURSUIT dbw 26, THUNDERPUNCH @@ -2186,6 +2249,7 @@ HitmonchanEvosAttacks: dbw 38, MEGA_PUNCH dbw 44, DETECT dbw 50, COUNTER + dbw 53, DYNAMICPUNCH ; SW97 db 0 ; no more level-up moves LickitungEvosAttacks: @@ -2201,6 +2265,7 @@ LickitungEvosAttacks: dbw 31, DISABLE dbw 37, SLAM dbw 43, SCREECH + dbw 50, AMNESIA ; SW97 db 0 ; no more level-up moves LickilickyEvosAttacks: @@ -2214,6 +2279,7 @@ LickilickyEvosAttacks: dbw 32, ROLLOUT dbw 40, SLAM dbw 49, SCREECH + dbw 54, AMNESIA ; SW97 db 0 ; no more level-up moves LickilordEvosAttacks: ; SW97 learnset + some poison stuff @@ -2245,6 +2311,7 @@ KoffingEvosAttacks: dbw 33, HAZE dbw 41, EXPLOSION dbw 45, DESTINY_BOND + dbw 50, SLUDGE_BOMB ; SW97 db 0 ; no more level-up moves WeezingEvosAttacks: @@ -2260,6 +2327,7 @@ WeezingEvosAttacks: dbw 33, HAZE dbw 44, EXPLOSION dbw 51, DESTINY_BOND + dbw 60, SLUDGE_BOMB ; SW97 db 0 ; no more level-up moves RhyhornEvosAttacks: @@ -2267,6 +2335,7 @@ RhyhornEvosAttacks: db 0 ; no more evolutions dbw 1, HORN_ATTACK dbw 1, TAIL_WHIP + dbw 1, MUD_SLAP ; SW97 dbw 13, STOMP dbw 19, FURY_ATTACK dbw 31, SCARY_FACE @@ -2281,7 +2350,7 @@ RhydonEvosAttacks: dbw 1, HORN_ATTACK dbw 1, TAIL_WHIP dbw 1, STOMP - dbw 1, FURY_ATTACK + dbw 1, MUD_SLAP ; SW97 dbw 13, STOMP dbw 19, FURY_ATTACK dbw 31, SCARY_FACE @@ -2383,6 +2452,7 @@ JungelaEvosAttacks: ; SW97 learnset + Giga Drain KangaskhanEvosAttacks: db 0 ; no more evolutions dbw 1, COMET_PUNCH + dbw 1, PROTECT ; SW97 dbw 7, LEER dbw 13, BITE dbw 19, TAIL_WHIP @@ -2399,6 +2469,7 @@ HorseaEvosAttacks: dbw 1, BUBBLE dbw 8, SMOKESCREEN dbw 15, LEER + dbw 18, PIN_MISSILE ; SW97 dbw 22, WATER_GUN dbw 29, TWISTER dbw 36, AGILITY @@ -2414,10 +2485,12 @@ SeadraEvosAttacks: 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 db 0 ; no more level-up moves BlastykeEvosAttacks: @@ -2436,7 +2509,7 @@ BlastykeEvosAttacks: db 0 ; no more level-up moves BlastoiseEvosAttacks: -db 0 ; no more evolutions + db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP dbw 1, BUBBLE @@ -2494,7 +2567,7 @@ SeakingEvosAttacks: dbw 61, AGILITY db 0 ; no more level-up moves -StaryuEvosAttacks: +StaryuEvosAttacks: ; aurorabeam? dbbw EVOLVE_ITEM, WATER_STONE, STARMIE db 0 ; no more evolutions dbw 1, TACKLE @@ -2565,6 +2638,7 @@ ScytherEvosAttacks: dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM + dbw 54, FURY_CUTTER ; SW97 db 0 ; no more level-up moves KleavorEvosAttacks: @@ -2579,6 +2653,7 @@ KleavorEvosAttacks: dbw 36, SLASH dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM + dbw 54, FURY_CUTTER ; SW97 db 0 ; no more level-up moves JynxEvosAttacks: @@ -2623,6 +2698,7 @@ ElectabuzzEvosAttacks: dbw 25, SWIFT dbw 36, SCREECH dbw 47, THUNDERBOLT + dbw 53, THUNDER_WAVE ; SW97 dbw 58, THUNDER db 0 ; no more level-up moves @@ -2636,6 +2712,7 @@ ElectivireEvosAttacks: dbw 25, SWIFT dbw 36, SCREECH dbw 47, THUNDERBOLT + dbw 53, THUNDER_WAVE ; SW97 dbw 58, THUNDER db 0 ; no more level-up moves @@ -2682,6 +2759,7 @@ 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 @@ -2695,6 +2773,7 @@ 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 @@ -2708,10 +2787,12 @@ TaurosEvosAttacks: dbw 8, RAGE dbw 13, HORN_ATTACK dbw 19, SCARY_FACE + dbw 23, STOMP ; SW97 dbw 26, PURSUIT dbw 34, REST dbw 43, THRASH dbw 53, TAKE_DOWN + dbw 60, SWAGGER ; SW97 db 0 ; no more level-up moves MagikarpEvosAttacks: @@ -2759,6 +2840,7 @@ 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 @@ -2797,16 +2879,19 @@ EeveeEvosAttacks: dbw 1, TAIL_WHIP dbw 8, SAND_ATTACK dbw 16, GROWL + dbw 19, MUD_SLAP ; SW97 dbw 23, QUICK_ATTACK dbw 30, BITE dbw 36, BATON_PASS dbw 42, TAKE_DOWN + dbw 50, 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 @@ -2835,6 +2920,7 @@ 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 @@ -2858,6 +2944,7 @@ PorygonEvosAttacks: dbw 32, LOCK_ON dbw 36, TRI_ATTACK dbw 44, ZAP_CANNON + dbw 50, HYPER_BEAM ; SW97 db 0 ; no more level-up moves OmanyteEvosAttacks: @@ -2865,6 +2952,8 @@ 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 19, WATER_GUN dbw 31, LEER @@ -2877,7 +2966,8 @@ OmastarEvosAttacks: db 0 ; no more evolutions dbw 1, CONSTRICT dbw 1, WITHDRAW - dbw 1, BITE + dbw 1, HORN_ATTACK ; SW97 + dbw 1, BIND ; SW97 dbw 13, BITE dbw 19, WATER_GUN dbw 31, LEER @@ -2892,12 +2982,15 @@ 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 db 0 ; no more level-up moves KabutopsEvosAttacks: @@ -2905,20 +2998,25 @@ KabutopsEvosAttacks: 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 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 @@ -2931,6 +3029,8 @@ FeradactylEvosAttacks: 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 @@ -3002,19 +3102,25 @@ SnorlaxEvosAttacks: 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 25, AGILITY dbw 37, MIND_READER dbw 49, ICE_BEAM dbw 61, REFLECT dbw 73, BLIZZARD + dbw 80, SAFEGUARD ; SW97 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 25, AGILITY dbw 37, DETECT @@ -3023,16 +3129,19 @@ ZapdosEvosAttacks: dbw 73, THUNDER db 0 ; no more level-up moves -MoltresEvosAttacks: +MoltresEvosAttacks: ; this fucker got recover once and im really tempted to add it in 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 25, AGILITY dbw 37, ENDURE dbw 49, FLAMETHROWER dbw 61, SAFEGUARD dbw 73, SKY_ATTACK + dbw 80, SACRED_FIRE ; SW97 ayooooo db 0 ; no more level-up moves SqueamataEvosAttacks: @@ -3084,6 +3193,8 @@ DratiniEvosAttacks: db 0 ; no more evolutions dbw 1, WRAP dbw 1, LEER + dbw 1, POUND ; SW97 + dbw 1, WATER_GUN ; SW97 dbw 8, THUNDER_WAVE dbw 15, TWISTER dbw 22, DRAGON_RAGE @@ -3128,7 +3239,7 @@ DragoniteEvosAttacks: dbw 75, HYPER_BEAM db 0 ; no more level-up moves -MewtwoEvosAttacks: +MewtwoEvosAttacks: ; could get psybeam db 0 ; no more evolutions dbw 1, CONFUSION dbw 1, DISABLE