summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-10 05:01:48 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-10 15:01:50 -0500
commit91bf7665c623011fb63a7045689ba600b4b1eda7 (patch)
tree0baf6dccdab738a6ca7437f367f97bd1573622d6 /data/maps
parent9fafa122851dc4eecdefde2b36b88be6572656f0 (diff)
Sync split scripts, more misc splits/doc
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc4
-rw-r--r--data/maps/CeladonCity/map.json2
-rw-r--r--data/maps/CeladonCity/scripts.inc4
-rw-r--r--data/maps/CeladonCity/text.inc8
-rw-r--r--data/maps/CeladonCity_DepartmentStore_2F/scripts.inc4
-rw-r--r--data/maps/CeladonCity_DepartmentStore_3F/map.json2
-rw-r--r--data/maps/CeladonCity_DepartmentStore_3F/scripts.inc4
-rw-r--r--data/maps/CeladonCity_DepartmentStore_4F/scripts.inc2
-rw-r--r--data/maps/CeladonCity_DepartmentStore_4F/text.inc8
-rw-r--r--data/maps/CeladonCity_DepartmentStore_5F/scripts.inc4
-rw-r--r--data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc2
-rw-r--r--data/maps/CeruleanCave_B1F/scripts.inc4
-rw-r--r--data/maps/CeruleanCity_Mart/scripts.inc2
-rw-r--r--data/maps/CinnabarIsland_Mart/scripts.inc2
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc8
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json2
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc4
-rw-r--r--data/maps/FourIsland_House1/map.json2
-rw-r--r--data/maps/FourIsland_Mart/scripts.inc2
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/text.inc8
-rw-r--r--data/maps/FuchsiaCity/map.json2
-rw-r--r--data/maps/FuchsiaCity/text.inc8
-rw-r--r--data/maps/FuchsiaCity_Mart/scripts.inc2
-rw-r--r--data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc2
-rw-r--r--data/maps/LavenderTown_Mart/scripts.inc2
-rw-r--r--data/maps/MtEmber_Exterior/map.json2
-rw-r--r--data/maps/MtEmber_Exterior/text.inc8
-rw-r--r--data/maps/MtEmber_Summit/scripts.inc4
-rw-r--r--data/maps/NavelRock_Base/scripts.inc4
-rw-r--r--data/maps/NavelRock_Summit/scripts.inc4
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc4
-rw-r--r--data/maps/PewterCity/text.inc8
-rw-r--r--data/maps/PewterCity_Mart/scripts.inc2
-rw-r--r--data/maps/PewterCity_Museum_1F/map.json2
-rw-r--r--data/maps/PewterCity_Museum_2F/text.inc8
-rw-r--r--data/maps/PewterCity_PokemonCenter_1F/map.json2
-rw-r--r--data/maps/PowerPlant/scripts.inc8
-rw-r--r--data/maps/RockTunnel_B1F/map.json2
-rw-r--r--data/maps/RocketHideout_Elevator/scripts.inc2
-rw-r--r--data/maps/Route12/scripts.inc2
-rw-r--r--data/maps/Route12/text.inc4
-rw-r--r--data/maps/Route16/scripts.inc2
-rw-r--r--data/maps/Route4/map.json4
-rw-r--r--data/maps/Route5/text.inc16
-rw-r--r--data/maps/SaffronCity_House1_2F/scripts.inc2
-rw-r--r--data/maps/SaffronCity_House1_2F/text.inc10
-rw-r--r--data/maps/SaffronCity_Mart/scripts.inc2
-rw-r--r--data/maps/SeafoamIslands_B4F/scripts.inc4
-rw-r--r--data/maps/SeafoamIslands_B4F/text.inc8
-rw-r--r--data/maps/SevenIsland/map.json2
-rw-r--r--data/maps/SevenIsland/text.inc8
-rw-r--r--data/maps/SevenIsland_House_Room1/scripts.inc2
-rw-r--r--data/maps/SevenIsland_Mart/scripts.inc2
-rw-r--r--data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc2
-rw-r--r--data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc2
-rw-r--r--data/maps/SilphCo_2F/map.json2
-rw-r--r--data/maps/SilphCo_2F/scripts.inc4
-rw-r--r--data/maps/SilphCo_2F/text.inc8
-rw-r--r--data/maps/SilphCo_Elevator/scripts.inc2
-rw-r--r--data/maps/SixIsland_Mart/scripts.inc2
-rw-r--r--data/maps/SixIsland_WaterPath_House1/text.inc18
-rw-r--r--data/maps/ThreeIsland_Mart/scripts.inc2
-rw-r--r--data/maps/TwoIsland/scripts.inc8
-rw-r--r--data/maps/TwoIsland_CapeBrink_House/map.json2
-rw-r--r--data/maps/VermilionCity_Mart/scripts.inc2
-rw-r--r--data/maps/VictoryRoad_2F/map.json2
-rw-r--r--data/maps/VictoryRoad_3F/text.inc8
-rw-r--r--data/maps/ViridianCity/map.json2
-rw-r--r--data/maps/ViridianCity/scripts.inc4
-rw-r--r--data/maps/ViridianCity_Mart/scripts.inc2
70 files changed, 147 insertions, 147 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 8d12c5458..f0843ae01 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -105,12 +105,12 @@ EventScript_1652C0:: @ 81652C0
EventScript_16533A:: @ 816533A
setflag FLAG_DEOXYS_FLEW_AWAY
setvar VAR_0x8004, SPECIES_DEOXYS
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
EventScript_165348:: @ 8165348
setvar VAR_0x8004, SPECIES_DEOXYS
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
Movement_165353:: @ 8165353
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index d60b4da02..75f6760d1 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "CeladonCity_EventScript_166CBF",
+ "script": "CeladonCity_EventScript_SoftboiledTutor",
"flag": "0"
},
{
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
index 225feeff6..b27d12178 100644
--- a/data/maps/CeladonCity/scripts.inc
+++ b/data/maps/CeladonCity/scripts.inc
@@ -24,8 +24,8 @@ CeladonCity_EventScript_166CB6:: @ 8166CB6
msgbox gUnknown_817FFC5, MSGBOX_NPC
end
-CeladonCity_EventScript_166CBF:: @ 8166CBF
- goto EventScript_1C4A86
+CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF
+ goto EventScript_SoftboiledTutor
end
CeladonCity_EventScript_166CC5:: @ 8166CC5
diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc
index f10516c9d..40f489e3c 100644
--- a/data/maps/CeladonCity/text.inc
+++ b/data/maps/CeladonCity/text.inc
@@ -83,7 +83,7 @@ gUnknown_8180300:: @ 8180300
.string "But it was boiling hot!\n"
.string "Gotta cool it to drink it.$"
-Text_180388:: @ 8180388
+Text_SoftboiledTeach:: @ 8180388
.string "Hello, there!\p"
.string "I've seen you about, but I never\n"
.string "had a chance to chat.\p"
@@ -92,16 +92,16 @@ Text_180388:: @ 8180388
.string "I'd like to celebrate by teaching\n"
.string "you the move SOFTBOILED.$"
-Text_18043F:: @ 818043F
+Text_SoftboiledDeclined:: @ 818043F
.string "I'll always be keeping an eye out\n"
.string "for you.\p"
.string "I hope we can chat again.$"
-Text_180484:: @ 8180484
+Text_SoftboiledWhichMon:: @ 8180484
.string "So, who's the POKéMON that gets\n"
.string "the chance to learn SOFTBOILED?$"
-Text_1804C4:: @ 81804C4
+Text_SoftboiledTaught:: @ 81804C4
.string "I wish you the best of luck!$"
gUnknown_81804E1:: @ 81804E1
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
index b9c3b056e..3289f08b3 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
message Text_MayIHelpYou
waitmessage
pokemart Items_16BB38
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
@@ -50,7 +50,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
message Text_MayIHelpYou
waitmessage
pokemart Items_16BB74
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index c1cc95ac4..9288edf21 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85",
+ "script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor",
"flag": "0"
},
{
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
index 46b2ebf4e..f4faca037 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
@@ -1,8 +1,8 @@
CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84
.byte 0
-CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85
- goto EventScript_1C4C26
+CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85
+ goto EventScript_CounterTutor
end
CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
index 6844069bf..233bfefc9 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
message Text_MayIHelpYou
waitmessage
pokemart Items_16BC30
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
index efe6c5835..426cc2c82 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
@@ -1,4 +1,4 @@
-Text_195928:: @ 8195928
+Text_CounterTeach:: @ 8195928
.string "Oh, hi!\n"
.string "I finally finished POKéMON.\p"
.string "Not done yet? How about I teach\n"
@@ -8,15 +8,15 @@ Text_195928:: @ 8195928
.string "Not like the one I'm leaning on,\n"
.string "mind you!$"
-Text_1959CC:: @ 81959CC
+Text_CounterDeclined:: @ 81959CC
.string "You're not interested? Come see\n"
.string "me if you change your mind.$"
-Text_195A08:: @ 8195A08
+Text_CounterWhichMon:: @ 8195A08
.string "Which POKéMON should I teach\n"
.string "COUNTER to?$"
-Text_195A31:: @ 8195A31
+Text_CounterTaught:: @ 8195A31
.string "Are you using that COUNTER move\n"
.string "I taught your POKéMON?$"
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
index 71a190c86..5163273c5 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
message Text_MayIHelpYou
waitmessage
pokemart Items_16BC84
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
@@ -48,7 +48,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
message Text_MayIHelpYou
waitmessage
pokemart Items_16BCBC
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
index 8a3d77577..14198db2f 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -7,7 +7,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
- message Text_1A535C
+ message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 3
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
index b252bf306..e896c8372 100644
--- a/data/maps/CeruleanCave_B1F/scripts.inc
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -55,14 +55,14 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
EventScript_162558:: @ 8162558
setflag FLAG_FOUGHT_MEWTWO
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
EventScript_162560:: @ 8162560
end
EventScript_162561:: @ 8162561
setvar VAR_0x8004, SPECIES_MEWTWO
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
EventScript_16256B:: @ 816256B
end
diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc
index 4008c5dd2..d6d132e79 100644
--- a/data/maps/CeruleanCity_Mart/scripts.inc
+++ b/data/maps/CeruleanCity_Mart/scripts.inc
@@ -18,7 +18,7 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
message Text_MayIHelpYou
waitmessage
pokemart Items_16ACD8
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc
index 7893e41bc..5d512a32b 100644
--- a/data/maps/CinnabarIsland_Mart/scripts.inc
+++ b/data/maps/CinnabarIsland_Mart/scripts.inc
@@ -18,7 +18,7 @@ CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
message Text_MayIHelpYou
waitmessage
pokemart Items_16EA48
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
index dda99e8ea..6b36fd1a3 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
@@ -1,4 +1,4 @@
-Text_19A137:: @ 819A137
+Text_MetronomeTeach:: @ 819A137
.string "Tch-tch-tch!\n"
.string "I'll teach you a nifty move.\p"
.string "Teach it to a POKéMON, and watch\n"
@@ -6,14 +6,14 @@ Text_19A137:: @ 819A137
.string "It's a move called METRONOME.\n"
.string "Does it strike your fancy?$"
-Text_19A1CB:: @ 819A1CB
+Text_MetronomeDeclined:: @ 819A1CB
.string "I tell you, it's a lot of fun!$"
-Text_19A1EA:: @ 819A1EA
+Text_MetronomeWhichMon:: @ 819A1EA
.string "Okay!\n"
.string "Which POKéMON should I teach?$"
-Text_19A20E:: @ 819A20E
+Text_MetronomeTaught:: @ 819A20E
.string "Tch-tch-tch!\n"
.string "That's the sound of a METRONOME.\p"
.string "It tweaks your POKéMON's brain into\n"
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
index 093cf61c7..c8c7f0414 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF",
+ "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor",
"flag": "0"
},
{
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
index dd38a85b5..3dcd07733 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
@@ -1,8 +1,8 @@
CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE
.byte 0
-CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
- goto EventScript_1C4C8E
+CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF
+ goto EventScript_MetronomeTutor
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index 0fd639d54..8320de554 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/data/maps/FourIsland_House1/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_House1_EventScript_1C4D84",
+ "script": "FourIsland_House1_EventScript_BodySlamTutor",
"flag": "0"
},
{
diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc
index 9918fb307..0d0d1c6df 100644
--- a/data/maps/FourIsland_Mart/scripts.inc
+++ b/data/maps/FourIsland_Mart/scripts.inc
@@ -10,7 +10,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
message Text_MayIHelpYou
waitmessage
pokemart Items_171CD4
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc
index 59beaf443..954aabd96 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc
@@ -1,4 +1,4 @@
-Text_1A3505:: @ 81A3505
+Text_BodySlamTeach:: @ 81A3505
.string "Ready?\n"
.string "Boing!\p"
.string "We're having a BODY SLAM match\n"
@@ -8,15 +8,15 @@ Text_1A3505:: @ 81A3505
.string "How about I teach BODY SLAM to\n"
.string "a POKéMON of yours instead?$"
-Text_1A35C7:: @ 81A35C7
+Text_BodySlamDeclined:: @ 81A35C7
.string "Come again!\n"
.string "Boing!$"
-Text_1A35DA:: @ 81A35DA
+Text_BodySlamWhichMon:: @ 81A35DA
.string "Which POKéMON wants to learn how\n"
.string "to BODY SLAM?$"
-Text_1A3609:: @ 81A3609
+Text_BodySlamTaught:: @ 81A3609
.string "Boioing!$"
Text_1A3612:: @ 81A3612
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
index 6c4b76320..35a26edc6 100644
--- a/data/maps/FuchsiaCity/map.json
+++ b/data/maps/FuchsiaCity/map.json
@@ -221,7 +221,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FuchsiaCity_EventScript_1C4AEE",
+ "script": "FuchsiaCity_EventScript_SubstituteTutor",
"flag": "0"
},
{
diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc
index 2916a29cf..969846706 100644
--- a/data/maps/FuchsiaCity/text.inc
+++ b/data/maps/FuchsiaCity/text.inc
@@ -79,7 +79,7 @@ gUnknown_81808FA:: @ 81808FA
Text_180945:: @ 8180945
.string "……$"
-Text_180948:: @ 8180948
+Text_SubstituteTeach:: @ 8180948
.string "Aww, I wish I was a KANGASKHAN\n"
.string "baby.\p"
.string "I'd love to be a substitute for the\n"
@@ -91,15 +91,15 @@ Text_180948:: @ 8180948
.string "Want me to teach SUBSTITUTE to\n"
.string "one of your POKéMON?$"
-Text_180A32:: @ 8180A32
+Text_SubstituteDeclined:: @ 8180A32
.string "Oh, really?\n"
.string "SUBSTITUTE seems so fun…$"
-Text_180A57:: @ 8180A57
+Text_SubstituteWhichMon:: @ 8180A57
.string "Which POKéMON wants to learn\n"
.string "SUBSTITUTE?$"
-Text_180A80:: @ 8180A80
+Text_SubstituteTaught:: @ 8180A80
.string "Boy, what I'd give to crawl inside\n"
.string "a KANGASKHAN belly pouch…$"
diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc
index 67fceb572..7d2df7e8f 100644
--- a/data/maps/FuchsiaCity_Mart/scripts.inc
+++ b/data/maps/FuchsiaCity_Mart/scripts.inc
@@ -18,7 +18,7 @@ FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
message Text_MayIHelpYou
waitmessage
pokemart Items_16D518
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
index 16eb449ae..1ba5b7380 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -49,7 +49,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
message Text_MayIHelpYou
waitmessage
pokemart Items_16EAF4
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc
index a0352ca88..1007b34cf 100644
--- a/data/maps/LavenderTown_Mart/scripts.inc
+++ b/data/maps/LavenderTown_Mart/scripts.inc
@@ -22,7 +22,7 @@ LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
message Text_MayIHelpYou
waitmessage
pokemart Items_16B390
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index 45fcd4703..29d5f1af8 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "MtEmber_Exterior_EventScript_1C48E6",
+ "script": "MtEmber_Exterior_EventScript_ExplosionTutor",
"flag": "0"
},
{
diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc
index d9a365f95..a3099147c 100644
--- a/data/maps/MtEmber_Exterior/text.inc
+++ b/data/maps/MtEmber_Exterior/text.inc
@@ -1,4 +1,4 @@
-Text_17A642:: @ 817A642
+Text_ExplosionTeach:: @ 817A642
.string "Can you imagine?\n"
.string "If this volcano were to erupt?\p"
.string "The explosion would be the end of\n"
@@ -6,16 +6,16 @@ Text_17A642:: @ 817A642
.string "While we're terrified, would you\n"
.string "like me to teach EXPLOSION?$"
-Text_17A6ED:: @ 817A6ED
+Text_ExplosionDeclined:: @ 817A6ED
.string "Yeah, you're right.\n"
.string "It is too terrifying.$"
-Text_17A717:: @ 817A717
+Text_ExplosionWhichMon:: @ 817A717
.string "You're terribly brave!\p"
.string "Which POKéMON should I teach\n"
.string "EXPLOSION?$"
-Text_17A756:: @ 817A756
+Text_ExplosionTaught:: @ 817A756
.string "Using EXPLOSION while on this\n"
.string "volcano…\p"
.string "What a terrifying thrill!$"
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index 45d2f76e0..7614cfd9a 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -55,10 +55,10 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
EventScript_163B96:: @ 8163B96
setflag FLAG_FOUGHT_MOLTRES
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
end
EventScript_163B9F:: @ 8163B9F
setvar VAR_0x8004, SPECIES_MOLTRES
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index a013d6707..c7fcd191a 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -78,10 +78,10 @@ NavelRock_Base_EventScript_165134:: @ 8165134
EventScript_1651D9:: @ 81651D9
setflag FLAG_LUGIA_FLEW_AWAY
setvar VAR_0x8004, SPECIES_LUGIA
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
EventScript_1651E7:: @ 81651E7
setvar VAR_0x8004, SPECIES_LUGIA
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index 0f6f7ec04..7cbeb764f 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -83,12 +83,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
EventScript_1650B4:: @ 81650B4
setflag FLAG_HO_OH_FLEW_AWAY
setvar VAR_0x8004, SPECIES_HO_OH
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
EventScript_1650C2:: @ 81650C2
setvar VAR_0x8004, SPECIES_HO_OH
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
Movement_1650CD:: @ 81650CD
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 0e3577c3b..261b16c1c 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -841,7 +841,7 @@ EventScript_1698D6:: @ 81698D6
end
EventScript_169903:: @ 8169903
- call EventScript_1A737B
+ call ProfOak_EventScript_RatePokedexInPerson
goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913
release
end
@@ -963,7 +963,7 @@ Movement_1699C5:
step_end
EventScript_1699CE:: @ 81699CE
- call EventScript_1A737B
+ call ProfOak_EventScript_RatePokedexInPerson
closemessage
compare VAR_0x8009, 60
goto_if_lt EventScript_1699F9
diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc
index de975f32d..966cbcfe4 100644
--- a/data/maps/PewterCity/text.inc
+++ b/data/maps/PewterCity/text.inc
@@ -1,4 +1,4 @@
-Text_17E316:: @ 817E316
+Text_DreamEaterTeach:: @ 817E316
.string "Yawn!\n"
.string "I must have dozed off in the sun.\p"
.string "I had this weird dream about\n"
@@ -9,14 +9,14 @@ Text_17E316:: @ 817E316
.string "Let me teach it to a POKéMON so\n"
.string "I can forget about it!$"
-Text_17E3E9:: @ 817E3E9
+Text_DreamEaterDeclined:: @ 817E3E9
.string "…Snore…$"
-Text_17E3F1:: @ 817E3F1
+Text_DreamEaterWhichMon:: @ 817E3F1
.string "Which POKéMON wants to learn\n"
.string "DREAM EATER?$"
-Text_17E41B:: @ 817E41B
+Text_DreamEaterTaught:: @ 817E41B
.string "…ZZZ…\n"
.string "I…can't eat…anymore…$"
diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc
index d4f0b37c4..e03f14deb 100644
--- a/data/maps/PewterCity_Mart/scripts.inc
+++ b/data/maps/PewterCity_Mart/scripts.inc
@@ -18,7 +18,7 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
message Text_MayIHelpYou
waitmessage
pokemart Items_16A708
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
index 76945d8ca..aef59195d 100644
--- a/data/maps/PewterCity_Museum_1F/map.json
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PewterCity_Museum_1F_EventScript_1C4BBE",
+ "script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor",
"flag": "0"
}
],
diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc
index b1767c681..2c1cd4d20 100644
--- a/data/maps/PewterCity_Museum_2F/text.inc
+++ b/data/maps/PewterCity_Museum_2F/text.inc
@@ -1,4 +1,4 @@
-Text_1909A3:: @ 81909A3
+Text_SeismicTossTeach:: @ 81909A3
.string "The secrets of space…\n"
.string "The mysteries of earth…\p"
.string "There are so many things about\n"
@@ -9,15 +9,15 @@ Text_1909A3:: @ 81909A3
.string "Well, how about SEISMIC TOSS?\n"
.string "Should I teach that to a POKéMON?$"
-Text_190AA9:: @ 8190AA9
+Text_SeismicTossDeclined:: @ 8190AA9
.string "Is that so?\n"
.string "I'm sure you'll be back for it.$"
-Text_190AD5:: @ 8190AD5
+Text_SeismicTossWhichMon:: @ 8190AD5
.string "Which POKéMON wants to learn\n"
.string "SEISMIC TOSS?$"
-Text_190B00:: @ 8190B00
+Text_SeismicTossTaught:: @ 8190B00
.string "I hope you won't toss in the towel.\n"
.string "Keep it up.$"
diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json
index 1a54e269b..683805b3c 100644
--- a/data/maps/PewterCity_PokemonCenter_1F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_1F/map.json
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16",
+ "script": "MysteryEventClub_EventScript_Man",
"flag": "0"
},
{
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index 1af3e9e76..08a223f1b 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -66,12 +66,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
EventScript_16381B:: @ 816381B
setflag FLAG_FOUGHT_ZAPDOS
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
end
EventScript_163824:: @ 8163824
setvar VAR_0x8004, SPECIES_ZAPDOS
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
end
PowerPlant_EventScript_16382F:: @ 816382F
@@ -102,7 +102,7 @@ PowerPlant_EventScript_16382F:: @ 816382F
EventScript_163884:: @ 8163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_16388D:: @ 816388D
@@ -133,5 +133,5 @@ PowerPlant_EventScript_16388D:: @ 816388D
EventScript_1638E2:: @ 81638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
end
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index 1dd0f419e..3c1144c42 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "RockTunnel_B1F_EventScript_1C487E",
+ "script": "RockTunnel_B1F_EventScript_RockSlideTutor",
"flag": "0"
},
{
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index 05e01e27a..f649e5c40 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -8,7 +8,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
- message Text_1A535C
+ message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 2
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
index fe21ac1d2..80a037a65 100644
--- a/data/maps/Route12/scripts.inc
+++ b/data/maps/Route12/scripts.inc
@@ -21,7 +21,7 @@ Route12_EventScript_168014:: @ 8168014
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16808D
- call EventScript_1A924B
+ call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
playmoncry SPECIES_SNORLAX, 2
diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc
index bf82fcf59..bd23a00ae 100644
--- a/data/maps/Route12/text.inc
+++ b/data/maps/Route12/text.inc
@@ -2,7 +2,7 @@ gUnknown_8185317:: @ 8185317
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
-Text_185354:: @ 8185354
+Text_SnorlaxWokeUp:: @ 8185354
.string "SNORLAX woke up!\p"
.string "It attacked in a grumpy rage!$"
@@ -14,7 +14,7 @@ gUnknown_8185383:: @ 8185383
gUnknown_81853CC:: @ 81853CC
.string "Want to use the POKé FLUTE?$"
-Text_1853E8:: @ 81853E8
+Text_PlayedPokeFlute:: @ 81853E8
.string "{PLAYER} played the POKé FLUTE.$"
Text_185402:: @ 8185402
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 135858798..eb866388b 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -40,7 +40,7 @@ Route16_EventScript_168121:: @ 8168121
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_168197
- call EventScript_1A924B
+ call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
playmoncry SPECIES_SNORLAX, 2
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index b628beefc..e7392969c 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route4_EventScript_1C494E",
+ "script": "Route4_EventScript_MegaPunchTutor",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route4_EventScript_1C49B6",
+ "script": "Route4_EventScript_MegaKickTutor",
"flag": "0"
},
{
diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc
index 066d8cfa6..0a3e80874 100644
--- a/data/maps/Route5/text.inc
+++ b/data/maps/Route5/text.inc
@@ -1,4 +1,4 @@
-Text_1839D5:: @ 81839D5
+Text_MegaPunchTeach:: @ 81839D5
.string "A punch of roaring ferocity!\p"
.string "Packed with destructive power!\p"
.string "When the chips are down,\n"
@@ -7,22 +7,22 @@ Text_1839D5:: @ 81839D5
.string "Now!\n"
.string "Let me teach it to your POKéMON!$"
-Text_183A83:: @ 8183A83
+Text_MegaPunchDeclined:: @ 8183A83
.string "You'll be back when you understand\n"
.string "the worth of MEGA PUNCH.$"
-Text_183ABF:: @ 8183ABF
+Text_MegaPunchWhichMon:: @ 8183ABF
.string "Fine!\n"
.string "Which POKéMON will learn it?$"
-Text_183AE2:: @ 8183AE2
+Text_MegaPunchTaught:: @ 8183AE2
.string "Now, we are comrades in the way of\n"
.string "punching!\p"
.string "You should go before you're seen\n"
.string "by the misguided fool who trains\l"
.string "only his silly kicking over there.$"
-Text_183B74:: @ 8183B74
+Text_MegaKickTeach:: @ 8183B74
.string "A kick of brutal ferocity!\p"
.string "Packed with destructive power!\p"
.string "When you get right down to it,\n"
@@ -31,15 +31,15 @@ Text_183B74:: @ 8183B74
.string "Okay!\n"
.string "I'll teach it to your POKéMON!$"
-Text_183C25:: @ 8183C25
+Text_MegaKickDeclined:: @ 8183C25
.string "You'll come crawling back when you\n"
.string "realize the value of MEGA KICK.$"
-Text_183C68:: @ 8183C68
+Text_MegaKickWhichMon:: @ 8183C68
.string "All right!\n"
.string "Which POKéMON wants to learn it?$"
-Text_183C94:: @ 8183C94
+Text_MegaKickTaught:: @ 8183C94
.string "Now, we are soul mates in the way\n"
.string "of kicking!\p"
.string "You should run before you're seen\n"
diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc
index 30931a998..f7efeddb1 100644
--- a/data/maps/SaffronCity_House1_2F/scripts.inc
+++ b/data/maps/SaffronCity_House1_2F/scripts.inc
@@ -26,7 +26,7 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
faceplayer
checkitem ITEM_POKE_DOLL, 1
compare VAR_RESULT, TRUE
- goto_if_eq EventScript_1C4CF6
+ goto_if_eq EventScript_MimicTutor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq EventScript_16EBB7
diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc
index d9fc46f7c..32a666e18 100644
--- a/data/maps/SaffronCity_House1_2F/text.inc
+++ b/data/maps/SaffronCity_House1_2F/text.inc
@@ -18,7 +18,7 @@ gUnknown_819ACF1:: @ 819ACF1
.string "COPYCAT: Hmm? Quit mimicking?\l"
.string "But that's my favorite hobby!$"
-Text_19AD85:: @ 819AD85
+Text_MimicTeach:: @ 819AD85
.string "Oh wow!\n"
.string "A POKé DOLL!\p"
.string "For me?\n"
@@ -26,14 +26,14 @@ Text_19AD85:: @ 819AD85
.string "You know what?\n"
.string "I can teach the move MIMIC.$"
-Text_19ADD8:: @ 819ADD8
+Text_MimicDeclined:: @ 819ADD8
.string "Don't you like MIMIC?$"
-Text_19ADEE:: @ 819ADEE
+Text_MimicWhichMon:: @ 819ADEE
.string "I really love MIMIC!\n"
.string "Who's going to learn it?$"
-Text_19AE1C:: @ 819AE1C
+Text_MimicTaughtMale:: @ 819AE1C
.string "{PLAYER}: Hi!\n"
.string "Thanks for earlier!\p"
.string "{PLAYER}: Pardon?\p"
@@ -42,7 +42,7 @@ Text_19AE1C:: @ 819AE1C
.string "COPYCAT: You bet!\n"
.string "It's a scream!$"
-Text_19AE90:: @ 819AE90
+Text_MimicTaughtFemale:: @ 819AE90
.string "{PLAYER}: Hi!\n"
.string "Thanks for what you did for us.\p"
.string "{PLAYER}: Pardon?\p"
diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc
index 815ee773b..78452151b 100644
--- a/data/maps/SaffronCity_Mart/scripts.inc
+++ b/data/maps/SaffronCity_Mart/scripts.inc
@@ -18,7 +18,7 @@ SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
message Text_MayIHelpYou
waitmessage
pokemart Items_16EFDC
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index ed878b0a5..68e45d952 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -185,14 +185,14 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
EventScript_16320F:: @ 816320F
setflag FLAG_FOUGHT_ARTICUNO
- goto EventScript_1A922D
+ goto EventScript_RemoveStaticMon
EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
setvar VAR_0x8004, SPECIES_ARTICUNO
- goto EventScript_1A9236
+ goto EventScript_MonFlewAway
EventScript_163222:: @ 8163222
end
diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc
index b2ef7d7e5..708828c74 100644
--- a/data/maps/SeafoamIslands_B4F/text.inc
+++ b/data/maps/SeafoamIslands_B4F/text.inc
@@ -1,4 +1,4 @@
-Text_1799E0:: @ 81799E0
+Text_RockSlideTeach:: @ 81799E0
.string "When you're up on a rocky mountain\n"
.string "like this, rockslides are a threat.\p"
.string "Can you imagine?\n"
@@ -8,14 +8,14 @@ Text_1799E0:: @ 81799E0
.string "You don't seem to be scared.\n"
.string "Want to try using ROCK SLIDE?$"
-Text_179AC0:: @ 8179AC0
+Text_RockSlideDeclined:: @ 8179AC0
.string "Oh, so you are scared after all.$"
-Text_179AE1:: @ 8179AE1
+Text_RockSlideWhichMon:: @ 8179AE1
.string "Which POKéMON should I teach\n"
.string "ROCK SLIDE?$"
-Text_179B0A:: @ 8179B0A
+Text_RockSlideTaught:: @ 8179B0A
.string "It might be scary to use it in this\n"
.string "tunnel…$"
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
index d83f81ed4..9f7d5692c 100644
--- a/data/maps/SevenIsland/map.json
+++ b/data/maps/SevenIsland/map.json
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_EventScript_1C4B56",
+ "script": "SevenIsland_EventScript_SwordsDanceTutor",
"flag": "0"
},
{
diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc
index 2795443a2..995752422 100644
--- a/data/maps/SevenIsland/text.inc
+++ b/data/maps/SevenIsland/text.inc
@@ -1,4 +1,4 @@
-Text_182F01:: @ 8182F01
+Text_SwordsDanceTeach:: @ 8182F01
.string "Not many people come out here.\p"
.string "If I train here, I'm convinced that\n"
.string "I'll get stronger and stronger.\p"
@@ -6,14 +6,14 @@ Text_182F01:: @ 8182F01
.string "How would you like to learn a move\n"
.string "like that? It's SWORDS DANCE.$"
-Text_182FC1:: @ 8182FC1
+Text_SwordsDanceDeclined:: @ 8182FC1
.string "Well, that's fine, too.$"
-Text_182FD9:: @ 8182FD9
+Text_SwordsDanceWhichMon:: @ 8182FD9
.string "All right, pick which POKéMON\n"
.string "I should teach it to.$"
-Text_18300D:: @ 818300D
+Text_SwordsDanceTaught:: @ 818300D
.string "If only we could keep getting\n"
.string "stronger and stronger, eh?$"
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index eb6900223..70a27185a 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -101,7 +101,7 @@ EventScript_170987:: @ 8170987
compare VAR_RESULT, NO
goto_if_eq EventScript_170A11
special LoadPlayerParty
- call EventScript_1A4EAF
+ call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_170A11
special SavePlayerParty
diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc
index d2a42ac38..0fc710d8a 100644
--- a/data/maps/SevenIsland_Mart/scripts.inc
+++ b/data/maps/SevenIsland_Mart/scripts.inc
@@ -10,7 +10,7 @@ SevenIsland_Mart_EventScript_170B31:: @ 8170B31
message Text_MayIHelpYou
waitmessage
pokemart Items_170B58
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
index a146b7990..f84c67295 100644
--- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
@@ -9,7 +9,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
- message Text_1A535C
+ message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
index 92c4f9576..fb6204f22 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -132,7 +132,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
message Text_MayIHelpYou
waitmessage
pokemart Items_1649B8
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index d937d283c..4529535b2 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SilphCo_2F_EventScript_16165A",
+ "script": "SilphCo_2F_EventScript_ThunderWaveTutor",
"flag": "0"
}
],
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
index 6488ce3e5..6f800bbd0 100644
--- a/data/maps/SilphCo_2F/scripts.inc
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -7,8 +7,8 @@ SilphCo_2F_OnLoad:: @ 8161647
call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2
end
-SilphCo_2F_EventScript_16165A:: @ 816165A
- goto EventScript_1C4816
+SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A
+ goto EventScript_ThunderWaveTutor
EventScript_16165F:: @ 816165F
end
diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc
index ee3fbc0b0..3dc65664d 100644
--- a/data/maps/SilphCo_2F/text.inc
+++ b/data/maps/SilphCo_2F/text.inc
@@ -44,7 +44,7 @@ gUnknown_81756E2:: @ 81756E2
.string "SILPH CO. will be associated with\n"
.string "TEAM ROCKET!$"
-Text_175711:: @ 8175711
+Text_ThunderWaveTeach:: @ 8175711
.string "Eeek!\n"
.string "No! Stop! Help!\p"
.string "Oh, you're not with TEAM ROCKET.\n"
@@ -52,15 +52,15 @@ Text_175711:: @ 8175711
.string "Will you forgive me if I teach\n"
.string "you the THUNDER WAVE technique?$"
-Text_17579D:: @ 817579D
+Text_ThunderWaveDeclined:: @ 817579D
.string "Oh…\n"
.string "But THUNDER WAVE is convenient…$"
-Text_1757C1:: @ 81757C1
+Text_ThunderWaveWhichMon:: @ 81757C1
.string "Which POKéMON should I teach\n"
.string "THUNDER WAVE?$"
-Text_1757EC:: @ 81757EC
+Text_ThunderWaveTaught:: @ 81757EC
.string "THUNDER WAVE causes paralysis in\n"
.string "the target POKéMON.\p"
.string "A paralyzed POKéMON may be unable\n"
diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
index 8f11d4ef7..df0a390ee 100644
--- a/data/maps/SilphCo_Elevator/scripts.inc
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -7,7 +7,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
- message Text_1A535C
+ message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc
index af865be28..1edcae092 100644
--- a/data/maps/SixIsland_Mart/scripts.inc
+++ b/data/maps/SixIsland_Mart/scripts.inc
@@ -10,7 +10,7 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66
message Text_MayIHelpYou
waitmessage
pokemart Items_171E8C
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc
index 71ecedc96..4c32a80ff 100644
--- a/data/maps/SixIsland_WaterPath_House1/text.inc
+++ b/data/maps/SixIsland_WaterPath_House1/text.inc
@@ -1,4 +1,4 @@
-Text_1A46C6:: @ 81A46C6
+Text_UltimateMoveThatMon:: @ 81A46C6
.string "I perfected the ultimate move of\n"
.string "its type…\p"
.string "But will no one take it for\n"
@@ -7,11 +7,11 @@ Text_1A46C6:: @ 81A46C6
.string "Y-you…\n"
.string "Th-that {STR_VAR_1}…$"
-Text_1A4737:: @ 81A4737
+Text_JustMistaken:: @ 81A4737
.string "…No…\n"
.string "I was just mistaken.$"
-Text_1A4751:: @ 81A4751
+Text_AllowMeToTeachMonUltimateMove:: @ 81A4751
.string "Oh! This is the one!\n"
.string "This is the POKéMON!\p"
.string "This {STR_VAR_1} is worthy of\n"
@@ -20,33 +20,33 @@ Text_1A4751:: @ 81A4751
.string "Will you allow your {STR_VAR_1} to\n"
.string "learn my {STR_VAR_2}?$"
-Text_1A47E5:: @ 81A47E5
+Text_YouRejectIt:: @ 81A47E5
.string "Gaah! You reject it?\n"
.string "No, I won't be dissuaded!$"
-Text_1A4814:: @ 81A4814
+Text_LetMeConferUltimateMove:: @ 81A4814
.string "You will allow it?\p"
.string "Then, let me confer my ultimate\n"
.string "{STR_VAR_2} on your {STR_VAR_1}.\p"
.string "Ggggrah-awooo!$"
-Text_1A4865:: @ 81A4865
+Text_TaughtMove:: @ 81A4865
.string "Gasp, gasp, gasp…\p"
.string "I didn't think I could teach that\n"
.string "move while I still lived…$"
-Text_1A48B3:: @ 81A48B3
+Text_MakeBestUseOfMove:: @ 81A48B3
.string "I implore you to make the best\n"
.string "use of that move and gain power!$"
-Text_1A48F3:: @ 81A48F3
+Text_PassedOnEverythingIKnow:: @ 81A48F3
.string "Gasp, gasp, gasp…\p"
.string "I have no regrets now.\n"
.string "I've passed on everything I know.\p"
.string "Now I can live out my life knowing\n"
.string "my work is done.$"
-Text_1A4972:: @ 81A4972
+Text_FeelRejuvenated:: @ 81A4972
.string "After I passed on my knowledge to\n"
.string "you, I felt so much relief.\p"
.string "In fact, I feel rejuvenated,\n"
diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc
index 3ac12bf36..074d78cd9 100644
--- a/data/maps/ThreeIsland_Mart/scripts.inc
+++ b/data/maps/ThreeIsland_Mart/scripts.inc
@@ -10,7 +10,7 @@ ThreeIsland_Mart_EventScript_17188D:: @ 817188D
message Text_MayIHelpYou
waitmessage
pokemart Items_1718B4
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index b785d2fd9..59c4ca6f9 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -118,7 +118,7 @@ EventScript_1676A6:: @ 81676A6
EventScript_1676D3:: @ 81676D3
pokemart Items_1676E4
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
@@ -132,7 +132,7 @@ Items_1676E4:: @ 81676E4
EventScript_1676EC:: @ 81676EC
pokemart Items_1676FC
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
@@ -148,7 +148,7 @@ Items_1676FC:: @ 81676FC
EventScript_167708:: @ 8167708
pokemart Items_167718
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
@@ -166,7 +166,7 @@ Items_167718:: @ 8167718
EventScript_167728:: @ 8167728
pokemart Items_167738
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json
index 4aa63fd0b..9d13a0086 100644
--- a/data/maps/TwoIsland_CapeBrink_House/map.json
+++ b/data/maps/TwoIsland_CapeBrink_House/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC",
+ "script": "TwoIsland_CapeBrink_House_EventScript_StarterTutor",
"flag": "0"
}
],
diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc
index 56ff2d7c0..ccb50f313 100644
--- a/data/maps/VermilionCity_Mart/scripts.inc
+++ b/data/maps/VermilionCity_Mart/scripts.inc
@@ -18,7 +18,7 @@ VermilionCity_Mart_EventScript_16B666:: @ 816B666
message Text_MayIHelpYou
waitmessage
pokemart Items_16B68C
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 02d2c8369..f52d46e71 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -179,7 +179,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "VictoryRoad_2F_EventScript_1C47AE",
+ "script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor",
"flag": "0"
}
],
diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc
index fbda3b739..22c42342a 100644
--- a/data/maps/VictoryRoad_3F/text.inc
+++ b/data/maps/VictoryRoad_3F/text.inc
@@ -1,7 +1,7 @@
Text_1749F3:: @ 81749F3
.string "ギヤーオ!$"
-Text_1749F9:: @ 81749F9
+Text_DoubleEdgeTeach:: @ 81749F9
.string "You should be proud of yourself,\n"
.string "having battled your way through\l"
.string "VICTORY ROAD so courageously.\p"
@@ -10,15 +10,15 @@ Text_1749F9:: @ 81749F9
.string "Would you like me to teach that\n"
.string "technique?$"
-Text_174ABC:: @ 8174ABC
+Text_DoubleEdgeDeclined:: @ 8174ABC
.string "I'll teach you the technique\n"
.string "anytime.$"
-Text_174AE2:: @ 8174AE2
+Text_DoubleEdgeWhichMon:: @ 8174AE2
.string "Which POKéMON should I teach\n"
.string "DOUBLE-EDGE?$"
-Text_174B0C:: @ 8174B0C
+Text_DoubleEdgeTaught:: @ 8174B0C
.string "Keep that drive going for the\n"
.string "POKéMON LEAGUE!\p"
.string "Take a run at them and knock 'em\n"
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index 4e1b2cd0e..4f5b1e9f5 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -39,7 +39,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "ViridianCity_EventScript_165AF0",
+ "script": "ViridianCity_EventScript_DreamEaterTutor",
"flag": "0"
},
{
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index c99ff83ec..4c9c09af8 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -192,8 +192,8 @@ EventScript_165ADB:: @ 8165ADB
release
end
-ViridianCity_EventScript_165AF0:: @ 8165AF0
- goto EventScript_1C4A1E
+ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0
+ goto EventScript_DreamEaterTutor
end
ViridianCity_EventScript_165AF6:: @ 8165AF6
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index 5dc1f3a67..fb77b7924 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -60,7 +60,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268
message Text_MayIHelpYou
waitmessage
pokemart Items_16A298
- msgbox gUnknown_81A5190
+ msgbox Text_PleaseComeAgain
release
end