diff options
author | dannye <33dannye@gmail.com> | 2021-06-11 17:44:59 -0500 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2021-06-11 17:44:59 -0500 |
commit | d5262b8b07335cc89289d9443ee9501579d1170a (patch) | |
tree | 09d6939914e5b4003098d351ffd99239b7abe644 /src/data | |
parent | 786574f7dde16b756ef6ae81e17a58d65bbb2888 (diff) |
Fix Ninetales typos
Diffstat (limited to 'src/data')
-rw-r--r-- | src/data/auto_deck_card_lists.asm | 10 | ||||
-rw-r--r-- | src/data/cards.asm | 34 | ||||
-rw-r--r-- | src/data/decks.asm | 8 | ||||
-rw-r--r-- | src/data/effect_commands.asm | 16 |
4 files changed, 34 insertions, 34 deletions
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 |