summaryrefslogtreecommitdiff
path: root/asm/battle_2.s
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-21 11:40:26 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-21 11:40:37 -0600
commit754e911b4e95205bafa5dc93242da9cee3f2c5c6 (patch)
treee544ba9723182224bf99c4fc144654517037296e /asm/battle_2.s
parenta753c44277c050fb24aaf97a8947c7f54e0dacd7 (diff)
Rename gScript* vars to gSpecialVar_*
Diffstat (limited to 'asm/battle_2.s')
-rw-r--r--asm/battle_2.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index c8f8eb0f4..dd720ec79 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -3336,7 +3336,7 @@ _08013ECE:
cmp r0, 0
bne _08013F2A
_08013EE0:
- ldr r1, _08013F3C @ =gScriptResult
+ ldr r1, _08013F3C @ =gSpecialVar_Result
ldr r5, _08013F40 @ =gBattleOutcome
ldrb r0, [r5]
strh r0, [r1]
@@ -3379,7 +3379,7 @@ _08013F2A:
_08013F30: .4byte gBattleTypeFlags
_08013F34: .4byte gPlayerParty
_08013F38: .4byte gReceivedRemoteLinkPlayers
-_08013F3C: .4byte gScriptResult
+_08013F3C: .4byte gSpecialVar_Result
_08013F40: .4byte gBattleOutcome
_08013F44: .4byte gMain
_08013F48: .4byte 0x0000043d