Merge remote-tracking branch 'pret/master' into render_text

2018-11-06 11:40:17 -06:00
parent 43a8534fce ccc5d27fcb
commit 9afe7a896e
86 changed files with 3821 additions and 9029 deletions
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -2163,7 +2163,7 @@ sub_8196D74: @ 8196D74
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	adds r0, 0xA
-	bl ReadUnalignedWord
+	bl GetTrainerId
 	adds r6, r0, 0
 	ldr r0, =0x0000ffff
 	ands r6, r0
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -15615,7 +15615,7 @@ _081B8618:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r4, r0, 16
-	ldr r3, =gUnknown_08611C9A
+	ldr r3, =gFrontierBannedSpecies
 	lsls r1, r6, 1
 	adds r0, r1, r3
 	ldrh r0, [r0]
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -11490,7 +11490,7 @@ _0801B628:
 	ldr r1, [r0]
 	adds r1, 0xA
 	adds r0, r4, 0
-	bl CopyUnalignedWord
+	bl CopyTrainerId
 	mov r2, r8
 	ldr r1, [r2]
 	adds r0, r6, 0