Merge branch 'master' into apprentice

2018-10-14 15:07:16 +02:00
parent 145df49063 0c1d33da4f
commit 84936b4260
29 changed files with 1378 additions and 2896 deletions
@@ -380,7 +380,7 @@ _081A1AEA:
 	cmp r3, r0
 	blt _081A1AEA
 _081A1B00:
-	bl sub_80F94E8
+	bl ReducePlayerPartyToThree
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -13236,7 +13236,7 @@ _081A87EC:
 	ldrh r1, [r0]
 	movs r0, 0x64
 	muls r0, r1
-	ldr r1, =gBattleScripting + 0x14
+	ldr r1, =gPlayerParty - 100
 	adds r0, r1
 	ldr r1, =0x00000e12
 	adds r3, r1