Document Sevii Island caves

data/event_scripts.s

@@ -25,7 +25,9 @@
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/cable_club.h"
+#include "constants/field_tasks.h"
 #include "constants/field_weather.h"
+#include "constants/weather.h"
 #include "constants/union_room.h"
 #include "constants/trade.h"
 #include "constants/quest_log.h"
@@ -658,6 +660,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TrainerTower/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
+	.include "data/maps/SevenIsland_TanobyRuins/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
 	.include "data/maps/PalletTown_GarysHouse/text.inc"
@@ -1648,9 +1651,9 @@ EventScript_1A8EC0:: @ 81A8EC0
 	.include "data/scripts/seagallop.inc"
 	.include "data/scripts/static_pokemon.inc"
 
-EventScript_1A925E:: @ 81A925E
+EventScript_TryDarkenRuins:: @ 81A925E
 	goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
-	setweather 11
+	setweather WEATHER_SHADE
 	doweather
 	return
 

data/layouts/layouts.json

@@ -3620,16 +3620,16 @@
       "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
     },
     {
-      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2",
+      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT",
-      "name": "UnusedLayout_83453C0_Layout",
+      "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout",
       "width": 30,
       "height": 7,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4A94",
       "secondary_tileset": "gTileset_82D4BFC",
-      "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin",
+      "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin"
+      "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",

data/maps/FourIsland_IcefallCave_1F/scripts.inc

@@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44
 	.byte 0
 
 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
-	setstepcallback 4
+	setstepcallback STEP_CB_ICE
 	end
 
 FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
@@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
 	end
 
 FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
-	map_script_2 VAR_TEMP_1, 1, EventScript_163D65
+	map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole
 	.2byte 0
 
-EventScript_163D65:: @ 8163D65
+FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65
 	lockall
 	delay 20
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
@@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65
 	releaseall
 	end
 
-Movement_163D7F:: @ 8163D7F
+FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F
 	set_invisible
 	step_end

data/maps/FourIsland_IcefallCave_Back/map.json

@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163F25",
+      "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei",
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -92,7 +92,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -101,7 +101,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     }
   ],
   "bg_events": []

data/maps/FourIsland_IcefallCave_Back/scripts.inc

@@ -1,100 +1,105 @@
+.equ LOCALID_ROCKET1, 1
+.equ LOCALID_ROCKET2, 2
+.equ LOCALID_LORELEI, 3
+.equ LOCALID_ROCKET3, 4
+
 FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
 	.byte 0
 
 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
 	compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
-	call_if_eq EventScript_163D94
+	call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
 	end
 
-EventScript_163D94:: @ 8163D94
+FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94
 	setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI
 	return
 
-FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
+FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
 	lockall
 	textcolor 1
-	msgbox gUnknown_817B04F
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
-	applymovement 1, Movement_163EE8
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B0B9
+	msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
 	closemessage
 	playse SE_PIN
-	applymovement 3, Movement_ExclamationMark
+	applymovement LOCALID_LORELEI, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_LORELEI, Movement_Delay48
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B109
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
 	closemessage
-	applymovement 3, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 35
-	applymovement 4, Movement_163F11
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
-	applymovement 3, Movement_163F18
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
 	waitmovement 0
-	applymovement 2, Movement_163EE8
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	playbgm MUS_ROCKET, 0
 	textcolor 0
-	msgbox gUnknown_817B20B
+	msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
-	setvar VAR_LAST_TALKED, 4
+	setvar VAR_LAST_TALKED, LOCALID_ROCKET3
-	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
-	applymovement 3, Movement_163F1B
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B269
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
 	textcolor 0
-	msgbox gUnknown_817B2EF
+	msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat
 	textcolor 1
-	message Text_17B313
+	message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
 	waitmessage
 	waitse
 	playmoncry SPECIES_LAPRAS, 2
 	waitbuttonpress
 	waitmoncry
-	applymovement 1, Movement_163EEE
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B399
+	msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
 	closemessage
-	applymovement 3, Movement_163F1D
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
-	applymovement 1, Movement_163EF0
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
-	applymovement 2, Movement_163EFA
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
-	applymovement 4, Movement_163F05
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
 	waitmovement 0
-	removeobject 1
+	removeobject LOCALID_ROCKET1
-	removeobject 2
+	removeobject LOCALID_ROCKET2
-	removeobject 4
+	removeobject LOCALID_ROCKET3
 	delay 50
