diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4cf97c967..869dd6e41 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6301,8 +6301,9 @@ BattleScript_CuteCharmActivates:: waitmessage 0x40 return -BattleScript_ApplySecondaryEffect:: +BattleScript_AbilityStatusEffect:: waitstate + call BattleScript_AbilityPopUp seteffectsecondary return diff --git a/include/battle_scripts.h b/include/battle_scripts.h index b9378cb32..b0cf7ae0e 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -169,7 +169,7 @@ extern const u8 BattleScript_StickyHoldActivates[]; extern const u8 BattleScript_ColorChangeActivates[]; extern const u8 BattleScript_RoughSkinActivates[]; extern const u8 BattleScript_CuteCharmActivates[]; -extern const u8 BattleScript_ApplySecondaryEffect[]; +extern const u8 BattleScript_AbilityStatusEffect[]; extern const u8 BattleScript_SynchronizeActivates[]; extern const u8 BattleScript_NoItemSteal[]; extern const u8 BattleScript_AbilityCuredStatus[]; diff --git a/src/battle_util.c b/src/battle_util.c index c93821477..c5b5bd387 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3249,7 +3249,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gBattleScripting.moveEffect += MOVE_EFFECT_AFFECTS_USER; BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; effect++; } @@ -3264,7 +3264,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_POISON; BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; effect++; } @@ -3279,7 +3279,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_PARALYSIS; BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; effect++; } @@ -3294,7 +3294,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { gBattleScripting.moveEffect = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN; BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; effect++; }