Finish Cinnabar Island scripts

11 files changed, 332 insertions, 320 deletions

diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index 0d2a05166..5780a2bf6 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -10,14 +10,14 @@ CinnabarIsland_OnTransition:: @ 8166EE1
 	setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
 	call CinnabarIsland_EventScript_CheckUnlockGym
 	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1
-	call_if_eq CinnabarIsland_EventScript_166F24
+	call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland
 	compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3
-	call_if_eq CinnabarIsland_EventScript_166F52
+	call_if_eq CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands
 	compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
-	call_if_eq CinnabarIsland_EventScript_166F0B
+	call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter
 	end
 
-CinnabarIsland_EventScript_166F0B:: @ 8166F0B
+CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B
 	savebgm MUS_ANNAI
 	setflag FLAG_TEMP_2
 	setobjectxyperm LOCALID_BILL, 15, 12
@@ -25,21 +25,21 @@ CinnabarIsland_EventScript_166F0B:: @ 8166F0B
 	setobjectxyperm LOCALID_SEAGALLOP, 30, 12
 	return
 
-CinnabarIsland_EventScript_166F24:: @ 8166F24
+CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: @ 8166F24
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 18
-	goto_if_ge CinnabarIsland_EventScript_166F4A
+	goto_if_ge CinnabarIsland_EventScript_MoveSeagallopDown
 	setflag FLAG_TEMP_2
 	setobjectxyperm LOCALID_BILL, 18, 12
 	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
 	setobjectxyperm LOCALID_SEAGALLOP, 30, 12
 	return
 
-CinnabarIsland_EventScript_166F4A:: @ 8166F4A
+CinnabarIsland_EventScript_MoveSeagallopDown:: @ 8166F4A
 	setobjectxyperm LOCALID_SEAGALLOP, 30, 8
 	return
 
-CinnabarIsland_EventScript_166F52:: @ 8166F52
+CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: @ 8166F52
 	setobjectxyperm LOCALID_BILL, 21, 8
 	setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
 	return
@@ -53,28 +53,28 @@ CinnabarIsland_EventScript_UnlockGym:: @ 8166F68
 	return
 
 CinnabarIsland_OnFrame:: @ 8166F6E
-	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_166F88
-	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_166FCD
-	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_166FA0
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_ExitPokeCenterForOneIsland
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_BillScene
+	map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_ReturnFromSeviiIslands
 	.2byte 0
 
-CinnabarIsland_EventScript_166F88:: @ 8166F88
+CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88
 	lockall
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	savebgm MUS_DUMMY
 	textcolor 0
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
 	delay 20
-	call CinnabarIsland_EventScript_1670E6
+	call CinnabarIsland_EventScript_SailToOneIsland
 	releaseall
 	end
 
-CinnabarIsland_EventScript_166FA0:: @ 8166FA0
+CinnabarIsland_EventScript_ReturnFromSeviiIslands:: @ 8166FA0
 	lockall
 	textcolor 0
-	msgbox CinnabarIsland_Text_8180F09
+	msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain
 	closemessage
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_166FC6
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit
 	waitmovement 0
 	removeobject LOCALID_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
@@ -83,7 +83,7 @@ CinnabarIsland_EventScript_166FA0:: @ 8166FA0
 	releaseall
 	end
 
-CinnabarIsland_Movement_166FC6:: @ 8166FC6
+CinnabarIsland_Movement_BillExit:: @ 8166FC6
 	walk_down
 	walk_down
 	walk_down
@@ -92,72 +92,72 @@ CinnabarIsland_Movement_166FC6:: @ 8166FC6
 	walk_down
 	step_end
 
-CinnabarIsland_EventScript_166FCD:: @ 8166FCD
+CinnabarIsland_EventScript_BillScene:: @ 8166FCD
 	lockall
 	textcolor 0
-	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_167032
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_16703D
+	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
 	playse SE_PIN
 	applymovement LOCALID_BILL, Movement_ExclamationMark
 	waitmovement 0
 	applymovement LOCALID_BILL, Movement_Delay48
 	waitmovement 0
-	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_167048
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_167053
-	msgbox CinnabarIsland_Text_8180C90
-	msgbox CinnabarIsland_Text_8180CAA, MSGBOX_YESNO
+	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
+	msgbox CinnabarIsland_Text_HeyIfItIsntPlayer
+	msgbox CinnabarIsland_Text_ComeWithMeToOneIsland, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq CinnabarIsland_EventScript_167068
+	goto_if_eq CinnabarIsland_EventScript_AgreeSailToOneIsland
 	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_EventScript_167078
+	goto_if_eq CinnabarIsland_EventScript_DeclineSailToOneIsland
 	end
 
-CinnabarIsland_EventScript_167032:: @ 8167032
+CinnabarIsland_EventScript_BillFacePlayer1:: @ 8167032
 	applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_16703D:: @ 816703D
+CinnabarIsland_EventScript_BillFacePlayer2:: @ 816703D
 	applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167048:: @ 8167048
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1671A4
+CinnabarIsland_EventScript_BillApproachPlayer1:: @ 8167048
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167053:: @ 8167053
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1671A6
+CinnabarIsland_EventScript_BillApproachPlayer2:: @ 8167053
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167068:: @ 8167068
-	msgbox CinnabarIsland_Text_8180DDD
+CinnabarIsland_EventScript_AgreeSailToOneIsland:: @ 8167068
+	msgbox CinnabarIsland_Text_AllRightLetsGo
 	closemessage
-	call CinnabarIsland_EventScript_1670E6
+	call CinnabarIsland_EventScript_SailToOneIsland
 	releaseall
 	end
 
-CinnabarIsland_EventScript_167078:: @ 8167078
-	msgbox CinnabarIsland_Text_8180DF8
+CinnabarIsland_EventScript_DeclineSailToOneIsland:: @ 8167078
+	msgbox CinnabarIsland_Text_IllBeWaitingInPokeCenter
 	closemessage
