Merge branch 'master' into easy_chat

2017-11-25 10:56:55 -05:00
parent 293dfc4823 1e4f12e6fa
commit a875d665b8
2944 changed files with 164526 additions and 29870 deletions
@@ -583,7 +583,7 @@ _0811AFAC:
 	b _0811AFE6
 	.pool
 _0811AFC0:
-	ldr r0, =gScriptResult
+	ldr r0, =gSpecialVar_Result
 	strh r1, [r0]
 	ldr r0, =gUnknown_0203A118
 	ldr r0, [r0]
@@ -633,7 +633,7 @@ _0811B00C:
 	.pool
 _0811B020:
 	bl sub_811BE9C
-	ldr r4, =gScriptResult
+	ldr r4, =gSpecialVar_Result
 	bl sub_811B4EC
 	strh r0, [r4]
 	bl sub_811B3E4
@@ -784,7 +784,7 @@ _0811B118:
 	b _0811B14A
 	.pool
 _0811B134:
-	ldr r4, =gScriptResult
+	ldr r4, =gSpecialVar_Result
 	bl sub_811B4EC
 	strh r0, [r4]
 	bl sub_811B3E4