option menu fix conflicts

2018-01-21 12:46:19 +01:00
parent 77352c7ee4 8a60952fc0
commit ad2ef517bd
734 changed files with 44889 additions and 16751 deletions
@@ -26963,7 +26963,7 @@ _0810C0E2:
 	bl sub_80A6B30
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
-	ldr r1, =gUnknown_0854CAD0
+	ldr r1, =gWeatherFog1Tiles
 	movs r2, 0x80
 	lsls r2, 4
 	mov r3, sp
@@ -27245,7 +27245,7 @@ _0810C366:
 	bl sub_80A6B30
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
-	ldr r1, =gUnknown_0854CAD0
+	ldr r1, =gWeatherFog1Tiles
 	movs r2, 0x80
 	lsls r2, 4
 	mov r3, sp