From e79b3ce9ff39fa48928e8adf84dab542e78c5d64 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 17:24:28 -0500 Subject: Fix file modes --- data/maps/events/Route124_DivingTreasureHuntersHouse.inc | 0 data/pc_screen_effect.s | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 data/maps/events/Route124_DivingTreasureHuntersHouse.inc mode change 100755 => 100644 data/pc_screen_effect.s (limited to 'data') diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc old mode 100755 new mode 100644 diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s old mode 100755 new mode 100644 -- cgit v1.2.3 From 5d923c4d5f3d0786715663b3ad83bc9f3e778164 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 20:41:55 -0600 Subject: import some battle_4.c code from emerald and get atk23_getexp matching --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') 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 -- cgit v1.2.3