Merge remote-tracking branch 'pret/master'

2017-09-16 14:24:47 -05:00
parent 3c63063831 19d2d73c70
commit 5a74c0e913
111 changed files with 6263 additions and 10954 deletions
@@ -756,7 +756,7 @@ sub_80E90C8: @ 80E90C8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gUnknown_02037350
+	ldr r1, =gMapObjects
 	adds r0, r1
 	movs r1, 0x2
 	bl FieldObjectTurn