Merge pull request #783 from tustin2121/tustin2121-patch-3

Replace {STRING 5} with {KUN}

data/event_scripts.s

@@ -2556,7 +2556,7 @@ gUnknown_08272A3F:: @ 8272A3F
 	.string "Please come again!$"
 
 gUnknown_08272A52:: @ 8272A52
-	.string "{PLAYER}{STRING 5}, welcome!\pWhat can I do for you?$"
+	.string "{PLAYER}{KUN}, welcome!\pWhat can I do for you?$"
 
 gUnknown_08272A78:: @ 8272A78
 	.string "Obtained the {STR_VAR_2}!$"

data/scripts/apprentice.inc

@@ -553,7 +553,7 @@ gText_082B7D18:: @ 82B7D18
 	.string "time with someone like me.$"
 
 gText_082B7DD4:: @ 82B7DD4
-	.string "Oh! You're {PLAYER}{STRING 5}, aren't you?\p"
+	.string "Oh! You're {PLAYER}{KUN}, aren't you?\p"
 	.string "I've heard that you're tough at\n"
 	.string "POKéMON!\p"
 	.string "I'm {STR_VAR_1}!\n"
@@ -576,19 +576,19 @@ gText_082B7F35:: @ 82B7F35
 	.string "You know that the BATTLE TOWER has\n"
 	.string "Level 50 and Open Level Rooms?\p"
 	.string "Which do you think would be good\n"
-	.string "for me, {PLAYER}{STRING 5}?$"
+	.string "for me, {PLAYER}{KUN}?$"
 
 gText_082B7FE8:: @ 82B7FE8
 	.string "Okay, {STR_VAR_1} is suitable for me?\n"
 	.string "Thank you!\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
 gText_082B8087:: @ 82B8087
-	.string "Oh, hi, there! {PLAYER}{STRING 5}!\n"
+	.string "Oh, hi, there! {PLAYER}{KUN}!\n"
 	.string "I know you because you're famous!\l"
 	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
 	.string "I'm a TRIATHLETE, so I keep myself\n"
@@ -599,13 +599,13 @@ gText_082B8087:: @ 82B8087
 	.string "me to become a decent TRAINER.\p"
 	.string "So, I have a proposition!\p"
 	.string "There must be a reason why we met.\n"
-	.string "So, {PLAYER}{STRING 5}, how about sharing your\l"
+	.string "So, {PLAYER}{KUN}, how about sharing your\l"
 	.string "wisdom with me every so often?$"
 
 gText_082B822B:: @ 82B822B
 	.string "Oh, but, please?\n"
 	.string "A guy like me needs someone like\l"
-	.string "you, {PLAYER}{STRING 5}!\p"
+	.string "you, {PLAYER}{KUN}!\p"
 	.string "Honestly, I need your advice!$"
 
 gText_082B8286:: @ 82B8286
@@ -741,15 +741,15 @@ gText_082B8C20:: @ 82B8C20
 
 gText_082B8CAA:: @ 82B8CAA
 	.string "Whoa! Could you be…\n"
-	.string "Might you be… {PLAYER}{STRING 5}?!\l"
+	.string "Might you be… {PLAYER}{KUN}?!\l"
 	.string "That strong and famous TRAINER?\l"
 	.string "Well, hello, aren't I just the luckiest!\p"
 	.string "Hello, the name's {STR_VAR_1}!\p"
 	.string "I've been on the lookout for\n"
 	.string "a POKéMON teacher.\p"
 	.string "And with impeccably good timing,\n"
-	.string "along came you, {PLAYER}{STRING 5}!\p"
+	.string "along came you, {PLAYER}{KUN}!\p"
-	.string "So, there you have it, {PLAYER}{STRING 5}!\n"
+	.string "So, there you have it, {PLAYER}{KUN}!\n"
 	.string "Let me apprentice under you!$"
 
 gText_082B8DD3:: @ 82B8DD3
@@ -774,7 +774,7 @@ gText_082B8ED5:: @ 82B8ED5
 	.string "Adios!$"
 
 gText_082B8F45:: @ 82B8F45
-	.string "Oh, hey, {PLAYER}{STRING 5}, right?\n"
+	.string "Oh, hey, {PLAYER}{KUN}, right?\n"
 	.string "The police were looking for you!\p"
 	.string "… … …\n"
 	.string "Of course I'm lying!\p"
@@ -822,7 +822,7 @@ gText_082B929C:: @ 82B929C
 	.string "Your turn now, tell me a little about\n"
 	.string "yourself, give it a try!\p"
 	.string "Uh-huh, uh-huh!\n"
-	.string "{PLAYER}{STRING 5}'s your name,\l"
+	.string "{PLAYER}{KUN}'s your name,\l"
 	.string "and POKéMON's your game!\p"
 	.string "And you're at a delicate age\n"
 	.string "when all the world's your stage!\p"
@@ -901,7 +901,7 @@ gText_082B992D:: @ 82B992D
 	.string "not built to take the abuse…\p"
 	.string "I decided I'll battle POKéMON and\n"
 	.string "toughen myself up.\p"
-	.string "You're {PLAYER}{STRING 5}, aren't you?\n"
+	.string "You're {PLAYER}{KUN}, aren't you?\n"
 	.string "The POKéMON LEAGUE CHAMP?\p"
 	.string "Listen, can I get you to give me\n"
 	.string "advice?$"
@@ -927,7 +927,7 @@ gText_082B9B76:: @ 82B9B76
 
 gText_082B9BF2:: @ 82B9BF2
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
+	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
 	.string "You're making me all self-conscious.\p"
 	.string "I… I'm {STR_VAR_1}.\p"
@@ -935,7 +935,7 @@ gText_082B9BF2:: @ 82B9BF2
 	.string "but I explore ancient ruins and such.\p"
 	.string "I'm even more embarrassed to admit\n"
 	.string "I'm interested in the BATTLE FRONTIER.\p"
-	.string "{PLAYER}{STRING 5}, you have a reputation as\n"
+	.string "{PLAYER}{KUN}, you have a reputation as\n"
 	.string "a tough TRAINER…\p"
 	.string "It's hard for me to say this,\n"
 	.string "but I want to ask something.\p"
@@ -962,18 +962,18 @@ gText_082B9EAA:: @ 82B9EAA
 	.string "I'll try my hand at that.\p"
 	.string "I hope I can make a valiant challenge\n"
 	.string "without getting all flustered…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
 gText_082B9F55:: @ 82B9F55
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "You may call me {STR_VAR_1}.\p"
 	.string "I have been toying with the idea of\n"
 	.string "apprenticing under a strong TRAINER.\p"
 	.string "So, I must say I'm lucky you came along!\n"
-	.string "…You really are {PLAYER}{STRING 5}, yes?\p"
+	.string "…You really are {PLAYER}{KUN}, yes?\p"
 	.string "No, no, if you are real, it's fine.\n"
 	.string "I merely want you to recognize me\l"
 	.string "as your apprentice.$"
@@ -1130,7 +1130,7 @@ gText_082BAA81:: @ 82BAA81
 	.string "my {STR_VAR_2} hold anything?$"
 
 gText_082BAB22:: @ 82BAB22
-	.string "Oh, {PLAYER}{STRING 5}.\n"
+	.string "Oh, {PLAYER}{KUN}.\n"
 	.string "There's something I wanted to ask you.\p"
 	.string "You know how you decided which\n"
 	.string "POKéMON I should have for me?\p"
@@ -1148,7 +1148,7 @@ gText_082BAC43:: @ 82BAC43
 gText_082BAC78:: @ 82BAC78
 	.string "If you think that's best, I'll do that.\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
@@ -1157,7 +1157,7 @@ gText_082BAD17:: @ 82BAD17
 	.string "The item {STR_VAR_1}, huh?\n"
 	.string "Not bad. I'll use it!\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
@@ -1170,7 +1170,7 @@ gText_082BADB6:: @ 82BADB6
 	.string "do the best it can empty-handed?$"
 
 gText_082BAE36:: @ 82BAE36
-	.string "Yo, {PLAYER}{STRING 5}!\p"
+	.string "Yo, {PLAYER}{KUN}!\p"
 	.string "We're both busy, but we seem to run\n"
 	.string "into each other often anyway!\p"
 	.string "Today I have to do some walking,\n"
@@ -1315,7 +1315,7 @@ gText_082BB84A:: @ 82BB84A
 
 gText_082BB8CD:: @ 82BB8CD
 	.string "Hola!\n"
-	.string "My maestro, {PLAYER}{STRING 5}!\p"
+	.string "My maestro, {PLAYER}{KUN}!\p"
 	.string "I want to hit you up for advice on\n"
 	.string "POKéMON tools.\p"
 	.string "What do you think would be good for\n"
@@ -1348,7 +1348,7 @@ gText_082BBA6C:: @ 82BBA6C
 	.string "can win without holding any item?$"
 
 gText_082BBB01:: @ 82BBB01
-	.string "{PLAYER}{STRING 5}, something unbelievable\n"
+	.string "{PLAYER}{KUN}, something unbelievable\n"
 	.string "has happened!\p"
 	.string "I woke up this morning, and my POKéMON\n"
 	.string "had 10 NUGGETS!\p"
@@ -1465,14 +1465,14 @@ gText_082BC373:: @ 82BC373
 	.string "Doesn't need to hold anything?$"
 
 gText_082BC40E:: @ 82BC40E
-	.string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm's broken!\n"
+	.string "Gwah! Ouch! {PLAYER}{KUN}, my arm's broken!\n"
 	.string "Don't touch it, please!\p"
 	.string "I must've broken it while I was trying\n"
 	.string "out different hold items with my posse\l"
 	.string "of POKéMON.\p"
 	.string "So, things being this way,\n"
 	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, what do you think would be\n"
+	.string "{PLAYER}{KUN}, what do you think would be\n"
 	.string "good for my {STR_VAR_1} to hold?$"
 
 gText_082BC514:: @ 82BC514
@@ -1504,14 +1504,14 @@ gText_082BC666:: @ 82BC666
 
 gText_082BC714:: @ 82BC714
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…\p"
+	.string "{PLAYER}{KUN}…\p"
 	.string "Please, don't look at me that way.\n"
 	.string "My POKéMON don't have anything.\p"
 	.string "I… I'm really embarrassed about this,\n"
 	.string "but I really need your advice.\p"
 	.string "I can't decide what hold item would\n"
 	.string "make my {STR_VAR_1} strong.\p"
-	.string "{PLAYER}{STRING 5}, what do you think would\n"
+	.string "{PLAYER}{KUN}, what do you think would\n"
 	.string "be good?$"
 
 gText_082BC808:: @ 82BC808
@@ -1523,7 +1523,7 @@ gText_082BC84D:: @ 82BC84D
 	.string "I'll go without an item.\p"
 	.string "This is nerve-racking, though.\n"
 	.string "Wouldn't it be too cool?\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
@@ -1532,7 +1532,7 @@ gText_082BC8EA:: @ 82BC8EA
 	.string "I'll go with that {STR_VAR_1}.\p"
 	.string "This is nerve-racking, though.\n"
 	.string "Wouldn't it be too cool?\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
@@ -1545,7 +1545,7 @@ gText_082BC984:: @ 82BC984
 	.string "my {STR_VAR_2} didn't have an item?$"
 
 gText_082BCA4D:: @ 82BCA4D
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps you're a twin?\p"
 	.string "Oh, no, no, no, don't worry!\n"
@@ -1647,7 +1647,7 @@ gText_082BD18A:: @ 82BD18A
 	.string "speak with me… Thank you!$"
 
 gText_082BD222:: @ 82BD222
-	.string "Oh, {PLAYER}{STRING 5}! It's me!\n"
+	.string "Oh, {PLAYER}{KUN}! It's me!\n"
 	.string "I'm so glad to see you because I have\l"
 	.string "this little problem.\p"
 	.string "I can't decide how my POKéMON should\n"
@@ -1660,13 +1660,13 @@ gText_082BD222:: @ 82BD222
 gText_082BD325:: @ 82BD325
 	.string "My {STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
 gText_082BD3B1:: @ 82BD3B1
-	.string "Hi, my teacher {PLAYER}{STRING 5}!\n"
+	.string "Hi, my teacher {PLAYER}{KUN}!\n"
 	.string "I'm busy again today!\p"
 	.string "I have to do some cycling, shopping,\n"
 	.string "and humming.\p"
@@ -1740,13 +1740,13 @@ gText_082BD8F5:: @ 82BD8F5
 
 gText_082BD9BE:: @ 82BD9BE
 	.string "Hello, hello!\n"
-	.string "My mentor, {PLAYER}{STRING 5}!\l"
+	.string "My mentor, {PLAYER}{KUN}!\l"
 	.string "Hit me with your sage advice today!\p"
 	.string "You see, I pulled together a team of\n"
 	.string "three POKéMON. So far so good.\p"
 	.string "But the team's battling order's not\n"
 	.string "settled yet.\p"
-	.string "This is where you come in, {PLAYER}{STRING 5}!\n"
+	.string "This is where you come in, {PLAYER}{KUN}!\n"
 	.string "You decide which POKéMON leads off!\p"
 	.string "Don't be shy now.\n"
 	.string "Let's blurt it out!$"
@@ -1759,7 +1759,7 @@ gText_082BDAE1:: @ 82BDAE1
 	.string "Adios!$"
 
 gText_082BDB4E:: @ 82BDB4E
-	.string "{PLAYER}{STRING 5}, listen!\n"
+	.string "{PLAYER}{KUN}, listen!\n"
 	.string "It's a crisis!\p"
 	.string "My POKéMON, all three of them, go into\n"
 	.string "battle at once!\p"
@@ -1815,7 +1815,7 @@ gText_082BDF4D:: @ 82BDF4D
 	.string "See you again, my smart friend!$"
 
 gText_082BDFD8:: @ 82BDFD8
-	.string "…Oof…ooch… {PLAYER}{STRING 5}…\n"
+	.string "…Oof…ooch… {PLAYER}{KUN}…\n"
 	.string "My stomach's hurting all of a sudden…\p"
 	.string "…It's getting better now…\p"
 	.string "I must've worried myself sick racking\n"
@@ -1823,7 +1823,7 @@ gText_082BDFD8:: @ 82BDFD8
 	.string "my posse of POKéMON.\p"
 	.string "So, things being this way,\n"
 	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, which of my POKéMON should\n"
+	.string "{PLAYER}{KUN}, which of my POKéMON should\n"
 	.string "go first? So I'd win, I mean.$"
 
 gText_082BE0FD:: @ 82BE0FD
@@ -1836,7 +1836,7 @@ gText_082BE0FD:: @ 82BE0FD
 
 gText_082BE189:: @ 82BE189
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}?\p"
+	.string "{PLAYER}{KUN}?\p"
 	.string "Please, don't look at me that way.\n"
 	.string "You're making me feel all flustered.\p"
 	.string "Um…\n"
@@ -1852,12 +1852,12 @@ gText_082BE2A5:: @ 82BE2A5
 	.string "I'll lead with my {STR_VAR_1}.\p"
 	.string "I hope I can do my best without\n"
 	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
 gText_082BE33E:: @ 82BE33E
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps you're a clever look-alike?\p"
 	.string "Oh, no, no, no, don't worry!\n"
@@ -1949,7 +1949,7 @@ gText_082BE99C:: @ 82BE99C
 	.string "Thank you!$"
 
 gText_082BEA1B:: @ 82BEA1B
-	.string "Oh, {PLAYER}{STRING 5}! I'm so glad to see you!\n"
+	.string "Oh, {PLAYER}{KUN}! I'm so glad to see you!\n"
 	.string "I was about to go looking for you!\p"
 	.string "Can you decide what kind of POKéMON\n"
 	.string "I should use?\p"
@@ -1962,20 +1962,20 @@ gText_082BEA1B:: @ 82BEA1B
 gText_082BEAE9:: @ 82BEAE9
 	.string "{STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
 gText_082BEB72:: @ 82BEB72
-	.string "If it isn't {PLAYER}{STRING 5}! How's it going?\n"
+	.string "If it isn't {PLAYER}{KUN}! How's it going?\n"
 	.string "I'm busy again as always!\p"
 	.string "I want to do good with POKéMON, too,\n"
 	.string "but I haven't been able to decide\l"
 	.string "which POKéMON I should use.\p"
 	.string "You know how {STR_VAR_1} look strong?\n"
 	.string "But {STR_VAR_2} are tough to ignore.\p"
-	.string "{PLAYER}{STRING 5}, give me some of your good\n"
+	.string "{PLAYER}{KUN}, give me some of your good\n"
 	.string "advice! Which one'd be good for me?$"
 
 gText_082BEC8E:: @ 82BEC8E
@@ -2046,7 +2046,7 @@ gText_082BF11D:: @ 82BF11D
 
 gText_082BF1A8:: @ 82BF1A8
 	.string "Hey, hey!\n"
-	.string "My mentor, {PLAYER}{STRING 5}!\p"
+	.string "My mentor, {PLAYER}{KUN}!\p"
 	.string "Hello, I've been looking for you\n"
 	.string "for some more of your sage advice!\p"
 	.string "Which kind of POKéMON would be right\n"
@@ -2062,7 +2062,7 @@ gText_082BF268:: @ 82BF268
 	.string "Adios!$"
 
 gText_082BF2D1:: @ 82BF2D1
-	.string "{PLAYER}{STRING 5}, listen! Big news!\n"
+	.string "{PLAYER}{KUN}, listen! Big news!\n"
 	.string "I caught a mirage POKéMON!\p"
 	.string "Of course I'm lying!\n"
 	.string "Wahahaha!\p"
@@ -2120,13 +2120,13 @@ gText_082BF6E5:: @ 82BF6E5
 	.string "See you again, my smart friend!$"
 
 gText_082BF773:: @ 82BF773
-	.string "Oh, hi, {PLAYER}{STRING 5}…\n"
+	.string "Oh, hi, {PLAYER}{KUN}…\n"
 	.string "I have this horrible headache…\p"
 	.string "I must've worried too much about\n"
 	.string "the kind of POKéMON I should raise.\p"
 	.string "So, things being this way,\n"
 	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
+	.string "{PLAYER}{KUN}, if I had to choose between\n"
 	.string "the POKéMON {STR_VAR_1} and\l"
 	.string "{STR_VAR_2}, which should it be?$"
 
@@ -2138,7 +2138,7 @@ gText_082BF869:: @ 82BF869
 
 gText_082BF8DD:: @ 82BF8DD
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
+	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
 	.string "I'm getting all flustered…\l"
 	.string "I… I need your advice.\p"
@@ -2152,12 +2152,12 @@ gText_082BF9BA:: @ 82BF9BA
 	.string "I'll do my best with one {STR_VAR_1}.\p"
 	.string "I hope I can do my best without\n"
 	.string "getting all flustered.\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
 gText_082BFA5A:: @ 82BFA5A
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "No, no, if you are real, it's fine.\n"
 	.string "Incidentally, I would like to obtain\l"
@@ -2250,7 +2250,7 @@ gText_082C0032:: @ 82C0032
 	.string "Thank you!$"
 
 gText_082C0090:: @ 82C0090
-	.string "Oh, {PLAYER}{STRING 5}!\n"
+	.string "Oh, {PLAYER}{KUN}!\n"
 	.string "I was just hoping to see you, too!\p"
 	.string "I was wondering what move would\n"
 	.string "be suitable for my {STR_VAR_1}.\p"
@@ -2263,14 +2263,14 @@ gText_082C0090:: @ 82C0090
 gText_082C016E:: @ 82C016E
 	.string "{STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
-	.string "{PLAYER}{STRING 5}, I won't be so upset if\l"
+	.string "{PLAYER}{KUN}, I won't be so upset if\l"
 	.string "I lose.\p"
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
 gText_082C01F7:: @ 82C01F7
 	.string "How could things be this busy?\n"
-	.string "Hey, if it isn't {PLAYER}{STRING 5}!\l"
+	.string "Hey, if it isn't {PLAYER}{KUN}!\l"
 	.string "How's it going?\p"
 	.string "Since I got up this morning, I've done\n"
 	.string "my jogging, swimming, and cooking!\p"
