Style

2 files changed, 35 insertions, 35 deletions

diff --git a/src/data/cards.asm b/src/data/cards.asm
index b246f59..480607e 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -221,7 +221,7 @@ CardPointers: ; 30c5c (c:4c5c)
 	dw PlusPowerCard
 	dw DefenderCard
 	dw ItemFinderCard
-	dw GustofWindCard
+	dw GustOfWindCard
 	dw DevolutionSprayCard
 	dw PotionCard
 	dw SuperPotionCard
@@ -872,12 +872,12 @@ NidoranFCard: ; 31134 (c:5134)
 
 	; move 2
 	energy GRASS, 2 ; energies
-	tx CallforFamilyName ; name
-	tx NidoranFsCallforFamilyDescription ; description
+	tx CallForFamilyName ; name
+	tx NidoranFsCallForFamilyDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw NidoranFCallforFamilyEffectCommands ; effect commands
+	dw NidoranFCallForFamilyEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db FLAG_3_BIT_1 ; flags 3
@@ -1637,12 +1637,12 @@ BellsproutCard: ; 31503 (c:5503)
 
 	; move 2
 	energy GRASS, 1 ; energies
-	tx CallforFamilyName ; name
-	tx BellsproutsCallforFamilyDescription ; description
+	tx CallForFamilyName ; name
+	tx BellsproutsCallForFamilyDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw BellsproutCallforFamilyEffectCommands ; effect commands
+	dw BellsproutCallForFamilyEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db FLAG_3_BIT_1 ; flags 3
@@ -2657,12 +2657,12 @@ Arcanine1Card: ; 31a17 (c:5a17)
 
 	; move 2
 	energy FIRE, 2 ; energies
-	tx FlamesofRageName ; name
-	tx FlamesofRageDescription ; description
+	tx FlamesOfRageName ; name
+	tx FlamesOfRageDescription ; description
 	dw NONE ; description (cont)
 	db 40 ; damage
 	db DAMAGE_PLUS ; category
-	dw ArcanineFlamesofRageEffectCommands ; effect commands
+	dw ArcanineFlamesOfRageEffectCommands ; effect commands
 	db NONE ; flags 1
 	db DISCARD_ENERGY ; flags 2
 	db BOOST_IF_TAKEN_DAMAGE ; flags 3
@@ -3779,12 +3779,12 @@ ShellderCard: ; 31fad (c:5fad)
 
 	; move 2
 	energy WATER, 1 ; energies
-	tx HideinShellName ; name
-	tx HideinShellDescription ; description
+	tx HideInShellName ; name
+	tx HideInShellDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw ShellderHideinShellEffectCommands ; effect commands
+	dw ShellderHideInShellEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
 	db NONE ; flags 3
@@ -3867,12 +3867,12 @@ KrabbyCard: ; 3202f (c:602f)
 
 	; move 1
 	energy WATER, 1 ; energies
-	tx CallforFamilyName ; name
-	tx KrabbysCallforFamilyDescription ; description
+	tx CallForFamilyName ; name
+	tx KrabbysCallForFamilyDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw KrabbyCallforFamilyEffectCommands ; effect commands
+	dw KrabbyCallForFamilyEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db FLAG_3_BIT_1 ; flags 3
@@ -5856,12 +5856,12 @@ Zapdos3Card: ; 32a16 (c:6a16)
 
 	; move 1
 	energy 0 ; energies
-	tx PealofThunderName ; name
-	tx PealofThunderDescription ; description
+	tx PealOfThunderName ; name
+	tx PealOfThunderDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db POKEMON_POWER ; category
-	dw ZapdosPealofThunderEffectCommands ; effect commands
+	dw ZapdosPealOfThunderEffectCommands ; effect commands
 	db DAMAGE_TO_OPPONENT_BENCH ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -8828,12 +8828,12 @@ WigglytuffCard: ; 338d0 (c:78d0)
 
 	; move 2
 	energy COLORLESS, 3 ; energies
