ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Touch up Weak Armor

Browse Source
This commit is contained in:
DizzyEggg 2019-03-23 16:56:56 +01:00
parent b9052fb37d
commit b8a634770f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -6289,8 +6289,8 @@ BattleScript_TargetAbilityStatRaise::
return
BattleScript_WeakArmorActivates::
setstatchanger STAT_DEF, 1, TRUE
call BattleScript_AbilityPopUp
setstatchanger STAT_DEF, 1, TRUE
statbuffchange 0x1, BattleScript_WeakArmorActivatesSpeed
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeakArmorDefAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_WeakArmorActivatesSpeed
@ -6304,7 +6304,7 @@ BattleScript_WeakArmorDefAnim:
printstring STRINGID_TARGETABILITYSTATLOWER
waitmessage 0x40
BattleScript_WeakArmorActivatesSpeed:
setstatchanger STAT_SPEED, 1, FALSE
setstatchanger STAT_SPEED, 2, FALSE
statbuffchange 0x1, BattleScript_WeakArmorActivatesEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeakArmorSpeedAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_WeakArmorActivatesEnd

1
src/battle_util.c
View File

@ -3157,6 +3157,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& TARGET_TURN_DAMAGED
&& IsBattlerAlive(battler)
&& gBattleMoves[gCurrentMove].split == SPLIT_PHYSICAL
&& (gBattleMons[battler].statStages[STAT_SPEED] != 12 || gBattleMons[battler].statStages[STAT_DEF] != 0))
{
BattleScriptPushCursor();