trainer data

asm/emerald.s

@@ -89975,7 +89975,7 @@ sub_8035770: ; 8035770
 	ands r1, r0
 	cmp r1, 0
 	beq @080358C4
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -91121,7 +91121,7 @@ sub_8036154: ; 8036154
 	ands r1, r0
 	cmp r1, 0
 	beq @08036350
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -91267,7 +91267,7 @@ sub_80363C4: ; 80363C4
 	ands r1, r0
 	cmp r1, 0
 	beq @0803648C
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -91389,7 +91389,7 @@ sub_80363C4: ; 80363C4
 	ands r1, r0
 	cmp r1, 0
 	beq @08036598
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -91512,7 +91512,7 @@ sub_80363C4: ; 80363C4
 	ands r1, r0
 	cmp r1, 0
 	beq @080366AC
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -95122,7 +95122,7 @@ sub_80385E8: ; 80385E8
 	ands r0, r1
 	cmp r0, 0
 	beq @08038668
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	ldr r2, [sp, 0x20]
 	ldr r3, [sp, 0x14]
 	adds r1, r2, r3
@@ -95142,7 +95142,7 @@ sub_80385E8: ; 80385E8
 	.align 2, 0
 	.pool
 @08038668:
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	ldr r2, [sp, 0x20]
 	ldr r3, [sp, 0x14]
 	adds r0, r2, r3
@@ -95569,7 +95569,7 @@ sub_80385E8: ; 80385E8
 @080389AC:
 	ldr r4, [sp, 0x24]
 	str r4, [sp, 0x18]
-	ldr r4, =gUnknown_08310030
+	ldr r4, =gTrainers
 	ldr r0, [sp, 0x18]
 @080389B4:
 	ldr r1, [sp, 0x1C]
@@ -95578,7 +95578,7 @@ sub_80385E8: ; 80385E8
 	b @08038688
 @080389BC:
 	ldr r2, =0x02022fec
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	ldr r3, [sp, 0x20]
 	ldr r4, [sp, 0x14]
 	adds r0, r3, r4
@@ -95589,7 +95589,7 @@ sub_80385E8: ; 80385E8
 	orrs r0, r1
 	str r0, [r2]
 @080389D2:
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	ldr r2, [sp, 0x20]
 	ldr r3, [sp, 0x14]
 	adds r1, r2, r3
@@ -104847,7 +104847,7 @@ sub_803D8C0: ; 803D8C0
 	ldr r1, =0x02024214
 	ldr r0, =gUnknown_082DA92D
 	str r0, [r1]
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -135662,7 +135662,7 @@ sub_804E598: ; 804E598
 	.align 2, 0
 	.pool
 @0804E5D8:
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	lsls r2, r6, 2
 	adds r1, r2, r6
 	lsls r1, 3
@@ -171498,14 +171498,14 @@ sub_8061690: ; 8061690
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq @08061788
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bcc
 	ldrh r1, [r0]
 	b @0806178C
 	.align 2, 0
 	.pool
 @08061788:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldrh r1, [r3]
 @0806178C:
 	lsls r0, r1, 2
@@ -171754,14 +171754,14 @@ sub_80618D8: ; 80618D8
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq @080619D0
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bcc
 	ldrh r1, [r0]
 	b @080619D4
 	.align 2, 0
 	.pool
 @080619D0:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldrh r1, [r3]
 @080619D4:
 	lsls r0, r1, 2
@@ -195159,7 +195159,7 @@ sub_806D888: ; 806D888
 	lsls r0, 24
 	cmp r0, 0
 	bne @0806D8C4
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	lsls r0, r4, 2
 	adds r0, r4
 	lsls r0, 3
@@ -195339,7 +195339,7 @@ happiness_algorithm: ; 806D934
 	ands r0, r1
 	cmp r0, 0
 	beq @0806DAC2
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -196761,7 +196761,7 @@ song_id_for_battle: ; 806E42C
 	movs r0, 0xA
 	b @0806E4B2
 @0806E4A2:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -196883,7 +196883,7 @@ song_id_for_battle: ; 806E42C
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gUnknown_08310034
+	ldr r1, =gTrainers + 0x4 ; name offset
 	adds r0, r1
 	ldr r1, =gUnknown_085CCB98
 	bl sub_8008C44
