summaryrefslogtreecommitdiff
path: root/data/battle_scripts_1.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-01-13 13:15:23 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2019-01-13 13:15:23 +0100
commitc0bc01d30150dae355b47bb3f42b71a7c00d0aec (patch)
tree4b1d9c57f8d9e7c3c3660d796ece46e8fe431c52 /data/battle_scripts_1.s
parent11a49a7f0220ebbdfa43ebaa9158906cf38f6a4d (diff)
Move some vars to C
Diffstat (limited to 'data/battle_scripts_1.s')
-rw-r--r--data/battle_scripts_1.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index be91c7c7e..8ddf56ef8 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -599,7 +599,7 @@ BattleScript_EffectBide::
ppreduce
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_x8000000
+ orword gHitMarker, HITMARKER_CHARGING
setbide
goto BattleScript_MoveEnd
@@ -824,7 +824,7 @@ BattleScriptFirstChargingTurn::
ppreduce
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_x8000000
+ orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
@@ -1941,7 +1941,7 @@ BattleScript_SolarbeamDecideTurn::
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn::
- orword gHitMarker, HITMARKER_x8000000
+ orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
ppreduce