diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
| commit | 05ab3f96218b58001aa2d90cef951f7e4087c4ae (patch) | |
| tree | 642a3ceb3f83690fb90d5c535592e1339c66664a /data | |
| parent | 35f04db27cd4d5689c6498ba80eaeb695f973ebc (diff) | |
| parent | e1fd501e16deefe643c4572efaa07a59372616e4 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/maps/events/Route124_DivingTreasureHuntersHouse.inc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/pc_screen_effect.s | 0 |
3 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 diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 17ec713de..17ec713de 100755..100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s index 1d6571149..1d6571149 100755..100644 --- a/data/pc_screen_effect.s +++ b/data/pc_screen_effect.s |