@@ -2279,7 +2279,7 @@ gText_082C01F7:: @ 82C01F7
 	.string "my {STR_VAR_1} should learn!\p"
 	.string "{STR_VAR_2} looks good, huh?\n"
 	.string "But {STR_VAR_3}'s also decent.\p"
-	.string "{PLAYER}{STRING 5}, give me some of your good\n"
+	.string "{PLAYER}{KUN}, give me some of your good\n"
 	.string "advice! Which move'd be good for me?$"
 
 gText_082C034C:: @ 82C034C
@@ -2344,7 +2344,7 @@ gText_082C06D8:: @ 82C06D8
 	.string "some more another time.$"
 
 gText_082C074A:: @ 82C074A
-	.string "Hola, {PLAYER}{STRING 5}, bueno!\n"
+	.string "Hola, {PLAYER}{KUN}, bueno!\n"
 	.string "I'm hoping for some more of\l"
 	.string "your sage advice today!\p"
 	.string "What would be the best move for\n"
@@ -2362,7 +2362,7 @@ gText_082C0809:: @ 82C0809
 	.string "Adios!$"
 
 gText_082C086E:: @ 82C086E
-	.string "{PLAYER}{STRING 5}, it's completely wild!\p"
+	.string "{PLAYER}{KUN}, it's completely wild!\p"
 	.string "My POKéMON!\n"
 	.string "It learned six moves!\p"
 	.string "Of course I'm lying!\n"
@@ -2420,13 +2420,13 @@ gText_082C0C7D:: @ 82C0C7D
 	.string "See you again, my smart friend!$"
 
 gText_082C0D0B:: @ 82C0D0B
-	.string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n"
+	.string "Gahack! Gaah! Oh, {PLAYER}{KUN}…\n"
 	.string "I have this lousy cold, I do…\p"
 	.string "I want to pick a move for my POKéMON,\n"
 	.string "but I'm not up to it…\p"
 	.string "So, things being this way,\n"
 	.string "I need you to decide for me.\p"
-	.string "{PLAYER}{STRING 5}, if I had to choose between\n"
+	.string "{PLAYER}{KUN}, if I had to choose between\n"
 	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
 	.string "my {STR_VAR_1}, which would it be?$"
 
@@ -2438,7 +2438,7 @@ gText_082C0DFE:: @ 82C0DFE
 
 gText_082C0E71:: @ 82C0E71
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…?\p"
+	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
 	.string "I'm getting all flustered…\l"
 	.string "I… I need your advice.\p"
@@ -2454,12 +2454,12 @@ gText_082C0F6D:: @ 82C0F6D
 	.string "I'll try that {STR_VAR_1}.\p"
 	.string "I hope I can teach that move…\n"
 	.string "This is so nerve-racking…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
 gText_082C1003:: @ 82C1003
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "Perhaps you're one of those popular\n"
 	.string "mimics?\p"
@@ -2569,7 +2569,7 @@ gText_082C174F:: @ 82C174F
 	.string "somewhere again!$"
 
 gText_082C1862:: @ 82C1862
-	.string "Oh, {PLAYER}{STRING 5}.\n"
+	.string "Oh, {PLAYER}{KUN}.\n"
 	.string "There's something I want you to hear.\p"
 	.string "I know that I don't always sound\n"
 	.string "nice or polite…\p"
@@ -2595,7 +2595,7 @@ gText_082C19A0:: @ 82C19A0
 
 gText_082C1A76:: @ 82C1A76
 	.string "Oh, I can't get over how busy I am!\n"
-	.string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p"
+	.string "Oh, hey, I was looking for you, {PLAYER}{KUN}.\p"
 	.string "Are you well as usual?\n"
 	.string "Things haven't changed for me at all.\p"
 	.string "I've got running, fighting, and mapping\n"
@@ -2605,7 +2605,7 @@ gText_082C1A76:: @ 82C1A76
 	.string "from a win without saying a word.\p"
 	.string "So, what would be a cool saying to\n"
 	.string "underline my coolness when I'm done\l"
