Merge remote-tracking branch 'origin/master'

2 files changed, 34 insertions, 23 deletions

diff --git a/asm/macros.s b/asm/macros.s
index 49ed99695..42c35026e 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -118,7 +118,7 @@
 	.2byte \unknown
 	.fill 4 @ padding
 	.endm
-	
+
 	.macro credits_entry number, text
 	.4byte \number
 	.4byte \text
@@ -136,3 +136,14 @@
 	.4byte \tile_addr
 	.4byte \palette_addr
 	.endm
+
+	.macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name
+	.2byte OPPONENT_\opp_1
+	.2byte OPPONENT_\opp_2
+	.2byte OPPONENT_\opp_3
+	.2byte OPPONENT_\opp_4
+	.2byte OPPONENT_\opp_5
+	.2byte GROUP_\map_name
+	.2byte MAP_\map_name
+	.space 2
+	.endm
diff --git a/asm/rom5.s b/asm/rom5.s
index c756134da..feb8c8ef7 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -16350,7 +16350,7 @@ _08082BFA:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08082C00: .4byte gUnknown_0839AE70
+_08082C00: .4byte gTrainerEyeTrainers
 _08082C04: .4byte 0x02025734
 _08082C08: .4byte 0x00000978
 	thumb_func_end sub_8082BD0
@@ -16370,7 +16370,7 @@ sub_8082C0C: @ 8082C0C
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08082C28: .4byte gUnknown_0839AE70
+_08082C28: .4byte gTrainerEyeTrainers
 	thumb_func_end sub_8082C0C
 
 	thumb_func_start unref_sub_8082C2C
@@ -16388,7 +16388,7 @@ unref_sub_8082C2C: @ 8082C2C
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08082C48: .4byte gUnknown_0839AE70
+_08082C48: .4byte gTrainerEyeTrainers
 	thumb_func_end unref_sub_8082C2C
 
 	thumb_func_start sub_8082C4C
@@ -16404,7 +16404,7 @@ sub_8082C4C: @ 8082C4C
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08082C64: .4byte gUnknown_0839AE70
+_08082C64: .4byte gTrainerEyeTrainers
 	thumb_func_end sub_8082C4C
 
 	thumb_func_start sub_8082C68
@@ -16425,7 +16425,7 @@ sub_8082C68: @ 8082C68
 	lsrs r0, 24
 	b _08082C96
 	.align 2, 0
-_08082C8C: .4byte gUnknown_0839AE70
+_08082C8C: .4byte gTrainerEyeTrainers
 _08082C90: .4byte 0x0202ff5e
 _08082C94:
 	movs r0, 0x1
@@ -16447,7 +16447,7 @@ sub_8082C9C: @ 8082C9C
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08082CB0: .4byte gUnknown_0839AE70
+_08082CB0: .4byte gTrainerEyeTrainers
 _08082CB4: .4byte 0x0202ff5e
 	thumb_func_end sub_8082C9C
 
@@ -16462,7 +16462,7 @@ sub_8082CB8: @ 8082CB8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08082CCC: .4byte gUnknown_0839AE70
+_08082CCC: .4byte gTrainerEyeTrainers
 _08082CD0: .4byte 0x0202ff5e
 	thumb_func_end sub_8082CB8
 
@@ -27630,9 +27630,9 @@ sub_80881C0: @ 80881C0
 	bx r0
 	.align 2, 0
 _08088218: .4byte REG_BG0CNT
-_0808821C: .4byte gUnknown_0839E914
+_0808821C: .4byte gFieldMoveStreaksTiles
 _08088220: .4byte 0x05000200
-_08088224: .4byte gUnknown_0839EB14
+_08088224: .4byte gFieldMoveStreaksPalette
 	thumb_func_end sub_80881C0
 
 	thumb_func_start sub_8088228
@@ -27943,7 +27943,7 @@ _08088452:
 	bx r0
 	.align 2, 0
 _08088470: .4byte 0x06000140
-_08088474: .4byte gUnknown_0839EB34
+_08088474: .4byte gFieldMoveStreaksTilemap
 _08088478: .4byte 0x0000013f
 	thumb_func_end sub_808843C
 
@@ -28048,9 +28048,9 @@ sub_80884E8: @ 80884E8
 	bx r0
 	.align 2, 0
 _08088544: .4byte REG_BG0CNT
-_08088548: .4byte gUnknown_0839EDB4
+_08088548: .4byte gDarknessFieldMoveStreaksTiles
 _0808854C: .4byte 0x05000200
