diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-15 21:39:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-15 21:39:07 -0600 |
commit | e1fd501e16deefe643c4572efaa07a59372616e4 (patch) | |
tree | 9993a2ad6e2c7609763f5649d5417aa4f784b9a3 /data | |
parent | ed152b1566fa5c39ee72ca190c49fbfe30708036 (diff) | |
parent | 15cffaecf34d93c99aa635586ad24fa9978a70a0 (diff) |
Merge pull request #540 from camthesaxman/emerald_port
port some fixed battle code from pokeemerald
Diffstat (limited to 'data')
-rw-r--r-- | data/battle_scripts_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b04ebefe5..d309aea7e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2589,12 +2589,12 @@ BattleScript_EffectEndeavor: @ 81D8852 attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyword gHP_dealt, gBattleMoveDamage + copyword gHpDealt, gBattleMoveDamage accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE typecalc jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE - copyword gBattleMoveDamage, gHP_dealt + copyword gBattleMoveDamage, gHpDealt adjustsetdamage goto BattleScript_HitFromAtkAnimation @@ -3314,7 +3314,7 @@ BattleScript_LeechSeedTurnDrain:: @ 81D904B orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - copyword gBattleMoveDamage, gHP_dealt + copyword gBattleMoveDamage, gHpDealt jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze manipulatedamage 0 setbyte cMULTISTRING_CHOOSER, 3 |