battle frontier/tent trainers

1 files changed, 52 insertions, 52 deletions

diff --git a/asm/emerald.s b/asm/emerald.s
index dcfc7fe2a..21fcef52a 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -185389,7 +185389,7 @@ sub_8068BB0: ; 8068BB0
 	ldrb r0, [r1, 0x13]
 	lsls r0, 3
 	orrs r2, r0
-	ldr r1, =gUnknown_0831F5CA
+	ldr r1, =gTrainerClassNameIndices
 	ldr r0, =gUnknown_08329D54
 	lsls r2, 1
 	adds r2, r0
@@ -191126,7 +191126,7 @@ sub_806B870: ; 806B870
 	adds r0, r1
 	adds r0, r5
 	ldrb r0, [r0]
-	ldr r1, =gUnknown_0831F5CA
+	ldr r1, =gTrainerClassNameIndices
 	adds r0, r1
 	ldrb r0, [r0]
 	pop {r4,r5}
@@ -684726,7 +684726,7 @@ sub_8162BD8: ; 8162BD8
 	lsls r0, 1
 	cmp r4, r0
 	bne @08162C08
-	ldr r1, =gUnknown_0831F5CA
+	ldr r1, =gTrainerClassNameIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r2, =0x00000bed
@@ -684761,7 +684761,7 @@ sub_8162BD8: ; 8162BD8
 	ldr r0, =0x0000012b
 	cmp r4, r0
 	bhi @08162C60
-	ldr r2, =gUnknown_0831F5CA
+	ldr r2, =gTrainerClassNameIndices
 	ldr r0, =0x0203bc88
 	ldr r1, [r0]
 	movs r0, 0x34
@@ -684784,7 +684784,7 @@ sub_8162BD8: ; 8162BD8
 	ands r0, r1
 	cmp r0, 0
 	beq @08162C90
-	ldr r4, =gUnknown_0831F5CA
+	ldr r4, =gTrainerClassNameIndices
 	bl sub_818649C
 	lsls r0, 24
 	lsrs r0, 24
@@ -684794,7 +684794,7 @@ sub_8162BD8: ; 8162BD8
 	.align 2, 0
 	.pool
 @08162C90:
-	ldr r3, =gUnknown_0831F5CA
+	ldr r3, =gTrainerClassNameIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0xfffffed4
@@ -684818,7 +684818,7 @@ sub_8162BD8: ; 8162BD8
 	ands r0, r1
 	cmp r0, 0
 	beq @08162CF4
-	ldr r5, =gUnknown_0831F5CA
+	ldr r5, =gTrainerClassNameIndices
 	ldr r4, =gUnknown_08610970
 	bl sub_81864A8
 	lsls r0, 24
@@ -684834,7 +684834,7 @@ sub_8162BD8: ; 8162BD8
 	.align 2, 0
 	.pool
 @08162CF4:
-	ldr r4, =gUnknown_0831F5CA
+	ldr r4, =gTrainerClassNameIndices
 	ldr r3, =gUnknown_08610970
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -685568,7 +685568,7 @@ sub_81630C4: ; 81630C4
 	movs r6, 0
 	cmp r6, r8
 	bge @08163346
-	ldr r5, =gUnknown_085CECB0
+	ldr r5, =gBattleFrontierHeldItems
 	mov r9, r5
 	movs r3, 0
 @08163308:
@@ -685705,7 +685705,7 @@ sub_81630C4: ; 81630C4
 	add r0, r9
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -686122,7 +686122,7 @@ sub_81635D4: ; 81635D4
 	adds r0, r7, r0
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -686252,7 +686252,7 @@ sub_816379C: ; 816379C
 	add r0, r8
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -689231,7 +689231,7 @@ sub_8165244: ; 8165244
 
 	thumb_func_start sub_8165264
 sub_8165264: ; 8165264
-	ldr r1, =gUnknown_0831F5CA
+	ldr r1, =gTrainerClassNameIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r2, =0x00000bed
@@ -689729,7 +689729,7 @@ sub_8165404: ; 8165404
 	adds r0, r1
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -690493,7 +690493,7 @@ sub_8165C40: ; 8165C40
 	cmp r0, 0x2
 	beq @08165C84
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085D97BC
@@ -690656,7 +690656,7 @@ sub_8165D78: ; 8165D78
 	cmp r0, 0x4
 	bne @08165DA8
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085DDA14
+	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085DE02C
@@ -690667,7 +690667,7 @@ sub_8165D78: ; 8165D78
 	cmp r0, 0x2
 	bne @08165DC8
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085DE610
+	ldr r0, =gVerdanturfBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085DEC28
@@ -690678,7 +690678,7 @@ sub_8165D78: ; 8165D78
 	cmp r0, 0x3
 	bne @08165DE8
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085DF084
+	ldr r0, =gFallarborBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085DF69C
@@ -690687,7 +690687,7 @@ sub_8165D78: ; 8165D78
 	.pool
 @08165DE8:
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085D97BC
@@ -690878,7 +690878,7 @@ sub_8165EA4: ; 8165EA4
 	movs r6, 0
 	cmp r6, r7
 	bge @08165FB8
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	mov r9, r0
 	movs r3, 0
 @08165F7A:
@@ -691015,7 +691015,7 @@ sub_8165EA4: ; 8165EA4
 	add r0, r9
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -771316,7 +771316,7 @@ sub_818FA74: ; 818FA74
 	adds r0, r1
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -776572,7 +776572,7 @@ sub_81924E0: ; 81924E0
 	ldr r4, [sp, 0x24]
 	cmp r4, r0
 	bne @08192784
-	ldr r0, =gUnknown_0831F5CA
+	ldr r0, =gTrainerClassNameIndices
 	adds r0, 0x3C
 	ldrb r5, [r0]
 	b @081927A2
@@ -781021,7 +781021,7 @@ sub_8194D48: ; 8194D48
 	ldr r0, =gUnknown_085D97BC
 	str r0, [r1]
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	bx lr
 	.align 2, 0
@@ -794355,7 +794355,7 @@ sub_819B484: ; 819B484
 	adds r1, r7, r1
 	ldrb r2, [r1, 0xA]
 	lsls r2, 1
-	ldr r1, =gUnknown_085CECB0
+	ldr r1, =gBattleFrontierHeldItems
 	adds r2, r1
 	movs r1, 0xC
 	bl pokemon_setattr
@@ -794498,7 +794498,7 @@ sub_819B63C: ; 819B63C
 	adds r1, r5, r1
 	ldrb r2, [r1, 0xA]
 	lsls r2, 1
-	ldr r1, =gUnknown_085CECB0
+	ldr r1, =gBattleFrontierHeldItems
 	adds r2, r1
 	movs r1, 0xC
 	bl pokemon_setattr
@@ -806868,7 +806868,7 @@ sub_81A1B1C: ; 81A1B1C
 	thumb_func_start sub_81A1B28
 sub_81A1B28: ; 81A1B28
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	bx lr
 	.align 2, 0
@@ -815230,7 +815230,7 @@ sub_81A61B0: ; 81A61B0
 	movs r1, 0x7
 	bl __udivsi3
 	ldr r2, =0x0203bc88
-	ldr r1, =gUnknown_085D5ACC
+	ldr r1, =gBattleFrontierTrainers
 	str r1, [r2]
 	ldr r5, =0x00000cb2
 	lsls r0, 24
@@ -815381,7 +815381,7 @@ sub_81A61B0: ; 81A61B0
 	movs r2, 0
 	cmp r2, r4
 	bge @081A633E
-	ldr r3, =gUnknown_085CECB0
+	ldr r3, =gBattleFrontierHeldItems
 	mov r12, r3
 	add r0, sp, 0x8
 	ldr r6, [sp, 0x14]
@@ -815420,7 +815420,7 @@ sub_81A61B0: ; 81A61B0
 	strh r0, [r2]
 	add r2, sp, 0x8
 	adds r2, r4
-	ldr r3, =gUnknown_085CECB0
+	ldr r3, =gBattleFrontierHeldItems
 	ldrb r0, [r1, 0xA]
 	lsls r0, 1
 	adds r0, r3
