move mon data fix conflicts

2018-02-07 20:17:55 +01:00
parent 541fef5368 802b505d7b
commit 4b7d778a5c
302 changed files with 14099 additions and 23834 deletions
@@ -5354,7 +5354,7 @@ sub_8164E04: @ 8164E04
 	adds r0, r2
 	ldrh r1, [r5]
 	bl sub_8165B88
-	ldr r6, =gBattlePartyID
+	ldr r6, =gBattlerPartyIndexes
 	ldrh r0, [r6, 0x2]
 	movs r5, 0x64
 	muls r0, r5