diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/ai/decks/legendary_moltres.asm | 2 | ||||
| -rw-r--r-- | src/engine/ai/special_attacks.asm | 2 | ||||
| -rw-r--r-- | src/engine/ai/trainer_cards.asm | 4 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 8 |
4 files changed, 8 insertions, 8 deletions
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 |