Fix Ninetales typos

15 files changed, 60 insertions, 60 deletions

diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm
index a079f72..2e7fa84 100644
--- a/src/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
@@ -50,8 +50,8 @@
 	const CHARMELEON              ; $31
 	const CHARIZARD               ; $32
 	const VULPIX                  ; $33
-	const NINETAILS1              ; $34
-	const NINETAILS2              ; $35
+	const NINETALES1              ; $34
+	const NINETALES2              ; $35
 	const GROWLITHE               ; $36
 	const ARCANINE1               ; $37
 	const ARCANINE2               ; $38
diff --git a/src/data/auto_deck_card_lists.asm b/src/data/auto_deck_card_lists.asm
index e53ff22..66b7b14 100644
--- a/src/data/auto_deck_card_lists.asm
+++ b/src/data/auto_deck_card_lists.asm
@@ -781,8 +781,8 @@ WondersOfScienceCardList: ; 1b616 (6:7616)
 ReplaceEmAllCardList: ; 1b63d (6:763d)

 	db 24, FIRE_ENERGY

 	db  4, VULPIX

-	db  2, NINETAILS1

-	db  1, NINETAILS2

+	db  2, NINETALES1

+	db  1, NINETALES2

 	db  4, GROWLITHE

 	db  1, ARCANINE1

 	db  1, ARCANINE2

@@ -844,8 +844,8 @@ FirePokemonCardList: ; 1b6a4 (6:76a4)
 	db  2, CHARMELEON

 	db  1, CHARIZARD

 	db  3, VULPIX

-	db  1, NINETAILS1

-	db  1, NINETAILS2

+	db  1, NINETALES1

+	db  1, NINETALES2

 	db  2, GROWLITHE

 	db  1, ARCANINE2

 	db  2, PONYTA

@@ -1061,7 +1061,7 @@ WaterBeetleCardList: ; 1b7fc (6:77fc)
 LegendaryMoltresCardList: ; 1b83b (6:783b)

 	db 25, FIRE_ENERGY

 	db  4, VULPIX

-	db  3, NINETAILS2

+	db  3, NINETALES2

 	db  4, GROWLITHE

 	db  2, ARCANINE2

 	db  2, MAGMAR1

diff --git a/src/data/cards.asm b/src/data/cards.asm
index 8f6654e..35536a9 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -54,8 +54,8 @@ CardPointers: ; 30c5c (c:4c5c)
 	dw CharmeleonCard
 	dw CharizardCard
 	dw VulpixCard
-	dw Ninetails1Card
-	dw Ninetails2Card
+	dw Ninetales1Card
+	dw Ninetales2Card
 	dw GrowlitheCard
 	dw Arcanine1Card
 	dw Arcanine2Card
@@ -2477,13 +2477,13 @@ VulpixCard: ; 31913 (c:5913)
 	tx VulpixDescription ; description
 	db 18
 
-Ninetails1Card: ; 31954 (c:5954)
+Ninetales1Card: ; 31954 (c:5954)
 	db TYPE_PKMN_FIRE ; type
-	gfx Ninetails1CardGfx ; gfx
-	tx NinetailsName ; name
+	gfx Ninetales1CardGfx ; gfx
+	tx NinetalesName ; name
 	db STAR ; rarity
 	db MYSTERY | NONE ; sets
-	db NINETAILS1
+	db NINETALES1
 	db 80 ; hp
 	db STAGE1 ; stage
 	tx VulpixName ; pre-evo name
@@ -2491,11 +2491,11 @@ Ninetails1Card: ; 31954 (c:5954)
 	; attack 1
 	energy COLORLESS, 2 ; energies
 	tx LureName ; name
-	tx NinetailsLureDescription ; description
+	tx NinetalesLureDescription ; description
 	dw NONE ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw NinetailsLureEffectCommands ; effect commands
+	dw NinetalesLureEffectCommands ; effect commands
 	db NONE ; flags 1
 	db SWITCH_OPPONENT_POKEMON ; flags 2
 	db NONE ; flags 3
@@ -2509,7 +2509,7 @@ Ninetails1Card: ; 31954 (c:5954)
 	dw NONE ; description (cont)
 	db 80 ; damage
 	db DAMAGE_NORMAL ; category
-	dw NinetailsFireBlastEffectCommands ; effect commands
+	dw NinetalesFireBlastEffectCommands ; effect commands
 	db NONE ; flags 1
 	db DISCARD_ENERGY ; flags 2
 	db NONE ; flags 3
@@ -2525,16 +2525,16 @@ Ninetails1Card: ; 31954 (c:5954)
 	db 32 ; level
 	db 3, 7 ; length
 	dw 44 * 10 ; weight
-	tx Ninetails1Description ; description
+	tx Ninetales1Description ; description
 	db 0
 