@@ -197664,7 +197664,7 @@ sub_806EBF8: ; 806EBF8
 	ldr r0, =0x00000c03
 	cmp r1, r0
 	bne @0806EC28
-	ldr r0, =gUnknown_08317DD4
+	ldr r0, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
 	b @0806EC64
 	.align 2, 0
 	.pool
@@ -198252,7 +198252,7 @@ sub_806F07C: ; 806F07C
 	bls @0806F08A
 	movs r2, 0
 @0806F08A:
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	lsls r0, r2, 2
 	adds r0, r2
 	lsls r0, 3
@@ -198281,7 +198281,7 @@ sub_806F0B0: ; 806F0B0
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gUnknown_08310034
+	ldr r1, =gTrainers + 0x4 ; name offset
 	adds r0, r1
 	pop {r1}
 	bx r1
@@ -332583,7 +332583,7 @@ sub_80B0DE8: ; 80B0DE8
 	lsrs r0, 16
 	lsls r1, 24
 	lsrs r4, r1, 24
-	ldr r5, =gUnknown_08310030
+	ldr r5, =gTrainers
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
@@ -332766,7 +332766,7 @@ sub_80B0F34: ; 80B0F34
 	lsls r0, 3
 	cmp r1, r0
 	beq @080B0F98
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	ldrh r2, [r4]
 	lsls r0, r2, 2
 	adds r0, r2
@@ -585865,7 +585865,7 @@ sub_81308C8: ; 81308C8
 	bne @0813092E
 	movs r4, 0
 	ldr r6, =0x02038bca
-	ldr r5, =gUnknown_08310040
+	ldr r5, =gTrainers + 0x10 ; items offset
 @081308F6:
 	lsls r2, r4, 1
 	ldrh r1, [r6]
@@ -586127,7 +586127,7 @@ sub_8130950: ; 8130950
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r4, [r0, 0x14]
-	ldr r3, =gUnknown_08310030
+	ldr r3, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
 	lsls r1, r0, 2
@@ -586152,7 +586152,7 @@ sub_8130950: ; 8130950
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -644994,7 +644994,7 @@ sub_814E764: ; 814E764
 	bl sub_8165264
 	b @0814F59C
 @0814F14E:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldrh r1, [r3]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -645094,7 +645094,7 @@ sub_814E764: ; 814E764
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
-	ldr r0, =gUnknown_08310034
+	ldr r0, =gTrainers + 0x4 ; name offset
 	adds r4, r1, r0
 	b @0814F5C0
 	.align 2, 0
@@ -645393,7 +645393,7 @@ sub_814E764: ; 814E764
 	.align 2, 0
 	.pool
 @0814F49C:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r0, =0x02038bcc
 	ldrh r1, [r0]
 	lsls r0, r1, 2
@@ -645435,7 +645435,7 @@ sub_814E764: ; 814E764
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gUnknown_08310034
+	ldr r1, =gTrainers + 0x4 ; name offset
 	adds r4, r0, r1
 	b @0814F5C0
 	.align 2, 0
@@ -684749,7 +684749,7 @@ sub_8162BD8: ; 8162BD8
 	ldr r0, =0x00000c03
 	cmp r4, r0
 	bne @08162C38
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	ldr r1, =0x00007da1
 @08162C26:
 	adds r0, r1
@@ -685011,7 +685011,7 @@ sub_8162E20: ; 8162E20
 	ldr r0, =0x00000c03
 	cmp r5, r0
 	bne @08162E88
-	ldr r2, =gUnknown_08317DD4
+	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
 @08162E70:
 	adds r0, r6, r4
 	adds r1, r4, r2
@@ -689574,7 +689574,7 @@ sub_8165404: ; 8165404
 	adds r4, r0
 	adds r0, r4, 0
 	movs r1, 0x7
-	ldr r2, =gUnknown_08317DD4
+	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
 	bl pokemon_setattr
 	movs r0, 0
 	str r0, [sp, 0x44]
@@ -782486,7 +782486,7 @@ sub_8195898: ; 8195898
 
 	thumb_func_start sub_8195910
 sub_8195910: ; 8195910
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	ldr r1, =0x00007df3
 	adds r0, r1
 	ldrb r0, [r0]
