trainer pic indices

3 files changed, 104 insertions, 19 deletions

diff --git a/asm/emerald.s b/asm/emerald.s
index 9193aa8c5..83cadc241 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -168965,13 +168965,13 @@ sub_8066748: ; 8066748
 	cmp r0, 0
 	beq @080668BC
 @080668AA:
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x4F
 	ldrb r0, [r0]
 	b @0806694C
 	.pool
 @080668BC:
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x4E
 	ldrb r0, [r0]
 	b @0806694C
@@ -169015,13 +169015,13 @@ sub_8066748: ; 8066748
 	cmp r0, 0
 	beq @08066924
 @08066916:
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x51
 	ldrb r0, [r0]
 	b @0806694C
 	.pool
 @08066924:
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x50
 	ldrb r0, [r0]
 	b @0806694C
@@ -178777,7 +178777,7 @@ sub_806B830: ; 806B830
 	adds r0, r1
 	adds r0, r5
 	ldrb r0, [r0]
-	ldr r1, =gUnknown_0831F578
+	ldr r1, =gTrainerPicIndices
 	adds r0, r1
 	ldrb r0, [r0]
 	pop {r4,r5}
@@ -185710,7 +185710,7 @@ sub_806EF84: ; 806EF84
 sub_806EFF0: ; 806EFF0
 	lsls r0, 16
 	lsrs r0, 16
-	ldr r1, =gUnknown_0831F578
+	ldr r1, =gTrainerPicIndices
 	adds r0, r1
 	ldrb r0, [r0]
 	bx lr
@@ -658297,7 +658297,7 @@ sub_8162AA0: ; 8162AA0
 	lsls r0, 1
 	cmp r4, r0
 	bne @08162AD0
-	ldr r1, =gUnknown_0831F578
+	ldr r1, =gTrainerPicIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r2, =0x00000bed
@@ -658319,7 +658319,7 @@ sub_8162AA0: ; 8162AA0
 	ldr r0, =0x0000012b
 	cmp r4, r0
 	bhi @08162B08
-	ldr r2, =gUnknown_0831F578
+	ldr r2, =gTrainerPicIndices
 	ldr r0, =0x0203bc88
 	ldr r1, [r0]
 	movs r0, 0x34
@@ -658340,7 +658340,7 @@ sub_8162AA0: ; 8162AA0
 	ands r0, r1
 	cmp r0, 0
 	beq @08162B38
-	ldr r4, =gUnknown_0831F578
+	ldr r4, =gTrainerPicIndices
 	bl sub_818649C
 	lsls r0, 24
 	lsrs r0, 24
@@ -658348,7 +658348,7 @@ sub_8162AA0: ; 8162AA0
 	b @08162BC8
 	.pool
 @08162B38:
-	ldr r3, =gUnknown_0831F578
+	ldr r3, =gTrainerPicIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0xfffffed4
@@ -658370,7 +658370,7 @@ sub_8162AA0: ; 8162AA0
 	ands r0, r1
 	cmp r0, 0
 	bne @08162BB0
-	ldr r4, =gUnknown_0831F578
+	ldr r4, =gTrainerPicIndices
 	ldr r3, =gUnknown_08610970
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -658393,7 +658393,7 @@ sub_8162AA0: ; 8162AA0
 	b @08162BC8
 	.pool
 @08162BB0:
-	ldr r5, =gUnknown_0831F578
+	ldr r5, =gTrainerPicIndices
 	ldr r4, =gUnknown_08610970
 	bl sub_81864A8
 	lsls r0, 24
@@ -662802,7 +662802,7 @@ sub_816515C: ; 816515C
 
 	thumb_func_start sub_8165244
 sub_8165244: ; 8165244
-	ldr r1, =gUnknown_0831F578
+	ldr r1, =gTrainerPicIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r2, =0x00000bed
@@ -738952,13 +738952,13 @@ sub_818D97C: ; 818D97C
 	bne @0818D9A2
 	cmp r0, 0
 	beq @0818D99C
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x3F
 	ldrb r0, [r0]
 	b @0818D9A2
 	.pool
 @0818D99C:
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, 0x3C
 	ldrb r0, [r0]
 @0818D9A2:
@@ -854836,7 +854836,7 @@ sub_81CAF04: ; 81CAF04
 	adds r0, r5, 0
 	bl sub_81D1BD0
 	adds r4, r0, 0
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r0, r4, r0
 	ldrb r0, [r0]
 	b @081CAF6C
@@ -875893,7 +875893,7 @@ sub_81D5588: ; 81D5588
 	adds r3, r0
 	ldrb r4, [r3, 0x1B]
 	bl sub_81D5710
-	ldr r0, =gUnknown_0831F578
+	ldr r0, =gTrainerPicIndices
 	adds r4, r0
 	ldrb r0, [r4]
 	pop {r4}
diff --git a/data/data2.s b/data/data2.s
index 4ac7f5600..dabe217fc 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1645,8 +1645,8 @@ gUnknown_0831C7B4: ; 831C7B4
 ; 831E898
 	.include "data/tm_hm_learnsets.s"
 
