New moves

This adds the SW97 and Fairy moves to the game. I have yet to do the effects for Coin Hurl, Synchronize, and Water Sport, but they seem relatively simple.

This also adds all the Fairy moves, including Moonblast, Strange Steam, and Play Rough, which become JEP-eligible under the game's criteria.

Animations not included. Sour Crystal may have what we're looking for, though.

constants/move_constants.asm

@@ -257,11 +257,27 @@
 	const ROCK_SMASH   ; f9
 	const WHIRLPOOL    ; fa
 	const BEAT_UP      ; fb
-	const ROCK_HEAD
+	const ROCK_HEAD ; FC
-	const ROCK_SLASH
+	const ROCK_SLASH ; FD
-	const CROSS_CUTTER
+	const CROSS_CUTTER ; FE
-	const MEGAPHONE
+	const MEGAPHONE ; FF
-	const MYSTIC_ICE
+	const MYSTIC_ICE ; G0
+	const BOUNCE
+	const BRIGHT_MOSS
+	const COIN_HURL
+	const UPROOT
+	const SYNCHRONIZE
+	const STRONG_ARM
+	const UPPERCUT
+	const WATER_SPORT
+	const WIND_RIDE
+	const DAZZLING_GLEAM
+	const DISARMING_VOICE
+	const DRAINING_KISS
+	const FAIRY_WIND
+	const MOONBLAST
+	const PLAY_ROUGH
+	const STRANGE_STEAM ; BONG WEEZING RIIIIIIISE UP
 DEF NUM_ATTACKS EQU const_value - 1
 
 	if NUM_ATTACKS > $3fff

data/moves/animations.asm

@@ -283,7 +283,23 @@ BattleAnimations::
 	dw BattleAnim_RockSlash
 	dw BattleAnim_CrossCutter
 	dw BattleAnim_Megaphone
-	dw BattleAnim_Wind_Ride
+	dw BattleAnim_Wind_Ride ; Mystic Ice - to be changed, all new anims here are temp
+	dw BattleAnim_Splash ; Bounce
+	dw BattleAnim_Flash ; Bright Moss
+	dw BattleAnim_PayDay ; Coin Hurl
+	dw BattleAnim_RockSmash ; Uproot
+	dw BattleAnim_Psybeam ; Synchronize
+	dw BattleAnim_Rollout ; Strong Arm (I want it to look like Arm Thrust in ADV!)
+	dw BattleAnim_MegaPunch ; Uppercut (replicate the KEP one!!)
+	dw BattleAnim_WaterGun ; uhhh
+	dw BattleAnim_Wind_Ride ; Wind Ride but real
+	dw BattleAnim_Flash ; Dazzling Gleam
+	dw BattleAnim_Sing ; Disarming Voice
+	dw BattleAnim_SweetKiss ; Draining Kiss
+	dw BattleAnim_SweetScent ; Fairy Wind
+	dw BattleAnim_Psywave ; Moonblast
+	dw BattleAnim_Rollout ; Play Rough
+	dw BattleAnim_ConfuseRay ; Strange Steam
 	assert_table_length NUM_ATTACKS + 1
 	dw BattleAnim_SweetScent2
 

data/moves/critical_hit_moves.asm

@@ -7,4 +7,5 @@ CriticalHitMoves:
 	dw AEROBLAST
 	dw CROSS_CHOP
 	dw CROSS_CUTTER
+	dw WIND_RIDE
 	dw -1

data/moves/descriptions.asm

@@ -261,6 +261,22 @@ MoveDescriptions1:
 	dw CrossCutterDescription
 	dw MegaphoneDescription
 	dw MysticIceDescription
+	dw BounceDescription
+	dw BrightMossDescription
+	dw CoinHurlDescription
+	dw UprootDescription
+	dw SynchroniseDescription
+	dw StrongArmDescription
+	dw UppercutDescription
+	dw WaterSportDescription
+	dw WindRideDescription
+	dw DazzlingGleamDescription
+	dw DisarmingVoiceDescription
+	dw DrainingKissDescription
+	dw FairyWindDescription
+	dw MoonblastDescription
+	dw PlayRoughDescription
+	dw StrangeSteamDescription
 
 .IndirectEnd::
 