-	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_1670A0
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_1670B3
+	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter
 	removeobject LOCALID_BILL
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	releaseall
 	end
 
-CinnabarIsland_EventScript_1670A0:: @ 81670A0
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1670AB
+CinnabarIsland_EventScript_BillExitToPokeCenter:: @ 81670A0
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
 	waitmovement 0
 	return
 
-CinnabarIsland_Movement_1670AB:: @ 81670AB
+CinnabarIsland_Movement_BillExitToPokeCenter:: @ 81670AB
 	walk_right
 	walk_down
 	walk_down
@@ -167,44 +167,45 @@ CinnabarIsland_Movement_1670AB:: @ 81670AB
 	walk_down
 	step_end
 
-CinnabarIsland_EventScript_1670B3:: @ 81670B3
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_1670DB
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1670DE
+CinnabarIsland_EventScript_BillReturnToPokeCenter:: @ 81670B3
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor
 	waitmovement 0
 	opendoor 14, 11
 	waitdooranim
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1670E2
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
 	waitmovement 0
 	closedoor 14, 11
 	waitdooranim
 	return
 
-CinnabarIsland_Movement_1670DB:: @ 81670DB
+CinnabarIsland_Movement_PlayerWatchBillExit:: @ 81670DB
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-CinnabarIsland_Movement_1670DE:: @ 81670DE
+CinnabarIsland_Movement_BillApproachDoor:: @ 81670DE
 	delay_16
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-CinnabarIsland_Movement_1670E2:: @ 81670E2
+CinnabarIsland_Movement_BillReEnterPokeCenter:: @ 81670E2
 	walk_up
 	delay_4
 	set_invisible
 	step_end
 
-CinnabarIsland_EventScript_1670E6:: @ 81670E6
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_167142
+@ Can be triggered outside, or after talking to Bill in the poke center
+CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore
 	addobject LOCALID_SEAGALLOP
-	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_167154
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_167166
-	msgbox CinnabarIsland_Text_8180EAD
+	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter
+	msgbox CinnabarIsland_Text_MyPalsBoatArrived
 	closemessage
-	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_167171
-	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_167183
+	call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat
+	call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
 	removeobject LOCALID_BILL
 	delay 40
@@ -215,36 +216,36 @@ CinnabarIsland_EventScript_1670E6:: @ 81670E6
 	goto EventScript_1A90DA
 	end
 
-CinnabarIsland_EventScript_167142:: @ 8167142
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1671AF
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_1671AF
+CinnabarIsland_EventScript_ApproachShore:: @ 8167142
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167154:: @ 8167154
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1671AA
-	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_167195
+CinnabarIsland_EventScript_BoatArrive:: @ 8167154
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat
+	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167166:: @ 8167166
-	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_167195
+CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: @ 8167166
+	applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167171:: @ 8167171
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_16719D
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_1671BA
+CinnabarIsland_EventScript_BoardBoat:: @ 8167171
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
 	waitmovement 0
 	return
 
-CinnabarIsland_EventScript_167183:: @ 8167183
-	applymovement LOCALID_BILL, CinnabarIsland_Movement_1671B6
-	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_1671C4
+CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: @ 8167183
+	applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
 	waitmovement 0
 	return
 
-CinnabarIsland_Movement_167195:: @ 8167195
+CinnabarIsland_Movement_BoatArrive:: @ 8167195
 	delay_16
 	delay_16
 	walk_fast_left
@@ -254,7 +255,7 @@ CinnabarIsland_Movement_167195:: @ 8167195
 	walk_slowest_left
 	step_end
 
-CinnabarIsland_Movement_16719D:: @ 816719D
+CinnabarIsland_Movement_BillBoardBoat:: @ 816719D
 	walk_right
 	walk_down
 	walk_down
@@ -263,24 +264,24 @@ CinnabarIsland_Movement_16719D:: @ 816719D
 	set_invisible
 	step_end
 
-CinnabarIsland_Movement_1671A4:: @ 81671A4
+CinnabarIsland_Movement_BillApproachPlayer1:: @ 81671A4
 	walk_up
 	step_end
 
-CinnabarIsland_Movement_1671A6:: @ 81671A6
+CinnabarIsland_Movement_BillApproachPlayer2:: @ 81671A6
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-CinnabarIsland_Movement_1671AA:: @ 81671AA
+CinnabarIsland_Movement_BillFaceBoat:: @ 81671AA
 	delay_16
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-CinnabarIsland_Movement_1671AF:: @ 81671AF
+CinnabarIsland_Movement_ApproachShore:: @ 81671AF
 	walk_right
 	walk_right
 	walk_right
@@ -289,13 +290,13 @@ CinnabarIsland_Movement_1671AF:: @ 81671AF
 	walk_right
 	step_end
 
-CinnabarIsland_Movement_1671B6:: @ 81671B6
+CinnabarIsland_Movement_BillBoardBoatFromShore:: @ 81671B6
 	walk_right
 	delay_4
 	set_invisible
 	step_end
 
-CinnabarIsland_Movement_1671BA:: @ 81671BA
+CinnabarIsland_Movement_PlayerBoardBoat:: @ 81671BA
 	walk_down
 	walk_right
 	walk_down
@@ -307,7 +308,7 @@ CinnabarIsland_Movement_1671BA:: @ 81671BA
 	set_invisible
 	step_end
 
-CinnabarIsland_Movement_1671C4:: @ 81671C4
+CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ 81671C4
 	walk_right
 	delay_4
 	walk_right
diff --git a/data/maps/CinnabarIsland/text.inc b/data/maps/CinnabarIsland/text.inc
index d15d7acf1..08ea3e44b 100644
--- a/data/maps/CinnabarIsland/text.inc
+++ b/data/maps/CinnabarIsland/text.inc
@@ -25,11 +25,11 @@ CinnabarIsland_Text_GymSign:: @ 8180C4A
     .string "LEADER: BLAINE\l"
     .string "The Hotheaded Quiz Master!$"
 
