From ed74430d26a2874c29f3ca2ed43555787c1e2d1e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 31 Mar 2021 23:11:27 -0300 Subject: [PATCH] Added a variation of BattleScript_NotAffected This one triggers the Ability PopUp. --- data/battle_scripts_1.s | 9 +++++++++ include/battle_scripts.h | 1 + src/battle_script_commands.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 16bb6e92c..373723711 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -4183,6 +4183,15 @@ BattleScript_NotAffected:: waitmessage 0x40 goto BattleScript_MoveEnd +BattleScript_NotAffectedAbilityPopUp:: + copybyte gBattlerAbility, gBattlerTarget + pause 0x20 + call BattleScript_AbilityPopUp + orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE + resultmessage + waitmessage 0x40 + goto BattleScript_MoveEnd + BattleScript_EffectUproar:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 2fc993b9c..844ffe6cf 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -367,5 +367,6 @@ extern const u8 BattleScript_CustapBerryActivation[]; extern const u8 BattleScript_MicleBerryActivateEnd2[]; extern const u8 BattleScript_MicleBerryActivateRet[]; extern const u8 BattleScript_JabocaRowapBerryActivates[]; +extern const u8 BattleScript_NotAffectedAbilityPopUp[]; #endif // GUARD_BATTLE_SCRIPTS_H diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 119af91aa..ce5b49048 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_NotAffected; + gBattlescriptCurrInstr = BattleScript_NotAffectedAbilityPopUp; gLastUsedAbility = ABILITY_OBLIVIOUS; RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS); } @@ -11096,7 +11096,7 @@ static void Cmd_settaunt(void) { if (GetBattlerAbility(gBattlerTarget) == ABILITY_OBLIVIOUS) { - gBattlescriptCurrInstr = BattleScript_NotAffected; + gBattlescriptCurrInstr = BattleScript_NotAffectedAbilityPopUp; gLastUsedAbility = ABILITY_OBLIVIOUS; RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS); }