From 002973d37368998c79de2188f11aae4c2fcf3f94 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 5 Dec 2020 13:50:47 -0300 Subject: [PATCH] Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target. --- data/battle_scripts_1.s | 2 +- include/battle_scripts.h | 2 +- src/battle_util.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 80dc1bdbb4..e9664a46f9 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -7107,7 +7107,7 @@ BattleScript_AngryPointActivates:: waitmessage 0x40 return -BattleScript_TargetAbilityStatRaiseOnSwitchIn:: +BattleScript_BattlerAbilityStatRaiseOnSwitchIn:: call BattleScript_AbilityPopUp statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL setgraphicalstatchangevalues diff --git a/include/battle_scripts.h b/include/battle_scripts.h index ecaaf52c47..864825ed6f 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -350,7 +350,7 @@ extern const u8 BattleScript_EmergencyExitWild[]; extern const u8 BattleScript_EmergencyExitWildNoPopUp[]; extern const u8 BattleScript_CheekPouchActivates[]; extern const u8 BattleScript_AnnounceAirLockCloudNine[]; -extern const u8 BattleScript_TargetAbilityStatRaiseOnSwitchIn[]; +extern const u8 BattleScript_BattlerAbilityStatRaiseOnSwitchIn[]; extern const u8 BattleScript_CottonDownActivates[]; extern const u8 BattleScript_BallFetch[]; diff --git a/src/battle_util.c b/src/battle_util.c index b60310c4f6..19171e7fdf 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3942,7 +3942,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move { gSpecialStatuses[battler].switchInAbilityDone = 1; SET_STATCHANGER(STAT_ATK, 1, FALSE); - BattleScriptPushCursorAndCallback(BattleScript_TargetAbilityStatRaiseOnSwitchIn); + BattleScriptPushCursorAndCallback(BattleScript_BattlerAbilityStatRaiseOnSwitchIn); effect++; } break; @@ -3951,7 +3951,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move { gSpecialStatuses[battler].switchInAbilityDone = 1; SET_STATCHANGER(STAT_DEF, 1, FALSE); - BattleScriptPushCursorAndCallback(BattleScript_TargetAbilityStatRaiseOnSwitchIn); + BattleScriptPushCursorAndCallback(BattleScript_BattlerAbilityStatRaiseOnSwitchIn); effect++; } break;