-	applymovement 3, Movement_163F23
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B457
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
 	setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
 	clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
 	setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
 	releaseall
 	end
 
-Movement_163EDD:: @ 8163EDD
+FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD
 	walk_up
 	walk_up
 	walk_right
 	walk_up
 	step_end
 
-Movement_163EE2:: @ 8163EE2
+FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2
 	delay_16
 	walk_in_place_fastest_left
 	delay_16
@@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163EE8:: @ 8163EE8
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8
 	walk_in_place_down
 	step_end
 
-gUnknown_163EEA:: @ 8163EEA
+FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-Movement_163EEE:: @ 8163EEE
+FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE
 	walk_in_place_fast_down
 	step_end
 
-Movement_163EF0:: @ 8163EF0
+FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0
 	walk_right
 	walk_down
 	walk_fast_down
@@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0
 	walk_fast_down
 	step_end
 
-Movement_163EFA:: @ 8163EFA
+FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA
 	delay_16
 	walk_left
 	walk_down
@@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA
 	walk_fast_down
 	step_end
 
-Movement_163F05:: @ 8163F05
+FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05
 	delay_16
 	walk_down
 	delay_16
@@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05
 	walk_fast_down
 	step_end
 
-Movement_163F11:: @ 8163F11
+FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-Movement_163F15:: @ 8163F15
+FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15
 	walk_left
 	walk_left
 	step_end
 
-Movement_163F18:: @ 8163F18
+FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18
 	walk_left
 	walk_up
 	step_end
 
-Movement_163F1B:: @ 8163F1B
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B
 	walk_in_place_up
 	step_end
 
-Movement_163F1D:: @ 8163F1D
+FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
@@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163F23:: @ 8163F23
+FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23
 	walk_right
 	step_end
 
-FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
+FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25
-	msgbox gUnknown_817B457, MSGBOX_NPC
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC
 	end

data/maps/FourIsland_IcefallCave_Back/text.inc

@@ -1,16 +1,16 @@
-gUnknown_817B04F:: @ 817B04F
+FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F
     .string "LORELEI: Keep your filthy hands\n"
     .string "off the POKéMON in the cave!\p"
     .string "Do as I say, or you'll have me to\n"
     .string "answer to!$"
 
-gUnknown_817B0B9:: @ 817B0B9
+FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9
     .string "Aww, shut it, lady, and leave\n"
     .string "us be.\p"
     .string "Don't let your glasses get all\n"
     .string "steamed up!$"
 
-gUnknown_817B109:: @ 817B109
+FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109
     .string "LORELEI: {PLAYER}?!\n"
     .string "What are you doing here?\p"
     .string "No, we can catch up later.\n"
@@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109
     .string "Are you ready?\n"
     .string "You take that one, please!$"
 
-gUnknown_817B20B:: @ 817B20B
+FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B
     .string "W-what?!\p"
     .string "Who says we can't do what we want\n"
     .string "with the POKéMON we catch?$"
 
-Text_17B251:: @ 817B251
+FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251
     .string "We didn't plan on this!$"
 
-gUnknown_817B269:: @ 817B269
+FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269
     .string "LORELEI: Humph.\n"
     .string "So despicably weak.\p"
     .string "You!\n"
@@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269
     .string "I'm smashing your ring once and\n"
     .string "for all!$"
 
-gUnknown_817B2EF:: @ 817B2EF
+FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF
     .string "N-no way!\n"
     .string "I'm not telling you that!$"
 
-Text_17B313:: @ 817B313
+FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313
     .string "LORELEI: If you won't confess,\n"
     .string "we'll deep-freeze you.\p"
     .string "My LAPRAS is furious for what\n"
@@ -52,7 +52,7 @@ Text_17B313:: @ 817B313
     .string "Go, LAPRAS!\n"
     .string "ICE BEAM…$"
 
-gUnknown_817B399:: @ 817B399
+FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399
     .string "Wawaah! Okay!\n"
     .string "I'll talk!\p"
     .string "The POKéMON are in the ROCKET\n"
@@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399
     .string "into the ROCKET WAREHOUSE!\p"
     .string "Heheheheh!$"
 
-gUnknown_817B457:: @ 817B457
+FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457
     .string "{PLAYER}, thank you.\n"
     .string "But this is awful…\p"
     .string "I was born and raised here on\n"

