Merge branch 'master' into field_map_obj

2017-09-16 15:41:54 -04:00
parent c7f28f034c 19d2d73c70
commit 559833ccf6
96 changed files with 5928 additions and 10623 deletions
@@ -1263,13 +1263,13 @@ sub_818D97C: @ 818D97C
 	bne _0818D9A2
 	cmp r0, 0
 	beq _0818D99C
-	ldr r0, =gTrainerPicIndices
+	ldr r0, =gUnknown_0831F578
 	adds r0, 0x3F
 	ldrb r0, [r0]
 	b _0818D9A2
 	.pool
 _0818D99C:
-	ldr r0, =gTrainerPicIndices
+	ldr r0, =gUnknown_0831F578
 	adds r0, 0x3C
 	ldrb r0, [r0]
 _0818D9A2: