Resolve some JP text

5 files changed, 21 insertions, 19 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9a646cd67..f148e2bd2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -843,7 +843,7 @@ Text_PlayerWhatCanIDoForYou:: @ 81A51D0
 
 	.include "data/text/obtain_item.inc"
 
-Text_1A5351:: @ 81A5351
+Text_MakingPreparations:: @ 81A5351
 	.string "じゅんびちゅうです！$"
 
 Text_WantWhichFloor:: @ 81A535C
@@ -926,16 +926,7 @@ Text_GiveNicknameToThisMon:: @ 81A56A7
 	.string "Do you want to give a nickname to\n"
 	.string "this {STR_VAR_1}?$"
 
-Text_1A56D2:: @ 81A56D2
-	.string "おッ！　ダウジングマシンが\n"
-	.string "はんのう　してるぞ！\p"
-	.string "ましたに　どうぐが　うまってる！\n"
-	.string "‥‥‥$"
-
-Text_DugUpItemFromGround:: @ 81A5700
-	.string "{PLAYER} dug up one {STR_VAR_2}\n"
-	.string "from deep in the ground.$"
-
+	.include "data/text/itemfinder.inc"
 	.include "data/text/route23.inc"
 	.include "data/text/aide.inc"
 	.include "data/text/ingame_trade.inc"
@@ -995,7 +986,7 @@ Text_TheDoorIsOpen:: @ 81A5CDF
 Text_MonFlewAway:: @ 81A63C4
 	.string "The {STR_VAR_1} flew away!$"
 
-Text_1A63D6:: @ 81A63D6
+Text_TheresBedLetsRest:: @ 81A63D6
 	.string "ベッドが　ある‥‥\n"
 	.string "やすんでいこう$"
 
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
index 140c98958..f2b950607 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
@@ -29,3 +29,9 @@ CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5
     .string "Sorry, you'll need more COINS\n"
     .string "than that.$"
 
+CeladonCity_GameCorner_PrizeRoom_Text_OopsNotEnoughRoom:: @ 81970FE
+    .string "おきゃくさん もう もてないよ$"
+
+CeladonCity_GameCorner_PrizeRoom_Text_OhFineThen:: @ 819710E
+    .string "あっ そう$"
+
diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc
index 02ded4fb0..9e372584e 100644
--- a/data/maps/CeladonCity_Gym/text.inc
+++ b/data/maps/CeladonCity_Gym/text.inc
@@ -1,9 +1,3 @@
-Text_SorryDontHaveAnyMore:: @ 81970FE
-    .string "おきゃくさん もう もてないよ$"
-
-Text_ISee:: @ 819710E
-    .string "あっ そう$"
-
 CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
     .string "Hello…\n"
     .string "Lovely weather, isn't it?\l"
diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc
index 06a21d302..7a940032d 100644
--- a/data/maps/CeruleanCity/text.inc
+++ b/data/maps/CeruleanCity/text.inc
@@ -42,7 +42,8 @@ CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D
     .string "All right, this time I really am\n"
     .string "gone. Smell ya!$"
 
-CeruleanCity_Text_17EDF8:: @ 817EDF8
+@ RB translation: "Heh! You're no match for my genius!"
+CeruleanCity_Text_RivalVictory:: @ 817EDF8
     .string "なんたって！\n"
     .string "おれは　てんさい　だからよ！$"
 
diff --git a/data/text/itemfinder.inc b/data/text/itemfinder.inc
new file mode 100644
index 000000000..5c59f43ee
--- /dev/null
+++ b/data/text/itemfinder.inc
@@ -0,0 +1,10 @@
+@ Unused
+Text_ItemfinderResponding:: @ 81A56D2
+	.string "おッ！　ダウジングマシンが\n"
+	.string "はんのう　してるぞ！\p"
+	.string "ましたに　どうぐが　うまってる！\n"
+	.string "‥‥‥$"
+
+Text_DugUpItemFromGround:: @ 81A5700
+	.string "{PLAYER} dug up one {STR_VAR_2}\n"
+	.string "from deep in the ground.$"