data/maps/PalletTown_PlayersHouse_1F/text.inc

@@ -1,65 +1,3 @@
-Text_18CF4D:: @ 818CF4D
-    .string "Training by oneself is certainly\n"
-    .string "not a bad thing.\p"
-    .string "But it's also not bad to aim for\n"
-    .string "the top with a partner.\p"
-    .string "Even BRUNO…\n"
-    .string "He trained with a fellow by the\l"
-    .string "name of BRAWLY before.$"
-
-Text_18CFFB:: @ 818CFFB
-    .string "Do you know anything about this\n"
-    .string "stone chamber?$"
-
-Text_18D02A:: @ 818D02A
-    .string "That was uncalled for.\n"
-    .string "You didn't have to be so rough.$"
-
-Text_18D061:: @ 818D061
-    .string "The TANOBY RUINS date back at\n"
-    .string "least 1,500 years.\p"
-    .string "But it's a baffling mystery as to\n"
-    .string "why it was built in the first place.$"
-
-Text_18D0D9:: @ 818D0D9
-    .string "A mystic POKéMON is said to sleep\n"
-    .string "inside here.$"
-
-Text_18D108:: @ 818D108
-    .string "I'm not much good in battle.$"
-
-Text_18D125:: @ 818D125
-    .string "I hear there are other ruins like\n"
-    .string "the one here.\p"
-    .string "Might they be the resting places\n"
-    .string "of other mystic POKéMON?$"
-
-Text_18D18F:: @ 818D18F
-    .string "CLIFFORD is teaching me how to\n"
-    .string "paint.$"
-
-Text_18D1B5:: @ 818D1B5
-    .string "We might get in trouble for being\n"
-    .string "noisy here.$"
-
-Text_18D1E3:: @ 818D1E3
-    .string "I said that I wanted to paint an\n"
-    .string "old building.\p"
-    .string "So CLIFFORD brought me here.$"
-
-Text_18D22F:: @ 818D22F
-    .string "Today, in addition to our lesson,\n"
-    .string "we came to see the chamber.$"
-
-Text_18D26D:: @ 818D26D
-    .string "My, how extraordinary.$"
-
-Text_18D284:: @ 818D284
-    .string "Ah, so you are studying POKéMON\n"
-    .string "on your own…\p"
-    .string "Yes, you certainly are quite the\n"
-    .string "extraordinary person, indeed.$"
-
 gUnknown_818D2F0:: @ 818D2F0
     .string "MOM: …Right.\n"
     .string "All boys leave home someday.\l"

data/maps/SevenIsland_SevaultCanyon/text.inc

@@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B
     .string "SEVAULT CANYON\n"
     .string "TANOBY RUINS AHEAD$"
 
+Text_18CF4D:: @ 818CF4D
+    .string "Training by oneself is certainly\n"
+    .string "not a bad thing.\p"
+    .string "But it's also not bad to aim for\n"
+    .string "the top with a partner.\p"
+    .string "Even BRUNO…\n"
+    .string "He trained with a fellow by the\l"
+    .string "name of BRAWLY before.$"

data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json

@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_7",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_6",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2"
     }
   ],
   "bg_events": []

data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc

@@ -1,10 +1,12 @@
+.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8
+
 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition
 	.byte 0
 
 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
-	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07
+	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setvar VAR_TEMP_5, 0
 	setvar VAR_TEMP_6, 0
 	setvar VAR_TEMP_7, 0
-	setvar VAR_TEMP_8, 0
+	setvar NUM_SWITCHES_PRESSED, 0
 	end
 
-EventScript_164E07:: @ 8164E07
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07
 	setobjectxyperm 1, 7, 2
 	setobjectxyperm 2, 4, 4
 	setobjectxyperm 3, 10, 4
@@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07
 	setobjectxyperm 7, 9, 8
 	return
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39
 	lockall
 	compare VAR_TEMP_1, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_1, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C
 	lockall
 	compare VAR_TEMP_2, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_2, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F
 	lockall
 	compare VAR_TEMP_3, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_3, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2
 	lockall
 	compare VAR_TEMP_4, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_4, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5
 	lockall
 	compare VAR_TEMP_5, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_5, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8
 	lockall
 	compare VAR_TEMP_6, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_6, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B
 	lockall
 	compare VAR_TEMP_7, 100
