aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/end_of_battle.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
commit38065a744de1065cc021a4cafe22476f8425448d (patch)
treea37a103d7c22f3cc5f62689e5062877961493caa /engine/battle/end_of_battle.asm
parentMerge pull request #116 from YamaArashi/master (diff)
downloadpokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.gz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.xz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.zip
No more W_
Diffstat (limited to 'engine/battle/end_of_battle.asm')
-rwxr-xr-xengine/battle/end_of_battle.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index f1de313c..34bc3119 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -47,10 +47,10 @@ EndOfBattle: ; 137aa (4:77aa)
xor a
ld [wLowHealthAlarm], a ;disable low health alarm
ld [wChannelSoundIDs + CH4], a
- ld [W_ISINBATTLE], a
- ld [W_BATTLETYPE], a
- ld [W_MOVEMISSED], a
- ld [W_CUROPPONENT], a
+ ld [wIsInBattle], a
+ ld [wBattleType], a
+ ld [wMoveMissed], a
+ ld [wCurOpponent], a
ld [wForcePlayerToChooseMon], a
ld [wNumRunAttempts], a
ld [wEscapedFromBattle], a