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.
This commit is contained in:
Llinos Evans 2024-08-26 08:50:21 +01:00
parent 2e24031730
commit caa6d9ceb3
8 changed files with 190 additions and 52 deletions

View file

@ -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

View file

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

View file

@ -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.@"

View file

@ -273,5 +273,21 @@ Moves1:
move EFFECT_NORMAL_HIT, 140, ROCK, 70, 5, 0 ;ROCK_SLASH
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_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::

View file

@ -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