Merge branch 'master' into quest_log

2018-10-12 20:18:48 -04:00
parent e143072f96 bd88c80379
commit 6c52f7ce04
88 changed files with 8986 additions and 17161 deletions
@@ -734,7 +734,7 @@ sub_8083970: @ 8083970
 	str r2, [sp, 0x4]
 	movs r1, 0
 	str r1, [sp, 0x8]
-	ldr r1, _080839C0 @ =gUnknown_823730C
+	ldr r1, _080839C0 @ =gMonPaletteTable
 	lsls r4, r0, 3
 	adds r4, r1
 	ldrh r1, [r4, 0x4]
@@ -758,7 +758,7 @@ sub_8083970: @ 8083970
 	lsrs r0, 24
 	b _080839CA
 	.align 2, 0
-_080839C0: .4byte gUnknown_823730C
+_080839C0: .4byte gMonPaletteTable
 _080839C4: .4byte 0x0000ffff
 _080839C8:
 	movs r0, 0x40