@@ -271,7 +287,15 @@ PoundDescription:
 	db   "Pounds with fore-"
 	next "legs or tail.@"
 
+; optimised
+WindRideDescription:
+CrossCutterDescription:
+RazorLeafDescription:
 KarateChopDescription:
+CrabhammerDescription:
+SlashDescription:
+AeroblastDescription:
+CrossChopDescription:
 	db   "Has a high criti-"
 	next "cal hit ratio.@"
 
@@ -503,6 +527,7 @@ BlizzardDescription:
 	db   "An attack that may"
 	next "freeze the foe.@"
 
+StrangeSteamDescription:
 PsybeamDescription:
 	db   "An attack that may"
 	next "confuse the foe.@"
@@ -511,6 +536,7 @@ BubblebeamDescription:
 	db   "An attack that may"
 	next "lower SPEED.@"
 
+PlayRoughDescription:
 AuroraBeamDescription:
 	db   "An attack that may"
 	next "lower ATTACK.@"
@@ -551,6 +577,7 @@ AbsorbDescription:
 	db   "Steals 1/2 of the"
 	next "damage inflicted.@"
 
+DrainingKissDescription:
 MegaDrainDescription:
 	db   "Steals 1/2 of the"
 	next "damage inflicted.@"
@@ -563,10 +590,6 @@ GrowthDescription:
 	db   "Raises the SPCL."
 	next "ATK rating.@"
 
-RazorLeafDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 SolarbeamDescription:
 	db   "1st turn: Prepare"
 	next "2nd turn: Attack@"
@@ -779,6 +802,7 @@ ClampDescription:
 	db   "Traps the foe for"
 	next "2-5 turns.@"
 
+DisarmingVoiceDescription:
 SwiftDescription:
 	db   "An attack that"
 	next "never misses.@"
@@ -871,10 +895,6 @@ AcidArmorDescription:
 	db   "Sharply raises the"
 	next "user's DEFENSE.@"
 
-CrabhammerDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 ExplosionDescription:
 	db   "Very powerful but"
 	next "makes user faint.@"
@@ -915,10 +935,6 @@ SuperFangDescription:
 	db   "Cuts the foe's HP"
 	next "by 1/2.@"
 
-SlashDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 SubstituteDescription:
 	db   "Makes a decoy with"
 	next "1/4 user's max HP.@"
@@ -971,10 +987,6 @@ Conversion2Description:
 	db   "The user's type is"
 	next "made resistant.@"
 
-AeroblastDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 CottonSporeDescription:
 	db   "Sharply reduces"
 	next "the foe's SPEED.@"
@@ -1215,10 +1227,6 @@ HiddenPowerDescription:
 	db   "The power varies"
 	next "with the #MON.@"
 
-CrossChopDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 TwisterDescription:
 	db   "Whips up a tornado"
 	next "to attack.@"
@@ -1279,10 +1287,6 @@ RockSlashDescription:
 	db   "A strong imprecise"
 	next "ROCK-type attack.@" ;the original description was too long I think
 	
-CrossCutterDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-	
 MegaphoneDescription:
 	db   "Reduces the foe's"
 	next "SPCL.ATK.@"
@@ -1290,3 +1294,48 @@ MegaphoneDescription:
 MysticIceDescription:
 	db   "Summons the north"
 	next "wind. May freeze.@"
+
+BounceDescription:
+	db "Bounces up, then"
+	next "down next turn.@"
+
+BrightMossDescription:
+	db "Lights up area to"
+	next "boost accuracy.@"
+
+CoinHurlDescription:
+	db "Power raises with"
+	next "wealth.@"
+
+UprootDescription:
+	db "Flings foe for"
+	next "massive damage.@"
+
+SynchroniseDescription:
+	db "Enemy takes same"
+	next "damage as user.@"
+
+StrongArmDescription:
+	db "May raise the"
+	next "user's ATTACK.@"
+
+UppercutDescription:
+	db "An attack that may"
+	next "cause flinching.@"
+
+WaterSportDescription:
+	db "Lowers FIRE move" ; I really want to change this tbh
+	next "power.@" 
+
+DazzlingGleamDescription:
+	db "Flashes a bright"
+	next "light to attack.@"
+
+FairyWindDescription:
+	db "Blows a pleasant"
+	next "wind to attack.@"
+
+MoonblastDescription:
+	db   "An attack that may"
+	next "lower SPCL.ATK.@"
+

