Document Routes 20-21, 24-25 scripts

2 files changed, 24 insertions, 17 deletions

diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
index 556dd9746..05b91c5d3 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_North_EventScript_1AB975",
+      "script": "Route21_North_EventScript_Ronald",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_North_EventScript_1AB9F1",
+      "script": "Route21_North_EventScript_Wade",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABA6D",
+      "script": "Route21_North_EventScript_Spencer",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABB65",
+      "script": "Route21_North_EventScript_Lil",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABBAB",
+      "script": "Route21_North_EventScript_Ian",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc
index ad1ec12d3..67b93c175 100644
--- a/data/maps/Route21_North/text.inc
+++ b/data/maps/Route21_North/text.inc
@@ -1,42 +1,49 @@
-Text_18835A:: @ 818835A
+Route21_North_Text_RonaldIntro:: @ 818835A
 	.string "You want to know if the fish are\n"
 	.string "biting?$"
 
-Text_188383:: @ 8188383
+Route21_North_Text_RonaldDefeat:: @ 8188383
 	.string "Dang!$"
 
-Text_188389:: @ 8188389
+Route21_North_Text_RonaldPostBattle:: @ 8188389
 	.string "I can't catch anything good.\n"
 	.string "Not one good POKéMON to be had!$"
 
-Text_1883C6:: @ 81883C6
+Route21_North_Text_WadeIntro:: @ 81883C6
 	.string "I got a big haul!\n"
 	.string "Wanna go for it?$"
 
-Text_1883E9:: @ 81883E9
+Route21_North_Text_WadeDefeat:: @ 81883E9
 	.string "Heheh, MAGIKARP just don't make\n"
 	.string "the grade, do they?$"
 
-Text_18841D:: @ 818841D
+Route21_North_Text_WadePostBattle:: @ 818841D
 	.string "I seem to only catch MAGIKARP!$"
 
-Text_18843C:: @ 818843C
+Route21_North_Text_SpencerIntro:: @ 818843C
 	.string "The sea cleanses my body and soul!$"
 
-Text_18845F:: @ 818845F
+Route21_North_Text_SpencerDefeat:: @ 818845F
 	.string "Ayah!$"
 
-Text_188465:: @ 8188465
+Route21_North_Text_SpencerPostBattle:: @ 8188465
 	.string "The sea is great and all, but I\n"
 	.string "like the mountains, too.$"
 
-Text_18849E:: @ 818849E
+@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1.
+@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated
+@ English translations from RB are listed
+
+@ "What's wrong with me swimming?"
+Route21_North_Text_CueBallIntro:: @ 818849E
 	.string "おれだって　たまには\n"
 	.string "およぎに　くるぜ！$"
 
-Text_1884B3:: @ 81884B3
+@ "Cheap shot!"
+Route21_North_Text_CueBallDefeat:: @ 81884B3
 	.string "ぐわわ！$"
 
-Text_1884B8:: @ 81884B8
+@ "I look like what? A studded inner tube? Get lost!"
+Route21_North_Text_CueBallPostBattle:: @ 81884B8
 	.string "うきやすそう　だと？\n"
 	.string "うるせー　おおきな　おせわだッ！$"