6 files changed, 95 insertions, 28 deletions
diff --git a/text/battle.asm b/text/battle.asm
index afc388a76..42bf2b7c0 100644
--- a/text/battle.asm
+++ b/text/battle.asm
@@ -1,4 +1,4 @@
-BattleText_PlayerPickuedUpPayDayMoney: ; 0x80730
+BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
 	text "<PLAYER> picked up"
 	line "¥@"
 	deciram wPayDayMoney, 3, 6
@@ -474,9 +474,9 @@ BecameConfusedText: ; 0x80d97
 	text "<TARGET>"
 	line "became confused!"
 	prompt
-; 0x80dab
+; ItemHealedConfusion
 
-BattleText_0x80dab: ; 0x80dab
+BattleText_ItemHealedConfusion: ; ItemHealedConfusion
 	text "A @"
 	text_from_ram StringBuffer1
 	text " rid"
diff --git a/text/common_1.asm b/text/common_1.asm
index 8a60a59fe..54cf5f8f1 100644
--- a/text/common_1.asm
+++ b/text/common_1.asm
@@ -500,7 +500,7 @@ UnknownText_0x1bc83a::
 UnknownText_0x1bc84b::
 	text ""
 	line "OAK: @"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	db "@@"
 
 UnknownText_0x1bc858::
@@ -1080,7 +1080,7 @@ Text_EnemyWithdrew::
 Text_EnemyUsedOn::
 	text "<ENEMY>"
 	line "used @"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text ""
 	cont "on @"
 	text_from_ram EnemyMonNick
@@ -1329,7 +1329,7 @@ UnknownText_0x1bd407::
 UnknownText_0x1bd429::
 	text "<PLAYER> traded"
 	line "@"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text " for"
 	cont "@"
 	text_from_ram StringBuffer2
@@ -1423,14 +1423,14 @@ UnknownText_0x1bd5cc::
 
 UnknownText_0x1bd5f4::
 	text "Hi! The @"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text ""
 	line "you traded me is"
 	cont "doing great!"
 	done
 
 UnknownText_0x1bd621::
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text "'s cute,"
 	line "but I don't have"
 
@@ -1464,7 +1464,7 @@ UnknownText_0x1bd6cd::
 	text "Wow! Thank you!"
 	line "I always wanted"
 	cont "@"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text "!"
 	done
 
@@ -1476,7 +1476,7 @@ UnknownText_0x1bd6f5::
 	cont "traded you doing?"
 
 	para "Your @"
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text "'s"
 	line "so cute!"
 	done
diff --git a/text/common_2.asm b/text/common_2.asm
index 9a512ffdb..060070dea 100644
--- a/text/common_2.asm
+++ b/text/common_2.asm
@@ -247,7 +247,7 @@ UnknownText_0x1c04fa::
 	text_from_ram StringBuffer1
 	text ""
 	cont "to @"
-	text_from_ram wc950 + 3
+	text_from_ram wMysteryGiftPlayerName
 	text "'s home."
 	prompt
 
@@ -307,9 +307,3 @@ UnknownText_0x1c0609::
 	line "lights the area!@"
 	text_waitbutton
 	db "@@"
-
-_UsedSurfText::
-	text_from_ram StringBuffer2
-	text " used"
-	line "SURF!"
-	done
diff --git a/text/common_3.asm b/text/common_3.asm
index 8880d482f..6f42c0bc3 100644
--- a/text/common_3.asm
+++ b/text/common_3.asm
@@ -1,3 +1,9 @@
+_UsedSurfText::
+	text_from_ram StringBuffer2
+	text " used"
+	line "SURF!"
+	done
+
 _CantSurfText::
 	text "You can't SURF"
 	line "here."
@@ -1059,7 +1065,7 @@ UnknownText_0x1c1b03::
 
 UnknownText_0x1c1b2c::
 	text "Took @"
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text "'s"
 	line "@"
 	text_from_ram StringBuffer1
@@ -1073,7 +1079,7 @@ UnknownText_0x1c1b2c::
 
 UnknownText_0x1c1b57::
 	text "Made @"
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text ""
 	line "hold @"
 	text_from_ram StringBuffer2
@@ -1086,7 +1092,7 @@ UnknownText_0x1c1b6f::
 	prompt
 
 UnknownText_0x1c1b8e::
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text " isn't"
 	line "holding anything."
 	prompt
@@ -1101,12 +1107,12 @@ UnknownText_0x1c1bc4::
 	text_from_ram StringBuffer1
 	text ""
 	line "from @"
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text "."
 	prompt
 
 UnknownText_0x1c1bdc::
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text " is"
 	line "already holding"
 
diff --git a/text/common_5.asm b/text/common_5.asm
index 926160662..ee9d32a8b 100644
--- a/text/common_5.asm
+++ b/text/common_5.asm
@@ -230,7 +230,7 @@ UnknownText_0x1c564a::
 	done
 
 UnknownText_0x1c5660::
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text " learned"
 	line "@"
 	text_from_ram StringBuffer2
@@ -252,7 +252,7 @@ UnknownText_0x1c5699::
 	done
 
 UnknownText_0x1c56af::
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text ""
 	line "did not learn"
 	cont "@"
@@ -261,7 +261,7 @@ UnknownText_0x1c56af::
 	prompt
 
 UnknownText_0x1c56c9::
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text " is"
 	line "trying to learn"
 	cont "@"
@@ -269,7 +269,7 @@ UnknownText_0x1c56c9::
 	text "."
 
 	para "But @"
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text ""
 	line "can't learn more"
 	cont "than four moves."
@@ -291,7 +291,7 @@ UnknownText_0x1c574e::
 	interpret_data
 	text ""
 	para "@"
-	text_from_ram wd050_MonNick
+	text_from_ram wMonOrItemNameBuffer
 	text " forgot"
 	line "@"
 	text_from_ram StringBuffer1
@@ -505,7 +505,7 @@ Text_Waitbutton_2::
 	db "@@"
 
 UnknownText_0x1c5b38::
-	text_from_ram wd050
+	text_from_ram wMonOrItemNameBuffer
 	text " was"
 	line "sent to BILL's PC."
 	prompt
diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm
new file mode 100755
index 000000000..daa7e08a9
--- /dev/null
+++ b/text/trainer_class_names.asm
@@ -0,0 +1,67 @@
+	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@"
+\ No newline at end of file