@@ -782497,7 +782497,7 @@ sub_8195910: ; 8195910
 
 	thumb_func_start sub_8195924
 sub_8195924: ; 8195924
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	ldr r1, =0x00007df1
 	adds r0, r1
 	ldrb r0, [r0]
@@ -782511,7 +782511,7 @@ sub_8195938: ; 8195938
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
-	ldr r4, =gUnknown_08317E24
+	ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 ; Tucker's name
 @08195940:
 	adds r0, r3, r2
 	adds r1, r2, r4
@@ -784681,7 +784681,7 @@ sub_8196A44: ; 8196A44
 	lsls r1, r4, 2
 	adds r1, r4
 	lsls r1, 3
-	ldr r0, =gUnknown_08310034
+	ldr r0, =gTrainers + 0x4 ; name offset
 	adds r1, r0
 	adds r0, r5, 0
 	bl gf_strcpy
@@ -784961,7 +784961,7 @@ sub_8196C70: ; 8196C70
 	bl sub_80B2250
 	lsls r0, 16
 	lsrs r0, 16
-	ldr r5, =gUnknown_08310030
+	ldr r5, =gTrainers
 	lsls r4, r0, 2
 	adds r4, r0
 	lsls r4, 3
@@ -812711,7 +812711,7 @@ sub_81A4CB0: ; 81A4CB0
 	lsls r0, 16
 	lsrs r0, 16
 @081A4CDA:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r1, =gUnknown_08611D30
 	lsls r0, 1
 	adds r0, r1
@@ -812749,7 +812749,7 @@ sub_81A4D00: ; 81A4D00
 	lsls r0, 16
 	lsrs r0, 16
 @081A4D2A:
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r1, =gUnknown_08611D30
 	lsls r0, 1
 	adds r0, r1
@@ -812790,7 +812790,7 @@ sub_81A4D50: ; 81A4D50
 @081A4D7A:
 	movs r3, 0
 	lsls r0, 1
-	ldr r2, =gUnknown_08310030
+	ldr r2, =gTrainers
 	ldr r1, =gUnknown_08611D30
 	adds r0, r1
 	ldrh r1, [r0]
@@ -887040,7 +887040,7 @@ sub_81CAF04: ; 81CAF04
 	ldrh r0, [r1, 0x1E]
 	bl sub_81D15BC
 	adds r4, r0, 0
-	ldr r1, =gUnknown_08310030
+	ldr r1, =gTrainers
 	lsls r0, r4, 2
 	adds r0, r4
 	lsls r0, 3
@@ -887069,7 +887069,7 @@ sub_81CAF04: ; 81CAF04
 	adds r0, r4, 0
 	bl sub_81D15BC
 	adds r4, r0, 0
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	lsls r1, r4, 2
 	adds r1, r4
 	lsls r1, 3
@@ -887215,7 +887215,7 @@ sub_81CB050: ; 81CB050
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	adds r1, r0
 	ldrb r2, [r1, 0x1]
 	movs r0, 0xD
@@ -901015,7 +901015,7 @@ sub_81D1B0C: ; 81D1B0C
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
-	ldr r0, =gUnknown_08310030
+	ldr r0, =gTrainers
 	adds r1, r0
 	ldrb r2, [r1, 0x1]
 	movs r0, 0xD

constants/constants.s

@@ -10,7 +10,7 @@
 	.include "constants/item_data_constants.s"
 	.include "constants/battle_move_constants.s"
 	.include "constants/easy_chat_constants.s"
-	.include "constants/trainer_class_constants.s"
+	.include "constants/trainer_constants.s"
 	.include "constants/battle_frontier_constants.s"
 	.include "constants/map_constants.s"
 	.include "constants/berry_constants.s"

constants/trainer_class_constants.s

