NidoranF attacks

2 files changed, 30 insertions, 30 deletions

diff --git a/src/data/cards.asm b/src/data/cards.asm
index e601f98..dca875a 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -858,12 +858,12 @@ NidoranFCard: ; 31134 (c:5134)
 
 	; move 1
 	energy GRASS, 1 ; energies
-	tx FurySweepesName ; name
+	tx FurySwipesName ; name
 	tx TripleAttackX10Description ; description
 	dw NONE ; description (cont)
 	db 10 ; damage
 	db DAMAGE_X ; category
-	dw NidoranFFurySweepesEffectCommands ; effect commands
+	dw NidoranFFurySwipesEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -3320,12 +3320,12 @@ PsyduckCard: ; 31d64 (c:5d64)
 
 	; move 2
 	energy WATER, 1 ; energies
-	tx FurySweepesName ; name
+	tx FurySwipesName ; name
 	tx TripleAttackX10Description ; description
 	dw NONE ; description (cont)
 	db 10 ; damage
 	db DAMAGE_X ; category
-	dw PsyduckFurySweepesEffectCommands ; effect commands
+	dw PsyduckFurySwipesEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -5972,12 +5972,12 @@ SandslashCard: ; 32a98 (c:6a98)
 
 	; move 2
 	energy FIGHTING, 2 ; energies
-	tx FurySweepesName ; name
+	tx FurySwipesName ; name
 	tx TripleAttackX20Description ; description
 	dw NONE ; description (cont)
 	db 20 ; damage
 	db DAMAGE_X ; category
-	dw SandslashFurySweepesEffectCommands ; effect commands
+	dw SandslashFurySwipesEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -6162,12 +6162,12 @@ PrimeapeCard: ; 32b9c (c:6b9c)
 
 	; move 1
 	energy FIGHTING, 2 ; energies
-	tx FurySweepesName ; name
+	tx FurySwipesName ; name
 	tx TripleAttackX20Description ; description
 	dw NONE ; description (cont)
 	db 20 ; damage
 	db DAMAGE_X ; category
-	dw PrimeapeFurySweepesEffectCommands ; effect commands
+	dw PrimeapeFurySwipesEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 952e895..bcf6636 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -59,9 +59,9 @@ WeepinbellPoisonPowderEffectCommands:
 
 VictreebelLureEffectCommands:
 	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, VictreebelLure_CheckBenchPokemon
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, VictreebelLure_SwitchDefendingPokemon
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, VictreebelLure_PlayerSelect
-	dbw EFFECTCMDTYPE_UNKNOWN_08, VictreebelLure_AISelect
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, VictreebelLure_SwitchEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, VictreebelLure_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_UNKNOWN_08, VictreebelLure_AISelectEffect
 	db  $00
 
 VictreebelAcidEffectCommands:
@@ -154,17 +154,17 @@ OddishStunSporeEffectCommands:
 	db  $00
 
 OddishSproutEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, SproutEffect_CheckDeckAndPlayArea
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, SproutEffect_PutInPlayArea
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, SproutEffect_SelectFromDeck
-	dbw EFFECTCMDTYPE_UNKNOWN_08, SproutEffect_AISelect
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, Sprout_CheckDeckAndPlayArea
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Sprout_PutInPlayAreaEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, Sprout_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_UNKNOWN_08, Sprout_AISelectEffect
 	db  $00
 
 ExeggutorTeleportEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, TeleportEffect_CheckBench
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, TeleportEffect_SwitchEffect
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, TeleportEffect_PlayerSelect
-	dbw EFFECTCMDTYPE_UNKNOWN_08, TeleportEffect_AISelect
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, Teleport_CheckBench
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, Teleport_SwitchEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, Teleport_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_UNKNOWN_08, Teleport_AISelectEffect
 	db  $00
 
 ExeggutorBigEggsplosionEffectCommands:
@@ -184,19 +184,19 @@ NidokingToxicEffectCommands:
 	db  $00
 
 NidoqueenBoyfriendsEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $4998
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, BoyfriendsEffect
 	db  $00
 
-NidoranFFurySweepesEffectCommands:
-	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $49c6
-	dbw EFFECTCMDTYPE_AI, $49be
+NidoranFFurySwipesEffectCommands:
+	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, NidoranFFurySwipes_MultiplierEffect
+	dbw EFFECTCMDTYPE_AI, NidoranFFurySwipes_AIEffect
 	db  $00
 
 NidoranFCallForFamilyEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, $49db
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, $4a6e
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, $49eb
-	dbw EFFECTCMDTYPE_UNKNOWN_08, $4a55
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, NidoranFCallForFamily_CheckDeckAndPlayArea
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, NidoranFCallForFamily_PutInPlayAreaEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, NidoranFCallForFamily_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_UNKNOWN_08, NidoranFCallForFamily_AISelectEffect
 	db  $00
 
 NidoranMHornHazardEffectCommands:
@@ -395,7 +395,7 @@ PsyduckHeadacheEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $500e
 	db  $00
 
-PsyduckFurySweepesEffectCommands:
+PsyduckFurySwipesEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $501e
 	dbw EFFECTCMDTYPE_AI, $5016
 	db  $00
@@ -894,7 +894,7 @@ OnixHardenEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $6075
 	db  $00
 
-PrimeapeFurySweepesEffectCommands:
+PrimeapeFurySwipesEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $6083
 	dbw EFFECTCMDTYPE_AI, $607b
 	db  $00
@@ -974,7 +974,7 @@ SandshrewSandAttackEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $626b
 	db  $00
 
-SandslashFurySweepesEffectCommands:
+SandslashFurySwipesEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $6279
 	dbw EFFECTCMDTYPE_AI, $6271
 	db  $00