Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00
parent c408110319 a1aa645f23
commit 35cc20c9aa
293 changed files with 8429 additions and 2787 deletions
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -244,7 +244,7 @@ _080D38F8:
 	lsrs r4, r0, 16
 	movs r7, 0x1
 	movs r5, 0
-	ldr r3, =gUnknown_0857C60A
+	ldr r3, =gUnknown_0857C608 + 2
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	adds r6, 0x1