@@ -1,149 +0,0 @@
-	.set TRAINER_CLASS_HIKER,           0x0
-	.set TRAINER_CLASS_TEAM_AQUA_1,     0x1
-	.set TRAINER_CLASS_PKMN_BREEDER_1,  0x2
-	.set TRAINER_CLASS_COOLTRAINER_1,   0x3
-	.set TRAINER_CLASS_BIRD_KEEPER,     0x4
-	.set TRAINER_CLASS_COLLECTOR,       0x5
-	.set TRAINER_CLASS_TEAM_AQUA_2,     0x6
-	.set TRAINER_CLASS_SWIMMER_M,       0x7
-	.set TRAINER_CLASS_TEAM_MAGMA_1,    0x8
-	.set TRAINER_CLASS_EXPERT_1,        0x9
-	.set TRAINER_CLASS_BLACK_BELT,      0xa
-	.set TRAINER_CLASS_AQUA_LEADER,     0xb
-	.set TRAINER_CLASS_HEX_MANIAC,      0xc
-	.set TRAINER_CLASS_AROMA_LADY,      0xd
-	.set TRAINER_CLASS_RUIN_MANIAC,     0xe
-	.set TRAINER_CLASS_INTERVIEWER,     0xf
-	.set TRAINER_CLASS_TUBER_1,         0x10
-	.set TRAINER_CLASS_TUBER_2,         0x11
-	.set TRAINER_CLASS_COOLTRAINER_2,   0x12
-	.set TRAINER_CLASS_LADY,            0x13
-	.set TRAINER_CLASS_BEAUTY,          0x14
-	.set TRAINER_CLASS_RICH_BOY,        0x15
-	.set TRAINER_CLASS_EXPERT_2,        0x16
-	.set TRAINER_CLASS_POKEMANIAC,      0x17
-	.set TRAINER_CLASS_TEAM_MAGMA_2,    0x18
-	.set TRAINER_CLASS_GUITARIST,       0x19
-	.set TRAINER_CLASS_KINDLER,         0x1a
-	.set TRAINER_CLASS_CAMPER,          0x1b
-	.set TRAINER_CLASS_PICNICKER,       0x1c
-	.set TRAINER_CLASS_BUG_MANIAC,      0x1d
-	.set TRAINER_CLASS_PSYCHIC_1,       0x1e
-	.set TRAINER_CLASS_PSYCHIC_2,       0x1f
-	.set TRAINER_CLASS_GENTLEMAN,       0x20
-	.set TRAINER_CLASS_ELITE_FOUR_1,    0x21
-	.set TRAINER_CLASS_ELITE_FOUR_2,    0x22
-	.set TRAINER_CLASS_LEADER_1,        0x23
-	.set TRAINER_CLASS_LEADER_2,        0x24
-	.set TRAINER_CLASS_LEADER_3,        0x25
-	.set TRAINER_CLASS_SCHOOL_KID_1,    0x26
-	.set TRAINER_CLASS_SCHOOL_KID_2,    0x27
-	.set TRAINER_CLASS_SR_AND_JR,       0x28
-	.set TRAINER_CLASS_POKEFAN_1,       0x29
-	.set TRAINER_CLASS_POKEFAN_2,       0x2a
-	.set TRAINER_CLASS_YOUNGSTER,       0x2b
-	.set TRAINER_CLASS_CHAMPION,        0x2c
-	.set TRAINER_CLASS_FISHERMAN,       0x2d
-	.set TRAINER_CLASS_TRIATHLETE_1,    0x2e
-	.set TRAINER_CLASS_TRIATHLETE_2,    0x2f
-	.set TRAINER_CLASS_TRIATHLETE_3,    0x30
-	.set TRAINER_CLASS_TRIATHLETE_4,    0x31
-	.set TRAINER_CLASS_TRIATHLETE_5,    0x32
-	.set TRAINER_CLASS_TRIATHLETE_6,    0x33
-	.set TRAINER_CLASS_DRAGON_TAMER,    0x34
-	.set TRAINER_CLASS_NINJA_BOY,       0x35
-	.set TRAINER_CLASS_BATTLE_GIRL,     0x36
-	.set TRAINER_CLASS_PARASOL_LADY,    0x37
-	.set TRAINER_CLASS_SWIMMER_F,       0x38
-	.set TRAINER_CLASS_TWINS,           0x39
-	.set TRAINER_CLASS_SAILOR,          0x3a
-	.set TRAINER_CLASS_PKMN_TRAINER_1,  0x3b
-	.set TRAINER_CLASS_PKMN_TRAINER_2,  0x3c
-	.set TRAINER_CLASS_PKMN_TRAINER_3,  0x3d
-	.set TRAINER_CLASS_PKMN_TRAINER_4,  0x3e
-	.set TRAINER_CLASS_PKMN_TRAINER_5,  0x3f
-	.set TRAINER_CLASS_PKMN_TRAINER_6,  0x40
-	.set TRAINER_CLASS_PKMN_TRAINER_7,  0x41
-	.set TRAINER_CLASS_PKMN_BREEDER_2,  0x42
-	.set TRAINER_CLASS_BUG_CATCHER,     0x43
-	.set TRAINER_CLASS_PKMN_RANGER_1,   0x44
-	.set TRAINER_CLASS_PKMN_RANGER_2,   0x45
-	.set TRAINER_CLASS_MAGMA_LEADER,    0x46
-	.set TRAINER_CLASS_LASS,            0x47
-	.set TRAINER_CLASS_YOUNG_COUPLE,    0x48
-	.set TRAINER_CLASS_OLD_COUPLE,      0x49
-	.set TRAINER_CLASS_SIS_AND_BRO,     0x4a
-	.set TRAINER_CLASS_PKMN_TRAINER_8,  0x4b
-	.set TRAINER_CLASS_SALON_MAIDEN,    0x4c
-	.set TRAINER_CLASS_DOME_ACE,        0x4d
-	.set TRAINER_CLASS_PKMN_TRAINER_9,  0x4e
-	.set TRAINER_CLASS_PKMN_TRAINER_10, 0x4f
-	.set TRAINER_CLASS_PKMN_TRAINER_11, 0x50
-	.set TRAINER_CLASS_PKMN_TRAINER_12, 0x51
-
-	.set TRAINER_CLASS_NAME_PKMN_TRAINER_1, 0x0
-	.set TRAINER_CLASS_NAME_PKMN_TRAINER_2, 0x1
-	.set TRAINER_CLASS_NAME_HIKER,          0x2
-	.set TRAINER_CLASS_NAME_TEAM_AQUA,      0x3
-	.set TRAINER_CLASS_NAME_PKMN_BREEDER,   0x4
-	.set TRAINER_CLASS_NAME_COOLTRAINER_1,  0x5
-	.set TRAINER_CLASS_NAME_BIRD_KEEPER,    0x6
-	.set TRAINER_CLASS_NAME_COLLECTOR,      0x7
-	.set TRAINER_CLASS_NAME_SWIMMER_M,      0x8
-	.set TRAINER_CLASS_NAME_TEAM_MAGMA,     0x9
-	.set TRAINER_CLASS_NAME_EXPERT,         0xa
-	.set TRAINER_CLASS_NAME_AQUA_ADMIN,     0xb
-	.set TRAINER_CLASS_NAME_BLACK_BELT,     0xc
-	.set TRAINER_CLASS_NAME_AQUA_LEADER,    0xd
-	.set TRAINER_CLASS_NAME_HEX_MANIAC,     0xe
-	.set TRAINER_CLASS_NAME_AROMA_LADY,     0xf
-	.set TRAINER_CLASS_NAME_RUIN_MANIAC,    0x10
-	.set TRAINER_CLASS_NAME_INTERVIEWER,    0x11
-	.set TRAINER_CLASS_NAME_TUBER_1,        0x12
-	.set TRAINER_CLASS_NAME_TUBER_2,        0x13
-	.set TRAINER_CLASS_NAME_LADY,           0x14
-	.set TRAINER_CLASS_NAME_BEAUTY,         0x15
-	.set TRAINER_CLASS_NAME_RICH_BOY,       0x16
-	.set TRAINER_CLASS_NAME_POKEMANIAC,     0x17
-	.set TRAINER_CLASS_NAME_GUITARIST,      0x18
-	.set TRAINER_CLASS_NAME_KINDLER,        0x19
-	.set TRAINER_CLASS_NAME_CAMPER,         0x1a
-	.set TRAINER_CLASS_NAME_PICNICKER,      0x1b
-	.set TRAINER_CLASS_NAME_BUG_MANIAC,     0x1c
-	.set TRAINER_CLASS_NAME_PSYCHIC,        0x1d
-	.set TRAINER_CLASS_NAME_GENTLEMAN,      0x1e
-	.set TRAINER_CLASS_NAME_ELITE_FOUR,     0x1f
-	.set TRAINER_CLASS_NAME_LEADER,         0x20
-	.set TRAINER_CLASS_NAME_SCHOOL_KID,     0x21
-	.set TRAINER_CLASS_NAME_SR_AND_JR,      0x22
-	.set TRAINER_CLASS_NAME_WINSTRATE,      0x23
-	.set TRAINER_CLASS_NAME_POKEFAN,        0x24
-	.set TRAINER_CLASS_NAME_YOUNGSTER,      0x25
-	.set TRAINER_CLASS_NAME_CHAMPION,       0x26
-	.set TRAINER_CLASS_NAME_FISHERMAN,      0x27
-	.set TRAINER_CLASS_NAME_TRIATHLETE,     0x28
-	.set TRAINER_CLASS_NAME_DRAGON_TAMER,   0x29
-	.set TRAINER_CLASS_NAME_NINJA_BOY,      0x2a
-	.set TRAINER_CLASS_NAME_BATTLE_GIRL,    0x2b
-	.set TRAINER_CLASS_NAME_PARASOL_LADY,   0x2c
-	.set TRAINER_CLASS_NAME_SWIMMER_F,      0x2d
-	.set TRAINER_CLASS_NAME_TWINS,          0x2e
-	.set TRAINER_CLASS_NAME_SAILOR,         0x2f
-	.set TRAINER_CLASS_NAME_COOLTRAINER_2,  0x30
-	.set TRAINER_CLASS_NAME_MAGMA_ADMIN,    0x31
-	.set TRAINER_CLASS_NAME_PKMN_TRAINER_3, 0x32
-	.set TRAINER_CLASS_NAME_BUG_CATCHER,    0x33
-	.set TRAINER_CLASS_NAME_PKMN_RANGER,    0x34
-	.set TRAINER_CLASS_NAME_MAGMA_LEADER,   0x35
-	.set TRAINER_CLASS_NAME_LASS,           0x36
-	.set TRAINER_CLASS_NAME_YOUNG_COUPLE,   0x37
-	.set TRAINER_CLASS_NAME_OLD_COUPLE,     0x38
-	.set TRAINER_CLASS_NAME_SIS_AND_BRO,    0x39
-	.set TRAINER_CLASS_NAME_SALON_MAIDEN,   0x3a
-	.set TRAINER_CLASS_NAME_DOME_ACE,       0x3b
-	.set TRAINER_CLASS_NAME_PALACE_MAVEN,   0x3c
-	.set TRAINER_CLASS_NAME_ARENA_TYCOON,   0x3d
-	.set TRAINER_CLASS_NAME_FACTORY_HEAD,   0x3e
-	.set TRAINER_CLASS_NAME_PIKE_QUEEN,     0x3f
-	.set TRAINER_CLASS_NAME_PYRAMID_KING,   0x40
-	.set TRAINER_CLASS_NAME_PKMN_TRAINER_4, 0x41

