From da24b9c25129dfa55085988c2bd934610f516884 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 31 Mar 2021 21:20:00 -0300 Subject: [PATCH] Tweaked Oblivious -Made it unaffected by a foe's taunt. -Changed the Battle Script it calls when a foe tries to infatuate. --- src/battle_script_commands.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0c5250050e..119af91aa5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9689,7 +9689,7 @@ static void Cmd_tryinfatuating(void) if (GetBattlerAbility(gBattlerTarget) == ABILITY_OBLIVIOUS) { - gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction; + gBattlescriptCurrInstr = BattleScript_NotAffected; gLastUsedAbility = ABILITY_OBLIVIOUS; RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS); } @@ -11094,7 +11094,13 @@ static void Cmd_jumpifnodamage(void) static void Cmd_settaunt(void) { - if (gDisableStructs[gBattlerTarget].tauntTimer == 0) + if (GetBattlerAbility(gBattlerTarget) == ABILITY_OBLIVIOUS) + { + gBattlescriptCurrInstr = BattleScript_NotAffected; + gLastUsedAbility = ABILITY_OBLIVIOUS; + RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS); + } + else if (gDisableStructs[gBattlerTarget].tauntTimer == 0) { u8 turns = 4; if (GetBattlerTurnOrderNum(gBattlerTarget) > GetBattlerTurnOrderNum(gBattlerAttacker))