-	.string "and walking away? {PLAYER}{STRING 5}, help me!$"
+	.string "and walking away? {PLAYER}{KUN}, help me!$"
 
 gText_082C1C16:: @ 82C1C16
 	.string "{STR_VAR_1}\p"
@@ -2615,7 +2615,7 @@ gText_082C1C16:: @ 82C1C16
 	.string "like you.\p"
 	.string "I'm going to make time somehow so\n"
 	.string "I can get into battling.\p"
-	.string "Thanks for everything, {PLAYER}{STRING 5}!\n"
+	.string "Thanks for everything, {PLAYER}{KUN}!\n"
 	.string "We have to battle, you and me, one day!$"
 
 gText_082C1CF5:: @ 82C1CF5
@@ -2694,7 +2694,7 @@ gText_082C21FF:: @ 82C21FF
 
 gText_082C231C:: @ 82C231C
 	.string "Hola, bueno!\n"
-	.string "{PLAYER}{STRING 5}!\p"
+	.string "{PLAYER}{KUN}!\p"
 	.string "You know, I'm getting the itch to roam\n"
 	.string "and battle where I may.\p"
 	.string "But before I do, I want your advice\n"
@@ -2714,7 +2714,7 @@ gText_082C2407:: @ 82C2407
 	.string "Adios!$"
 
 gText_082C24B5:: @ 82C24B5
-	.string "{PLAYER}{STRING 5}, there's big trouble!\p"
+	.string "{PLAYER}{KUN}, there's big trouble!\p"
 	.string "When I win a battle, I brag about it\n"
 	.string "for an hour at least!\p"
 	.string "Of course I'm lying!\n"
@@ -2793,14 +2793,14 @@ gText_082C2A0B:: @ 82C2A0B
 	.string "Love ya!$"
 
 gText_082C2B50:: @ 82C2B50
-	.string "{PLAYER}{STRING 5}, I'm finished…\n"
+	.string "{PLAYER}{KUN}, I'm finished…\n"
 	.string "My nose won't stop dripping…\p"
 	.string "I was trying to think up something\n"
 	.string "cool to say when I win a battle.\p"
 	.string "It inspired me so much, it made me cry,\n"
 	.string "and now my nose won't stop running…\p"
 	.string "So, things being this way,\n"
-	.string "I need you to decide for me, {PLAYER}{STRING 5}.\p"
+	.string "I need you to decide for me, {PLAYER}{KUN}.\p"
 	.string "When I win a battle,\n"
 	.string "what should I say?$"
 
@@ -2812,13 +2812,13 @@ gText_082C2C77:: @ 82C2C77
 	.string "But in spite of my tears and runny\n"
 	.string "nose, I will use that saying!\p"
 	.string "I'm plumb out of things to ask you,\n"
-	.string "{PLAYER}{STRING 5}.\p"
+	.string "{PLAYER}{KUN}.\p"
 	.string "From now on, we're rivals!\n"
 	.string "Thanks for everything!$"
 
 gText_082C2D67:: @ 82C2D67
 	.string "Er… Um…\n"
-	.string "{PLAYER}{STRING 5}…\p"
+	.string "{PLAYER}{KUN}…\p"
 	.string "Please, don't look at me that way.\n"
 	.string "You're making me all nervous.\p"
 	.string "I… I need your advice again.\n"
@@ -2832,13 +2832,13 @@ gText_082C2E41:: @ 82C2E41
 	.string "Oh… Okay!\n"
 	.string "I'll try to say that!\l"
 	.string "I might be too nervous to say it…\p"
-	.string "Thank you, {PLAYER}{STRING 5}.\n"
+	.string "Thank you, {PLAYER}{KUN}.\n"
 	.string "I have to say good-bye now.\p"
 	.string "I'll obey all that you've taught me,\n"
-	.string "{PLAYER}{STRING 5}, and do the best I can.$"
+	.string "{PLAYER}{KUN}, and do the best I can.$"
 
 gText_082C2EF5:: @ 82C2EF5
-	.string "Hm? You appear to be {PLAYER}{STRING 5}…\n"
+	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps a clever {PLAYER} DOLL?\p"
 	.string "Oh, no, no, no, don't worry!\n"