data/data2.s

@@ -1424,27 +1424,16 @@ gUnknown_08309AAC: ; 8309AAC
 	.include "data/graphics/pokemon/mon_front_pic_table.s"
 
 ; 830AF4C
-	.incbin "base_emerald.gba", 0x30af4c, 0x4d88
+	.incbin "base_emerald.gba", 0x30af4c, 0x6e0
+
+; 830B62C
+	.include "data/trainer_parties.s"
 
 ; 830FCD4
 	.include "data/text/trainer_class_names.s"
 
-	.align 2, 0
+; 8310030
-
+	.include "data/trainers.s"
-gUnknown_08310030: ; 8310030
-	.incbin "base_emerald.gba", 0x310030, 0x4
-
-gUnknown_08310034: ; 8310034
-	.incbin "base_emerald.gba", 0x310034, 0xc
-
-gUnknown_08310040: ; 8310040
-	.incbin "base_emerald.gba", 0x310040, 0x7d94
-
-gUnknown_08317DD4: ; 8317DD4
-	.incbin "base_emerald.gba", 0x317dd4, 0x50
-
-gUnknown_08317E24: ; 8317E24
-	.incbin "base_emerald.gba", 0x317e24, 0x7a4
 
 ; 83185C8
 	.include "data/text/species_names.s"