@@ -815546,7 +815546,7 @@ sub_81A63CC: ; 81A63CC
 	adds r1, r0
 	ldrb r2, [r1, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r5, 0
 	movs r1, 0xC
@@ -815752,7 +815752,7 @@ sub_81A64C4: ; 81A64C4
 	adds r0, r7, r0
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -815914,7 +815914,7 @@ sub_81A64C4: ; 81A64C4
 	adds r0, r7, r0
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -815957,7 +815957,7 @@ sub_81A67EC: ; 81A67EC
 	push {r5-r7}
 	sub sp, 0x4C
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	mov r0, sp
 	adds r0, 0xC
@@ -816124,7 +816124,7 @@ sub_81A67EC: ; 81A67EC
 	movs r3, 0
 	cmp r3, r6
 	bge @081A699C
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	mov r12, r0
 	ldr r1, [sp, 0x30]
 	ldr r2, [sp, 0x3C]
@@ -816176,7 +816176,7 @@ sub_81A67EC: ; 81A67EC
 	ldrh r0, [r1]
 	ldr r4, [sp, 0x44]
 	strh r0, [r4]
-	ldr r2, =gUnknown_085CECB0
+	ldr r2, =gBattleFrontierHeldItems
 	ldrb r0, [r1, 0xA]
 	lsls r0, 1
 	adds r0, r2
@@ -816535,7 +816535,7 @@ sub_81A6C1C: ; 81A6C1C
 	adds r2, r1
 	ldrb r2, [r2, 0xA]
 	lsls r2, 1
-	ldr r1, =gUnknown_085CECB0
+	ldr r1, =gBattleFrontierHeldItems
 	adds r2, r1
 	movs r1, 0xC
 	bl pokemon_setattr
@@ -816720,7 +816720,7 @@ sub_81A6CD0: ; 81A6CD0
 	movs r4, 0
 	cmp r4, r9
 	bge @081A6E0C
-	ldr r7, =gUnknown_085CECB0
+	ldr r7, =gBattleFrontierHeldItems
 	ldr r6, =0x0203bc8c
 	add r2, sp, 0x14
 	lsls r3, r5, 4
@@ -816758,7 +816758,7 @@ sub_81A6CD0: ; 81A6CD0
 	strh r0, [r1]
 	add r1, sp, 0x14
 	adds r1, r2
-	ldr r2, =gUnknown_085CECB0
+	ldr r2, =gBattleFrontierHeldItems
 	ldrb r0, [r4, 0xA]
 	lsls r0, 1
 	adds r0, r2
@@ -816819,7 +816819,7 @@ sub_81A6CD0: ; 81A6CD0
 	adds r0, r7, r0
 	ldrb r2, [r0, 0xA]
 	lsls r2, 1
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	adds r2, r0
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -819453,7 +819453,7 @@ sub_81A82A4: ; 81A82A4
 	ldr r5, =0x02038bca
 	strh r4, [r5]
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldrh r0, [r5]
 	movs r1, 0
@@ -819499,7 +819499,7 @@ sub_81A8374: ; 81A8374
 	lsls r0, 16
 	lsrs r5, r0, 16
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	lsls r7, r5, 24
 	adds r6, r4, 0
@@ -821564,7 +821564,7 @@ sub_81A93C8: ; 81A93C8
 	thumb_func_start sub_81A9414
 sub_81A9414: ; 81A9414
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085D5ACC
+	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	bx lr
 	.align 2, 0
@@ -822948,7 +822948,7 @@ sub_81A9F3C: ; 81A9F3C
 	lsls r0, 16
 	lsrs r0, 16
 	movs r4, 0
-	ldr r3, =gUnknown_0831F5CA
+	ldr r3, =gTrainerClassNameIndices
 	ldr r1, =0x0203bc88
 	ldr r2, [r1]
 	movs r1, 0x34
@@ -854002,7 +854002,7 @@ sub_81B9EC0: ; 81B9EC0
 	push {r5-r7}
 	sub sp, 0x3C
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085DDA14
+	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	add r0, sp, 0xC
 	mov r9, r0
@@ -854097,7 +854097,7 @@ sub_81B9EC0: ; 81B9EC0
 	movs r2, 0
 	cmp r2, r6
 	bge @081B9FD4
-	ldr r0, =gUnknown_085CECB0
+	ldr r0, =gBattleFrontierHeldItems
 	mov r12, r0
 	ldr r7, =0x0203bc8c
 	ldr r1, [sp, 0x24]
@@ -854150,7 +854150,7 @@ sub_81B9EC0: ; 81B9EC0
 	ldrh r0, [r1]
 	ldr r7, [sp, 0x34]
 	strh r0, [r7]
-	ldr r2, =gUnknown_085CECB0
+	ldr r2, =gBattleFrontierHeldItems
 	ldrb r0, [r1, 0xA]
 	lsls r0, 1
 	adds r0, r2
@@ -854195,7 +854195,7 @@ sub_81BA040: ; 81BA040
 	movs r0, 0
 	mov r10, r0
 	ldr r1, =0x0203bc88
-	ldr r0, =gUnknown_085DDA14
+	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
 	ldr r0, =gUnknown_085DE02C
@@ -854367,7 +854367,7 @@ sub_81BA040: ; 81BA040
 	movs r4, 0
 	cmp r4, r5
 	bge @081BA1E6
-	ldr r6, =gUnknown_085CECB0
+	ldr r6, =gBattleFrontierHeldItems
 	mov r12, r6
 	add r3, sp, 0x8
 @081BA1C0:
@@ -854405,7 +854405,7 @@ sub_81BA040: ; 81BA040
 	strh r0, [r3]
 	add r1, sp, 0x8
 	adds r1, r2
-	ldr r3, =gUnknown_085CECB0
+	ldr r3, =gBattleFrontierHeldItems
 	ldrh r0, [r7]
 	lsls r0, 4
 	adds r0, r4
@@ -908488,7 +908488,7 @@ sub_81D5530: ; 81D5530
 	lsls r1, 24
 	adds r0, r1
 	lsrs r0, 24
-	ldr r2, =gUnknown_0831F5CA
+	ldr r2, =gTrainerClassNameIndices
 	ldr r1, =0x0203cf58
 	ldr r1, [r1]
 	adds r1, 0x16
@@ -910314,7 +910314,7 @@ sub_81D63C8: ; 81D63C8
 	ldrb r4, [r3, 0x1B]
 	bl sub_81D5710
 	movs r2, 0
-	ldr r0, =gUnknown_0831F5CA
+	ldr r0, =gTrainerClassNameIndices
 	adds r4, r0
 	ldrb r3, [r4]
 	ldr r1, =gUnknown_0862A3B4