summaryrefslogtreecommitdiff
path: root/asm/easy_chat.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-15 17:18:05 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-15 17:18:05 +0100
commit1e79d53d2f913c65295b2547549d2c4ed849122b (patch)
treede6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /asm/easy_chat.s
parent0310be30079c657f3a21da64683bdf9ac1d4d394 (diff)
parent055a419830c0725a629f971b0299c89082c192fd (diff)
merge daycare with master
Diffstat (limited to 'asm/easy_chat.s')
-rw-r--r--asm/easy_chat.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index e9565dfa9..eb20e68fa 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -1659,7 +1659,7 @@ _0811AFAC:
b _0811AFE6
.pool
_0811AFC0:
- ldr r0, =gScriptResult
+ ldr r0, =gSpecialVar_Result
strh r1, [r0]
ldr r0, =gUnknown_0203A118
ldr r0, [r0]
@@ -1709,7 +1709,7 @@ _0811B00C:
.pool
_0811B020:
bl sub_811BE9C
- ldr r4, =gScriptResult
+ ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -1860,7 +1860,7 @@ _0811B118:
b _0811B14A
.pool
_0811B134:
- ldr r4, =gScriptResult
+ ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4