Extra trainer classes, new bold P

I changed the P image to match the font used in the prototype assets.

Also, because Yujirou has a pic all alone in that one bank, I added the other 4 beta trainer classes that never got used. They're all ready to be used, just need teams and a place to go, but I want to address trainer line-ups last code-wise.

data/trainers/ai_pointers.asm

@@ -16,7 +16,6 @@ TrainerAIPointers:
 	dbw 3, GenericAI
 	dbw 3, GenericAI
 	dbw 3, GenericAI
-	dbw 3, JugglerAI ; unused_juggler
 	dbw 3, GenericAI
 	dbw 3, GenericAI
 	dbw 3, GenericAI
@@ -51,4 +50,9 @@ TrainerAIPointers:
 	dbw 3, GenericAI
 	dbw 2, AgathaAI ; agatha
 	dbw 1, LanceAI ; lance
+	dbw 3, GenericAI ; Yujirou
+	dbw 3, GenericAI ; Student
+	dbw 3, GenericAI ; Firefighter
+	dbw 3, GenericAI ; Junior
+	dbw 2, BlackbeltAI ; Jack
 	assert_table_length NUM_TRAINERS

data/trainers/move_choices.asm

@@ -21,7 +21,6 @@ TrainerClassMoveChoiceModifications:
 	move_choices 1       ; BIKER
 	move_choices 1, 3    ; BURGLAR
 	move_choices 1       ; ENGINEER
-	move_choices 1, 3,   ; UNUSED_JUGGLER
 	move_choices 1, 3    ; FISHER
 	move_choices 1, 3    ; SWIMMER
 	move_choices         ; CUE_BALL
@@ -56,4 +55,9 @@ TrainerClassMoveChoiceModifications:
 	move_choices 1       ; CHANNELER
 	move_choices 1       ; AGATHA
 	move_choices 1, 3    ; LANCE
+	move_choices 1, 3,   ; YUJIROU, was UNUSED_JUGGLER
+	move_choices 1, 3,   ; STUDENT
+	move_choices 1, 3,   ; FIREFIGHTER
+	move_choices 1, 3,   ; JUNIOR
+	move_choices 1, 3,   ; JACK
 	assert_list_length NUM_TRAINERS

data/trainers/names.asm

@@ -46,3 +46,7 @@ TrainerNames::
 	db "AGATHA@"
 	db "LANCE@"
 	db "YUJIROU@"
+	db "STUDENT@"
+	db "FIREFIGHTER@"
+	db "JUNIOR@"
+	db "JACK@"

data/trainers/parties.asm

@@ -46,6 +46,10 @@ TrainerDataPointers:
 	dw AgathaData
 	dw LanceData
 	dw YujirouData ; was unused juggler
+	dw StudentData
+	dw FirefighterData
+	dw JuniorData
+	dw JackData
 
 ; if first byte != $FF, then
 	; first byte is level (of all pokemon on this team)
@@ -858,3 +862,11 @@ YujirouData: ; was unused juggler
 	db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
 ; post-game rematch team (currently unused)
 	db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
+
+StudentData:
+
+FirefighterData:
+
+JuniorData:
+
+JackData:

data/trainers/pic_pointers_money.asm

@@ -20,7 +20,7 @@ TrainerPicAndMoneyPointers::
 	pic_money BurglarPic,      9000
 	pic_money EngineerPic,     5000
 	pic_money FisherPic,       3500
-	pic_money SwimmerPic,       500
+	pic_money SwimmerPic,      1500
 	pic_money CueBallPic,      2500
 	pic_money GamblerPic,      7000
 	pic_money BeautyPic,       7000
@@ -54,4 +54,8 @@ TrainerPicAndMoneyPointers::
 	pic_money AgathaPic,       9900
 	pic_money LancePic,        9900
 	pic_money YujirouPic,      9900 ; was unused juggler
+	pic_money StudentPic,      1000
+	pic_money FirefighterPic,  1500
+	pic_money JuniorPic,       1000
+	pic_money JackPic,         5000
 	assert_table_length NUM_TRAINERS