diff --git a/src/engine/bank0a.asm b/src/engine/bank0a.asm index 24df3c2..46bcadd 100644 --- a/src/engine/bank0a.asm +++ b/src/engine/bank0a.asm @@ -1048,7 +1048,7 @@ AISelectSpecialAttackParameters: ret .select_foxfire_based_on_energies - farcall AIDecideFirefoxTarget + farcall AIDecideFoxfireTarget ldh [hTemp_ffa0], a scf ret diff --git a/src/engine/bank12.asm b/src/engine/bank12.asm index a041002..ae66c07 100644 --- a/src/engine/bank12.asm +++ b/src/engine/bank12.asm @@ -4117,7 +4117,7 @@ CountNonDrawEngineCardsInHand: SECTION "Bank 12@7029", ROMX[$7029], BANK[$12] -AIDecideFirefoxTarget: +AIDecideFoxfireTarget: farcall CheckIfArenaCardCanKnockOutDefendingCard jr nc, .cannot_ko .no_carry diff --git a/src/engine/duel/special_attacks.asm b/src/engine/duel/special_attacks.asm index e27fdd5..988f737 100644 --- a/src/engine/duel/special_attacks.asm +++ b/src/engine/duel/special_attacks.asm @@ -56,7 +56,7 @@ HandleSpecialAIAttacks: cp16 MOLTRES_LV37 jp z, .DryUp cp16 VULPIX_LV13 - jp z, .FireFox + jp z, .Foxfire cp16 DARK_ELECTRODE jp z, .EnergyBomb cp16 ZAPDOS_LV28 @@ -733,28 +733,28 @@ HandleSpecialAIAttacks: ; +3 if in a gusting situation; ; -50 if the defender is immune, without Benched Pokémon; ; neutral otherwise -.FireFox: +.Foxfire: ld a, [wOpponentDeckID] cp FLAME_FESTIVAL_DECK_ID - jr z, .encourage_firefox + jr z, .encourage_foxfire farcall Func_209fc - jr c, .encourage_firefox + jr c, .encourage_foxfire farcall IsPlayerArenaCardImmune - jr nc, .firefox_neutral + jr nc, .foxfire_neutral ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA call GetNonTurnDuelistVariable cp 1 - jr z, .discourage_firefox + jr z, .discourage_foxfire -.firefox_neutral +.foxfire_neutral ld a, 128 ret -.encourage_firefox +.encourage_foxfire ld a, 131 ret -.discourage_firefox +.discourage_foxfire ld a, 78 ret