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

Implemented Intrepid Sword and Dauntless Shield and...

Browse Source 
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin

Their labels reflect the instances of a battle in which they can be called.
This commit is contained in:
LOuroboros 2020-12-02 18:46:29 -03:00
parent aa7facf57b
commit e11fa09632
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -7082,7 +7082,17 @@ BattleScript_AngryPointActivates::
waitmessage 0x40 waitmessage 0x40
return return
BattleScript_TargetAbilityStatRaise:: BattleScript_TargetAbilityStatRaiseOnSwitchin::
call BattleScript_AbilityPopUp
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
printstring STRINGID_TARGETABILITYSTATRAISE
waitmessage 0x40
end3
BattleScript_TargetAbilityStatRaiseOnMoveEnd::
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues setgraphicalstatchangevalues

3
include/battle_scripts.h
View File

@ -249,7 +249,7 @@ extern const u8 BattleScript_SturdiedMsg[];
extern const u8 BattleScript_GravityEnds[]; extern const u8 BattleScript_GravityEnds[];
extern const u8 BattleScript_MoveStatDrain[]; extern const u8 BattleScript_MoveStatDrain[];
extern const u8 BattleScript_MoveStatDrain_PPLoss[]; extern const u8 BattleScript_MoveStatDrain_PPLoss[];
extern const u8 BattleScript_TargetAbilityStatRaise[]; extern const u8 BattleScript_TargetAbilityStatRaiseOnMoveEnd[];
extern const u8 BattleScript_AngryPointActivates[]; extern const u8 BattleScript_AngryPointActivates[];
extern const u8 BattleScript_AttackerAbilityStatRaise[]; extern const u8 BattleScript_AttackerAbilityStatRaise[];
extern const u8 BattleScript_AttackerAbilityStatRaiseEnd3[]; extern const u8 BattleScript_AttackerAbilityStatRaiseEnd3[];
@ -350,5 +350,6 @@ extern const u8 BattleScript_EmergencyExitWild[];
extern const u8 BattleScript_EmergencyExitWildNoPopUp[]; extern const u8 BattleScript_EmergencyExitWildNoPopUp[];
extern const u8 BattleScript_CheekPouchActivates[]; extern const u8 BattleScript_CheekPouchActivates[];
extern const u8 BattleScript_AnnounceAirLockCloudNine[]; extern const u8 BattleScript_AnnounceAirLockCloudNine[];
extern const u8 BattleScript_TargetAbilityStatRaiseOnSwitchin[];
#endif // GUARD_BATTLE_SCRIPTS_H #endif // GUARD_BATTLE_SCRIPTS_H

28
src/battle_util.c
View File

@ -3936,6 +3936,24 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
effect++; effect++;
} }
break; break;
case ABILITY_INTREPID_SWORD:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
SET_STATCHANGER(STAT_ATK, 1, FALSE);
BattleScriptPushCursorAndCallback(BattleScript_TargetAbilityStatRaiseOnSwitchin);
effect++;
}
break;
case ABILITY_DAUNTLESS_SHIELD:
if (!gSpecialStatuses[battler].switchInAbilityDone)
{
gSpecialStatuses[battler].switchInAbilityDone = 1;
SET_STATCHANGER(STAT_DEF, 1, FALSE);
BattleScriptPushCursorAndCallback(BattleScript_TargetAbilityStatRaiseOnSwitchin);
effect++;
}
break;
} }
break; break;
case ABILITYEFFECT_ENDTURN: // 1 case ABILITYEFFECT_ENDTURN: // 1
@ -4249,7 +4267,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
{ {
SET_STATCHANGER(STAT_ATK, 1, FALSE); SET_STATCHANGER(STAT_ATK, 1, FALSE);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaise; gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
effect++; effect++;
} }
break; break;
@ -4262,7 +4280,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
{ {
SET_STATCHANGER(STAT_SPEED, 1, FALSE); SET_STATCHANGER(STAT_SPEED, 1, FALSE);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaise; gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
effect++; effect++;
} }
break; break;
@ -4275,7 +4293,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
{ {
SET_STATCHANGER(STAT_DEF, 2, FALSE); SET_STATCHANGER(STAT_DEF, 2, FALSE);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaise; gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
effect++; effect++;
} }
break; break;
@ -4287,7 +4305,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
{ {
SET_STATCHANGER(STAT_DEF, 1, FALSE); SET_STATCHANGER(STAT_DEF, 1, FALSE);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaise; gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
effect++; effect++;
} }
break; break;
@ -4304,7 +4322,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
{ {
SET_STATCHANGER(STAT_SPATK, 1, FALSE); SET_STATCHANGER(STAT_SPATK, 1, FALSE);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaise; gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseOnMoveEnd;
effect++; effect++;
} }
break; break;