-Ninetails2Card: ; 31995 (c:5995)
+Ninetales2Card: ; 31995 (c:5995)
 	db TYPE_PKMN_FIRE ; type
-	gfx Ninetails2CardGfx ; gfx
-	tx NinetailsName ; name
+	gfx Ninetales2CardGfx ; gfx
+	tx NinetalesName ; name
 	db STAR ; rarity
 	db LABORATORY | GB ; sets
-	db NINETAILS2
+	db NINETALES2
 	db 80 ; hp
 	db STAGE1 ; stage
 	tx VulpixName ; pre-evo name
@@ -2546,7 +2546,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	tx MixUpDescriptionCont ; description (cont)
 	db 0 ; damage
 	db RESIDUAL ; category
-	dw NinetailsMixUpEffectCommands ; effect commands
+	dw NinetalesMixUpEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db SPECIAL_AI_HANDLING ; flags 3
@@ -2560,7 +2560,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	dw NONE ; description (cont)
 	db 10 ; damage
 	db DAMAGE_X ; category
-	dw NinetailsDancingEmbersEffectCommands ; effect commands
+	dw NinetalesDancingEmbersEffectCommands ; effect commands
 	db NONE ; flags 1
 	db NONE ; flags 2
 	db NONE ; flags 3
@@ -2576,7 +2576,7 @@ Ninetails2Card: ; 31995 (c:5995)
 	db 35 ; level
 	db 3, 7 ; length
 	dw 44 * 10 ; weight
-	tx Ninetails2Description ; description
+	tx Ninetales2Description ; description
 	db 0
 
 GrowlitheCard: ; 319d6 (c:59d6)
diff --git a/src/data/decks.asm b/src/data/decks.asm
index 8b800f4..d0502a0 100644
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
@@ -364,7 +364,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
 ; 30278 (c:4278)
 	db 24, FIRE_ENERGY
 	db 4, FLAREON1
-	db 4, NINETAILS2
+	db 4, NINETALES2
 	db 4, MOLTRES2
 	db 4, EEVEE
 	db 4, CHARMANDER
@@ -870,7 +870,7 @@ GrassAndPsychicDeck: ; 305d6 (c:45d6)
 LegendaryMoltresDeck: ; 30609 (c:4609)
 	db 25, FIRE_ENERGY
 	db 4, VULPIX
-	db 3, NINETAILS2
+	db 3, NINETALES2
 	db 4, GROWLITHE
 	db 2, ARCANINE2
 	db 2, MAGMAR1
@@ -1719,7 +1719,7 @@ FlamethrowerDeck: ; 30be5 (c:4be5)
 	db 2, CHARMELEON
 	db 1, CHARIZARD
 	db 2, VULPIX
-	db 1, NINETAILS1
+	db 1, NINETALES1
 	db 2, GROWLITHE
 	db 1, ARCANINE2
 	db 3, MAGMAR1
@@ -1739,7 +1739,7 @@ ReshuffleDeck: ; 30c0e (c:4c0e)
 	db 23, FIRE_ENERGY
 	db 2, DOUBLE_COLORLESS_ENERGY
 	db 4, VULPIX
-	db 3, NINETAILS2
+	db 3, NINETALES2
 	db 2, GROWLITHE
 	db 1, ARCANINE2
 	db 2, PONYTA
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 23b72e1..e96ef7e 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -586,14 +586,14 @@ RapidashAgilityEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, RapidashAgilityEffect
 	db  $00
 
-NinetailsLureEffectCommands:
-	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, NinetailsLure_CheckBench
-	dbw EFFECTCMDTYPE_AFTER_DAMAGE, NinetailsLure_SwitchEffect
-	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, NinetailsLure_PlayerSelectEffect
-	dbw EFFECTCMDTYPE_AI_SELECTION, NinetailsLure_AISelectEffect
+NinetalesLureEffectCommands:
+	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, NinetalesLure_CheckBench
+	dbw EFFECTCMDTYPE_AFTER_DAMAGE, NinetalesLure_SwitchEffect
+	dbw EFFECTCMDTYPE_REQUIRE_SELECTION, NinetalesLure_PlayerSelectEffect
+	dbw EFFECTCMDTYPE_AI_SELECTION, NinetalesLure_AISelectEffect
 	db  $00
 
-NinetailsFireBlastEffectCommands:
+NinetalesFireBlastEffectCommands:
 	dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, FireBlast_CheckEnergy
 	dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, FireBlast_PlayerSelectEffect
 	dbw EFFECTCMDTYPE_DISCARD_ENERGY, FireBlast_DiscardEffect
@@ -675,11 +675,11 @@ FlareonRageEffectCommands:
 	dbw EFFECTCMDTYPE_AI, FlareonRage_AIEffect
 	db  $00
 