data/moves/moves.asm

@@ -274,4 +274,20 @@ Moves1:
 	move EFFECT_NORMAL_HIT,         50, BUG,           100, 15,   0      ;CROSS_CUTTER
 	move EFFECT_SP_ATK_DOWN,         0, NORMAL,        100, 40,   0      ;MEGAPHONE
 	move EFFECT_FREEZE_HIT,        100, ICE,         	95,  5,  30      ;MYSTIC_ICE
+	move EFFECT_FLY,                85, WATER,         85,  5,   0     ; BOUNCE - went back and forth on type (making it modern or keeping it spaceworldy), chose spaceworld to diversify the "fly" move category
+	move EFFECT_ACCURACY_UP,        85, GRASS,         	 0, 20,   0     ; BRIGHT_MOSS
+	move EFFECT_RETURN,              1, NORMAL,        100, 20,   0     ; COIN_HURL - effect not implemented
+	move EFFECT_NORMAL_HIT,         85, GROUND,        100, 10,   0     ; UPROOT
+	move EFFECT_MIRROR_COAT,         1, PSYCHIC_TYPE,  100, 10,   0     ; SYNCHRONIZE - effect not implemented
+	move EFFECT_ATTACK_UP_HIT,      70, STEEL,         	90, 10,  10     ; STRONG_ARM
+	move EFFECT_FLINCH_HIT,         55, FIGHTING,       80, 15,   30    ; UPPERCUT
+	move EFFECT_NORMAL_HIT,          1, WATER,         	 1, 15,   0     ; WATER_SPORT  - effect not implemented
+	move EFFECT_NORMAL_HIT,         55, FLYING,         95, 10,   0     ; WIND_RIDE
+	move EFFECT_NORMAL_HIT,         80, FAIRY,         100, 10,   0     ; DAZZLING_GLEAM
+	move EFFECT_ALWAYS_HIT,         40, FAIRY,         100, 15,   0     ; DISARMING_VOICE
+	move EFFECT_LEECH_HIT,          50, FAIRY,         100, 10,   0     ; DRAINING_KISS
+	move EFFECT_NORMAL_HIT,         40, FAIRY,         100, 30,   0     ; FAIRY_WIND
+	move EFFECT_SP_ATK_DOWN_HIT,    95, FAIRY,  	   100, 15,  30      ; MOONBLAST
+	move EFFECT_ATTACK_DOWN_HIT,    90, FAIRY,          90, 10,  10      ; PLAY_ROUGH
+	move EFFECT_CONFUSE_HIT,        90, FAIRY,  	    95, 10,  20      ; STRANGE_STEAM
 .IndirectEnd::

data/moves/names.asm

@@ -256,4 +256,20 @@ MoveNames::
 	li "CROSS CUTTER"
 	li "MEGAPHONE"
 	li "MYSTIC ICE"
+	li "BOUNCE"
+	li "BRIGHT MOSS"
+	li "COIN HURL"
+	li "UPROOT"
+	li "SYNCHRONIZE"
+	li "STRONG ARM"
+	li "UPPERCUT"
+	li "WATER SPORT"
+	li "WIND RIDE"
+	li "DAZZLE GLEAM"
+	li "DISARM VOICE"
+	li "DRAININGKISS"
+	li "FAIRY WIND"
+	li "MOONBLAST"
+	li "PLAY ROUGH"
+	li "STRANGE STEAM"
 	assert_list_length NUM_ATTACKS

data/pokemon/evos_attacks_johto.asm

@@ -492,6 +492,7 @@ HoothootEvosAttacks:
 	dbw 42, REFLECT
 	dbw 48, MOONLIGHT ; SW97
 	dbw 54, DREAM_EATER
+	dbw 60, MOONBLAST ; SM
 	db 0 ; no more level-up moves
 
 NoctowlEvosAttacks:
@@ -508,6 +509,7 @@ NoctowlEvosAttacks:
 	dbw 46, REFLECT
 	dbw 52, MOONLIGHT ; SW97
 	dbw 58, DREAM_EATER