-	goto_if_eq EventScript_164F8A
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
-	call EventScript_164F2E
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_7, 100
-	compare VAR_TEMP_8, 7
+	compare NUM_SWITCHES_PRESSED, 7
-	goto_if_eq EventScript_164F8C
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-EventScript_164F2E:: @ 8164F2E
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
-	addvar VAR_TEMP_8, 1
+	addvar NUM_SWITCHES_PRESSED, 1
 	playse SE_TRACK_MOVE
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
@@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E
 	delay 60
 	return
 
-EventScript_164F51:: @ 8164F51
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
@@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51
 	waitse
 	return
 
-EventScript_164F8A:: @ 8164F8A
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A
 	releaseall
 	end
 
-EventScript_164F8C:: @ 8164F8C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C
-	call EventScript_164F51
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen
-	msgbox gUnknown_817D31B
+	msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway
 	setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
 	releaseall
 	end

data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc

@@ -1,4 +1,4 @@
-gUnknown_817D31B:: @ 817D31B
+SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B
     .string "A mysterious rumble echoed\n"
     .string "somewhere far away.$"
 

data/maps/SevenIsland_TanobyRuins/map.json

@@ -29,7 +29,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D",
+      "script": "SevenIsland_TanobyRuins_EventScript_Brandon",
       "flag": "0"
     },
     {
@@ -42,7 +42,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B",
+      "script": "SevenIsland_TanobyRuins_EventScript_Benjamin",
       "flag": "0"
     },
     {
@@ -55,7 +55,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9",
+      "script": "SevenIsland_TanobyRuins_EventScript_Edna",
       "flag": "0"
     },
     {
@@ -68,7 +68,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACD07",
+      "script": "SevenIsland_TanobyRuins_EventScript_Clifford",
       "flag": "0"
     }
   ],

data/maps/SevenIsland_TanobyRuins/text.inc

@@ -0,0 +1,52 @@
+SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB
+    .string "Do you know anything about this\n"
+    .string "stone chamber?$"
+
+SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A
+    .string "That was uncalled for.\n"
+    .string "You didn't have to be so rough.$"
+
+SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061
+    .string "The TANOBY RUINS date back at\n"
+    .string "least 1,500 years.\p"
+    .string "But it's a baffling mystery as to\n"
+    .string "why it was built in the first place.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9
+    .string "A mystic POKéMON is said to sleep\n"
+    .string "inside here.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108
+    .string "I'm not much good in battle.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125
+    .string "I hear there are other ruins like\n"
+    .string "the one here.\p"
+    .string "Might they be the resting places\n"
+    .string "of other mystic POKéMON?$"
+
+SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F
+    .string "CLIFFORD is teaching me how to\n"
+    .string "paint.$"
+
+SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5
+    .string "We might get in trouble for being\n"
+    .string "noisy here.$"
+
+SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3
+    .string "I said that I wanted to paint an\n"
+    .string "old building.\p"
+    .string "So CLIFFORD brought me here.$"
+
+SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F
+    .string "Today, in addition to our lesson,\n"
+    .string "we came to see the chamber.$"
+
+SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D
+    .string "My, how extraordinary.$"
+
+SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284
+    .string "Ah, so you are studying POKéMON\n"
+    .string "on your own…\p"
+    .string "Yes, you certainly are quite the\n"
+    .string "extraordinary person, indeed.$"

data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6
 	.byte 0
 
 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE
 	.byte 0
 
 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc

@@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF
 
 SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E
 	.byte 0
 
 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02
 	.byte 0
 
 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A
 	.byte 0
 
 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc

@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA
 	.byte 0
 
 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end

data/maps/SixIsland_DottedHole_1F/scripts.inc

@@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F
 	end
 
-SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
+SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C
 	lockall
 	braillemessage Braille_Text_Up
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
+SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195
 	lockall
 	braillemessage Braille_Text_Down
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
+SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E
 	lockall
 	braillemessage Braille_Text_Right
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
+SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7
 	lockall
 	braillemessage Braille_Text_Left
 	waitbuttonpress

data/maps/SixIsland_DottedHole_B1F/map.json

@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B1F_EventScript_16418C"
+      "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp"
     }
   ]
 }

data/maps/SixIsland_DottedHole_B2F/map.json

