Merge origin/master into pikalaxalt/link

2017-11-16 08:36:51 -05:00
parent 50501396b2 c0d180a870
commit 236cbf96c8
2913 changed files with 158852 additions and 19880 deletions
@@ -10424,7 +10424,7 @@ sub_80B0534: @ 80B0534
 	lsls r1, 3
 	ldr r0, =gTasks + 0x8
 	adds r1, r0
-	ldr r0, =gScriptResult
+	ldr r0, =gSpecialVar_Result
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _080B0568