trainer eye trainers

4 files changed, 80 insertions, 11 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 8c2ef7cbb..3a4002165 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
 
@@ -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
diff --git a/data/data2.s b/data/data2.s
index aa7189127..a9d70b78a 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -10975,8 +10975,8 @@ gUnknown_0839ADE0:: @ 839ADE0
 gUnknown_0839AE28:: @ 839AE28
 	.incbin "baserom.gba", 0x0039ae28, 0x48
 
-gUnknown_0839AE70:: @ 839AE70
-	.incbin "baserom.gba", 0x0039ae70, 0x380
+@ 839AE70
+	.include "data/trainer_eye_trainers.s"
 
 	.align 2
 gUnknown_0839B1F0:: @ 839B1F0
diff --git a/data/trainer_eye_trainers.s b/data/trainer_eye_trainers.s
new file mode 100644
index 000000000..3628ea598
--- /dev/null
+++ b/data/trainer_eye_trainers.s
@@ -0,0 +1,58 @@
+	.align 2
+gTrainerEyeTrainers:: @ 839AE70
+	trainer_eye_trainer ROSE_1, ROSE_2, ROSE_3, ROSE_4, ROSE_5, Route118
+	trainer_eye_trainer DUSTY_1, DUSTY_2, DUSTY_3, DUSTY_4, DUSTY_5, Route111
+	trainer_eye_trainer LOLA_1, LOLA_2, LOLA_3, LOLA_4, LOLA_5, Route109
+	trainer_eye_trainer RICKY_1, RICKY_2, RICKY_3, RICKY_4, RICKY_5, Route109
+	trainer_eye_trainer RITA_AND_SAM_1, RITA_AND_SAM_2, RITA_AND_SAM_3, RITA_AND_SAM_4, RITA_AND_SAM_5, Route124
+	trainer_eye_trainer BROOKE_1, BROOKE_2, BROOKE_3, BROOKE_4, BROOKE_5, Route111
+	trainer_eye_trainer WILTON_1, WILTON_2, WILTON_3, WILTON_4, WILTON_5, Route111
+	trainer_eye_trainer VALERIE_1, VALERIE_2, VALERIE_3, VALERIE_4, VALERIE_5, MtPyre_6F
+	trainer_eye_trainer CINDY_1, CINDY_3, CINDY_4, CINDY_5, CINDY_6, Route104
+	trainer_eye_trainer JESSICA_1, JESSICA_2, JESSICA_3, JESSICA_4, JESSICA_5, Route121
+	trainer_eye_trainer WINSTON_1, WINSTON_2, WINSTON_3, WINSTON_4, WINSTON_5, Route104
+	trainer_eye_trainer STEVE_1, STEVE_2, STEVE_3, STEVE_4, STEVE_5, Route114
+	trainer_eye_trainer TONY_1, TONY_2, TONY_3, TONY_4, TONY_5, Route107
+	trainer_eye_trainer NOB_1, NOB_2, NOB_3, NOB_4, NOB_5, Route115
+	trainer_eye_trainer DALTON_1, DALTON_2, DALTON_3, DALTON_4, DALTON_5, Route118
+	trainer_eye_trainer BERNIE_1, BERNIE_2, BERNIE_3, BERNIE_4, BERNIE_5, Route114
+	trainer_eye_trainer ETHAN_1, ETHAN_2, ETHAN_3, ETHAN_4, ETHAN_5, JaggedPass
+	trainer_eye_trainer JOHN_AND_JAY_1, JOHN_AND_JAY_2, JOHN_AND_JAY_3, JOHN_AND_JAY_4, JOHN_AND_JAY_5, MeteorFalls_1F_2R
+	trainer_eye_trainer BRANDON_1, BRANDON_2, BRANDON_3, BRANDON_4, BRANDON_5, Route120
+	trainer_eye_trainer CAMERON_1, CAMERON_2, CAMERON_3, CAMERON_4, CAMERON_5, Route123
+	trainer_eye_trainer JACKI_1, JACKI_2, JACKI_3, JACKI_4, JACKI_5, Route123
+	trainer_eye_trainer WALTER_1, WALTER_2, WALTER_3, WALTER_4, WALTER_5, Route121
+	trainer_eye_trainer KAREN_1, KAREN_2, KAREN_3, KAREN_4, KAREN_5, Route116
+	trainer_eye_trainer JERRY_1, JERRY_2, JERRY_3, JERRY_4, JERRY_5, Route116
+	trainer_eye_trainer ANNA_AND_MEG_1, ANNA_AND_MEG_2, ANNA_AND_MEG_3, ANNA_AND_MEG_4, ANNA_AND_MEG_5, Route117
+	trainer_eye_trainer ISABEL_1, ISABEL_2, ISABEL_3, ISABEL_4, ISABEL_5, Route110
+	trainer_eye_trainer MIGUEL_1, MIGUEL_2, MIGUEL_3, MIGUEL_4, MIGUEL_5, Route103
+	trainer_eye_trainer TIMOTHY_1, TIMOTHY_2, TIMOTHY_3, TIMOTHY_4, TIMOTHY_5, Route115
+	trainer_eye_trainer SHELBY_1, SHELBY_2, SHELBY_3, SHELBY_4, SHELBY_5, MtChimney
+	trainer_eye_trainer CALVIN_1, CALVIN_2, CALVIN_3, CALVIN_4, CALVIN_5, Route102
+	trainer_eye_trainer ELLIOT_1, ELLIOT_2, ELLIOT_3, ELLIOT_4, ELLIOT_5, Route106
+	trainer_eye_trainer ABIGAIL_1, ABIGAIL_2, ABIGAIL_3, ABIGAIL_4, ABIGAIL_5, Route110
+	trainer_eye_trainer BENJAMIN_1, BENJAMIN_2, BENJAMIN_3, BENJAMIN_4, BENJAMIN_5, Route110
+	trainer_eye_trainer ISAIAH_1, ISAIAH_2, ISAIAH_3, ISAIAH_4, ISAIAH_5, Route128
+	trainer_eye_trainer KATELYN_1, KATELYN_2, KATELYN_3, KATELYN_4, KATELYN_5, Route128
+	trainer_eye_trainer MARIA_1, MARIA_2, MARIA_3, MARIA_4, MARIA_5, Route117
+	trainer_eye_trainer DYLAN_1, DYLAN_2, DYLAN_3, DYLAN_4, DYLAN_5, Route117
+	trainer_eye_trainer NICOLAS_1, NICOLAS_2, NICOLAS_3, NICOLAS_4, NICOLAS_5, MeteorFalls_1F_2R
+	trainer_eye_trainer ROBERT_1, ROBERT_2, ROBERT_3, ROBERT_4, ROBERT_5, Route120
+	trainer_eye_trainer LAO_1, LAO_2, LAO_3, LAO_4, LAO_5, Route113
+	trainer_eye_trainer CYNDY_1, CYNDY_2, CYNDY_3, CYNDY_4, CYNDY_5, Route115
+	trainer_eye_trainer MADELINE_1, MADELINE_2, MADELINE_3, MADELINE_4, MADELINE_5, Route113
+	trainer_eye_trainer JENNY_1, JENNY_2, JENNY_3, JENNY_4, JENNY_5, Route124
+	trainer_eye_trainer DIANA_1, DIANA_2, DIANA_3, DIANA_4, DIANA_5, JaggedPass
+	trainer_eye_trainer AMY_AND_LIV_1, AMY_AND_LIV_2, AMY_AND_LIV_4, AMY_AND_LIV_5, AMY_AND_LIV_6, Route103
+	trainer_eye_trainer ERNEST_1, ERNEST_2, ERNEST_3, ERNEST_4, ERNEST_5, Route125
+	trainer_eye_trainer EDWIN_1, EDWIN_2, EDWIN_3, EDWIN_4, EDWIN_5, Route110
+	trainer_eye_trainer LYDIA_1, LYDIA_2, LYDIA_3, LYDIA_4, LYDIA_5, Route117
+	trainer_eye_trainer ISAAC_1, ISAAC_2, ISAAC_3, ISAAC_4, ISAAC_5, Route117
+	trainer_eye_trainer CATHERINE_1, CATHERINE_2, CATHERINE_3, CATHERINE_4, CATHERINE_5, Route119
+	trainer_eye_trainer JACKSON_1, JACKSON_2, JACKSON_3, JACKSON_4, JACKSON_5, Route119
+	trainer_eye_trainer HALEY_1, HALEY_2, HALEY_3, HALEY_4, HALEY_5, Route104
+	trainer_eye_trainer JAMES_1, JAMES_2, JAMES_3, JAMES_4, JAMES_5, PetalburgWoods
+	trainer_eye_trainer TRENT_1, TRENT_2, TRENT_3, TRENT_4, TRENT_5, Route112
+	trainer_eye_trainer LOIS_AND_HAL_1, LOIS_AND_HAL_2, LOIS_AND_HAL_3, LOIS_AND_HAL_4, LOIS_AND_HAL_5, AbandonedShip_Rooms2_1F
+	trainer_eye_trainer WALLY_3, WALLY_4, WALLY_5, WALLY_6, NONE, VictoryRoad_1F