-NinetailsMixUpEffectCommands:
+NinetalesMixUpEffectCommands:
 	dbw EFFECTCMDTYPE_AFTER_DAMAGE, MixUpEffect
 	db  $00
 
-NinetailsDancingEmbersEffectCommands:
+NinetalesDancingEmbersEffectCommands:
 	dbw EFFECTCMDTYPE_BEFORE_DAMAGE, DancingEmbers_MultiplierEffect
 	dbw EFFECTCMDTYPE_AI, DancingEmbers_AIEffect
 	db  $00
diff --git a/src/engine/ai/decks/legendary_moltres.asm b/src/engine/ai/decks/legendary_moltres.asm
index d07afb9..c2a3882 100644
--- a/src/engine/ai/decks/legendary_moltres.asm
+++ b/src/engine/ai/decks/legendary_moltres.asm
@@ -64,7 +64,7 @@ AIActionTable_LegendaryMoltres: ; 149e8 (05:49e8)
 
 .list_energy ; 14a2e (5:4a2e)
 	ai_energy VULPIX,     3, +0
-	ai_energy NINETAILS2, 3, +1
+	ai_energy NINETALES2, 3, +1
 	ai_energy GROWLITHE,  3, +1
 	ai_energy ARCANINE2,  4, +1
 	ai_energy MAGMAR1,    4, -1
diff --git a/src/engine/ai/special_attacks.asm b/src/engine/ai/special_attacks.asm
index 0ed3c8e..5ec465e 100644
--- a/src/engine/ai/special_attacks.asm
+++ b/src/engine/ai/special_attacks.asm
@@ -39,7 +39,7 @@ HandleSpecialAIAttacks: ; 16dcd (5:6dcd)
 	jp z, .EnergyAbsorption

 	cp MEWTWO2

 	jp z, .EnergyAbsorption

-	cp NINETAILS2

+	cp NINETALES2

 	jp z, .MixUp

 	cp ZAPDOS3

 	jp z, .BigThunder

diff --git a/src/engine/ai/trainer_cards.asm b/src/engine/ai/trainer_cards.asm
index cd87a4b..e85b022 100644
--- a/src/engine/ai/trainer_cards.asm
+++ b/src/engine/ai/trainer_cards.asm
@@ -6034,11 +6034,11 @@ AIDecide_PokemonTrader_Flamethrower: ; 22133 (8:6133)
 	call LookForCardIDInDeck_GivenCardIDInHand
 	jr c, .find_duplicates
 	ld b, VULPIX
-	ld a, NINETAILS1
+	ld a, NINETALES1
 	call LookForCardIDInDeck_GivenCardIDInHandAndPlayArea
 	jr c, .find_duplicates
 	ld a, VULPIX
-	ld b, NINETAILS1
+	ld b, NINETALES1
 	call LookForCardIDInDeck_GivenCardIDInHand
 	jr c, .find_duplicates
 	ld b, GROWLITHE
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 1065411..7abd585 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -3632,14 +3632,14 @@ RapidashAgilityEffect: ; 2d413 (b:5413)
 	ret
 
 ; returns carry if Opponent has no Pokemon in bench
-NinetailsLure_CheckBench: ; 2d425 (b:5425)
+NinetalesLure_CheckBench: ; 2d425 (b:5425)
 	ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
 	call GetNonTurnDuelistVariable
 	ldtx hl, EffectNoPokemonOnTheBenchText
 	cp 2
 	ret
 
-NinetailsLure_PlayerSelectEffect: ; 2d430 (b:5430)
+NinetalesLure_PlayerSelectEffect: ; 2d430 (b:5430)
 	ldtx hl, SelectPkmnOnBenchToSwitchWithActiveText
 	call DrawWideTextBox_WaitForInput
 	call SwapTurn
@@ -3652,12 +3652,12 @@ NinetailsLure_PlayerSelectEffect: ; 2d430 (b:5430)
 	call SwapTurn
 	ret
 
-NinetailsLure_AISelectEffect: ; 2d449 (b:5449)
+NinetalesLure_AISelectEffect: ; 2d449 (b:5449)
 	call GetBenchPokemonWithLowestHP
 	ldh [hTemp_ffa0], a
 	ret
 
-NinetailsLure_SwitchEffect: ; 2d44f (b:544f)
+NinetalesLure_SwitchEffect: ; 2d44f (b:544f)
 	call SwapTurn
 	ldh a, [hTemp_ffa0]
 	ld e, a
diff --git a/src/gfx.asm b/src/gfx.asm
index e9016be..c952593 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -1680,13 +1680,13 @@ VulpixCardGfx:: ; cd840 (33:5840)
 	INCBIN "gfx/cards/vulpix.2bpp"
 	INCBIN "gfx/cards/vulpix.pal"
 
