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
@@ -1364,7 +1364,7 @@ _080F6454:
 	mov r9, r4
 	ldr r4, =gMonFrontPicTable
 	mov r12, r4
-	ldr r4, =gUnknown_020244D4
+	ldr r4, =gBattleSpritesGfx
 	mov r8, r4
 	cmp r0, 0
 	beq _080F648C
@@ -1638,7 +1638,7 @@ _080F66DA:
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x2
-	bl pokedex_flag_operation
+	bl GetSetPokedexFlag
 	adds r5, 0x40
 	subs r4, 0x1
 	cmp r4, 0