Merge remote-tracking branch 'origin/master' into master

4 files changed, 98 insertions, 67 deletions

diff --git a/text/common_text.asm b/text/common_text.asm
index c4891ab15..d21685480 100644
--- a/text/common_text.asm
+++ b/text/common_text.asm
@@ -1,12 +1,18 @@
 INCLUDE "includes.asm"
 
+
 SECTION "Text 1", ROMX
+
 INCLUDE "text/common_1.asm"
 
+
 SECTION "Text 2", ROMX
+
 INCLUDE "text/common_2.asm"
 INCLUDE "text/common_3.asm"
 
+
 SECTION "Text 3", ROMX
+
 INCLUDE "text/common_4.asm"
 INCLUDE "text/common_5.asm"
diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm
deleted file mode 100755
index 555e6c652..000000000
--- a/text/trainer_class_names.asm
+++ /dev/null
@@ -1,67 +0,0 @@
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "RIVAL@"
-	db "#MON PROF.@"
-	db "ELITE FOUR@"
-	db "<PKMN> TRAINER@"
-	db "ELITE FOUR@"
-	db "ELITE FOUR@"
-	db "ELITE FOUR@"
-	db "CHAMPION@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "SCIENTIST@"
-	db "LEADER@"
-	db "YOUNGSTER@"
-	db "SCHOOLBOY@"
-	db "BIRD KEEPER@"
-	db "LASS@"
-	db "LEADER@"
-	db "COOLTRAINER@"
-	db "COOLTRAINER@"
-	db "BEAUTY@"
-	db "#MANIAC@"
-	db "ROCKET@"
-	db "GENTLEMAN@"
-	db "SKIER@"
-	db "TEACHER@"
-	db "LEADER@"
-	db "BUG CATCHER@"
-	db "FISHER@"
-	db "SWIMMER♂@"
-	db "SWIMMER♀@"
-	db "SAILOR@"
-	db "SUPER NERD@"
-	db "RIVAL@"
-	db "GUITARIST@"
-	db "HIKER@"
-	db "BIKER@"
-	db "LEADER@"
-	db "BURGLAR@"
-	db "FIREBREATHER@"
-	db "JUGGLER@"
-	db "BLACKBELT@"
-	db "ROCKET@"
-	db "PSYCHIC@"
-	db "PICNICKER@"
-	db "CAMPER@"
-	db "ROCKET@"
-	db "SAGE@"
-	db "MEDIUM@"
-	db "BOARDER@"
-	db "#FAN@"
-	db "KIMONO GIRL@"
-	db "TWINS@"
-	db "#FAN@"
-	db "<PKMN> TRAINER@"
-	db "LEADER@"
-	db "OFFICER@"
-	db "ROCKET@"
-	db "MYSTICALMAN@"
diff --git a/text/unused_gen_1_trainers.asm b/text/unused_gen_1_trainers.asm
new file mode 100644
index 000000000..9a637d6a2
--- /dev/null
+++ b/text/unused_gen_1_trainers.asm
@@ -0,0 +1,92 @@
+GetGen1TrainerClassName: ; 50a28
+; XXX
+	ld hl, .Strings
+	ld a, [TrainerClass]
+	dec a
+	ld c, a
+	ld b, 0
+	add hl, bc
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld de, StringBuffer1
+.copy
+	ld a, [hli]
+	ld [de], a
+	inc de
+	cp "@"
+	jr nz, .copy
+	ret
+
+.Strings: ; 50a42
+; Untranslated trainer class names from Red.
+	dw .Youngster
+	dw .BugCatcher
+	dw .Lass
+	dw OTClassName
+	dw .JrTrainerM
+	dw .JrTrainerF
+	dw .Pokemaniac
+	dw .SuperNerd
+	dw OTClassName
+	dw OTClassName
+	dw .Burglar
+	dw .Engineer
+	dw .Jack
+	dw OTClassName
+	dw .Swimmer
+	dw OTClassName
+	dw OTClassName
+	dw .Beauty
+	dw OTClassName
+	dw .Rocker
+	dw .Juggler
+	dw OTClassName
+	dw OTClassName
+	dw .Blackbelt
+	dw OTClassName
+	dw .ProfOak
+	dw .Chief
+	dw .Scientist
+	dw OTClassName
+	dw .Rocket
+	dw .CooltrainerM
+	dw .CooltrainerF
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+	dw OTClassName
+
+.Youngster:    db "たんパン@"
+.BugCatcher:   db "むしとり@"
+.Lass:         db "ミニスカ@"
+.JrTrainerM:   db "ボーイ@"
+.JrTrainerF:   db "ガール@"
+.Pokemaniac:   db "マニア@"
+.SuperNerd:    db "りかけい@"
+.Burglar:      db "どろぼう@"
+.Engineer:     db "ォヤジ@"
+.Jack:         db "ジャック@"
+.Swimmer:      db "かいパン@"
+.Beauty:       db "おねえさん@"
+.Rocker:       db "グループ@"
+.Juggler:      db "ジャグラー@"
+.Blackbelt:    db "からて@"
+.ProfOak:      db "ォーキド@"
+.Chief:        db "チーフ@"
+.Scientist:    db "けんきゅういん@"
+.Rocket:       db "だんいん@"
+.CooltrainerM: db "エりート♂@"
+.CooltrainerF: db "エりート♀@"
diff --git a/text/sweethoney.asm b/text/unused_sweet_honey.asm
index 9bfa4f6b1..9bfa4f6b1 100644
--- a/text/sweethoney.asm
+++ b/text/unused_sweet_honey.asm