-CinnabarIsland_Text_8180C90:: @ 8180C90
+CinnabarIsland_Text_HeyIfItIsntPlayer:: @ 8180C90
     .string "Huh?\n"
     .string "Hey, if it isn't {PLAYER}!$"
 
-CinnabarIsland_Text_8180CAA:: @ 8180CAA
+CinnabarIsland_Text_ComeWithMeToOneIsland:: @ 8180CAA
     .string "Look, it's me, BILL.\n"
     .string "Long time no see!\p"
     .string "I hope you're still using my\n"
@@ -43,11 +43,11 @@ CinnabarIsland_Text_8180CAA:: @ 8180CAA
     .string "How about it?\n"
     .string "Do you feel like coming with me?$"
 
-CinnabarIsland_Text_8180DDD:: @ 8180DDD
+CinnabarIsland_Text_AllRightLetsGo:: @ 8180DDD
     .string "All right, then.\n"
     .string "Let's go!$"
 
-CinnabarIsland_Text_8180DF8:: @ 8180DF8
+CinnabarIsland_Text_IllBeWaitingInPokeCenter:: @ 8180DF8
     .string "What, are you too busy?\p"
     .string "Well, all right.\n"
     .string "The boat hasn't arrived yet anyway.\p"
@@ -56,13 +56,13 @@ CinnabarIsland_Text_8180DF8:: @ 8180DF8
     .string "Come see me when you're done with\n"
     .string "your business here.$"
 
-CinnabarIsland_Text_8180EAD:: @ 8180EAD
+CinnabarIsland_Text_MyPalsBoatArrived:: @ 8180EAD
     .string "Looks like my pal's boat arrived,\n"
     .string "too.\p"
     .string "He sent it specially here to\n"
     .string "CINNABAR to pick me up.$"
 
-CinnabarIsland_Text_8180F09:: @ 8180F09
+CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain:: @ 8180F09
     .string "Hey, wasn't that a long cruise?\p"
     .string "My buddy CELIO seemed to enjoy\n"
     .string "your company.\p"
diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json
index 85fb8ebf0..05ba07431 100644
--- a/data/maps/CinnabarIsland_Gym/map.json
+++ b/data/maps/CinnabarIsland_Gym/map.json
@@ -189,70 +189,70 @@
       "x": 15,
       "y": 2,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DCDD"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz2Left"
     },
     {
       "type": "bg_event_type_1",
       "x": 16,
       "y": 2,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DCE9"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz2Right"
     },
     {
       "type": "bg_event_type_1",
       "x": 13,
       "y": 10,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DDBB"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz3Left"
     },
     {
       "type": "bg_event_type_1",
       "x": 14,
       "y": 10,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DDC7"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz3Right"
     },
     {
       "type": "bg_event_type_1",
       "x": 13,
       "y": 17,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DE92"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz4Left"
     },
     {
       "type": "bg_event_type_1",
       "x": 14,
       "y": 17,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DE9E"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz4Right"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 18,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DF69"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz5Left"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 18,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16DF75"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz5Right"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 10,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16E040"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz6Left"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 10,
       "elevation": 0,
-      "script": "CinnabarIsland_Gym_EventScript_16E04C"
+      "script": "CinnabarIsland_Gym_EventScript_Quiz6Right"
     },
     {
       "type": "bg_event_type_1",
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index e8a412381..f31d6f7bb 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -91,12 +91,12 @@ CinnabarIsland_Gym_EventScript_Avery:: @ 816DA96
 	end
 
 CinnabarIsland_Gym_EventScript_DefeatedAvery:: @ 816DAB1
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer
 	release
 	end
 
-EventScript_16DABC:: @ 816DABC
-	call EventScript_16DD31
+CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer:: @ 816DABC
+	call CinnabarIsland_Gym_EventScript_Quiz2Complete
 	return
 
 CinnabarIsland_Gym_EventScript_Derek:: @ 816DAC2
@@ -106,25 +106,25 @@ CinnabarIsland_Gym_EventScript_Derek:: @ 816DAC2
 	end
 
 CinnabarIsland_Gym_EventScript_DefeatedDerek:: @ 816DAEA
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer
 	release
 	end
 
-EventScript_16DAF5:: @ 816DAF5
-	call EventScript_16DEE6
+CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer:: @ 816DAF5
+	call CinnabarIsland_Gym_EventScript_Quiz4Complete
 	return
 
 CinnabarIsland_Gym_EventScript_Zac:: @ 816DAFB
-	trainerbattle_single TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacIntro, CinnabarIsland_Gym_Text_ZacDefeat, EventScript_16DB16
+	trainerbattle_single TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacIntro, CinnabarIsland_Gym_Text_ZacDefeat, CinnabarIsland_Gym_EventScript_DefeatedZac
 	msgbox CinnabarIsland_Gym_Text_ZacPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16DB16:: @ 816DB16
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21
+CinnabarIsland_Gym_EventScript_DefeatedZac:: @ 816DB16
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer
 	release
 	end
 
-EventScript_16DB21:: @ 816DB21
+CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer:: @ 816DB21
 	call CinnabarIsland_Gym_EventScript_Quiz6Complete
 	return
 
@@ -134,11 +134,11 @@ CinnabarIsland_Gym_EventScript_Quinn:: @ 816DB27
 	end
 
 CinnabarIsland_Gym_EventScript_DefeatedQuinn:: @ 816DB42
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer
 	release
 	end
 
-EventScript_16DB4D:: @ 816DB4D
+CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer:: @ 816DB4D
 	call CinnabarIsland_Gym_EventScript_Quiz1Complete
 	return
 
@@ -148,26 +148,26 @@ CinnabarIsland_Gym_EventScript_Ramon:: @ 816DB53
 	end
 
 CinnabarIsland_Gym_EventScript_DefeatedRamon:: @ 816DB6E
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer
 	release
 	end
 
-EventScript_16DB79:: @ 816DB79
-	call EventScript_16DE0F
+CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer:: @ 816DB79
+	call CinnabarIsland_Gym_EventScript_Quiz3Complete
 	return
 
 CinnabarIsland_Gym_EventScript_Dusty:: @ 816DB7F
-	trainerbattle_single TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyIntro, CinnabarIsland_Gym_Text_DustyDefeat, EventScript_16DB9A
+	trainerbattle_single TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyIntro, CinnabarIsland_Gym_Text_DustyDefeat, CinnabarIsland_Gym_EventScript_DefeatedDusty
 	msgbox CinnabarIsland_Gym_Text_DustyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16DB9A:: @ 816DB9A
-	call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5
+CinnabarIsland_Gym_EventScript_DefeatedDusty:: @ 816DB9A
+	call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer
 	release
 	end
 
-EventScript_16DBA5:: @ 816DBA5
-	call EventScript_16DFBD
+CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer:: @ 816DBA5
+	call CinnabarIsland_Gym_EventScript_Quiz5Complete
 	return
 
 CinnabarIsland_Gym_EventScript_GymGuy:: @ 816DBAB
@@ -257,9 +257,9 @@ CinnabarIsland_Gym_EventScript_Quiz1Incorrect:: @ 816DC6A
 
 CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16DCB4
+	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16DCC6
+	call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_QuinnIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnDefeat
@@ -268,56 +268,56 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A
 	releaseall
 	end
 
-EventScript_16DCB4:: @ 816DCB4
+CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: @ 816DCB4
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 1, Movement_16DCD8
+	applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16DCC6:: @ 816DCC6
+CinnabarIsland_Gym_EventScript_QuinnApproachRight:: @ 816DCC6
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 1, Movement_16DCDB
+	applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachRight
 	waitmovement 0
 	return
 
-Movement_16DCD8:: @ 816DCD8
+CinnabarIsland_Gym_Movement_QuinnApproachLeft:: @ 816DCD8
 	walk_left
 	walk_left
 	step_end
 
-Movement_16DCDB:: @ 816DCDB
+CinnabarIsland_Gym_Movement_QuinnApproachRight:: @ 816DCDB
 	walk_left
 	step_end
 
-CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD
+CinnabarIsland_Gym_EventScript_Quiz2Left:: @ 816DCDD
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16DCF5
+	goto CinnabarIsland_Gym_EventScript_Quiz2
 	end
 
-CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
+CinnabarIsland_Gym_EventScript_Quiz2Right:: @ 816DCE9
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16DCF5
+	goto CinnabarIsland_Gym_EventScript_Quiz2
 	end
 
-EventScript_16DCF5:: @ 816DCF5
+CinnabarIsland_Gym_EventScript_Quiz2:: @ 816DCF5
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16DD41
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Incorrect
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16DD1C
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Correct
 	end
 
-EventScript_16DD1C:: @ 816DD1C
+CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C
 	call CinnabarIsland_Gym_EventScript_CorrectAnswer
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DD31
+	call CinnabarIsland_Gym_EventScript_Quiz2Complete
 	releaseall
 	end
 
-EventScript_16DD31:: @ 816DD31
+CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31
 	playse SE_KI_GASYAN
 	waitse
 	call CinnabarIsland_Gym_EventScript_OpenDoor2
@@ -325,84 +325,84 @@ EventScript_16DD31:: @ 816DD31
 	setflag FLAG_CINNABAR_GYM_QUIZ_2
 	return
 
-EventScript_16DD41:: @ 816DD41
+CinnabarIsland_Gym_EventScript_Quiz2Incorrect:: @ 816DD41
 	call CinnabarIsland_Gym_EventScript_IncorrectAnswer
-	goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51
+	goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_EventScript_BattleAvery
 	releaseall
 	end
 
-EventScript_16DD51:: @ 816DD51
+CinnabarIsland_Gym_EventScript_BattleAvery:: @ 816DD51
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16DD8B
+	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16DD9D
+	call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_AveryIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DD31
+	call CinnabarIsland_Gym_EventScript_Quiz2Complete
 	releaseall
 	end
 
-EventScript_16DD8B:: @ 816DD8B
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
-	applymovement 3, Movement_16DDAF
+CinnabarIsland_Gym_EventScript_AveryApproachLeft:: @ 816DD8B
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
+	applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16DD9D:: @ 816DD9D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7
-	applymovement 3, Movement_16DDB3
+CinnabarIsland_Gym_EventScript_AveryApproachRight:: @ 816DD9D
+	applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
+	applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachRight
 	waitmovement 0
 	return
 
-Movement_16DDAF:: @ 816DDAF
+CinnabarIsland_Gym_Movement_AveryApproachLeft:: @ 816DDAF
 	walk_up
 	walk_up
 	walk_left
 	step_end
 
-Movement_16DDB3:: @ 816DDB3
+CinnabarIsland_Gym_Movement_AveryApproachRight:: @ 816DDB3
 	walk_up
 	walk_up
 	walk_in_place_fastest_left
 	step_end
 
-Movement_16DDB7:: @ 816DDB7
+CinnabarIsland_Gym_Movement_PlayerFaceAvery:: @ 816DDB7
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB
+CinnabarIsland_Gym_EventScript_Quiz3Left:: @ 816DDBB
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16DDD3
+	goto CinnabarIsland_Gym_EventScript_Quiz3
 	end
 
-CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
+CinnabarIsland_Gym_EventScript_Quiz3Right:: @ 816DDC7
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16DDD3
+	goto CinnabarIsland_Gym_EventScript_Quiz3
 	end
 
-EventScript_16DDD3:: @ 816DDD3
+CinnabarIsland_Gym_EventScript_Quiz3:: @ 816DDD3
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion3, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16DE1F
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Incorrect
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16DDFA
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Correct
 	end
 
-EventScript_16DDFA:: @ 816DDFA
+CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA
 	call CinnabarIsland_Gym_EventScript_CorrectAnswer
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DE0F
+	call CinnabarIsland_Gym_EventScript_Quiz3Complete
 	releaseall
 	end
 
-EventScript_16DE0F:: @ 816DE0F
+CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F
 	playse SE_KI_GASYAN
 	waitse
 	call CinnabarIsland_Gym_EventScript_OpenDoor3
@@ -410,75 +410,75 @@ EventScript_16DE0F:: @ 816DE0F
 	setflag FLAG_CINNABAR_GYM_QUIZ_3
 	return
 
-EventScript_16DE1F:: @ 816DE1F
+CinnabarIsland_Gym_EventScript_Quiz3Incorrect:: @ 816DE1F
 	call CinnabarIsland_Gym_EventScript_IncorrectAnswer
-	goto_if_not_defeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F
+	goto_if_not_defeated TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_EventScript_BattleRamon
 	releaseall
 	end
 
-EventScript_16DE2F:: @ 816DE2F
+CinnabarIsland_Gym_EventScript_BattleRamon:: @ 816DE2F
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16DE69
+	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16DE7B
+	call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_RamonIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DE0F
+	call CinnabarIsland_Gym_EventScript_Quiz3Complete
 	releaseall
 	end
 
-EventScript_16DE69:: @ 816DE69
+CinnabarIsland_Gym_EventScript_RamonApproachLeft:: @ 816DE69
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 4, Movement_16DE8D
+	applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16DE7B:: @ 816DE7B
+CinnabarIsland_Gym_EventScript_RamonApproachRight:: @ 816DE7B
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 4, Movement_16DE90
+	applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachRight
 	waitmovement 0
 	return
 
-Movement_16DE8D:: @ 816DE8D
+CinnabarIsland_Gym_Movement_RamonApproachLeft:: @ 816DE8D
 	walk_left
 	walk_left
 	step_end
 
-Movement_16DE90:: @ 816DE90
+CinnabarIsland_Gym_Movement_RamonApproachRight:: @ 816DE90
 	walk_left
 	step_end
 
-CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92
+CinnabarIsland_Gym_EventScript_Quiz4Left:: @ 816DE92
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16DEAA
+	goto CinnabarIsland_Gym_EventScript_Quiz4
 	end
 
-CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
+CinnabarIsland_Gym_EventScript_Quiz4Right:: @ 816DE9E
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16DEAA
+	goto CinnabarIsland_Gym_EventScript_Quiz4
 	end
 
-EventScript_16DEAA:: @ 816DEAA
+CinnabarIsland_Gym_EventScript_Quiz4:: @ 816DEAA
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion4, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16DEF6
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Incorrect
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16DED1
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Correct
 	end
 
-EventScript_16DED1:: @ 816DED1
+CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1
 	call CinnabarIsland_Gym_EventScript_CorrectAnswer
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DEE6
+	call CinnabarIsland_Gym_EventScript_Quiz4Complete
 	releaseall
 	end
 
-EventScript_16DEE6:: @ 816DEE6
+CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6
 	playse SE_KI_GASYAN
 	waitse
 	call CinnabarIsland_Gym_EventScript_OpenDoor4
@@ -486,75 +486,75 @@ EventScript_16DEE6:: @ 816DEE6
 	setflag FLAG_CINNABAR_GYM_QUIZ_4
 	return
 
-EventScript_16DEF6:: @ 816DEF6
+CinnabarIsland_Gym_EventScript_Quiz4Incorrect:: @ 816DEF6
 	call CinnabarIsland_Gym_EventScript_IncorrectAnswer
-	goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06
+	goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_EventScript_BattleDerek
 	releaseall
 	end
 
-EventScript_16DF06:: @ 816DF06
+CinnabarIsland_Gym_EventScript_BattleDerek:: @ 816DF06
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16DF40
+	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16DF52
+	call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_DerekIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DEE6
+	call CinnabarIsland_Gym_EventScript_Quiz4Complete
 	releaseall
 	end
 
-EventScript_16DF40:: @ 816DF40
+CinnabarIsland_Gym_EventScript_DerekApproachLeft:: @ 816DF40
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 5, Movement_16DF64
+	applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16DF52:: @ 816DF52
+CinnabarIsland_Gym_EventScript_DerekApproachRight:: @ 816DF52
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 5, Movement_16DF67
+	applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachRight
 	waitmovement 0
 	return
 
-Movement_16DF64:: @ 816DF64
+CinnabarIsland_Gym_Movement_DerekApproachLeft:: @ 816DF64
 	walk_left
 	walk_left
 	step_end
 
-Movement_16DF67:: @ 816DF67
+CinnabarIsland_Gym_Movement_DerekApproachRight:: @ 816DF67
 	walk_left
 	step_end
 
-CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69
+CinnabarIsland_Gym_EventScript_Quiz5Left:: @ 816DF69
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16DF81
+	goto CinnabarIsland_Gym_EventScript_Quiz5
 	end
 
-CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
+CinnabarIsland_Gym_EventScript_Quiz5Right:: @ 816DF75
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16DF81
+	goto CinnabarIsland_Gym_EventScript_Quiz5
 	end
 
-EventScript_16DF81:: @ 816DF81
+CinnabarIsland_Gym_EventScript_Quiz5:: @ 816DF81
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion5, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16DFA8
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Correct
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16DFCD
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Incorrect
 	end
 
-EventScript_16DFA8:: @ 816DFA8
+CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8
 	call CinnabarIsland_Gym_EventScript_CorrectAnswer
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DFBD
+	call CinnabarIsland_Gym_EventScript_Quiz5Complete
 	releaseall
 	end
 
-EventScript_16DFBD:: @ 816DFBD
+CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD
 	playse SE_KI_GASYAN
 	waitse
 	call CinnabarIsland_Gym_EventScript_OpenDoor5
@@ -562,68 +562,68 @@ EventScript_16DFBD:: @ 816DFBD
 	setflag FLAG_CINNABAR_GYM_QUIZ_5
 	return
 
-EventScript_16DFCD:: @ 816DFCD
+CinnabarIsland_Gym_EventScript_Quiz5Incorrect:: @ 816DFCD
 	call CinnabarIsland_Gym_EventScript_IncorrectAnswer
-	goto_if_not_defeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD
+	goto_if_not_defeated TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_EventScript_BattleDusty
 	releaseall
 	end
 
-EventScript_16DFDD:: @ 816DFDD
+CinnabarIsland_Gym_EventScript_BattleDusty:: @ 816DFDD
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16E017
+	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16E029
+	call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_DustyIntro
 	trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyDefeat
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
-	call EventScript_16DFBD
+	call CinnabarIsland_Gym_EventScript_Quiz5Complete
 	releaseall
 	end
 
-EventScript_16E017:: @ 816E017
+CinnabarIsland_Gym_EventScript_DustyApproachLeft:: @ 816E017
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 6, Movement_16E03B
+	applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16E029:: @ 816E029
+CinnabarIsland_Gym_EventScript_DustyApproachRight:: @ 816E029
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 6, Movement_16E03E
+	applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachRight
 	waitmovement 0
 	return
 
-Movement_16E03B:: @ 816E03B
+CinnabarIsland_Gym_Movement_DustyApproachLeft:: @ 816E03B
 	walk_left
 	walk_left
 	step_end
 
-Movement_16E03E:: @ 816E03E
+CinnabarIsland_Gym_Movement_DustyApproachRight:: @ 816E03E
 	walk_left
 	step_end
 
-CinnabarIsland_Gym_EventScript_16E040:: @ 816E040
+CinnabarIsland_Gym_EventScript_Quiz6Left:: @ 816E040
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16E058
+	goto CinnabarIsland_Gym_EventScript_Quiz6
 	end
 
-CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
+CinnabarIsland_Gym_EventScript_Quiz6Right:: @ 816E04C
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16E058
+	goto CinnabarIsland_Gym_EventScript_Quiz6
 	end
 
-EventScript_16E058:: @ 816E058
+CinnabarIsland_Gym_EventScript_Quiz6:: @ 816E058
 	msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
 	msgbox CinnabarIsland_Gym_Text_QuizQuestion6, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16E0A4
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Incorrect
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16E07F
+	goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Correct
 	end
 
-EventScript_16E07F:: @ 816E07F
+CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F
 	call CinnabarIsland_Gym_EventScript_CorrectAnswer
 	goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen
 	call CinnabarIsland_Gym_EventScript_Quiz6Complete
@@ -638,17 +638,17 @@ CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094
 	setflag FLAG_CINNABAR_GYM_QUIZ_6
 	return
 
-EventScript_16E0A4:: @ 816E0A4
+CinnabarIsland_Gym_EventScript_Quiz6Incorrect:: @ 816E0A4
 	call CinnabarIsland_Gym_EventScript_IncorrectAnswer
-	goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4
+	goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_EventScript_BattleZac
 	releaseall
 	end
 
-EventScript_16E0B4:: @ 816E0B4
+CinnabarIsland_Gym_EventScript_BattleZac:: @ 816E0B4
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16E0EE
+	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16E100
+	call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachRight
 	textcolor 0
 	msgbox CinnabarIsland_Gym_Text_ZacIntro
 	trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacDefeat
@@ -657,79 +657,79 @@ EventScript_16E0B4:: @ 816E0B4
 	releaseall
 	end
 
-EventScript_16E0EE:: @ 816E0EE
+CinnabarIsland_Gym_EventScript_ZacApproachLeft:: @ 816E0EE
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 7, Movement_16E112
+	applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachLeft
 	waitmovement 0
 	return
 
-EventScript_16E100:: @ 816E100
+CinnabarIsland_Gym_EventScript_ZacApproachRight:: @ 816E100
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
-	applymovement 7, Movement_16E115
+	applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachRight
 	waitmovement 0
 	return
 
-Movement_16E112:: @ 816E112
+CinnabarIsland_Gym_Movement_ZacApproachLeft:: @ 816E112
 	walk_left
 	walk_left
 	step_end
 
-Movement_16E115:: @ 816E115
+CinnabarIsland_Gym_Movement_ZacApproachRight:: @ 816E115
 	walk_left
 	step_end
 
 CinnabarIsland_Gym_EventScript_OpenDoor1:: @ 816E117
-	setmetatile 26, 8, 711, 0
-	setmetatile 27, 8, 710, 0
-	setmetatile 26, 9, 719, 0
-	setmetatile 27, 9, 718, 0
-	setmetatile 26, 10, 649, 0
-	setmetatile 27, 10, 641, 0
-	setmetatile 28, 10, 642, 0
+	setmetatile 26,  8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0
+	setmetatile 27,  8, METATILE_CinnabarGym_Floor_WallRightCorner, 0
+	setmetatile 26,  9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0
+	setmetatile 27,  9, METATILE_CinnabarGym_Floor_WallRightEdge, 0
+	setmetatile 26, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile 27, 10, METATILE_CinnabarGym_Floor, 0
+	setmetatile 28, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0
 	return
 
 CinnabarIsland_Gym_EventScript_OpenDoor2:: @ 816E157
-	setmetatile 17, 8, 711, 0
-	setmetatile 18, 8, 710, 0
-	setmetatile 17, 9, 719, 0
-	setmetatile 18, 9, 718, 0
-	setmetatile 17, 10, 649, 0
-	setmetatile 18, 10, 641, 0
-	setmetatile 19, 10, 642, 0
+	setmetatile 17,  8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0
+	setmetatile 18,  8, METATILE_CinnabarGym_Floor_WallRightCorner, 0
+	setmetatile 17,  9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0
+	setmetatile 18,  9, METATILE_CinnabarGym_Floor_WallRightEdge, 0
+	setmetatile 17, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile 18, 10, METATILE_CinnabarGym_Floor, 0
+	setmetatile 19, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0
 	return
 
 CinnabarIsland_Gym_EventScript_OpenDoor3:: @ 816E197
-	setmetatile 17, 15, 711, 0
-	setmetatile 18, 15, 710, 0
-	setmetatile 17, 16, 719, 0
-	setmetatile 18, 16, 718, 0
-	setmetatile 17, 17, 649, 0
-	setmetatile 18, 17, 641, 0
-	setmetatile 19, 17, 642, 0
+	setmetatile 17, 15, METATILE_CinnabarGym_Floor_WallLeftCorner, 0
+	setmetatile 18, 15, METATILE_CinnabarGym_Floor_WallRightCorner, 0
+	setmetatile 17, 16, METATILE_CinnabarGym_Floor_WallLeftEdge, 0
+	setmetatile 18, 16, METATILE_CinnabarGym_Floor_WallRightEdge, 0
+	setmetatile 17, 17, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile 18, 17, METATILE_CinnabarGym_Floor, 0
+	setmetatile 19, 17, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0
 	return
 
 CinnabarIsland_Gym_EventScript_OpenDoor4:: @ 816E1D7
-	setmetatile 11, 21, 721, 1
-	setmetatile 11, 22, 649, 0
-	setmetatile 11, 23, 641, 0
+	setmetatile 11, 21, METATILE_CinnabarGym_Wall_RetractedBarrier, 1
+	setmetatile 11, 22, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile 11, 23, METATILE_CinnabarGym_Floor, 0
 	return
 
 CinnabarIsland_Gym_EventScript_OpenDoor5:: @ 816E1F3
-	setmetatile 5, 16, 711, 0
-	setmetatile 6, 16, 710, 0
-	setmetatile 5, 17, 719, 0
-	setmetatile 6, 17, 718, 0
-	setmetatile 5, 18, 649, 0
-	setmetatile 6, 18, 641, 0
-	setmetatile 7, 18, 642, 0
+	setmetatile  5, 16, METATILE_CinnabarGym_Floor_WallLeftCorner, 0
+	setmetatile  6, 16, METATILE_CinnabarGym_Floor_WallRightCorner, 0
+	setmetatile  5, 17, METATILE_CinnabarGym_Floor_WallLeftEdge, 0
+	setmetatile  6, 17, METATILE_CinnabarGym_Floor_WallRightEdge, 0
+	setmetatile  5, 18, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile  6, 18, METATILE_CinnabarGym_Floor, 0
+	setmetatile  7, 18, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0
 	return
 
 CinnabarIsland_Gym_EventScript_OpenDoor6:: @ 816E233
-	setmetatile 5, 8, 711, 0
-	setmetatile 6, 8, 710, 0
-	setmetatile 5, 9, 719, 0
-	setmetatile 6, 9, 718, 0
-	setmetatile 5, 10, 649, 0
-	setmetatile 6, 10, 641, 0
-	setmetatile 7, 10, 642, 0
+	setmetatile  5,  8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0
+	setmetatile  6,  8, METATILE_CinnabarGym_Floor_WallRightCorner, 0
+	setmetatile  5,  9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0
+	setmetatile  6,  9, METATILE_CinnabarGym_Floor_WallRightEdge, 0
+	setmetatile  5, 10, METATILE_CinnabarGym_Floor_ShadeFull, 0
+	setmetatile  6, 10, METATILE_CinnabarGym_Floor, 0
+	setmetatile  7, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0
 	return
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
index 5f444eceb..08fe9acb8 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
@@ -10,35 +10,35 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: @ 816E401
 	faceplayer
 	setvar VAR_0x8008, INGAME_TRADE_SEEL
 	call EventScript_GetInGameTradeSpeciesInfo
-	goto_if_set FLAG_DID_SEELOR_TRADE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E473
-	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	goto_if_set FLAG_DID_SEELOR_TRADE, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded
+	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E45B
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
 	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E45B
+	goto_if_ge CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E465
+	goto_if_ne CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
-	msgbox gUnknown_81A59DA
+	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_SEELOR_TRADE
 	release
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E45B:: @ 816E45B
-	msgbox gUnknown_81A59B6
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade:: @ 816E45B
+	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E465:: @ 816E465
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon:: @ 816E465
 	getspeciesname 0, VAR_0x8009
-	msgbox gUnknown_81A59C6
+	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E473:: @ 816E473
-	msgbox gUnknown_81A59E7
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded:: @ 816E473
+	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
 
@@ -89,7 +89,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse:: @ 816E534
 	return
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil:: @ 816E53A
-	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_819A314
+	msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad
 	release
 	end
 
@@ -220,9 +220,9 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: @ 816E758
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_HELIX
 	compare VAR_RESULT, 0
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
 	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D
@@ -234,9 +234,9 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_DOME
 	compare VAR_RESULT, 0
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
 	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2
@@ -248,12 +248,12 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	setflag FLAG_REVIVED_AMBER
 	compare VAR_RESULT, 0
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty
 	compare VAR_RESULT, 1
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827:: @ 816E827
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827
 	textcolor 3
 	playfanfare MUS_FANFA1
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
@@ -262,13 +262,13 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827:: @ 816E827
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
+	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B:: @ 816E85B
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B
 	textcolor 3
 	playfanfare MUS_FANFA1
 	message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor
@@ -277,17 +277,17 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B:: @ 816E85B
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A
+	goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
 	call EventScript_NameReceivedBoxMon
-	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A
+	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A:: @ 816E88A
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC:: @ 816E88A
 	call EventScript_TransferredToPC
-	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
+	goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon
 	end
 
-CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895:: @ 816E895
+CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon:: @ 816E895
 	release
 	end
 
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
index 70b136486..9a19c16f7 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
@@ -28,7 +28,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: @ 819A282
     .string "You!\n"
     .string "Have you a fossil for me?$"
 
-CinnabarIsland_PokemonLab_ExperimentRoom_Text_819A314:: @ 819A314
+CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad:: @ 819A314
     .string "No!\n"
     .string "Is too bad!$"
 
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
index 93a059d12..68b520e47 100644
--- a/data/maps/Route11_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -23,7 +23,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
 	setvar VAR_0x8008, INGAME_TRADE_NIDORINOA
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE
-	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16FDB6
 	call EventScript_ChooseMonForInGameTrade
@@ -33,24 +33,24 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
 	compare VAR_RESULT, VAR_0x8009
 	goto_if_ne EventScript_16FDC0
 	call EventScript_DoInGameTrade
-	msgbox gUnknown_81A59DA
+	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_NINA_TRADE
 	release
 	end
 
 EventScript_16FDB6:: @ 816FDB6
-	msgbox gUnknown_81A59B6
+	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
 EventScript_16FDC0:: @ 816FDC0
 	getspeciesname 0, VAR_0x8009
-	msgbox gUnknown_81A59C6
+	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
 EventScript_16FDCE:: @ 816FDCE
-	msgbox gUnknown_81A59E7
+	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
 
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
index 483aba832..ed29859ab 100644
--- a/data/maps/Route18_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -15,7 +15,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
 	setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
-	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1704D8
 	call EventScript_ChooseMonForInGameTrade
@@ -25,23 +25,23 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
 	compare VAR_RESULT, VAR_0x8009
 	goto_if_ne EventScript_1704E2
 	call EventScript_DoInGameTrade
-	msgbox gUnknown_81A59DA
+	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MARC_TRADE
 	release
 	end
 
 EventScript_1704D8:: @ 81704D8
-	msgbox gUnknown_81A59B6
+	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
 EventScript_1704E2:: @ 81704E2
 	getspeciesname 0, VAR_0x8009
-	msgbox gUnknown_81A59C6
+	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
 EventScript_1704F0:: @ 81704F0
-	msgbox gUnknown_81A59E7
+	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc
index 641689dff..2cdc2d8ec 100644
--- a/data/maps/Route2_House/scripts.inc
+++ b/data/maps/Route2_House/scripts.inc
@@ -11,7 +11,7 @@ Route2_House_EventScript_16F602:: @ 816F602
 	setvar VAR_0x8008, INGAME_TRADE_MR_MIME
 	call EventScript_GetInGameTradeSpeciesInfo
 	goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
-	msgbox gUnknown_81A597B, MSGBOX_YESNO
+	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_16F65C
 	call EventScript_ChooseMonForInGameTrade
@@ -21,23 +21,23 @@ Route2_House_EventScript_16F602:: @ 816F602
 	compare VAR_RESULT, VAR_0x8009
 	goto_if_ne EventScript_16F666
 	call EventScript_DoInGameTrade
-	msgbox gUnknown_81A59DA
+	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MIMIEN_TRADE
 	release
 	end
 
 EventScript_16F65C:: @ 816F65C
-	msgbox gUnknown_81A59B6
+	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
 EventScript_16F666:: @ 816F666
 	getspeciesname 0, VAR_0x8009
-	msgbox gUnknown_81A59C6
+	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
 EventScript_16F674:: @ 816F674
-	msgbox gUnknown_81A59E7
+	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
diff --git a/data/text/ingame_trade.inc b/data/text/ingame_trade.inc
index 46f33ba1c..0b84b96d6 100644
--- a/data/text/ingame_trade.inc
+++ b/data/text/ingame_trade.inc
@@ -1,21 +1,21 @@
-gUnknown_81A597B:: @ 81A597B
+Trade_Text_LookingForMonWannaTradeForMon:: @ 81A597B
 	.string "I'm looking for the POKéMON\n"
 	.string "{STR_VAR_1}!\p"
 	.string "Wanna trade one for my\n"
 	.string "{STR_VAR_2}?$"
 
-gUnknown_81A59B6:: @ 81A59B6
+Trade_Text_AwwOhWell:: @ 81A59B6
 	.string "Awww!\n"
 	.string "Oh, well…$"
 
-gUnknown_81A59C6:: @ 81A59C6
+Trade_Text_WhatThatsNoMon:: @ 81A59C6
 	.string "What?\n"
 	.string "That's no {STR_VAR_1}!$"
 
-gUnknown_81A59DA:: @ 81A59DA
+Trade_Text_HeyThanks:: @ 81A59DA
 	.string "Hey, thanks!$"
 
-gUnknown_81A59E7:: @ 81A59E7
+Trade_Text_IsntMyOldMonGreat:: @ 81A59E7
 	.string "Isn't my old {STR_VAR_2} great?$"
 
 Trade_Text_DoYouHaveMonWouldYouTradeForMon:: @ 81A59FE
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index c664290d5..2d7600696 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -34,4 +34,15 @@
 #define METATILE_PokemonMansion_Statue_RedEyes_Shade                     0x34E
 #define METATILE_PokemonMansion_Statue_RedEyes_Basement                  0x34F
 
+// Cinnabar Gym
+#define METATILE_CinnabarGym_Floor                  0x281
+#define METATILE_CinnabarGym_Floor_ShadeDiagonal    0x282
+#define METATILE_CinnabarGym_Floor_ShadeFull        0x289
+#define METATILE_CinnabarGym_Floor_WallRightCorner  0x2C6
+#define METATILE_CinnabarGym_Floor_WallLeftCorner   0x2C7
+#define METATILE_CinnabarGym_Floor_WallRightEdge    0x2CE
+#define METATILE_CinnabarGym_Floor_WallLeftEdge     0x2CF
+#define METATILE_CinnabarGym_Wall_RetractedBarrier  0x2D1
+
+
 #endif // GUARD_METATILE_LABELS_H