ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

BattleScript_DefiantActivates rename

Browse Source
This commit is contained in:
sneed 2022-05-06 11:15:24 +03:00
parent 865b771db7
commit ef7cd3cdfe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -7925,7 +7925,7 @@ BattleScript_DrizzleActivates::
call BattleScript_WeatherFormChanges call BattleScript_WeatherFormChanges
end3 end3
BattleScript_DefiantActivates:: BattleScript_AbilityRaisesDefenderStat::
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
statbuffchange 0, NULL statbuffchange 0, NULL

2
include/battle_scripts.h
View File

@ -308,7 +308,7 @@ extern const u8 BattleScript_MistySurgeActivates[];
extern const u8 BattleScript_ElectricSurgeActivates[]; extern const u8 BattleScript_ElectricSurgeActivates[];
extern const u8 BattleScript_SpectralThiefSteal[]; extern const u8 BattleScript_SpectralThiefSteal[];
extern const u8 BattleScript_StatUpMsg[]; extern const u8 BattleScript_StatUpMsg[];
extern const u8 BattleScript_DefiantActivates[]; extern const u8 BattleScript_AbilityRaisesDefenderStat[];
extern const u8 BattleScript_PowderMoveNoEffect[]; extern const u8 BattleScript_PowderMoveNoEffect[];
extern const u8 BattleScript_GrassyTerrainHeals[]; extern const u8 BattleScript_GrassyTerrainHeals[];
extern const u8 BattleScript_VCreateStatLoss[]; extern const u8 BattleScript_VCreateStatLoss[];

4
src/battle_util.c
View File

@ -1575,7 +1575,7 @@ void PrepareStringBattle(u16 stringId, u8 battler)
gBattleScripting.stickyWebStatDrop = 0; gBattleScripting.stickyWebStatDrop = 0;
gBattlerAbility = gBattlerTarget; gBattlerAbility = gBattlerTarget;
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_DefiantActivates; gBattlescriptCurrInstr = BattleScript_AbilityRaisesDefenderStat;
if (targetAbility == ABILITY_DEFIANT) if (targetAbility == ABILITY_DEFIANT)
SET_STATCHANGER(STAT_ATK, 2, FALSE); SET_STATCHANGER(STAT_ATK, 2, FALSE);
else else
@ -1587,7 +1587,7 @@ void PrepareStringBattle(u16 stringId, u8 battler)
{ {
gBattlerAbility = gBattlerTarget; gBattlerAbility = gBattlerTarget;
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_DefiantActivates; gBattlescriptCurrInstr = BattleScript_AbilityRaisesDefenderStat;
SET_STATCHANGER(STAT_SPEED, 1, FALSE); SET_STATCHANGER(STAT_SPEED, 1, FALSE);
} }
#endif #endif