@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B2F_EventScript_1641A7"
+      "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft"
     }
   ]
 }

data/maps/SixIsland_DottedHole_B3F/map.json

@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B3F_EventScript_16419E"
+      "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight"
     }
   ]
 }

data/maps/SixIsland_DottedHole_B4F/map.json

@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B4F_EventScript_164195"
+      "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown"
     }
   ]
 }

data/maps/SixIsland_DottedHole_SapphireRoom/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire",
       "flag": "FLAG_HIDE_SAPPHIRE"
     },
     {
@@ -63,7 +63,7 @@
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F"
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage"
     }
   ]
 }

data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc

@@ -1,29 +1,32 @@
+.equ LOCALID_SAPPHIRE, 1
+.equ LOCALID_THIEF,    2
+
 SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4
 	.byte 0
 
-SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
+SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5
 	lock
 	faceplayer
 	textcolor 3
 	playfanfare MUS_FAN5
-	message Text_17BD82
+	message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire
 	waitmessage
 	waitfanfare
 	closemessage
-	setobjectxyperm 2, 5, 0
+	setobjectxyperm LOCALID_THIEF, 5, 0
-	addobject 2
+	addobject LOCALID_THIEF
 	playse SE_RU_HYUU
-	applymovement 2, Movement_16440F
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn
 	waitmovement 0
 	playse SE_W070
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 12
@@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
 	special Special_ShakeScreen
 	delay 60
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164325
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164330
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16433B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164346
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest
 	textcolor 0
-	msgbox gUnknown_817BD97
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164351
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164366
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16437B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164390
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest
-	removeobject 1
+	removeobject LOCALID_SAPPHIRE
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_164304
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164304
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
-	msgbox gUnknown_817BDD4
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1643A5
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1643B7
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_1643C9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_1643DB
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest
 	playse SE_KAIDAN
 	delay 35
-	removeobject 2
+	removeobject LOCALID_THIEF
 	setflag FLAG_LEARNED_YES_NAH_CHANSEY
 	release
 	end
 
-EventScript_1642F9:: @ 81642F9
+@ Lots of redundant scripts below
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164304:: @ 8164304
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16430F:: @ 816430F
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_16431A:: @ 816431A
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_164325:: @ 8164325
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325
-	applymovement 2, Movement_1643ED
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_164330:: @ 8164330
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330
-	applymovement 2, Movement_1643ED
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_16433B:: @ 816433B
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B
-	applymovement 2, Movement_1643F1
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164346:: @ 8164346
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346
-	applymovement 2, Movement_1643F1
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164351:: @ 8164351
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351
-	applymovement 2, Movement_1643F5
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164366:: @ 8164366
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366
-	applymovement 2, Movement_1643F5
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16437B:: @ 816437B
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B
-	applymovement 2, Movement_1643F7
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164390:: @ 8164390
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390
-	applymovement 2, Movement_1643F7
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_1643A5:: @ 81643A5
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
-	applymovement 2, Movement_1643F9
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
 	waitmovement 0
 	return
 
-EventScript_1643B7:: @ 81643B7
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
-	applymovement 2, Movement_164401
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
 	waitmovement 0
 	return
 
-EventScript_1643C9:: @ 81643C9
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
-	applymovement 2, Movement_164409
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-EventScript_1643DB:: @ 81643DB
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
-	applymovement 2, Movement_164409
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-Movement_1643ED:: @ 81643ED
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-Movement_1643F1:: @ 81643F1
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_1643F5:: @ 81643F5
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5
 	walk_right
 	step_end
 
-Movement_1643F7:: @ 81643F7
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7
 	walk_up
 	step_end
 
-Movement_1643F9:: @ 81643F9
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9
 	walk_fast_up
 	walk_fast_right
 	walk_fast_right
@@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9
 	walk_fast_right
 	step_end
 
-Movement_164401:: @ 8164401
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -207,7 +211,7 @@ Movement_164401:: @ 8164401
 	walk_fast_right
 	step_end
 
-Movement_164409:: @ 8164409
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -215,7 +219,7 @@ Movement_164409:: @ 8164409
 	walk_fast_up
 	step_end
 
-Movement_16440F:: @ 816440F
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F
 	face_down
 	disable_anim
 	slide_down
@@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F
 	restore_anim
 	step_end
 