+	dbw 60, MOONBLAST ; SM
 	db 0 ; no more level-up moves
 
 LedybaEvosAttacks:
@@ -685,6 +687,7 @@ CleffaEvosAttacks:
 	dbw 4, ENCORE
 	dbw 8, SING
 	dbw 13, SWEET_KISS
+	dbw 20, FAIRY_WIND ; PLA
 	db 0 ; no more level-up moves
 
 IgglybuffEvosAttacks:
@@ -695,6 +698,7 @@ IgglybuffEvosAttacks:
 	dbw 4, DEFENSE_CURL
 	dbw 9, POUND
 	dbw 14, SWEET_KISS
+	dbw 20, DISARMING_VOICE
 	db 0 ; no more level-up moves
 
 TogepiEvosAttacks:
@@ -706,6 +710,7 @@ TogepiEvosAttacks:
 	dbw 7, METRONOME
 	dbw 13, SWEET_KISS
 	dbw 19, ENCORE
+	dbw 19, FAIRY_WIND ; XY
 	dbw 25, SPIKE_CANNON ; SW97
 	dbw 31, ANCIENTPOWER ; FRLG
 	dbw 37, SAFEGUARD
@@ -713,6 +718,7 @@ TogepiEvosAttacks:
 	dbw 49, SKULL_BASH ; SW97
 	dbw 55, DOUBLE_EDGE
 	dbw 61, BATON_PASS ; FRLG
+	dbw 66, MOONBLAST ; PLA
 	db 0 ; no more level-up moves
 
 TogeticEvosAttacks:
@@ -724,6 +730,7 @@ TogeticEvosAttacks:
 	dbw 7, METRONOME
 	dbw 13, SWEET_KISS
 	dbw 19, ENCORE
+	dbw 19, FAIRY_WIND ; XY
 	dbw 25, SPIKE_CANNON ; SW97
 	dbw 31, ANCIENTPOWER ; FRLG
 	dbw 37, SAFEGUARD
@@ -731,6 +738,7 @@ TogeticEvosAttacks:
 	dbw 49, SKULL_BASH ; SW97
 	dbw 55, DOUBLE_EDGE
 	dbw 61, BATON_PASS ; FRLG
+	dbw 66, MOONBLAST ; PLA
 	db 0 ; no more level-up moves
 	
 TogekissEvosAttacks:
@@ -838,6 +846,7 @@ MareepEvosAttacks:
 	dbw 22, COTTON_SPORE
 	dbw 28, SWIFT ; SW97
 	dbw 34, LIGHT_SCREEN
+	dbw 34, DAZZLING_GLEAM ; SV
 	dbw 40, THUNDERBOLT ; SW97
 	dbw 46, HYPNOSIS ; SW97
 	dbw 52, THUNDER
@@ -854,6 +863,7 @@ FlaaffyEvosAttacks:
 	dbw 24, COTTON_SPORE
 	dbw 30, SWIFT ; SW97
 	dbw 38, LIGHT_SCREEN
+	dbw 34, DAZZLING_GLEAM ; SV
 	dbw 44, THUNDERBOLT ; SW97
 	dbw 50, HYPNOSIS ; SW97
 	dbw 58, THUNDER
@@ -869,6 +879,7 @@ AmpharosEvosAttacks:
 	dbw 24, COTTON_SPORE
 	dbw 30, SWIFT ; SW97
 	dbw 40, LIGHT_SCREEN
+	dbw 34, DAZZLING_GLEAM ; SV
 	dbw 46, THUNDERBOLT ; SW97
 	dbw 54, HYPNOSIS ; SW97
 	dbw 62, THUNDER
@@ -971,6 +982,7 @@ HoppipEvosAttacks:
 	dbw 5, TAIL_WHIP
 	dbw 8, ABSORB ; SW97
 	dbw 12, TACKLE
+	dbw 12, FAIRY_WIND ; XY
 	dbw 16, POISONPOWDER
 	dbw 17, STUN_SPORE
 	dbw 18, SLEEP_POWDER
@@ -1308,15 +1320,17 @@ SylveonEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, TACKLE
 	dbw 1, TAIL_WHIP