-	tx DotheWaveName ; name
-	tx DotheWaveDescription ; description
+	tx DoTheWaveName ; name
+	tx DoTheWaveDescription ; description
 	dw NONE ; description (cont)
 	db 10 ; damage
 	db DAMAGE_PLUS ; category
-	dw WigglytuffDotheWaveEffectCommands ; effect commands
+	dw WigglytuffDoTheWaveEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -10111,15 +10111,15 @@ ItemFinderCard: ; 33f47 (c:7f47)
 	tx ItemFinderDescription ; description
 	dw NONE ; description (cont)
 
-GustofWindCard: ; 33f55 (c:7f55)
+GustOfWindCard: ; 33f55 (c:7f55)
 	db TYPE_TRAINER ; type
-	gfx GustofWindCardGfx ; gfx
-	tx GustofWindName ; name
+	gfx GustOfWindCardGfx ; gfx
+	tx GustOfWindName ; name
 	db CIRCLE ; rarity
 	db EVOLUTION | NONE ; sets
 	db GUST_OF_WIND
-	dw GustofWindEffectCommands ; effect commands
-	tx GustofWindDescription ; description
+	dw GustOfWindEffectCommands ; effect commands
+	tx GustOfWindDescription ; description
 	dw NONE ; description (cont)
 
 DevolutionSprayCard: ; 33f63 (c:7f63)
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 3dfdf9c..1df3d0d 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -182,7 +182,7 @@ NidoranFFurySweepesEffectCommands:
 	dbw $09, $49be
 	db  $00
 
-NidoranFCallforFamilyEffectCommands:
+NidoranFCallForFamilyEffectCommands:
 	dbw $01, $49db
 	dbw $04, $4a6e
 	dbw $05, $49eb
@@ -264,7 +264,7 @@ MukSludgeEffectCommands:
 	dbw $09, $4c38
 	db  $00
 
-BellsproutCallforFamilyEffectCommands:
+BellsproutCallForFamilyEffectCommands:
 	dbw $01, $4c40
 	dbw $04, $4cc2
 	dbw $05, $4c50
@@ -369,7 +369,7 @@ KinglerFlailEffectCommands:
 	dbw $09, $4f4e
 	db  $00
 
-KrabbyCallforFamilyEffectCommands:
+KrabbyCallForFamilyEffectCommands:
 	dbw $01, $4f5d
 	dbw $04, $4fdf
 	dbw $05, $4f6d
@@ -413,7 +413,7 @@ ShellderSupersonicEffectCommands:
 	dbw $03, $509d
 	db  $00
 
-ShellderHideinShellEffectCommands:
+ShellderHideInShellEffectCommands:
 	dbw $03, $50a4
 	db  $00
 
@@ -555,7 +555,7 @@ ArcanineQuickAttackEffectCommands:
 	dbw $09, $5385
 	db  $00
 
-ArcanineFlamesofRageEffectCommands:
+ArcanineFlamesOfRageEffectCommands:
 	dbw $01, $53a0
 	dbw $02, $53ae
 	dbw $03, $53ef
@@ -1114,7 +1114,7 @@ Magneton2SelfdestructEffectCommands:
 	dbw $04, $675f
 	db  $00
 
-ZapdosPealofThunderEffectCommands:
+ZapdosPealOfThunderEffectCommands:
 	dbw $01, $677e
 	dbw $07, $6780
 	db  $00
@@ -1289,7 +1289,7 @@ WigglytuffLullabyEffectCommands:
 	dbw $03, SleepEffect
 	db  $00
 
-WigglytuffDotheWaveEffectCommands:
+WigglytuffDoTheWaveEffectCommands:
 	dbw $03, $6d87
 	dbw $09, $6d87
 	db  $00
@@ -1599,7 +1599,7 @@ SuperEnergyRetrievalEffectCommands:
 	dbw $05, $7dba
 	db  $00
 
-GustofWindEffectCommands:
+GustOfWindEffectCommands:
 	dbw $01, $7e6e
 	dbw $02, $7e79
 	dbw $03, $7e90