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
@@ -581,7 +581,7 @@ sub_81302E8: @ 81302E8
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r4, =gUnknown_020244D4
+	ldr r4, =gBattleSpritesGfx
 	ldr r1, [r4]
 	ldr r1, [r1, 0x8]
 	ldr r2, [r6]
@@ -600,7 +600,7 @@ _08130348:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r4, =gUnknown_020244D4
+	ldr r4, =gBattleSpritesGfx
 	ldr r1, [r4]
 	ldr r1, [r1, 0x4]
 	ldr r2, [r6]