-Ninetails1CardGfx:: ; cdb48 (33:5b48)
-	INCBIN "gfx/cards/ninetails1.2bpp"
-	INCBIN "gfx/cards/ninetails1.pal"
+Ninetales1CardGfx:: ; cdb48 (33:5b48)
+	INCBIN "gfx/cards/ninetales1.2bpp"
+	INCBIN "gfx/cards/ninetales1.pal"
 
-Ninetails2CardGfx:: ; cde50 (33:5e50)
-	INCBIN "gfx/cards/ninetails2.2bpp"
-	INCBIN "gfx/cards/ninetails2.pal"
+Ninetales2CardGfx:: ; cde50 (33:5e50)
+	INCBIN "gfx/cards/ninetales2.2bpp"
+	INCBIN "gfx/cards/ninetales2.pal"
 
 GrowlitheCardGfx:: ; ce158 (33:6158)
 	INCBIN "gfx/cards/growlithe.2bpp"
diff --git a/src/gfx/cards/ninetails1.png b/src/gfx/cards/ninetales1.png
index 0740ab8..0740ab8 100644
--- a/src/gfx/cards/ninetails1.png
+++ b/src/gfx/cards/ninetales1.png
diff --git a/src/gfx/cards/ninetails2.png b/src/gfx/cards/ninetales2.png
index a40d30e..a40d30e 100644
--- a/src/gfx/cards/ninetails2.png
+++ b/src/gfx/cards/ninetales2.png
diff --git a/src/text/text10.asm b/src/text/text10.asm
index 4a79b12..e000a3b 100644
--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -869,11 +869,11 @@ VulpixDescription: ; 5a163 (16:6163)
 	line "tip as it grows older."
 	done
 
-NinetailsName: ; 5a1c0 (16:61c0)
+NinetalesName: ; 5a1c0 (16:61c0)
 	text "Ninetails"
 	done
 
-NinetailsLureDescription: ; 5a1cb (16:61cb)
+NinetalesLureDescription: ; 5a1cb (16:61cb)
 	text "If your opponent has any Benched"
 	line "Pokémon, choose 1 of them and switch"
 	line "it with the Defending Pokémon."
@@ -889,7 +889,7 @@ FireBlastDescription: ; 5a23d (16:623d)
 	line "attack."
 	done
 
-Ninetails1Description: ; 5a28a (16:628a)
+Ninetales1Description: ; 5a28a (16:628a)
 	text "Very smart and very vengeful."
 	line "Grabbing one of its many tails could"
 	line "result in a 1,000-year curse."
@@ -924,7 +924,7 @@ DancingEmbersDescription: ; 5a441 (16:6441)
 	line "damage times the number of heads."
 	done
 
-Ninetails2Description: ; 5a486 (16:6486)
+Ninetales2Description: ; 5a486 (16:6486)
 	text "According to an enduring legend,"
 	line "9 noble heroes were united and"
 	line "reincarnated as this."
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index ee0f3a2..0d212c2 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -2280,17 +2280,17 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer ConfuseRayName                                     ; 0x08e4
 	textpointer FoxName                                            ; 0x08e5
 	textpointer VulpixDescription                                  ; 0x08e6
-	textpointer NinetailsName                                      ; 0x08e7
-	textpointer NinetailsLureDescription                           ; 0x08e8
+	textpointer NinetalesName                                      ; 0x08e7
+	textpointer NinetalesLureDescription                           ; 0x08e8
 	textpointer FireBlastName                                      ; 0x08e9
 	textpointer FireBlastDescription                               ; 0x08ea
-	textpointer Ninetails1Description                              ; 0x08eb
+	textpointer Ninetales1Description                              ; 0x08eb
 	textpointer MixUpName                                          ; 0x08ec
 	textpointer MixUpDescription                                   ; 0x08ed
 	textpointer MixUpDescriptionCont                               ; 0x08ee
 	textpointer DancingEmbersName                                  ; 0x08ef
 	textpointer DancingEmbersDescription                           ; 0x08f0
-	textpointer Ninetails2Description                              ; 0x08f1
+	textpointer Ninetales2Description                              ; 0x08f1
 	textpointer GrowlitheName                                      ; 0x08f2
 	textpointer FlareName                                          ; 0x08f3
 	textpointer PuppyName                                          ; 0x08f4
diff --git a/tools/constants.py b/tools/constants.py
index 7dd74df..e7d1484 100644
--- a/tools/constants.py
+++ b/tools/constants.py
@@ -84,8 +84,8 @@ cards = {
 	0x31: "CHARMELEON",
 	0x32: "CHARIZARD",
 	0x33: "VULPIX",
-	0x34: "NINETAILS1",
-	0x35: "NINETAILS2",
+	0x34: "NINETALES1",
+	0x35: "NINETALES2",
 	0x36: "GROWLITHE",
 	0x37: "ARCANINE1",
 	0x38: "ARCANINE2",