-gUnknown_0831F578: ; 831F578
-	.incbin "base_emerald.gba", 0x31f578, 0x52
+; 831F578
+	.include "data/trainer_pic_indices.s"
 
 ; 831F5CA
 	.include "data/trainer_class_name_indices.s"
diff --git a/data/trainer_pic_indices.s b/data/trainer_pic_indices.s
new file mode 100644
index 000000000..9cef7e5e8
--- /dev/null
+++ b/data/trainer_pic_indices.s
@@ -0,0 +1,85 @@
+	.align 2, 0
+
+gTrainerPicIndices: ; 831F578
+	.byte TRAINER_PIC_HIKER
+	.byte TRAINER_PIC_AQUA_GRUNT_M
+	.byte TRAINER_PIC_POKEMON_BREEDER_F
+	.byte TRAINER_PIC_COOL_TRAINER_M
+	.byte TRAINER_PIC_BIRD_KEEPER
+	.byte TRAINER_PIC_COLLECTOR
+	.byte TRAINER_PIC_AQUA_GRUNT_F
+	.byte TRAINER_PIC_SWIMMER_M
+	.byte TRAINER_PIC_MAGMA_GRUNT_M
+	.byte TRAINER_PIC_EXPERT_M
+	.byte TRAINER_PIC_BLACK_BELT
+	.byte TRAINER_PIC_AQUA_LEADER_ARCHIE
+	.byte TRAINER_PIC_HEX_MANIAC
+	.byte TRAINER_PIC_AROMA_LADY
+	.byte TRAINER_PIC_RUIN_MANIAC
+	.byte TRAINER_PIC_INTERVIEWER
+	.byte TRAINER_PIC_TUBER_F
+	.byte TRAINER_PIC_TUBER_M
+	.byte TRAINER_PIC_COOL_TRAINER_F
+	.byte TRAINER_PIC_LADY
+	.byte TRAINER_PIC_BEAUTY
+	.byte TRAINER_PIC_RICH_BOY
+	.byte TRAINER_PIC_EXPERT_F
+	.byte TRAINER_PIC_POKEMANIAC
+	.byte TRAINER_PIC_MAGMA_GRUNT_F
+	.byte TRAINER_PIC_GUITARIST
+	.byte TRAINER_PIC_KINDLER
+	.byte TRAINER_PIC_CAMPER
+	.byte TRAINER_PIC_PICNICKER
+	.byte TRAINER_PIC_BUG_MANIAC
+	.byte TRAINER_PIC_PSYCHIC_M
+	.byte TRAINER_PIC_PSYCHIC_F
+	.byte TRAINER_PIC_GENTLEMAN
+	.byte TRAINER_PIC_ELITE_FOUR_SIDNEY
+	.byte TRAINER_PIC_ELITE_FOUR_PHOEBE
+	.byte TRAINER_PIC_LEADER_ROXANNE
+	.byte TRAINER_PIC_LEADER_BRAWLY
+	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
+	.byte TRAINER_PIC_SCHOOL_KID_M
+	.byte TRAINER_PIC_SCHOOL_KID_F
+	.byte TRAINER_PIC_SR_AND_JR
+	.byte TRAINER_PIC_WINSTRATE_M
+	.byte TRAINER_PIC_WINSTRATE_F
+	.byte TRAINER_PIC_YOUNGSTER
+	.byte TRAINER_PIC_CHAMPION_WALLACE
+	.byte TRAINER_PIC_FISHERMAN
+	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
+	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
+	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
+	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
+	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
+	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
+	.byte TRAINER_PIC_DRAGON_TAMER
+	.byte TRAINER_PIC_NINJA_BOY
+	.byte TRAINER_PIC_BATTLE_GIRL
+	.byte TRAINER_PIC_PARASOL_LADY
+	.byte TRAINER_PIC_SWIMMER_F
+	.byte TRAINER_PIC_TWINS
+	.byte TRAINER_PIC_SAILOR
+	.byte TRAINER_PIC_WALLY
+	.byte TRAINER_PIC_BRENDAN
+	.byte TRAINER_PIC_BRENDAN
+	.byte TRAINER_PIC_BRENDAN
+	.byte TRAINER_PIC_MAY
+	.byte TRAINER_PIC_MAY
+	.byte TRAINER_PIC_MAY
+	.byte TRAINER_PIC_POKEMON_BREEDER_M
+	.byte TRAINER_PIC_BUG_CATCHER
+	.byte TRAINER_PIC_POKEMON_RANGER_M
+	.byte TRAINER_PIC_POKEMON_RANGER_F
+	.byte TRAINER_PIC_MAGMA_LEADER_MAXIE
+	.byte TRAINER_PIC_LASS
+	.byte TRAINER_PIC_YOUNG_COUPLE
+	.byte TRAINER_PIC_OLD_COUPLE
+	.byte TRAINER_PIC_SIS_AND_BRO
+	.byte TRAINER_PIC_STEVEN
+	.byte TRAINER_PIC_SALON_MAIDEN_ANABEL
+	.byte TRAINER_PIC_DOME_ACE_TUCKER
+	.byte TRAINER_PIC_RED
+	.byte TRAINER_PIC_LEAF
+	.byte TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
+	.byte TRAINER_PIC_RUBY_SAPPHIRE_MAY