diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-15 20:41:55 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-15 20:41:55 -0600 |
| commit | 5d923c4d5f3d0786715663b3ad83bc9f3e778164 (patch) | |
| tree | 99e35c489871918c95493c74ae753a9e3eb60357 /data | |
| parent | ed152b1566fa5c39ee72ca190c49fbfe30708036 (diff) | |
import some battle_4.c code from emerald and get atk23_getexp matching
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 |