-_08088550: .4byte gUnknown_0839EE34
+_08088550: .4byte gDarknessFieldMoveStreaksPalette
 	thumb_func_end sub_80884E8
 
 	thumb_func_start sub_8088554
@@ -28366,7 +28366,7 @@ _080887A8:
 	bx r1
 	.align 2, 0
 _080887B8: .4byte 0x06000140
-_080887BC: .4byte gUnknown_0839EE54
+_080887BC: .4byte gDarknessFieldMoveStreaksTilemap
 	thumb_func_end sub_8088708
 
 	thumb_func_start sub_80887C0
@@ -38487,7 +38487,7 @@ _0808D914:
 	.align 2, 0
 _0808D928: .4byte 0x0202ffb4
 _0808D92C: .4byte 0x0000060c
-_0808D930: .4byte gUnknown_0839FAC4
+_0808D930: .4byte gPokedexOrder_Alphabetical
 _0808D934:
 	ldr r4, _0808D9B0
 	lsls r0, r4, 16
@@ -38554,7 +38554,7 @@ _0808D99E:
 _0808D9B0: .4byte 0x00000181
 _0808D9B4: .4byte 0x0202ffb4
 _0808D9B8: .4byte 0x0000060c
-_0808D9BC: .4byte gUnknown_0839FDFA
+_0808D9BC: .4byte gPokedexOrder_Weight
 _0808D9C0: .4byte 0xffff0000
 _0808D9C4:
 	movs r4, 0
@@ -38628,7 +38628,7 @@ _0808DA3A:
 _0808DA4C: .4byte 0x0202ffb4
 _0808DA50: .4byte 0x0000060c
 _0808DA54: .4byte 0x00000181
-_0808DA58: .4byte gUnknown_0839FDFA
+_0808DA58: .4byte gPokedexOrder_Weight
 _0808DA5C:
 	ldr r4, _0808DAD8
 	lsls r0, r4, 16
@@ -38695,7 +38695,7 @@ _0808DAC6:
 _0808DAD8: .4byte 0x00000181
 _0808DADC: .4byte 0x0202ffb4
 _0808DAE0: .4byte 0x0000060c
-_0808DAE4: .4byte gUnknown_083A00FE
+_0808DAE4: .4byte gPokedexOrder_Height
 _0808DAE8: .4byte 0xffff0000
 _0808DAEC:
 	movs r4, 0
@@ -38821,7 +38821,7 @@ _0808DBC4:
 _0808DBD4: .4byte 0x0202ffb4
 _0808DBD8: .4byte 0x0000060c
 _0808DBDC: .4byte 0x00000181
-_0808DBE0: .4byte gUnknown_083A00FE
+_0808DBE0: .4byte gPokedexOrder_Height
 _0808DBE4: .4byte 0x0000ffff
 	thumb_func_end sub_808D690
 
@@ -254360,7 +254360,7 @@ _080F6D0E:
 _080F6D44: .4byte gUnknown_083DFEC4
 _080F6D48: .4byte 0x0000d158
 _080F6D4C: .4byte 0x020260ae
-_080F6D50: .4byte gUnknown_0839AE70
+_080F6D50: .4byte gTrainerEyeTrainers
 _080F6D54: .4byte 0x0000cee8
 _080F6D58: .4byte 0x0000ceec
 _080F6D5C: .4byte 0x0000ceea
@@ -294076,7 +294076,7 @@ _081099E0:
 	.align 2, 0
 _08109A14: .4byte 0x020284c8
 _08109A18: .4byte gUnknown_083F62D8
-_08109A1C: .4byte gUnknown_083F62E8
+_08109A1C: .4byte gTraderDecorations
 	thumb_func_end sub_81099CC
 
 	thumb_func_start sub_8109A20
@@ -296935,7 +296935,7 @@ _0810B0E0:
 	bx r0
 	.align 2, 0
 _0810B0EC: .4byte 0x03004b20
-_0810B0F0: .4byte gUnknown_083F7B58
+_0810B0F0: .4byte gClockHandCoords
 	thumb_func_end sub_810B05C
 
 	thumb_func_start sub_810B0F4
@@ -297015,7 +297015,7 @@ _0810B178:
 	bx r0
 	.align 2, 0
 _0810B184: .4byte 0x03004b20
-_0810B188: .4byte gUnknown_083F7B58
+_0810B188: .4byte gClockHandCoords
 	thumb_func_end sub_810B0F4
 
 	thumb_func_start sub_810B18C