-Movement_16441C:: @ 816441C
+SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
+SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F
 	lockall
 	setvar VAR_0x8005, 130
 	braillemessage_wait Braille_Text_LetTheTwo

data/maps/SixIsland_DottedHole_SapphireRoom/text.inc

@@ -1,12 +1,12 @@
-Text_17BD82:: @ 817BD82
+SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82
     .string "{PLAYER} found a SAPPHIRE!$"
 
-gUnknown_817BD97:: @ 817BD97
+SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97
     .string "Fufu… Fufufufu…\n"
     .string "I guessed right.\p"
     .string "I was right in tailing you!$"
 
-gUnknown_817BDD4:: @ 817BDD4
+SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4
     .string "I knew that there was a SAPPHIRE\n"
     .string "here, so it belongs to me!\p"
     .string "I'll sell it to TEAM ROCKET for\n"

data/maps/ThreeIsland_BerryForest/map.json

@@ -5,7 +5,7 @@
   "music": "MUS_T_MORI",
   "region_map_section": "MAPSEC_BERRY_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,

data/maps/ThreeIsland_DunsparceTunnel/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60",
+      "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector",
       "flag": "0"
     }
   ],

data/maps/ThreeIsland_DunsparceTunnel/scripts.inc

@@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, TRUE
-	call_if_eq EventScript_164D50
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut
 	compare VAR_0x8008, FALSE
-	call_if_eq EventScript_164D54
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall
 	end
 
-EventScript_164D50:: @ 8164D50
+ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50
-	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2
+	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT
 	return
 
-EventScript_164D54:: @ 8164D54
+ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54
 	setobjectxyperm 1, 6, 3
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
+ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2
+	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_164D90
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold
-	msgbox gUnknown_817D13B
+	msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold
 	closemessage
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-EventScript_164D90:: @ 8164D90
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90
-	msgbox gUnknown_817D1C9
+	msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou
 	giveitem ITEM_NUGGET
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_164DB8
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget
 	setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL
-	goto EventScript_164DC2
+	goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	end
 
-EventScript_164DB8:: @ 8164DB8
+ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8
-	msgbox gUnknown_817D2DC
+	msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull
 	release
 	end
 
-EventScript_164DC2:: @ 8164DC2
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2
-	msgbox gUnknown_817D28C
+	msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget
 	release
 	end

data/maps/ThreeIsland_DunsparceTunnel/text.inc

@@ -1,4 +1,4 @@
-gUnknown_817D13B:: @ 817D13B
+ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B
     .string "Hey, there!\n"
     .string "How's it going?\p"
     .string "What am I doing here, you ask?\n"
@@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B
     .string "When I strike it rich, I'm buying\n"
     .string "a house in KANTO.$"
 
-gUnknown_817D1C9:: @ 817D1C9
+ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9
     .string "Hey, there! How's it going?\n"
     .string "Did you hear? I've struck gold!\p"
     .string "You remembered that I was\n"
@@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9
     .string "So, I'll show you!\n"
     .string "This is for you!$"
 
-gUnknown_817D28C:: @ 817D28C
+ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C
     .string "That's a NUGGET!\p"
     .string "I can't give you any nuggets of\n"
     .string "wisdom, so that'll have to do!$"
 
-gUnknown_817D2DC:: @ 817D2DC
+ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC
     .string "Whoops, your BAG is crammed full!\n"
     .string "I'll give this to you later.$"
 

data/text/trainers.inc

@@ -989,18 +989,18 @@ Text_1C4699:: @ 81C4699
 	.string "NYA: I won't drag down my mentor\n"
 	.string "LEX! We're going to win!$"
 
-Text_1C46D3:: @ 81C46D3
+SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3
 	.string "Have you discovered anything about\n"
 	.string "this stone chamber?$"
 
-Text_1C470A:: @ 81C470A
+SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A
 	.string "A mystic POKéMON is said to sleep\n"
 	.string "inside here.$"
 
-Text_1C4739:: @ 81C4739
+SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739
 	.string "My teacher is showing me how to\n"
 	.string "paint some more.$"
 
-Text_1C476A:: @ 81C476A
+SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A
 	.string "Today, in addition to our lesson,\n"
 	.string "we came to see the chamber again.$"

include/constants/layouts.h

@@ -301,7 +301,7 @@
 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
 #define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317
 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
-#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319
+#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT 319
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322