+	dbw 1, FAIRY_WIND ; XY
 	dbw 8, SAND_ATTACK
-	dbw 16, POUND ; DISARMING_VOICE
+	dbw 16, DISARMING_VOICE
 	dbw 20, CHARM
 	dbw 25, QUICK_ATTACK
-	dbw 30, POUND ; DRAINING_KISS
+	dbw 30, DRAINING_KISS
-	dbw 36, POUND ; DAZZLING_GLEAM
+	dbw 36, DAZZLING_GLEAM
 	dbw 42, SWIFT
 	dbw 47, PSYCH_UP ; XY
 	dbw 52, LIGHT_SCREEN
+	dbw 60, MOONBLAST ; ? feels wrong
 	db 0 ; no more level-up moves
 
 MurkrowEvosAttacks:
@@ -1660,11 +1674,12 @@ CaretorkerEvosAttacks:
 	dbw 13, WING_ATTACK
 	dbw 19, FLAIL
 	dbw 23, SAFEGUARD
-	; dbw 29, DISARMING_VOICE
+	dbw 29, DISARMING_VOICE
 	dbw 35, WHIRLWIND
 	dbw 41, PROTECT
-	; dbw 47, DAZZLING_GLEAM
+	dbw 47, DAZZLING_GLEAM
 	dbw 53, SOFTBOILED
+	dbw 53, MOONBLAST ; Yoshi's Island opening reference!
 	db 0 ; no more level-up moves
 
 QwilfishEvosAttacks:
@@ -2679,17 +2694,17 @@ CoatlEvosAttacks:
 
 MimearEvosAttacks:
 	db 0 ; no more evolutions
-	; dbw 1, DISARMING_VOICE ; move not yet implemented
+	dbw 1, DISARMING_VOICE
 	dbw 1, GROWL
-	; dbw 8, FAIRY_WIND ; move not yet implemented
+	dbw 8, FAIRY_WIND
 	dbw 13, CHARM
 	dbw 19, QUICK_ATTACK
 	dbw 25, FORESIGHT
-	; dbw 31, DRAINING_KISS ; move not yet implemented
+	dbw 31, DRAINING_KISS
 	dbw 37, AMNESIA
 	dbw 43, MIRROR_COAT
 	dbw 49, SAFEGUARD
-	; dbw 55, DAZZLING_GLEAM ; move not yet implemented
+	dbw 55, DAZZLING_GLEAM
 	db 0 ; no more level-up moves
 
 InoshikaEvosAttacks:
@@ -2830,11 +2845,11 @@ FlutterManeEvosAttacks:
 	dbw 7, SUNNY_DAY
 	dbw 14, PSYBEAM
 	dbw 21, MEAN_LOOK
-	; dbw 28, FAIRY_WIND ; move not yet implemented
+	dbw 28, FAIRY_WIND
 	dbw 35, PSYCH_UP
-	; dbw 42, DAZZLING_GLEAM ; move not yet implemented
+	dbw 42, DAZZLING_GLEAM
 	dbw 49, SHADOW_BALL
-	dbw 56, PSYCHIC_M
+	dbw 56, MOONBLAST
 	dbw 63, PAIN_SPLIT
 	dbw 70, PERISH_SONG
 	db 0 ; no more level-up moves

data/pokemon/evos_attacks_kanto.asm

@@ -877,12 +877,14 @@ ClefairyEvosAttacks:
 	dbw 8, SING
 	dbw 13, DOUBLESLAP
 	dbw 19, MINIMIZE
+	dbw 19, FAIRY_WIND ; PLA
 	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
+	dbw 55, MOONBLAST ; XY
 	db 0 ; no more level-up moves
 
 ClefableEvosAttacks:
@@ -942,6 +944,7 @@ JigglypuffEvosAttacks:
 	dbw 4, DEFENSE_CURL
 	dbw 9, POUND
 	dbw 14, DISABLE
+	dbw 14, DISARMING_VOICE ; Chose to give Clefairy Fairy Wind and Jigglypuff Disarming Voice for a dichotomy
 	dbw 19, ROLLOUT
 	dbw 24, DOUBLESLAP
 	dbw 29, REST
