battle frontier/tent pokemon

1 files changed, 19 insertions, 19 deletions

diff --git a/asm/emerald.s b/asm/emerald.s
index 21fcef52a..2d31cd05d 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -690496,7 +690496,7 @@ sub_8165C40: ; 8165C40
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r0, [r2]
 	lsls r0, 30
@@ -690659,7 +690659,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690670,7 +690670,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gVerdanturfBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DEC28
+	ldr r0, =gVerdanturfBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690681,7 +690681,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gFallarborBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DF69C
+	ldr r0, =gFallarborBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690690,7 +690690,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 @08165DF2:
 	str r0, [r1]
 	bl sub_8165CB4
@@ -781018,7 +781018,7 @@ sub_8194CE4: ; 8194CE4
 	thumb_func_start sub_8194D48
 sub_8194D48: ; 8194D48
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldr r1, =0x0203bc88
 	ldr r0, =gBattleFrontierTrainers
@@ -794214,7 +794214,7 @@ sub_819B484: ; 819B484
 	lsrs r0, 24
 	str r0, [sp, 0x18]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r1, [r4]
 	movs r0, 0x3
@@ -794394,7 +794394,7 @@ sub_819B63C: ; 819B63C
 	movs r1, 0
 	strb r1, [r0]
 	ldr r2, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r2]
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -815476,13 +815476,13 @@ sub_81A63CC: ; 81A63CC
 	cmp r0, 0x2
 	beq @081A63FC
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	b @081A6400
 	.align 2, 0
 	.pool
 @081A63FC:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 @081A6400:
 	str r0, [r1]
 	movs r7, 0
@@ -815584,7 +815584,7 @@ sub_81A64C4: ; 81A64C4
 	cmp r0, 0x2
 	bne @081A6500
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r1]
 	movs r2, 0x1E
 	str r2, [sp, 0x14]
@@ -815593,7 +815593,7 @@ sub_81A64C4: ; 81A64C4
 	.pool
 @081A6500:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r1, [r2]
 	adds r0, r3, 0
@@ -816020,7 +816020,7 @@ sub_81A67EC: ; 81A67EC
 	movs r2, 0x1
 @081A6878:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	mov r1, r9
 	ldr r0, [r1]
@@ -816217,7 +816217,7 @@ sub_81A6A08: ; 81A6A08
 	push {r7}
 	sub sp, 0x18
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	movs r4, 0
 	add r5, sp, 0x14
@@ -816334,7 +816334,7 @@ sub_81A6AEC: ; 81A6AEC
 	sub sp, 0x8
 	movs r7, 0
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	movs r4, 0
 	movs r1, 0
@@ -816504,13 +816504,13 @@ sub_81A6C1C: ; 81A6C1C
 	cmp r0, 0x2
 	beq @081A6C48
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	b @081A6C4C
 	.align 2, 0
 	.pool
 @081A6C48:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 @081A6C4C:
 	str r0, [r1]
 	movs r4, 0
@@ -854010,7 +854010,7 @@ sub_81B9EC0: ; 81B9EC0
 	adds r1, 0x18
 	str r1, [sp, 0x2C]
 	ldr r5, =0x0203bc8c
-	ldr r4, =gUnknown_085DE02C
+	ldr r4, =gSlateportBattleTentMons
 	movs r2, 0
 	adds r3, r1, 0
 	mov r1, r9
@@ -854198,7 +854198,7 @@ sub_81BA040: ; 81BA040
 	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r1]
 	ldr r7, =0x03005d90
 	ldr r1, =0x0000ffff