@@ -1016,6 +1019,7 @@ OddishEvosAttacks:
 	dbw 32, MOONLIGHT
 	dbw 36, GROWTH ; SW97
 	dbw 40, PETAL_DANCE
+	dbw 44, MOONBLAST ; XY
 	dbw 46, GIGA_DRAIN ; HGSS
 	db 0 ; no more level-up moves
 
@@ -1033,6 +1037,7 @@ GloomEvosAttacks:
 	dbw 34, MOONLIGHT
 	dbw 40, GROWTH ; SW97
 	dbw 44, PETAL_DANCE
+	dbw 44, MOONBLAST ; XY
 	dbw 50, GIGA_DRAIN ; HGSS
 	db 0 ; no more level-up moves
 
@@ -1625,11 +1630,11 @@ BlottleEvosAttacks:
 	dbw 1, SMOKESCREEN
 	dbw 6, BUBBLE
 	dbw 12, WRAP
-	; dbw 15, FAIRY_WIND
+	dbw 15, FAIRY_WIND
 	dbw 19, HYPNOSIS
 	dbw 24, OCTAZOOKA
 	dbw 30, SUPERSONIC
-	;dbw 36, DAZZLE_GLEAM
+	dbw 36, DAZZLING_GLEAM
 	dbw 43, HAZE
 	dbw 49, HYDRO_PUMP
 	db 0
@@ -1640,11 +1645,11 @@ PendrakenEvosAttacks:
 	dbw 1, SMOKESCREEN
 	dbw 6, BUBBLE
 	dbw 12, WRAP
-	; dbw 15, FAIRY_WIND
+	dbw 15, FAIRY_WIND
 	dbw 19, HYPNOSIS
 	dbw 24, OCTAZOOKA
 	dbw 32, SUPERSONIC
-	;dbw 38, DAZZLE_GLEAM
+	dbw 38, DAZZLING_GLEAM
 	dbw 47, HAZE
 	dbw 53, HYDRO_PUMP
 	db 0
@@ -1749,17 +1754,17 @@ RapidashEvosAttacks:
 
 BalumbaEvosAttacks:
 	db 0
-	; dbw 1, FAIRY_WIND
+	dbw 1, FAIRY_WIND
 	dbw 1, GROWL
-	; dbw 6, DRAIN_KISS
+	dbw 6, DRAINING_KISS
-	; dbw 12, DISARM_VOICE
+	dbw 12, DISARMING_VOICE
 	dbw 18, GUST
 	dbw 24, SWEET_KISS
 	dbw 30, CONFUSE_RAY
 	dbw 36, CHARM
 	dbw 42, WHIRLWIND
-	; dbw 48, DAZZLE_GLEAM
+	dbw 48, DAZZLING_GLEAM
-	; dbw 54, WIND_RIDE
+	dbw 54, WIND_RIDE
 	db 0
 
 SlowpokeEvosAttacks:
@@ -2072,6 +2077,7 @@ MukEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, POISON_GAS
 	dbw 1, POUND
+	dbw 1, MOONBLAST ; relearn move from LGPE
 	dbw 5, HARDEN
 	dbw 10, DISABLE
 	dbw 16, ACID ; SW97
@@ -2783,6 +2789,7 @@ MimeJrEvosAttacks:
 	dbw 31, ENCORE
 	dbw 36, PSYBEAM
 	dbw 41, BATON_PASS
+	dbw 41, DAZZLING_GLEAM ; XY
 	dbw 46, SAFEGUARD
 	dbw 52, PSYCHIC_M ; FRLG
 	db 0 ; no more level-up moves
@@ -2800,6 +2807,7 @@ MrMimeEvosAttacks:
 	dbw 33, ENCORE
 	dbw 40, PSYBEAM
 	dbw 45, BATON_PASS
+	dbw 41, DAZZLING_GLEAM ; XY
 	dbw 51, SAFEGUARD
 	dbw 58, PSYCHIC_M ; FRLG
 	db 0 ; no more level-up moves
@@ -2843,6 +2851,7 @@ JynxEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, POUND
 	dbw 1, LICK
+	dbw 1, DRAINING_KISS ; XY
 	dbw 7, SWEET_KISS ; from Smoochum
 	dbw 12, POWDER_SNOW
 	dbw 17, CONFUSION