Merge branch 'master' of github.com:pret/pokefirered into union_room_chat

2020-01-24 21:42:03 -05:00
parent d22dd0f08b a09e66b53f
commit 2531afb6ab
113 changed files with 1045 additions and 995 deletions
@@ -689,6 +689,7 @@ gStdScriptsEnd::
 	.include "data/maps/VermilionCity_House1/text.inc"
 	.include "data/maps/VermilionCity_PokemonCenter_1F/text.inc"
 	.include "data/maps/VermilionCity_PokemonFanClub/text.inc"
 	.include "data/maps/VermilionCity_House2/text.inc"
 	.include "data/maps/VermilionCity_Mart/text.inc"
 	.include "data/maps/VermilionCity_Gym/text.inc"
 	.include "data/maps/VermilionCity_House3/text.inc"
@@ -1076,13 +1077,7 @@ Text_FoundTMHMContainsMove:: @ 81A63E8
 	.string "{PLAYER} found a {STR_VAR_2}!\n"
 	.string "It contains {STR_VAR_1}.$"
-Text_1A6407:: @ 81A6407
+	.include "data/text/seagallop.inc"
 	.string "おつかれさん！\n"
 	.string "どこに　いきたいんだ？$"
 Text_1A641B:: @ 81A641B
 	.string "All right!\n"
 	.string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"
@ Call for legendary bird trio
 Text_Gyaoo:: @ 81A6448
@@ -1525,21 +1520,21 @@ Common_EventScript_DirectCornerAttendant:: @ 81A8D02
 	call CableClub_EventScript_DirectCornerAttendant
 	end
-VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
+VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F
+	goto_if_set FLAG_GOT_VS_SEEKER, VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker
-	msgbox Text_194234
+	msgbox VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain
 	setflag FLAG_GOT_VS_SEEKER
 	giveitem ITEM_VS_SEEKER
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
-	msgbox Text_19430F
+	msgbox VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches
 	release
 	end
-EventScript_1A8D3F:: @ 81A8D3F
+VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F
-	msgbox Text_194381
+	msgbox VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker
 	release
 	end
@@ -213,7 +213,7 @@ CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
 	setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
 	setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
 CinnabarIsland_EventScript_ApproachShore:: @ 8167142
@@ -7,5 +7,5 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end
@@ -7,5 +7,5 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end
@@ -18,3 +18,8 @@ LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1
    .string "If that happens, you have to send\n"
    .string "out two POKéMON to battle, too.$"
 LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: @ 8193E82
    .string "この　あいだ　やまおくで\n"
    .string "きんのたまを　ひろい　ましてね！\p"
    .string "つかえない　しなもの　ですが\n"
    .string "うったら　なんと　5000¥でした$"
@@ -38,5 +38,5 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
-	goto EventScript_1A8EC5
+	goto EventScript_ChooseDestFromOneIsland
 	end
@@ -503,7 +503,7 @@ EventScript_1711DA:: @ 81711DA
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3
 	setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
 	setvar VAR_0x8006, SEAGALLOP_CINNABAR_ISLAND
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
 EventScript_1712E4:: @ 81712E4
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Corridor_EventScript_1608D5",
+      "script": "SSAnne_1F_Corridor_EventScript_Sailor",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Corridor_EventScript_1608CC",
+      "script": "SSAnne_1F_Corridor_EventScript_WorkerM",
      "flag": "0"
    }
  ],
@@ -1,10 +1,10 @@
 SSAnne_1F_Corridor_MapScripts:: @ 81608CB
 	.byte 0
-SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC
+SSAnne_1F_Corridor_EventScript_WorkerM:: @ 81608CC
-	msgbox gUnknown_8172EE7, MSGBOX_NPC
+	msgbox SSAnne_1F_Corridor_Text_LeStrongSilentType, MSGBOX_NPC
 	end
-SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5
+SSAnne_1F_Corridor_EventScript_Sailor:: @ 81608D5
-	msgbox gUnknown_8172F60, MSGBOX_NPC
+	msgbox SSAnne_1F_Corridor_Text_PassengersAreRestless, MSGBOX_NPC
 	end
@@ -1,4 +1,4 @@
-gUnknown_8172EE7:: @ 8172EE7
+SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7
    .string "Bonjour!\n"
    .string "I am le waiter on this ship!\p"
    .string "I will be happy to serve you\n"
@@ -6,7 +6,7 @@ gUnknown_8172EE7:: @ 8172EE7
    .string "… … …\n"
    .string "Ah! Le strong silent type!$"
-gUnknown_8172F60:: @ 8172F60
+SSAnne_1F_Corridor_Text_PassengersAreRestless:: @ 8172F60
    .string "The passengers are restless from\n"
    .string "this long voyage.\p"
    .string "You might be challenged by the\n"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room1_EventScript_160BDC",
+      "script": "SSAnne_1F_Room1_EventScript_Gentleman",
      "flag": "0"
    }
  ],
@@ -1,6 +1,6 @@
 SSAnne_1F_Room1_MapScripts:: @ 8160BDB
 	.byte 0
-SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC
+SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC
-	msgbox gUnknown_817393B, MSGBOX_NPC
+	msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC
 	end
@@ -1,4 +1,4 @@
-gUnknown_817393B:: @ 817393B
+SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B
    .string "Ssh…!\n"
    .string "I'm a GLOBAL POLICE agent.\p"
    .string "I'm on the trail of TEAM ROCKET.\n"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_1F_Room2_EventScript_160BEF",
+      "script": "SSAnne_1F_Room2_EventScript_Ann",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_1F_Room2_EventScript_160C06",
+      "script": "SSAnne_1F_Room2_EventScript_Tyler",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 1,
-      "script": "SSAnne_1F_Room2_EventScript_160BE6",
+      "script": "SSAnne_1F_Room2_EventScript_Woman",
      "flag": "0"
    },
    {
@@ -1,16 +1,16 @@
 SSAnne_1F_Room2_MapScripts:: @ 8160BE5
 	.byte 0
-SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6
+SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6
-	msgbox gUnknown_8173AC5, MSGBOX_NPC
+	msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC
 	end
-SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF
+SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF
-	trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F
+	trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat
-	msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06
+SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06
-	trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1
+	trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat
-	msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,31 +1,31 @@
-Text_173999:: @ 8173999
+SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999
    .string "I love POKéMON!\n"
    .string "Do you?$"
-Text_1739B1:: @ 81739B1
+SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1
    .string "Wow! \n"
    .string "You're great!$"
-gUnknown_81739C5:: @ 81739C5
+SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5
    .string "Listen, listen!\n"
    .string "Let me be your friend, okay?\p"
    .string "Then we can trade POKéMON and\n"
    .string "do stuff.$"
-Text_173A1A:: @ 8173A1A
+SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A
    .string "I collected these POKéMON\n"
    .string "from all around the world!$"
-Text_173A4F:: @ 8173A4F
+SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F
    .string "Oh, no!\n"
    .string "I went around the world for these!$"
-gUnknown_8173A7A:: @ 8173A7A
+SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A
    .string "You hurt my poor POKéMON!\p"
    .string "I demand that you heal them at a\n"
    .string "POKéMON CENTER!$"
-gUnknown_8173AC5:: @ 8173AC5
+SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5
    .string "We are cruising around the world,\n"
    .string "my children and I.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 3,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C1E",
+      "script": "SSAnne_1F_Room3_EventScript_LittleGirl",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C30",
+      "script": "SSAnne_1F_Room3_EventScript_Wigglytuff",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C27",
+      "script": "SSAnne_1F_Room3_EventScript_BaldingMan",
      "flag": "0"
    }
  ],
@@ -1,20 +1,20 @@
 SSAnne_1F_Room3_MapScripts:: @ 8160C1D
 	.byte 0
-SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E
+SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E
-	msgbox gUnknown_8173B21, MSGBOX_NPC
+	msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC
 	end
-SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27
+SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27
-	msgbox gUnknown_8173AFA, MSGBOX_NPC
+	msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC
 	end
-SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30
+SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WIGGLYTUFF, 0
-	msgbox gUnknown_8173B61
+	msgbox SSAnne_1F_Room3_Text_Wigglytuff
 	waitmoncry
 	release
 	end
@@ -1,11 +1,11 @@
-gUnknown_8173AFA:: @ 8173AFA
+SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA
    .string "A world cruise is so elegant yet\n"
    .string "cozy!$"
-gUnknown_8173B21:: @ 8173B21
+SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21
    .string "I always travel with WIGGLYTUFF.\n"
    .string "I never leave home without it.$"
-gUnknown_8173B61:: @ 8173B61
+SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61
    .string "WIGGLYTUFF: Puup pupuu!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room4_EventScript_160C44",
+      "script": "SSAnne_1F_Room4_EventScript_Woman",
      "flag": "0"
    }
  ],
@@ -1,17 +1,17 @@
 SSAnne_1F_Room4_MapScripts:: @ 8160C43
 	.byte 0
-SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44
+SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_160C5C
+	goto_if_eq SSAnne_1F_Room4_EventScript_WomanPlayerMale
-	msgbox gUnknown_8173BA4
+	msgbox SSAnne_1F_Room4_Text_WaitressCherryPiePlease
 	release
 	end
-EventScript_160C5C:: @ 8160C5C
+SSAnne_1F_Room4_EventScript_WomanPlayerMale:: @ 8160C5C
-	msgbox gUnknown_8173B79
+	msgbox SSAnne_1F_Room4_Text_WaiterCherryPiePlease
 	release
 	end
@@ -1,8 +1,8 @@
-gUnknown_8173B79:: @ 8173B79
+SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: @ 8173B79
    .string "Waiter, I would like a cherry pie,\n"
    .string "please!$"
-gUnknown_8173BA4:: @ 8173BA4
+SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: @ 8173BA4
    .string "Waitress, I would like a cherry\n"
    .string "pie, please!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 4,
-      "script": "SSAnne_1F_Room5_EventScript_160C67",
+      "script": "SSAnne_1F_Room5_EventScript_Arthur",
      "flag": "0"
    }
  ],
@@ -1,7 +1,7 @@
 SSAnne_1F_Room5_MapScripts:: @ 8160C66
 	.byte 0
-SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67
+SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67
-	trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA
+	trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat
-	msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,12 +1,12 @@
-Text_173BD1:: @ 8173BD1
+SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1
    .string "You insolent pup!\n"
    .string "How dare you barge in!$"
-Text_173BFA:: @ 8173BFA
+SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA
    .string "Humph! You rude child!\n"
    .string "You have no sense of courtesy!$"
-gUnknown_8173C30:: @ 8173C30
+SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30
    .string "I wish to be left alone!\n"
    .string "Get out!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room6_EventScript_160DF3",
+      "script": "SSAnne_1F_Room6_EventScript_Woman",
      "flag": "0"
    }
  ],
@@ -1,27 +1,27 @@
 SSAnne_1F_Room6_MapScripts:: @ 8160DF2
 	.byte 0
-SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
+SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3
 	lock
 	faceplayer
-	msgbox gUnknown_817445B, MSGBOX_YESNO
+	msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_160E18
+	goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHeal
 	closemessage
 	call EventScript_OutOfCenterPartyHeal
-	msgbox gUnknown_8174490
+	msgbox SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed
 	release
 	end
-EventScript_160E18:: @ 8160E18
+SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_160E2E
+	goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale
-	msgbox gUnknown_8174515
+	msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMySister
 	release
 	end
-EventScript_160E2E:: @ 8160E2E
+SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E
-	msgbox gUnknown_81744D0
+	msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother
 	release
 	end
@@ -1,16 +1,16 @@
-gUnknown_817445B:: @ 817445B
+SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B
    .string "You look tired. Would you like to\n"
    .string "take a short rest?$"
-gUnknown_8174490:: @ 8174490
+SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490
    .string "I'm glad to see that everyone is\n"
    .string "looking refreshed and chipper.$"
-gUnknown_81744D0:: @ 81744D0
+SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0
    .string "Oh, I'm sorry for fussing over you.\n"
    .string "You look like my little brother…$"
-gUnknown_8174515:: @ 8174515
+SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515
    .string "Oh, I'm sorry for fussing over you.\n"
    .string "You look like my little sister…$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_1F_Room7_EventScript_160C7F",
+      "script": "SSAnne_1F_Room7_EventScript_Thomas",
      "flag": "0"
    }
  ],
@@ -1,7 +1,7 @@
 SSAnne_1F_Room7_MapScripts:: @ 8160C7E
 	.byte 0
-SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F
+SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F
-	trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4
+	trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat
-	msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,11 +1,11 @@
-Text_173C52:: @ 8173C52
+SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52
    .string "I am but a solitary traveler…\p"
    .string "My sole companions and friends are\n"
    .string "POKéMON I caught on my journeys…$"
-Text_173CB4:: @ 8173CB4
+SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4
    .string "My, my friends…$"
-gUnknown_8173CC4:: @ 8173CC4
+SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4
    .string "You should be nice to friends!$"
@@ -36,7 +36,7 @@
      "movement_range_y": 2,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_160A54",
+      "script": "SSAnne_2F_Corridor_EventScript_Sailor",
      "flag": "0"
    }
  ],
@@ -113,7 +113,7 @@
      "elevation": 3,
      "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
      "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608DF"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerLeft"
    },
    {
      "type": "trigger",
@@ -122,7 +122,7 @@
      "elevation": 3,
      "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
      "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608EB"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerMid"
    },
    {
      "type": "trigger",
@@ -131,7 +131,7 @@
      "elevation": 3,
      "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
      "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608F7"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerRight"
    }
  ],
  "bg_events": []
@@ -1,31 +1,25 @@
 SSAnne_2F_Corridor_MapScripts:: @ 81608DE
 	.byte 0
-SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
+SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
 EventScript_1608EA:: @ 81608EA
 	end
-SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
+SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
 EventScript_1608F6:: @ 81608F6
 	end
-SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
+SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
 EventScript_160902:: @ 8160902
 	end
-EventScript_160903:: @ 8160903
+SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903
 	textcolor 0
 	playse SE_KAIDAN
 	delay 5
@@ -36,80 +30,80 @@ EventScript_160903:: @ 8160903
 	waitmovement 0
 	delay 20
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_1609AD
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_1609B8
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1609CA
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight
-	msgbox gUnknown_8173035
+	msgbox SSAnne_2F_Corridor_Text_RivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_1609DC
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_1609E7
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_1609F2
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalCharmander
-	msgbox gUnknown_8173164
+	msgbox SSAnne_2F_Corridor_Text_RivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_1609FD
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_160A08
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_160A13
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
 	releaseall
 	end
-EventScript_1609AD:: @ 81609AD
+SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD
-	applymovement 1, Movement_160A2A
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachLeft
 	waitmovement 0
 	return
-EventScript_1609B8:: @ 81609B8
+SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8
-	applymovement 1, Movement_160A2E
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachMid
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
 	waitmovement 0
 	return
-EventScript_1609CA:: @ 81609CA
+SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
-	applymovement 1, Movement_160A34
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachRight
 	waitmovement 0
 	return
-EventScript_1609DC:: @ 81609DC
+SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
-EventScript_1609E7:: @ 81609E7
+SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
-EventScript_1609F2:: @ 81609F2
+SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
-EventScript_1609FD:: @ 81609FD
+SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD
-	applymovement 1, Movement_160A3B
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitLeft
 	waitmovement 0
 	return
-EventScript_160A08:: @ 8160A08
+SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08
-	applymovement 1, Movement_160A44
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitMid
 	waitmovement 0
 	return
-EventScript_160A13:: @ 8160A13
+SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13
-	applymovement 1, Movement_160A4C
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitRight
 	waitmovement 0
 	return
-Movement_160A1E:: @ 8160A1E
+SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E
 	delay_16
 	delay_16
 	delay_16
@@ -117,7 +111,7 @@ Movement_160A1E:: @ 8160A1E
 	walk_in_place_fastest_left
 	step_end
-Movement_160A24:: @ 8160A24
+SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24
 	delay_16
 	delay_16
 	delay_16
@@ -125,13 +119,13 @@ Movement_160A24:: @ 8160A24
 	walk_in_place_fastest_left
 	step_end
-Movement_160A2A:: @ 8160A2A
+SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A
 	walk_down
 	walk_down
 	walk_down
 	step_end
-Movement_160A2E:: @ 8160A2E
+SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E
 	walk_down
 	walk_down
 	walk_down
@@ -139,7 +133,7 @@ Movement_160A2E:: @ 8160A2E
 	walk_in_place_fastest_right
 	step_end
-Movement_160A34:: @ 8160A34
+SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34
 	walk_down
 	walk_down
 	walk_down
@@ -148,7 +142,7 @@ Movement_160A34:: @ 8160A34
 	delay_4
 	step_end
-Movement_160A3B:: @ 8160A3B
+SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B
 	walk_right
 	walk_down
 	walk_down
@@ -159,7 +153,7 @@ Movement_160A3B:: @ 8160A3B
 	walk_down
 	step_end
-Movement_160A44:: @ 8160A44
+SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44
 	walk_down
 	walk_down
 	walk_down
@@ -169,7 +163,7 @@ Movement_160A44:: @ 8160A44
 	walk_down
 	step_end
-Movement_160A4C:: @ 8160A4C
+SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C
 	walk_down
 	walk_down
 	walk_down
@@ -179,6 +173,6 @@ Movement_160A4C:: @ 8160A4C
 	walk_down
 	step_end
-SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
+SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54
-	msgbox gUnknown_8172FC3, MSGBOX_NPC
+	msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC
 	end
@@ -1,10 +1,10 @@
-gUnknown_8172FC3:: @ 8172FC3
+SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3
    .string "This ship, she is a luxury liner for\n"
    .string "TRAINERS of the world!\p"
    .string "At every port, we hold parties with\n"
    .string "invited TRAINERS.$"
-gUnknown_8173035:: @ 8173035
+SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035
    .string "{RIVAL}: Bonjour!\n"
    .string "{PLAYER}!\p"
    .string "Imagine seeing you here!\n"
@@ -15,18 +15,18 @@ gUnknown_8173035:: @ 8173035
    .string "Crawl around in grassy areas, and\n"
    .string "look hard for them.$"
-Text_173110:: @ 8173110
+SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110
    .string "Humph!\p"
    .string "At least you're raising your\n"
    .string "POKéMON!$"
-Text_17313D:: @ 817313D
+SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D
    .string "{PLAYER}‥！\n"
    .string "ふなよい　してるのか！\p"
    .string "もっと　からだ\n"
    .string "きたえた　ほうが　いいぜ！$"
-gUnknown_8173164:: @ 8173164
+SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164
    .string "{RIVAL}: I heard there was a CUT\n"
    .string "master on board.\p"
    .string "But he was just a seasick old man!\p"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room1_EventScript_160C97",
+      "script": "SSAnne_2F_Room1_EventScript_Gentleman",
      "flag": "0"
    }
  ],
@@ -1,10 +1,10 @@
 SSAnne_2F_Room1_MapScripts:: @ 8160C96
 	.byte 0
-SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
+SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
 	lock
 	faceplayer
-	message Text_173CE3
+	message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
 	special Special_SetSeenMon
@@ -1,4 +1,4 @@
-Text_173CE3:: @ 8173CE3
+SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3
    .string "I've journeyed far and wide, but in\n"
    .string "all my travels I've never seen\l"
    .string "any POKéMON sleep like this one!\p"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_2F_Room2_EventScript_160CB1",
+      "script": "SSAnne_2F_Room2_EventScript_Dale",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_2F_Room2_EventScript_160CC8",
+      "script": "SSAnne_2F_Room2_EventScript_Brooks",
      "flag": "0"
    },
    {
@@ -1,12 +1,12 @@
 SSAnne_2F_Room2_MapScripts:: @ 8160CB0
 	.byte 0
-SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1
+SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1
-	trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7
+	trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat
-	msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8
+SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8
-	trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92
+	trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat
-	msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,22 +1,22 @@
-Text_173D63:: @ 8173D63
+SSAnne_2F_Room2_Text_BrooksIntro:: @ 8173D63
    .string "Competing against the young keeps\n"
    .string "me youthful.$"
-Text_173D92:: @ 8173D92
+SSAnne_2F_Room2_Text_BrooksDefeat:: @ 8173D92
    .string "Good match!\n"
    .string "Ah, I feel young again!$"
-gUnknown_8173DB6:: @ 8173DB6
+SSAnne_2F_Room2_Text_BrooksPostBattle:: @ 8173DB6
    .string "Fifteen years ago, I would\n"
    .string "have won!$"
-Text_173DDB:: @ 8173DDB
+SSAnne_2F_Room2_Text_DaleIntro:: @ 8173DDB
    .string "Check out what I fished up!$"
-Text_173DF7:: @ 8173DF7
+SSAnne_2F_Room2_Text_DaleDefeat:: @ 8173DF7
    .string "I'm all out!$"
-gUnknown_8173E04:: @ 8173E04
+SSAnne_2F_Room2_Text_DalePostBattle:: @ 8173E04
    .string "Party?\p"
    .string "The cruise ship's party should be\n"
    .string "over by now.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room3_EventScript_160CE0",
+      "script": "SSAnne_2F_Room3_EventScript_Gentleman",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room3_EventScript_160CE9",
+      "script": "SSAnne_2F_Room3_EventScript_OldMan",
      "flag": "0"
    }
  ],
@@ -1,10 +1,10 @@
 SSAnne_2F_Room3_MapScripts:: @ 8160CDF
 	.byte 0
-SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0
+SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0
-	msgbox gUnknown_8173E3A, MSGBOX_NPC
+	msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC
 	end
-SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9
+SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9
-	msgbox gUnknown_8173E7B, MSGBOX_NPC
+	msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC
 	end
@@ -1,8 +1,8 @@
-gUnknown_8173E3A:: @ 8173E3A
+SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A
    .string "Ah, yes, I have seen some POKéMON\n"
    .string "ferry people across the water!$"
-gUnknown_8173E7B:: @ 8173E7B
+SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B
    .string "Small trees can be chopped down\n"
    .string "using the move CUT.\p"
    .string "But remember this!\n"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_2F_Room4_EventScript_160CF3",
+      "script": "SSAnne_2F_Room4_EventScript_Lamar",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_2F_Room4_EventScript_160D0A",
+      "script": "SSAnne_2F_Room4_EventScript_Dawn",
      "flag": "0"
    },
    {
@@ -1,12 +1,12 @@
 SSAnne_2F_Room4_MapScripts:: @ 8160CF2
 	.byte 0
-SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3
+SSAnne_2F_Room4_EventScript_Lamar:: @ 8160CF3
-	trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42
+	trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat
-	msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A
+SSAnne_2F_Room4_EventScript_Dawn:: @ 8160D0A
-	trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB
+	trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat
-	msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,22 +1,22 @@
-Text_173F07:: @ 8173F07
+SSAnne_2F_Room4_Text_LamarIntro:: @ 8173F07
    .string "Which do you find more worthy,\n"
    .string "a strong or a rare POKéMON?$"
-Text_173F42:: @ 8173F42
+SSAnne_2F_Room4_Text_LamarDefeat:: @ 8173F42
    .string "I must salute you!$"
-gUnknown_8173F55:: @ 8173F55
+SSAnne_2F_Room4_Text_LamarPostBattle:: @ 8173F55
    .string "Personally, I prefer strong and\n"
    .string "rare POKéMON.$"
-Text_173F83:: @ 8173F83
+SSAnne_2F_Room4_Text_DawnIntro:: @ 8173F83
    .string "I don't believe I saw you at the\n"
    .string "party?$"
-Text_173FAB:: @ 8173FAB
+SSAnne_2F_Room4_Text_DawnDefeat:: @ 8173FAB
    .string "Take it easy!$"
-gUnknown_8173FB9:: @ 8173FB9
+SSAnne_2F_Room4_Text_DawnPostBattle:: @ 8173FB9
    .string "Oh, I adore your strong POKéMON!\n"
    .string "Oh, how I envy you for them!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room5_EventScript_160D22",
+      "script": "SSAnne_2F_Room5_EventScript_Gentleman",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room5_EventScript_160D2B",
+      "script": "SSAnne_2F_Room5_EventScript_LittleBoy",
      "flag": "0"
    }
  ],
@@ -1,10 +1,10 @@
 SSAnne_2F_Room5_MapScripts:: @ 8160D21
 	.byte 0
-SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22
+SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22
-	msgbox gUnknown_8173FF7, MSGBOX_NPC
+	msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC
 	end
-SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B
+SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B
-	msgbox gUnknown_817404F, MSGBOX_NPC
+	msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC
 	end
@@ -1,10 +1,10 @@
-gUnknown_8173FF7:: @ 8173FF7
+SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7
    .string "Have you gone to the SAFARI ZONE\n"
    .string "in FUCHSIA CITY?\p"
    .string "There are many kinds of rare\n"
    .string "POKéMON.$"
-gUnknown_817404F:: @ 817404F
+SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F
    .string "Me and my daddy think the SAFARI\n"
    .string "ZONE is awesome!\l"
    .string "I wish we could go there again.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room6_EventScript_160D3E",
+      "script": "SSAnne_2F_Room6_EventScript_Woman2",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room6_EventScript_160D35",
+      "script": "SSAnne_2F_Room6_EventScript_Woman1",
      "flag": "0"
    }
  ],
@@ -1,10 +1,10 @@
 SSAnne_2F_Room6_MapScripts:: @ 8160D34
 	.byte 0
-SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35
+SSAnne_2F_Room6_EventScript_Woman1:: @ 8160D35
-	msgbox gUnknown_81740A1, MSGBOX_NPC
+	msgbox SSAnne_2F_Room6_Text_CaptainIsAwfullySick, MSGBOX_NPC
 	end
-SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E
+SSAnne_2F_Room6_EventScript_Woman2:: @ 8160D3E
-	msgbox gUnknown_81740D6, MSGBOX_NPC
+	msgbox SSAnne_2F_Room6_Text_ManyPeopleGetSeasick, MSGBOX_NPC
 	end
@@ -1,7 +1,7 @@
-gUnknown_81740A1:: @ 81740A1
+SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: @ 81740A1
    .string "The CAPTAIN said he's awfully sick.\n"
    .string "He was all pale.$"
-gUnknown_81740D6:: @ 81740D6
+SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: @ 81740D6
    .string "I hear many people get seasick.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_3F_Corridor_EventScript_160A5E",
+      "script": "SSAnne_3F_Corridor_EventScript_Sailor",
      "flag": "0"
    }
  ],
@@ -1,6 +1,6 @@
 SSAnne_3F_Corridor_MapScripts:: @ 8160A5D
 	.byte 0
-SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E
+SSAnne_3F_Corridor_EventScript_Sailor:: @ 8160A5E
-	msgbox gUnknown_817320C, MSGBOX_NPC
+	msgbox SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons, MSGBOX_NPC
 	end
@@ -1,4 +1,4 @@
-gUnknown_817320C:: @ 817320C
+SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: @ 817320C
    .string "Our CAPTAIN is a sword master.\n"
    .string "He's awesome at using CUT.\p"
    .string "They say he even teaches CUT\n"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_B1F_Room1_EventScript_160D48",
+      "script": "SSAnne_B1F_Room1_EventScript_Barny",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_B1F_Room1_EventScript_160D5F",
+      "script": "SSAnne_B1F_Room1_EventScript_Phillip",
      "flag": "0"
    }
  ],
@@ -1,12 +1,12 @@
 SSAnne_B1F_Room1_MapScripts:: @ 8160D47
 	.byte 0
-SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48
+SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48
-	trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF
+	trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat
-	msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F
+SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F
-	trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123
+	trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat
-	msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,26 +1,26 @@
-Text_1740F6:: @ 81740F6
+SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6
    .string "Matey, you're walking the plank if\n"
    .string "you lose!$"
-Text_174123:: @ 8174123
+SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123
    .string "Argh!\n"
    .string "Beaten by a kid!$"
-gUnknown_817413A:: @ 817413A
+SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A
    .string "When we're out at sea, jellyfish\n"
    .string "POKéMON sometimes drift by.$"
-Text_174177:: @ 8174177
+SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177
    .string "Hello, stranger!\p"
    .string "I can't tell if you're from the seas\n"
    .string "or mountains, but stop and chat.\p"
    .string "All my POKéMON are from the sea.$"
-Text_1741EF:: @ 81741EF
+SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF
    .string "Darn!\n"
    .string "I let that one get away!$"
-gUnknown_817420E:: @ 817420E
+SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E
    .string "I was going to make you my\n"
    .string "assistant, too!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 1,
-      "script": "SSAnne_B1F_Room2_EventScript_160D77",
+      "script": "SSAnne_B1F_Room2_EventScript_Huey",
      "flag": "0"
    },
    {
@@ -1,7 +1,7 @@
 SSAnne_B1F_Room2_MapScripts:: @ 8160D76
 	.byte 0
-SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77
+SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77
-	trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C
+	trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat
-	msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,10 +1,10 @@
-Text_174239:: @ 8174239
+SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239
    .string "Even us sailors have POKéMON, too!$"
-Text_17425C:: @ 817425C
+SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C
    .string "Okay, you're not bad.$"
-gUnknown_8174272:: @ 8174272
+SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272
    .string "We caught all our POKéMON while\n"
    .string "we were out at sea.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_B1F_Room3_EventScript_160D8F",
+      "script": "SSAnne_B1F_Room3_EventScript_Dylan",
      "flag": "0"
    },
    {
@@ -1,7 +1,7 @@
 SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
 	.byte 0
-SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F
+SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F
-	trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3
+	trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat
-	msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,11 +1,11 @@
-Text_1742A6:: @ 81742A6
+SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6
    .string "I like feisty kids like you!$"
-Text_1742C3:: @ 81742C3
+SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3
    .string "Argh!\n"
    .string "Lost it!$"
-gUnknown_81742D2:: @ 81742D2
+SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2
    .string "Sea POKéMON live in deep water.\n"
    .string "You'll need a ROD to fish them up!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_B1F_Room4_EventScript_160DBE",
+      "script": "SSAnne_B1F_Room4_EventScript_Duncan",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 1,
-      "script": "SSAnne_B1F_Room4_EventScript_160DA7",
+      "script": "SSAnne_B1F_Room4_EventScript_Leonard",
      "flag": "0"
    }
  ],
@@ -1,12 +1,12 @@
 SSAnne_B1F_Room4_MapScripts:: @ 8160DA6
 	.byte 0
-SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7
+SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7
-	trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348
+	trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat
-	msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE
+SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE
-	trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3
+	trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat
-	msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,23 +1,23 @@
-Text_174315:: @ 8174315
+SSAnne_B1F_Room4_Text_LeonardIntro:: @ 8174315
    .string "You know what they say about\n"
    .string "sailors and battling!$"
-Text_174348:: @ 8174348
+SSAnne_B1F_Room4_Text_LeonardDefeat:: @ 8174348
    .string "Right!\n"
    .string "Good battle, mate!$"
-gUnknown_8174362:: @ 8174362
+SSAnne_B1F_Room4_Text_LeonardPostBattle:: @ 8174362
    .string "Hahaha!\n"
    .string "Want to be a sailor, mate?$"
-Text_174385:: @ 8174385
+SSAnne_B1F_Room4_Text_DuncanIntro:: @ 8174385
    .string "Come on, then!\n"
    .string "My sailor's pride is at stake!$"
-Text_1743B3:: @ 81743B3
+SSAnne_B1F_Room4_Text_DuncanDefeat:: @ 81743B3
    .string "Your spirit sank me!$"
-gUnknown_81743C8:: @ 81743C8
+SSAnne_B1F_Room4_Text_DuncanPostBattle:: @ 81743C8
    .string "Did you see the FISHING GURU in\n"
    .string "VERMILION CITY?$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_B1F_Room5_EventScript_160DD6",
+      "script": "SSAnne_B1F_Room5_EventScript_Boy",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_B1F_Room5_EventScript_160DDF",
+      "script": "SSAnne_B1F_Room5_EventScript_Machoke",
      "flag": "0"
    },
    {
@@ -1,16 +1,16 @@
 SSAnne_B1F_Room5_MapScripts:: @ 8160DD5
 	.byte 0
-SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6
+SSAnne_B1F_Room5_EventScript_Boy:: @ 8160DD6
-	msgbox gUnknown_81743F8, MSGBOX_NPC
+	msgbox SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks, MSGBOX_NPC
 	end
-SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF
+SSAnne_B1F_Room5_EventScript_Machoke:: @ 8160DDF
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_MACHOKE, 0
-	msgbox gUnknown_8174444
+	msgbox SSAnne_B1F_Room5_Text_Machoke
 	waitmoncry
 	release
 	end
@@ -1,8 +1,8 @@
-gUnknown_81743F8:: @ 81743F8
+SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks:: @ 81743F8
    .string "My buddy MACHOKE is super strong!\p"
    .string "He has enough STRENGTH to move\n"
    .string "big rocks!$"
-gUnknown_8174444:: @ 8174444
+SSAnne_B1F_Room5_Text_Machoke:: @ 8174444
    .string "MACHOKE: Gwoh! Goggoh!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_CaptainsOffice_EventScript_160B3A",
+      "script": "SSAnne_CaptainsOffice_EventScript_Captain",
      "flag": "0"
    }
  ],
@@ -43,21 +43,21 @@
      "x": 2,
      "y": 4,
      "elevation": 0,
-      "script": "SSAnne_CaptainsOffice_EventScript_160BD2"
+      "script": "SSAnne_CaptainsOffice_EventScript_Book"
    },
    {
      "type": "bg_event_type_0",
      "x": 5,
      "y": 3,
      "elevation": 0,
-      "script": "SSAnne_CaptainsOffice_EventScript_160BC9"
+      "script": "SSAnne_CaptainsOffice_EventScript_TrashCan"
    },
    {
      "type": "bg_event_type_0",
      "x": 2,
      "y": 3,
      "elevation": 0,
-      "script": "SSAnne_CaptainsOffice_EventScript_160BD2"
+      "script": "SSAnne_CaptainsOffice_EventScript_Book"
    }
  ]
 }
@@ -1,12 +1,12 @@
 SSAnne_CaptainsOffice_MapScripts:: @ 8160B39
 	.byte 0
-SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
+SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A
 	lock
-	goto_if_set FLAG_GOT_HM01, EventScript_160BB5
+	goto_if_set FLAG_GOT_HM01, SSAnne_CaptainsOffice_EventScript_AlreadyGotCut
-	msgbox gUnknown_8173646
+	msgbox SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick
 	textcolor 3
-	message Text_173676
+	message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack
 	waitmessage
 	playfanfare MUS_ME_ASA
 	waitfanfare
@@ -14,33 +14,34 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
 	delay 50
 	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81736A6
+	msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut
-	giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5
+	giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5
-	msgbox gUnknown_81737D2
+	msgbox SSAnne_CaptainsOffice_Text_ExplainCut
 	setflag FLAG_GOT_HM01
 	setvar VAR_MAP_SCENE_VERMILION_CITY, 1
 	release
 	end
-EventScript_160BA0:: @ 8160BA0
+@ Unused
-	msgbox gUnknown_81738C3
+SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: @ 8160BA0
 	msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis
 	closemessage
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
-EventScript_160BB5:: @ 8160BB5
+SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: @ 8160BB5
 	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_8173831
+	msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon
 	release
 	end
-SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9
+SSAnne_CaptainsOffice_EventScript_TrashCan:: @ 8160BC9
-	msgbox gUnknown_81738E6, MSGBOX_SIGN
+	msgbox SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked, MSGBOX_SIGN
 	end
-SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2
+SSAnne_CaptainsOffice_EventScript_Book:: @ 8160BD2
-	msgbox gUnknown_8173903, MSGBOX_SIGN
+	msgbox SSAnne_CaptainsOffice_Text_HowToConquerSeasickness, MSGBOX_SIGN
 	end
@@ -1,15 +1,15 @@
-gUnknown_8173646:: @ 8173646
+SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick:: @ 8173646
    .string "CAPTAIN: Ooargh…\n"
    .string "I feel hideous…\l"
    .string "Urrp! Seasick…$"
-Text_173676:: @ 8173676
+SSAnne_CaptainsOffice_Text_RubbedCaptainsBack:: @ 8173676
    .string "{PLAYER} rubbed the CAPTAIN's\n"
    .string "back!\p"
    .string "Rub-rub…\n"
    .string "Rub-rub…$"
-gUnknown_81736A6:: @ 81736A6
+SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut:: @ 81736A6
    .string "CAPTAIN: Whew! Thank you!\n"
    .string "I'm feeling much better now.\p"
    .string "You want to see my hidden CUT\n"
@@ -21,17 +21,17 @@ gUnknown_81736A6:: @ 81736A6
    .string "Teach CUT to your POKéMON, and\n"
    .string "you can see it CUT anytime!$"
-gUnknown_81737AF:: @ 81737AF
+SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain:: @ 81737AF
    .string "{PLAYER} obtained HM01\n"
    .string "from the CAPTAIN!$"
-gUnknown_81737D2:: @ 81737D2
+SSAnne_CaptainsOffice_Text_ExplainCut:: @ 81737D2
    .string "Using CUT, you can chop down\n"
    .string "small trees.\p"
    .string "Why not try it with the trees\n"
    .string "around VERMILION CITY?$"
-gUnknown_8173831:: @ 8173831
+SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon:: @ 8173831
    .string "CAPTAIN: …Whew!\p"
    .string "Now that I'm not sick anymore,\n"
    .string "I guess it's time.\p"
@@ -39,15 +39,15 @@ gUnknown_8173831:: @ 8173831
    .string "Farewell, until our return to\n"
    .string "VERMILION CITY!$"
-gUnknown_81738C3:: @ 81738C3
+SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis:: @ 81738C3
    .string "Oh, no!\n"
    .string "You have no room for this!$"
-gUnknown_81738E6:: @ 81738E6
+SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked:: @ 81738E6
    .string "Yuck!\n"
    .string "Shouldn't have looked!$"
-gUnknown_8173903:: @ 8173903
+SSAnne_CaptainsOffice_Text_HowToConquerSeasickness:: @ 8173903
    .string "How to Conquer Seasickness…\n"
    .string "The CAPTAIN's reading this!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_Deck_EventScript_160A9B",
+      "script": "SSAnne_Deck_EventScript_Trevor",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Deck_EventScript_160A72",
+      "script": "SSAnne_Deck_EventScript_BaldingMan",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Deck_EventScript_160A7B",
+      "script": "SSAnne_Deck_EventScript_Sailor",
      "flag": "0"
    },
    {
@@ -62,7 +62,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 1,
-      "script": "SSAnne_Deck_EventScript_160A84",
+      "script": "SSAnne_Deck_EventScript_Edmond",
      "flag": "0"
    },
    {
@@ -75,7 +75,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Deck_EventScript_160A69",
+      "script": "SSAnne_Deck_EventScript_Youngster",
      "flag": "0"
    }
  ],
@@ -1,24 +1,24 @@
 SSAnne_Deck_MapScripts:: @ 8160A68
 	.byte 0
-SSAnne_Deck_EventScript_160A69:: @ 8160A69
+SSAnne_Deck_EventScript_Youngster:: @ 8160A69
-	msgbox gUnknown_817326F, MSGBOX_NPC
+	msgbox SSAnne_Deck_Text_ShipDepartingSoon, MSGBOX_NPC
 	end
-SSAnne_Deck_EventScript_160A72:: @ 8160A72
+SSAnne_Deck_EventScript_BaldingMan:: @ 8160A72
-	msgbox gUnknown_81732C6, MSGBOX_NPC
+	msgbox SSAnne_Deck_Text_FeelSeasick, MSGBOX_NPC
 	end
-SSAnne_Deck_EventScript_160A7B:: @ 8160A7B
+SSAnne_Deck_EventScript_Sailor:: @ 8160A7B
-	msgbox gUnknown_81732A2, MSGBOX_NPC
+	msgbox SSAnne_Deck_Text_ScrubbingDecksHardWork, MSGBOX_NPC
 	end
-SSAnne_Deck_EventScript_160A84:: @ 8160A84
+SSAnne_Deck_EventScript_Edmond:: @ 8160A84
-	trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B
+	trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat
-	msgbox gUnknown_817333E, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
 	end
-SSAnne_Deck_EventScript_160A9B:: @ 8160A9B
+SSAnne_Deck_EventScript_Trevor:: @ 8160A9B
-	trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0
+	trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat
-	msgbox gUnknown_81733B5, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -1,35 +1,35 @@
-gUnknown_817326F:: @ 817326F
+SSAnne_Deck_Text_ShipDepartingSoon:: @ 817326F
    .string "The party's over.\n"
    .string "The ship will be departing soon.$"
-gUnknown_81732A2:: @ 81732A2
+SSAnne_Deck_Text_ScrubbingDecksHardWork:: @ 81732A2
    .string "Whew!\n"
    .string "Scrubbing decks is hard work!$"
-gUnknown_81732C6:: @ 81732C6
+SSAnne_Deck_Text_FeelSeasick:: @ 81732C6
    .string "Urf… I feel ill…\p"
    .string "I got seasick, so I stepped out to\n"
    .string "get some air…$"
-Text_173308:: @ 8173308
+SSAnne_Deck_Text_EdmondIntro:: @ 8173308
    .string "Hey, matey!\p"
    .string "Let's do a little jig!$"
-Text_17332B:: @ 817332B
+SSAnne_Deck_Text_EdmondDefeat:: @ 817332B
    .string "You're impressive!$"
-gUnknown_817333E:: @ 817333E
+SSAnne_Deck_Text_EdmondPostBattle:: @ 817333E
    .string "How many kinds of POKéMON do you\n"
    .string "think there are in this big world?$"
-Text_173382:: @ 8173382
+SSAnne_Deck_Text_TrevorIntro:: @ 8173382
    .string "Ahoy, there!\n"
    .string "Are you seasick?$"
-Text_1733A0:: @ 81733A0
+SSAnne_Deck_Text_TrevorDefeat:: @ 81733A0
    .string "I was just careless!$"
-gUnknown_81733B5:: @ 81733B5
+SSAnne_Deck_Text_TrevorPostBattle:: @ 81733B5
    .string "My pa said there are 100 kinds of\n"
    .string "POKéMON. I think there are more.$"
@@ -8,22 +8,22 @@ SSAnne_Exterior_OnTransition:: @ 816084B
 	end
 SSAnne_Exterior_OnFrame:: @ 816084F
-	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859
+	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_ExitSSAnne
 	.2byte 0
-SSAnne_Exterior_160859:: @ 8160859
+SSAnne_Exterior_ExitSSAnne:: @ 8160859
 	lockall
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8005, 6
-	call_if_le EventScript_1608A1
+	call_if_le SSAnne_Exterior_WalkDown
 	compare VAR_0x8005, 7
-	call_if_ge EventScript_1608AC
+	call_if_ge SSAnne_Exterior_WalkInPlaceDown
 	fadenewbgm MUS_NAMINORI
 	delay 50
 	special Special_SSAnneDepartureCutscene
 	waitstate
 	removeobject 1
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit
 	waitmovement 0
 	setvar VAR_MAP_SCENE_VERMILION_CITY, 2
 	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
@@ -32,17 +32,17 @@ SSAnne_Exterior_160859:: @ 8160859
 	releaseall
 	end
-EventScript_1608A1:: @ 81608A1
+SSAnne_Exterior_WalkDown:: @ 81608A1
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown
 	waitmovement 0
 	return
-EventScript_1608AC:: @ 81608AC
+SSAnne_Exterior_WalkInPlaceDown:: @ 81608AC
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
-Movement_1608B7:: @ 81608B7
+SSAnne_Exterior_Movement_Exit:: @ 81608B7
 	walk_up
 	walk_up
 	walk_up
@@ -54,7 +54,7 @@ Movement_1608B7:: @ 81608B7
 	walk_up
 	step_end
-Movement_1608C1:: @ 81608C1
+SSAnne_Exterior_Movement_WalkDown:: @ 81608C1
 	walk_down
 	walk_down
 	walk_down
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160AB3",
+      "script": "SSAnne_Kitchen_EventScript_Chef1",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 2,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160ABC",
+      "script": "SSAnne_Kitchen_EventScript_Chef2",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160AC5",
+      "script": "SSAnne_Kitchen_EventScript_Chef3",
      "flag": "0"
    },
    {
@@ -62,7 +62,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160ACE",
+      "script": "SSAnne_Kitchen_EventScript_Chef4",
      "flag": "0"
    },
    {
@@ -75,7 +75,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160B1E",
+      "script": "SSAnne_Kitchen_EventScript_Chef5",
      "flag": "0"
    },
    {
@@ -88,7 +88,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160B27",
+      "script": "SSAnne_Kitchen_EventScript_Chef6",
      "flag": "0"
    },
    {
@@ -101,7 +101,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_Kitchen_EventScript_160B30",
+      "script": "SSAnne_Kitchen_EventScript_Chef7",
      "flag": "0"
    },
    {
@@ -1,53 +1,53 @@
 SSAnne_Kitchen_MapScripts:: @ 8160AB2
 	.byte 0
-SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3
+SSAnne_Kitchen_EventScript_Chef1:: @ 8160AB3
-	msgbox gUnknown_81733F8, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_BusyOutOfTheWay, MSGBOX_NPC
 	end
-SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC
+SSAnne_Kitchen_EventScript_Chef2:: @ 8160ABC
-	msgbox gUnknown_8173429, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_SawOddBerryInTrash, MSGBOX_NPC
 	end
-SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5
+SSAnne_Kitchen_EventScript_Chef3:: @ 8160AC5
-	msgbox gUnknown_8173462, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_SoBusyImDizzy, MSGBOX_NPC
 	end
-SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE
+SSAnne_Kitchen_EventScript_Chef4:: @ 8160ACE
 	lock
 	faceplayer
-	msgbox gUnknown_8173570
+	msgbox SSAnne_Kitchen_Text_IAmLeChefMainCourseIs
 	random 3
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, 0
-	call_if_eq EventScript_160B03
+	call_if_eq SSAnne_Kitchen_EventScript_SalmonDuSalad
 	compare VAR_0x8008, 1
-	call_if_eq EventScript_160B0C
+	call_if_eq SSAnne_Kitchen_EventScript_EelsAuBarbecue
 	compare VAR_0x8008, 2
-	call_if_eq EventScript_160B15
+	call_if_eq SSAnne_Kitchen_EventScript_PrimeBeefsteak
 	release
 	end
-EventScript_160B03:: @ 8160B03
+SSAnne_Kitchen_EventScript_SalmonDuSalad:: @ 8160B03
-	msgbox gUnknown_817359F
+	msgbox SSAnne_Kitchen_Text_SalmonDuSalad
 	return
-EventScript_160B0C:: @ 8160B0C
+SSAnne_Kitchen_EventScript_EelsAuBarbecue:: @ 8160B0C
-	msgbox gUnknown_81735DF
+	msgbox SSAnne_Kitchen_Text_EelsAuBarbecue
 	return
-EventScript_160B15:: @ 8160B15
+SSAnne_Kitchen_EventScript_PrimeBeefsteak:: @ 8160B15
-	msgbox gUnknown_8173611
+	msgbox SSAnne_Kitchen_Text_PrimeBeefsteak
 	return
-SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E
+SSAnne_Kitchen_EventScript_Chef5:: @ 8160B1E
-	msgbox gUnknown_81734A0, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_PeelSpudsEveryDay, MSGBOX_NPC
 	end
-SSAnne_Kitchen_EventScript_160B27:: @ 8160B27
+SSAnne_Kitchen_EventScript_Chef6:: @ 8160B27
-	msgbox gUnknown_81734D3, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton, MSGBOX_NPC
 	end
-SSAnne_Kitchen_EventScript_160B30:: @ 8160B30
+SSAnne_Kitchen_EventScript_Chef7:: @ 8160B30
-	msgbox gUnknown_817353E, MSGBOX_NPC
+	msgbox SSAnne_Kitchen_Text_OnlyGetToPeelOnions, MSGBOX_NPC
 	end
@@ -1,47 +1,47 @@
-gUnknown_81733F8:: @ 81733F8
+SSAnne_Kitchen_Text_BusyOutOfTheWay:: @ 81733F8
    .string "You, mon petit!\n"
    .string "We're busy here!\l"
    .string "Out of the way!$"
-gUnknown_8173429:: @ 8173429
+SSAnne_Kitchen_Text_SawOddBerryInTrash:: @ 8173429
    .string "I saw an odd BERRY in the trash.\n"
    .string "I wonder what that was?$"
-gUnknown_8173462:: @ 8173462
+SSAnne_Kitchen_Text_SoBusyImDizzy:: @ 8173462
    .string "I'm so busy I'm getting dizzy!\n"
    .string "You have to give me room here!$"
-gUnknown_81734A0:: @ 81734A0
+SSAnne_Kitchen_Text_PeelSpudsEveryDay:: @ 81734A0
    .string "Hum-de-hum-de-ho…\p"
    .string "I peel spuds every day!\n"
    .string "Hum-hum…$"
-gUnknown_81734D3:: @ 81734D3
+SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton:: @ 81734D3
    .string "Did you hear about SNORLAX?\n"
    .string "It's a glutton.\p"
    .string "No other POKéMON eats and sleeps\n"
    .string "the way SNORLAX can and does!$"
-gUnknown_817353E:: @ 817353E
+SSAnne_Kitchen_Text_OnlyGetToPeelOnions:: @ 817353E
    .string "Snivel… Sniff…\p"
    .string "I only get to peel onions…\n"
    .string "Snivel…$"
-gUnknown_8173570:: @ 8173570
+SSAnne_Kitchen_Text_IAmLeChefMainCourseIs:: @ 8173570
    .string "Er-hem!\n"
    .string "Indeed I am le CHEF!\p"
    .string "Le main course is$"
-gUnknown_817359F:: @ 817359F
+SSAnne_Kitchen_Text_SalmonDuSalad:: @ 817359F
    .string "Salmon du Salad!\p"
    .string "Les guests may gripe it's fish\n"
    .string "again, however!$"
-gUnknown_81735DF:: @ 81735DF
+SSAnne_Kitchen_Text_EelsAuBarbecue:: @ 81735DF
    .string "Eels au Barbecue!\p"
    .string "Les guests will mutiny, I fear.$"
-gUnknown_8173611:: @ 8173611
+SSAnne_Kitchen_Text_PrimeBeefsteak:: @ 8173611
    .string "Prime Beefsteak!\p"
    .string "But, have I enough fillets du\n"
    .string "beef?$"
@@ -7,5 +7,5 @@ SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end
@@ -7,5 +7,5 @@ SixIsland_Harbor_EventScript_171E48:: @ 8171E48
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end
@@ -7,5 +7,5 @@ ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end
@@ -7,5 +7,5 @@ TwoIsland_Harbor_EventScript_171806:: @ 8171806
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND
-	goto EventScript_1A8F54
+	goto EventScript_ChooseDestFromTwoIsland
 	end
@@ -34,7 +34,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166917",
+      "script": "VermilionCity_EventScript_Woman",
      "flag": "0"
    },
    {
@@ -47,7 +47,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166920",
+      "script": "VermilionCity_EventScript_OldMan1",
      "flag": "0"
    },
    {
@@ -60,7 +60,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166C2F",
+      "script": "VermilionCity_EventScript_OldMan2",
      "flag": "0"
    },
    {
@@ -73,7 +73,7 @@
      "movement_range_y": 2,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166C38",
+      "script": "VermilionCity_EventScript_Machop",
      "flag": "0"
    },
    {
@@ -86,7 +86,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166C17",
+      "script": "VermilionCity_EventScript_Sailor",
      "flag": "0"
    },
    {
@@ -99,7 +99,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166941",
+      "script": "VermilionCity_EventScript_FerrySailor",
      "flag": "0"
    },
    {
@@ -125,7 +125,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_EventScript_166C20",
+      "script": "VermilionCity_EventScript_OaksAide",
      "flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE"
    }
  ],
@@ -209,7 +209,7 @@
      "elevation": 0,
      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
      "var_value": 0,
-      "script": "VermilionCity_EventScript_166B8A"
+      "script": "VermilionCity_EventScript_CheckTicketLeft"
    },
    {
      "type": "trigger",
@@ -218,7 +218,7 @@
      "elevation": 0,
      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
      "var_value": 0,
-      "script": "VermilionCity_EventScript_166B91"
+      "script": "VermilionCity_EventScript_CheckTicketRight"
    },
    {
      "type": "trigger",
@@ -227,7 +227,7 @@
      "elevation": 0,
      "var": "VAR_TEMP_1",
      "var_value": 0,
-      "script": "VermilionCity_EventScript_166B98"
+      "script": "VermilionCity_EventScript_ExitedTicketCheck"
    },
    {
      "type": "trigger",
@@ -236,7 +236,7 @@
      "elevation": 0,
      "var": "VAR_TEMP_1",
      "var_value": 0,
-      "script": "VermilionCity_EventScript_166B98"
+      "script": "VermilionCity_EventScript_ExitedTicketCheck"
    }
  ],
  "bg_events": [
@@ -245,35 +245,35 @@
      "x": 33,
      "y": 6,
      "elevation": 0,
-      "script": "VermilionCity_EventScript_166C53"
+      "script": "VermilionCity_EventScript_CitySign"
    },
    {
      "type": "bg_event_type_0",
      "x": 10,
      "y": 17,
      "elevation": 3,
-      "script": "VermilionCity_EventScript_166C65"
+      "script": "VermilionCity_EventScript_PokemonFanClubSign"
    },
    {
      "type": "bg_event_type_0",
      "x": 10,
      "y": 24,
      "elevation": 0,
-      "script": "VermilionCity_EventScript_166C6E"
+      "script": "VermilionCity_EventScript_GymSign"
    },
    {
      "type": "bg_event_type_0",
      "x": 34,
      "y": 18,
      "elevation": 0,
-      "script": "VermilionCity_EventScript_166C86"
+      "script": "VermilionCity_EventScript_HarborSign"
    },
    {
      "type": "bg_event_type_0",
      "x": 45,
      "y": 17,
      "elevation": 3,
-      "script": "VermilionCity_EventScript_166C5C"
+      "script": "VermilionCity_EventScript_SnorlaxNotice"
    },
    {
      "type": "hidden_item",
@@ -1,62 +1,64 @@
 .equ LOCALID_FERRY_SAILOR, 6
 VermilionCity_MapScripts:: @ 81668DC
 	map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame
 	.byte 0
 VermilionCity_OnFrame:: @ 81668E7
-	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1
+	map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, VermilionCity_EventScript_ExitSSAnne
 	.2byte 0
-EventScript_1668F1:: @ 81668F1
+VermilionCity_EventScript_ExitSSAnne:: @ 81668F1
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_166903
+	applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne
 	waitmovement 0
 	setvar VAR_MAP_SCENE_VERMILION_CITY, 3
 	releaseall
 	end
-Movement_166903:: @ 8166903
+VermilionCity_Movement_ExitSSAnne:: @ 8166903
 	walk_up
 	walk_up
 	step_end
 VermilionCity_OnTransition:: @ 8166906
 	setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY
-	call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, EventScript_166913
+	call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, VermilionCity_EventScript_HideOaksAide
 	end
-EventScript_166913:: @ 8166913
+VermilionCity_EventScript_HideOaksAide:: @ 8166913
 	setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
 	return
-VermilionCity_EventScript_166917:: @ 8166917
+VermilionCity_EventScript_Woman:: @ 8166917
-	msgbox gUnknown_817F723, MSGBOX_NPC
+	msgbox VermilionCity_Text_GrimerMultipliesInSludge, MSGBOX_NPC
 	end
-VermilionCity_EventScript_166920:: @ 8166920
+VermilionCity_EventScript_OldMan1:: @ 8166920
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_VERMILION_CITY, 3
-	goto_if_eq EventScript_166937
+	goto_if_eq VermilionCity_EventScript_OldMan1SSAnneLeft
-	msgbox gUnknown_817F776
+	msgbox VermilionCity_Text_DidYouSeeSSAnneInHarbor
 	release
 	end
-EventScript_166937:: @ 8166937
+VermilionCity_EventScript_OldMan1SSAnneLeft:: @ 8166937
-	msgbox gUnknown_817F7A6
+	msgbox VermilionCity_Text_SSAnneHasDepartedForYear
 	release
 	end
-VermilionCity_EventScript_166941:: @ 8166941
+VermilionCity_EventScript_FerrySailor:: @ 8166941
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_VERMILION_CITY, 3
-	goto_if_eq EventScript_166996
+	goto_if_eq VermilionCity_EventScript_CheckSeagallopPresent
-	msgbox gUnknown_817FA22
+	msgbox VermilionCity_Text_WelcomeToTheSSAnne
 	release
 	end
-EventScript_166958:: @ 8166958
+VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958
 	goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, FALSE
@@ -64,7 +66,7 @@ EventScript_166958:: @ 8166958
 	goto EventScript_SetResultTrue
 	end
-EventScript_166977:: @ 8166977
+VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977
 	goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, FALSE
@@ -72,206 +74,207 @@ EventScript_166977:: @ 8166977
 	goto EventScript_SetResultTrue
 	end
-EventScript_166996:: @ 8166996
+VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
-	goto_if_ge EventScript_1669BB
+	goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass
 	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
-	goto_if_ge EventScript_166B3B
+	goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestTriPass
-	msgbox gUnknown_817FB10
+	msgbox VermilionCity_Text_TheShipSetSail
 	release
 	end
-EventScript_1669BB:: @ 81669BB
+VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	call EventScript_166958
+	call VermilionCity_EventScript_CheckHasMysticTicket
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1669FD
+	goto_if_eq VermilionCity_EventScript_HasMysticTicket
-	call EventScript_166977
+	call VermilionCity_EventScript_CheckHasAuroraTicket
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_166A5F
+	goto_if_eq VermilionCity_EventScript_HasAuroraTicket
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
-	message Text_17FBB8
+	message VermilionCity_Text_BoardSeagallopRainbowPass
 	waitmessage
-	goto EventScript_1A911E
+	goto EventScript_SeviiDestinationsPage1
 	end
-EventScript_1669FD:: @ 81669FD
+VermilionCity_EventScript_HasMysticTicket:: @ 81669FD
-	call EventScript_166977
+	call VermilionCity_EventScript_CheckHasAuroraTicket
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_166AB1
+	goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets
-	call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53
+	call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket
-	message Text_17FCC1
+	message VermilionCity_Text_BoardSeagallopFerry
 	waitmessage
 	multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_1A911E
+	case 0, EventScript_SeviiDestinationsPage1
-	case 1, EventScript_166B0B
+	case 1, EventScript_SailToNavelRock
 	case 2, EventScript_CancelSail
 	case 127, EventScript_CancelSail
 	end
-EventScript_166A53:: @ 8166A53
+VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53
 	setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN
-	msgbox gUnknown_817FC00
+	msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock
 	return
-EventScript_166A5F:: @ 8166A5F
+VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F
-	call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5
+	call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket
-	message Text_17FCC1
+	message VermilionCity_Text_BoardSeagallopFerry
 	waitmessage
 	multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_1A911E
+	case 0, EventScript_SeviiDestinationsPage1
-	case 1, EventScript_166B23
+	case 1, EventScript_SailToBirthIsland
 	case 2, EventScript_CancelSail
 	case 127, EventScript_CancelSail
 	end
-EventScript_166AA5:: @ 8166AA5
+VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5
 	setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN
-	msgbox gUnknown_817FC5F
+	msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland
 	return
-EventScript_166AB1:: @ 8166AB1
+VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1
-	call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53
+	call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket
-	call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5
+	call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket
-	message Text_17FCC1
+	message VermilionCity_Text_BoardSeagallopFerry
 	waitmessage
 	multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_1A911E
+	case 0, EventScript_SeviiDestinationsPage1
-	case 1, EventScript_166B0B
+	case 1, EventScript_SailToNavelRock
-	case 2, EventScript_166B23
+	case 2, EventScript_SailToBirthIsland
 	case 3, EventScript_CancelSail
 	case 127, EventScript_CancelSail
 	end
-EventScript_166B0B:: @ 8166B0B
+EventScript_SailToNavelRock:: @ 8166B0B
-	msgbox gUnknown_817FCEC
+	msgbox VermilionCity_Text_Seagallop10Departing
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
-EventScript_166B23:: @ 8166B23
+EventScript_SailToBirthIsland:: @ 8166B23
-	msgbox gUnknown_817FD5F
+	msgbox VermilionCity_Text_Seagallop12Departing
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
-EventScript_166B3B:: @ 8166B3B
+VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B
-	message Text_17FB23
+	message VermilionCity_Text_BoardSeagallopTriPass
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_1A8FEE
+	case 0, EventScript_SailToOneIsland2
-	case 1, EventScript_1A8FF9
+	case 1, EventScript_SailToTwoIsland2
-	case 2, EventScript_1A9004
+	case 2, EventScript_SailToThreeIsland2
 	case 3, EventScript_CancelSail
 	case 127, EventScript_CancelSail
 	end
-EventScript_166B88:: @ 8166B88
+@ Unreachable
 Vermilion_EventScript_Unused:: @ 8166B88
 	release
 	end
-VermilionCity_EventScript_166B8A:: @ 8166B8A
+VermilionCity_EventScript_CheckTicketLeft:: @ 8166B8A
 	lockall
-	goto EventScript_166BA0
+	goto VermilionCity_EventScript_CheckTicket
 	end
-VermilionCity_EventScript_166B91:: @ 8166B91
+VermilionCity_EventScript_CheckTicketRight:: @ 8166B91
 	lockall
-	goto EventScript_166BA0
+	goto VermilionCity_EventScript_CheckTicket
 	end
-VermilionCity_EventScript_166B98:: @ 8166B98
+VermilionCity_EventScript_ExitedTicketCheck:: @ 8166B98
 	lockall
 	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
 	releaseall
 	end
-EventScript_166BA0:: @ 8166BA0
+VermilionCity_EventScript_CheckTicket:: @ 8166BA0
 	textcolor 0
-	applymovement 6, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	compare VAR_MAP_SCENE_VERMILION_CITY, 3
-	goto_if_eq EventScript_166BED
+	goto_if_eq VermilionCity_EventScript_CheckSeagallopPresentTrigger
-	msgbox gUnknown_817FA3C
+	msgbox VermilionCity_Text_DoYouHaveATicket
-	goto_if_unset FLAG_GOT_SS_TICKET, EventScript_166BDE
+	goto_if_unset FLAG_GOT_SS_TICKET, VermilionCity_EventScript_DontHaveSSTicket
-	msgbox gUnknown_817FA77
+	msgbox VermilionCity_Text_FlashedSSTicket
 	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
 	releaseall
 	end
-EventScript_166BDE:: @ 8166BDE
+VermilionCity_EventScript_DontHaveSSTicket:: @ 8166BDE
-	msgbox gUnknown_817FABA
+	msgbox VermilionCity_Text_DontHaveNeededSSTicket
 	closemessage
-	goto EventScript_1A9108
+	goto VermilionCity_EventScript_WalkUpPier
 	end
-EventScript_166BED:: @ 8166BED
+VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED
 	setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
 	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
-	goto_if_ge EventScript_1669BB
+	goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass
 	compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
-	goto_if_ge EventScript_166B3B
+	goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestTriPass
-	msgbox gUnknown_817FB10
+	msgbox VermilionCity_Text_TheShipSetSail
 	closemessage
-	goto EventScript_1A9108
+	goto VermilionCity_EventScript_WalkUpPier
 	end
-VermilionCity_EventScript_166C17:: @ 8166C17
+VermilionCity_EventScript_Sailor:: @ 8166C17
-	msgbox gUnknown_817F8AC, MSGBOX_NPC
+	msgbox VermilionCity_Text_SSAnneVisitsOnceAYear, MSGBOX_NPC
 	end
-VermilionCity_EventScript_166C20:: @ 8166C20
+VermilionCity_EventScript_OaksAide:: @ 8166C20
 	lock
 	faceplayer
 	setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION
-	msgbox gUnknown_817FDD2
+	msgbox VermilionCity_Text_Route2AideHasPackageForYou
 	release
 	end
-VermilionCity_EventScript_166C2F:: @ 8166C2F
+VermilionCity_EventScript_OldMan2:: @ 8166C2F
-	msgbox gUnknown_817F7FD, MSGBOX_NPC
+	msgbox VermilionCity_Text_BuildingOnThisLand, MSGBOX_NPC
 	end
-VermilionCity_EventScript_166C38:: @ 8166C38
+VermilionCity_EventScript_Machop:: @ 8166C38
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_MACHOP, 0
-	msgbox gUnknown_817F871
+	msgbox VermilionCity_Text_Machop
 	waitmoncry
-	msgbox gUnknown_817F888
+	msgbox VermilionCity_Text_MachopStompingLandFlat
 	release
 	end
-VermilionCity_EventScript_166C53:: @ 8166C53
+VermilionCity_EventScript_CitySign:: @ 8166C53
-	msgbox gUnknown_817F8FB, MSGBOX_SIGN
+	msgbox VermilionCity_Text_CitySign, MSGBOX_SIGN
 	end
-VermilionCity_EventScript_166C5C:: @ 8166C5C
+VermilionCity_EventScript_SnorlaxNotice:: @ 8166C5C
-	msgbox gUnknown_817F928, MSGBOX_SIGN
+	msgbox VermilionCity_Text_SnorlaxBlockingRoute12, MSGBOX_SIGN
 	end
-VermilionCity_EventScript_166C65:: @ 8166C65
+VermilionCity_EventScript_PokemonFanClubSign:: @ 8166C65
-	msgbox gUnknown_817F9A1, MSGBOX_SIGN
+	msgbox VermilionCity_Text_PokemonFanClubSign, MSGBOX_SIGN
 	end
-VermilionCity_EventScript_166C6E:: @ 8166C6E
+VermilionCity_EventScript_GymSign:: @ 8166C6E
 	lockall
 	famechecker FAMECHECKER_LTSURGE, 0
-	msgbox gUnknown_817F9CC
+	msgbox VermilionCity_Text_GymSign
 	releaseall
 	end
-VermilionCity_EventScript_166C86:: @ 8166C86
+VermilionCity_EventScript_HarborSign:: @ 8166C86
-	msgbox gUnknown_817FA11, MSGBOX_SIGN
+	msgbox VermilionCity_Text_VermilionHarbor, MSGBOX_SIGN
 	end
@@ -1,39 +1,39 @@
-gUnknown_817F723:: @ 817F723
+VermilionCity_Text_GrimerMultipliesInSludge:: @ 817F723
    .string "We're careful about pollution here.\p"
    .string "We've heard GRIMER multiplies in\n"
    .string "toxic sludge.$"
-gUnknown_817F776:: @ 817F776
+VermilionCity_Text_DidYouSeeSSAnneInHarbor:: @ 817F776
    .string "Did you see the S.S. ANNE moored\n"
    .string "in the harbor?$"
-gUnknown_817F7A6:: @ 817F7A6
+VermilionCity_Text_SSAnneHasDepartedForYear:: @ 817F7A6
    .string "So, the S.S. ANNE has departed?\p"
    .string "She'll be back in VERMILION about\n"
    .string "this time next year.$"
-gUnknown_817F7FD:: @ 817F7FD
+VermilionCity_Text_BuildingOnThisLand:: @ 817F7FD
    .string "I'm putting up a building on this\n"
    .string "plot of land. I own it all.\p"
    .string "My POKéMON is tamping the land\n"
    .string "to lay the foundation.$"
-gUnknown_817F871:: @ 817F871
+VermilionCity_Text_Machop:: @ 817F871
    .string "MACHOP: Guoh! Gogogoh!$"
-gUnknown_817F888:: @ 817F888
+VermilionCity_Text_MachopStompingLandFlat:: @ 817F888
    .string "A MACHOP is stomping the land flat.$"
-gUnknown_817F8AC:: @ 817F8AC
+VermilionCity_Text_SSAnneVisitsOnceAYear:: @ 817F8AC
    .string "The S.S. ANNE is a famous luxury\n"
    .string "cruise ship.\p"
    .string "It visits VERMILION once a year.$"
-gUnknown_817F8FB:: @ 817F8FB
+VermilionCity_Text_CitySign:: @ 817F8FB
    .string "VERMILION CITY\n"
    .string "The Port of Exquisite Sunsets$"
-gUnknown_817F928:: @ 817F928
+VermilionCity_Text_SnorlaxBlockingRoute12:: @ 817F928
    .string "NOTICE!\p"
    .string "ROUTE 12 may be blocked off by a\n"
    .string "sleeping POKéMON.\p"
@@ -41,83 +41,83 @@ gUnknown_817F928:: @ 817F928
    .string "LAVENDER TOWN.\p"
    .string "VERMILION POLICE$"
-gUnknown_817F9A1:: @ 817F9A1
+VermilionCity_Text_PokemonFanClubSign:: @ 817F9A1
    .string "POKéMON FAN CLUB\n"
    .string "All POKéMON fans welcome!$"
-gUnknown_817F9CC:: @ 817F9CC
+VermilionCity_Text_GymSign:: @ 817F9CC
    .string "VERMILION CITY POKéMON GYM\n"
    .string "LEADER: LT. SURGE\l"
    .string "The Lightning American!$"
-gUnknown_817FA11:: @ 817FA11
+VermilionCity_Text_VermilionHarbor:: @ 817FA11
    .string "VERMILION HARBOR$"
-gUnknown_817FA22:: @ 817FA22
+VermilionCity_Text_WelcomeToTheSSAnne:: @ 817FA22
    .string "Welcome to the S.S. ANNE!$"
-gUnknown_817FA3C:: @ 817FA3C
+VermilionCity_Text_DoYouHaveATicket:: @ 817FA3C
    .string "Welcome to the S.S. ANNE!\p"
    .string "Excuse me, do you have a ticket?$"
-gUnknown_817FA77:: @ 817FA77
+VermilionCity_Text_FlashedSSTicket:: @ 817FA77
    .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p"
    .string "{SIZE}ÇGreat!\n"
    .string "Welcome to the S.S. ANNE!$"
-gUnknown_817FABA:: @ 817FABA
+VermilionCity_Text_DontHaveNeededSSTicket:: @ 817FABA
    .string "{SIZE}Á{PLAYER} doesn't have the needed\n"
    .string "S.S. TICKET.\p"
    .string "{SIZE}ÇSorry!\p"
    .string "You need a ticket to get aboard.$"
-gUnknown_817FB10:: @ 817FB10
+VermilionCity_Text_TheShipSetSail:: @ 817FB10
    .string "The ship set sail.$"
-Text_17FB23:: @ 817FB23
+VermilionCity_Text_BoardSeagallopTriPass:: @ 817FB23
    .string "Ah, you have a TRI-PASS.\p"
    .string "Would you like to board\n"
    .string "a SEAGALLOP ferry?$"
-Text_17FB67:: @ 817FB67
+VermilionCity_Text_Seagallop7Departing:: @ 817FB67
    .string "Okay, everything's in order.\p"
    .string "SEAGALLOP HI-SPEED 7 will be\n"
    .string "departing immediately.$"
-Text_17FBB8:: @ 817FBB8
+VermilionCity_Text_BoardSeagallopRainbowPass:: @ 817FBB8
    .string "Ah, you have a RAINBOW PASS.\p"
    .string "Would you like to board\n"
    .string "a SEAGALLOP ferry?$"
-gUnknown_817FC00:: @ 817FC00
+VermilionCity_Text_OhMysticTicketTakeYouToNavelRock:: @ 817FC00
    .string "Oh! That's a MYSTICTICKET!\n"
    .string "Now that is rare.\p"
    .string "We'll be happy to take you to\n"
    .string "NAVEL ROCK anytime.$"
-gUnknown_817FC5F:: @ 817FC5F
+VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland:: @ 817FC5F
    .string "Oh! That's an AURORATICKET!\n"
    .string "Now that is rare.\p"
    .string "We'll be happy to take you to\n"
    .string "BIRTH ISLAND anytime.$"
-Text_17FCC1:: @ 817FCC1
+VermilionCity_Text_BoardSeagallopFerry:: @ 817FCC1
    .string "Would you like to board\n"
    .string "a SEAGALLOP ferry?$"
-gUnknown_817FCEC:: @ 817FCEC
+VermilionCity_Text_Seagallop10Departing:: @ 817FCEC
    .string "Okay, everything's in order for you\n"
    .string "to board a special ferry.\p"
    .string "SEAGALLOP HI-SPEED 10 will be\n"
    .string "departing immediately.$"
-gUnknown_817FD5F:: @ 817FD5F
+VermilionCity_Text_Seagallop12Departing:: @ 817FD5F
    .string "Okay, everything's in order for you\n"
    .string "to board a special ferry.\p"
    .string "SEAGALLOP HI-SPEED 12 will be\n"
    .string "departing immediately.$"
-gUnknown_817FDD2:: @ 817FDD2
+VermilionCity_Text_Route2AideHasPackageForYou:: @ 817FDD2
    .string "Oh, hello, {PLAYER}!\n"
    .string "How are you doing?\p"
    .string "It's me, one of PROF. OAK's AIDES.\p"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_Gym_EventScript_16B94A",
+      "script": "VermilionCity_Gym_EventScript_LtSurge",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "VermilionCity_Gym_EventScript_16BA1E",
+      "script": "VermilionCity_Gym_EventScript_Baily",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "VermilionCity_Gym_EventScript_16B9FA",
+      "script": "VermilionCity_Gym_EventScript_Dwayne",
      "flag": "0"
    },
    {
@@ -62,7 +62,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_Gym_EventScript_16BA6C",
+      "script": "VermilionCity_Gym_EventScript_GymGuy",
      "flag": "0"
    },
    {
@@ -75,7 +75,7 @@
      "movement_range_y": 1,
      "trainer_type": 1,
      "trainer_sight_or_berry_tree_id": 3,
-      "script": "VermilionCity_Gym_EventScript_16BA35",
+      "script": "VermilionCity_Gym_EventScript_Tucker",
      "flag": "0"
    }
  ],
@@ -109,119 +109,119 @@
      "x": 3,
      "y": 17,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16BA8B"
+      "script": "VermilionCity_Gym_EventScript_GymStatue"
    },
    {
      "type": "bg_event_type_0",
      "x": 7,
      "y": 17,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16BA8B"
+      "script": "VermilionCity_Gym_EventScript_GymStatue"
    },
    {
      "type": "bg_event_type_0",
      "x": 1,
      "y": 10,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B78F"
+      "script": "VermilionCity_Gym_EventScript_TrashCan1"
    },
    {
      "type": "bg_event_type_0",
      "x": 3,
      "y": 10,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B79B"
+      "script": "VermilionCity_Gym_EventScript_TrashCan2"
    },
    {
      "type": "bg_event_type_0",
      "x": 5,
      "y": 10,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7A7"
+      "script": "VermilionCity_Gym_EventScript_TrashCan3"
    },
    {
      "type": "bg_event_type_0",
      "x": 7,
      "y": 10,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7B3"
+      "script": "VermilionCity_Gym_EventScript_TrashCan4"
    },
    {
      "type": "bg_event_type_0",
      "x": 9,
      "y": 10,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7BF"
+      "script": "VermilionCity_Gym_EventScript_TrashCan5"
    },
    {
      "type": "bg_event_type_0",
      "x": 1,
      "y": 12,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7CB"
+      "script": "VermilionCity_Gym_EventScript_TrashCan6"
    },
    {
      "type": "bg_event_type_0",
      "x": 3,
      "y": 12,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7D7"
+      "script": "VermilionCity_Gym_EventScript_TrashCan7"
    },
    {
      "type": "bg_event_type_0",
      "x": 5,
      "y": 12,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7E3"
+      "script": "VermilionCity_Gym_EventScript_TrashCan8"
    },
    {
      "type": "bg_event_type_0",
      "x": 7,
      "y": 12,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7EF"
+      "script": "VermilionCity_Gym_EventScript_TrashCan9"
    },
    {
      "type": "bg_event_type_0",
      "x": 9,
      "y": 12,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B7FB"
+      "script": "VermilionCity_Gym_EventScript_TrashCan10"
    },
    {
      "type": "bg_event_type_0",
      "x": 1,
      "y": 14,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B807"
+      "script": "VermilionCity_Gym_EventScript_TrashCan11"
    },
    {
      "type": "bg_event_type_0",
      "x": 3,
      "y": 14,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B813"
+      "script": "VermilionCity_Gym_EventScript_TrashCan12"
    },
    {
      "type": "bg_event_type_0",
      "x": 5,
      "y": 14,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B81F"
+      "script": "VermilionCity_Gym_EventScript_TrashCan13"
    },
    {
      "type": "bg_event_type_0",
      "x": 7,
      "y": 14,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B82B"
+      "script": "VermilionCity_Gym_EventScript_TrashCan14"
    },
    {
      "type": "bg_event_type_0",
      "x": 9,
      "y": 14,
      "elevation": 0,
-      "script": "VermilionCity_Gym_EventScript_16B837"
+      "script": "VermilionCity_Gym_EventScript_TrashCan15"
    }
  ]
 }
@@ -1,180 +1,185 @@
 .equ FOUND_FIRST_SWITCH, FLAG_TEMP_1
 .equ SWITCH1_ID,         VAR_0x8004
 .equ SWITCH2_ID,         VAR_0x8005
 .equ TRASH_CAN_ID,       VAR_0x8008
 VermilionCity_Gym_MapScripts:: @ 816B69E
 	map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition
 	.byte 0
 VermilionCity_Gym_OnLoad:: @ 816B6A9
-	call_if_set FLAG_TEMP_1, EventScript_16B6BC
+	call_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_SetOneBeamOff
-	call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B717
+	call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_SetBeamsOff
 	end
-EventScript_16B6BC:: @ 816B6BC
+VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC
-	setmetatile 3, 6, 699, 1
+	setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn, 1
-	setmetatile 4, 6, 700, 1
+	setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn, 1
-	setmetatile 5, 6, 701, 1
+	setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop_HalfOn, 1
-	setmetatile 6, 6, 702, 1
+	setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_HalfOn, 1
-	setmetatile 7, 6, 703, 1
+	setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_HalfOn, 1
-	setmetatile 3, 7, 707, 1
+	setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_HalfOn, 1
-	setmetatile 4, 7, 708, 1
+	setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_HalfOn, 1
-	setmetatile 5, 7, 709, 1
+	setmetatile 5, 7, METATILE_VermilionGym_Beam_MidBottom_HalfOn, 1
-	setmetatile 6, 7, 710, 1
+	setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn, 1
-	setmetatile 7, 7, 711, 1
+	setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn, 1
 	return
-EventScript_16B717:: @ 816B717
+VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717
-	setmetatile 3, 6, 659, 1
+	setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Off, 1
-	setmetatile 4, 6, 660, 0
+	setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off, 0
-	setmetatile 5, 6, 641, 0
+	setmetatile 5, 6, METATILE_VermilionGym_Floor, 0
-	setmetatile 6, 6, 661, 0
+	setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_Off, 0
-	setmetatile 7, 6, 662, 1
+	setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_Off, 1
-	setmetatile 3, 7, 667, 1
+	setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Off, 1
-	setmetatile 4, 7, 668, 0
+	setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_Off, 0
-	setmetatile 5, 7, 641, 0
+	setmetatile 5, 7, METATILE_VermilionGym_Floor, 0
-	setmetatile 6, 7, 669, 0
+	setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_Off, 0
-	setmetatile 7, 7, 670, 1
+	setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Off, 1
 	return
 VermilionCity_Gym_OnTransition:: @ 816B772
-	call EventScript_16B778
+	call VermilionCity_Gym_EventScript_InitTrashCans
 	end
-EventScript_16B778:: @ 816B778
+VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778
 	goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return
 	special Special_SetVermilionTrashCans
-	copyvar VAR_TEMP_0, VAR_0x8004
+	copyvar VAR_TEMP_0, SWITCH1_ID
-	copyvar VAR_TEMP_1, VAR_0x8005
+	copyvar VAR_TEMP_1, SWITCH2_ID
 	return
-VermilionCity_Gym_EventScript_16B78F:: @ 816B78F
+VermilionCity_Gym_EventScript_TrashCan1:: @ 816B78F
 	lockall
-	setvar VAR_0x8008, 1
+	setvar TRASH_CAN_ID, 1
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B79B:: @ 816B79B
+VermilionCity_Gym_EventScript_TrashCan2:: @ 816B79B
 	lockall
-	setvar VAR_0x8008, 2
+	setvar TRASH_CAN_ID, 2
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7A7:: @ 816B7A7
+VermilionCity_Gym_EventScript_TrashCan3:: @ 816B7A7
 	lockall
-	setvar VAR_0x8008, 3
+	setvar TRASH_CAN_ID, 3
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7B3:: @ 816B7B3
+VermilionCity_Gym_EventScript_TrashCan4:: @ 816B7B3
 	lockall
-	setvar VAR_0x8008, 4
+	setvar TRASH_CAN_ID, 4
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7BF:: @ 816B7BF
+VermilionCity_Gym_EventScript_TrashCan5:: @ 816B7BF
 	lockall
-	setvar VAR_0x8008, 5
+	setvar TRASH_CAN_ID, 5
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7CB:: @ 816B7CB
+VermilionCity_Gym_EventScript_TrashCan6:: @ 816B7CB
 	lockall
-	setvar VAR_0x8008, 6
+	setvar TRASH_CAN_ID, 6
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7D7:: @ 816B7D7
+VermilionCity_Gym_EventScript_TrashCan7:: @ 816B7D7
 	lockall
-	setvar VAR_0x8008, 7
+	setvar TRASH_CAN_ID, 7
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7E3:: @ 816B7E3
+VermilionCity_Gym_EventScript_TrashCan8:: @ 816B7E3
 	lockall
-	setvar VAR_0x8008, 8
+	setvar TRASH_CAN_ID, 8
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7EF:: @ 816B7EF
+VermilionCity_Gym_EventScript_TrashCan9:: @ 816B7EF
 	lockall
-	setvar VAR_0x8008, 9
+	setvar TRASH_CAN_ID, 9
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B7FB:: @ 816B7FB
+VermilionCity_Gym_EventScript_TrashCan10:: @ 816B7FB
 	lockall
-	setvar VAR_0x8008, 10
+	setvar TRASH_CAN_ID, 10
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B807:: @ 816B807
+VermilionCity_Gym_EventScript_TrashCan11:: @ 816B807
 	lockall
-	setvar VAR_0x8008, 11
+	setvar TRASH_CAN_ID, 11
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B813:: @ 816B813
+VermilionCity_Gym_EventScript_TrashCan12:: @ 816B813
 	lockall
-	setvar VAR_0x8008, 12
+	setvar TRASH_CAN_ID, 12
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B81F:: @ 816B81F
+VermilionCity_Gym_EventScript_TrashCan13:: @ 816B81F
 	lockall
-	setvar VAR_0x8008, 13
+	setvar TRASH_CAN_ID, 13
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B82B:: @ 816B82B
+VermilionCity_Gym_EventScript_TrashCan14:: @ 816B82B
 	lockall
-	setvar VAR_0x8008, 14
+	setvar TRASH_CAN_ID, 14
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-VermilionCity_Gym_EventScript_16B837:: @ 816B837
+VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837
 	lockall
-	setvar VAR_0x8008, 15
+	setvar TRASH_CAN_ID, 15
-	goto EventScript_16B843
+	goto VermilionCity_Gym_EventScript_TrashCan
 	end
-EventScript_16B843:: @ 816B843
+VermilionCity_Gym_EventScript_TrashCan:: @ 816B843
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
-	copyvar VAR_0x8004, VAR_TEMP_0
+	copyvar SWITCH1_ID, VAR_TEMP_0
-	copyvar VAR_0x8005, VAR_TEMP_1
+	copyvar SWITCH2_ID, VAR_TEMP_1
-	goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B8E5
+	goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen
-	goto_if_set FLAG_TEMP_1, EventScript_16B89E
+	goto_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_TrySwitchTwo
-	compare VAR_0x8004, VAR_0x8008
+	compare SWITCH1_ID, TRASH_CAN_ID
-	goto_if_eq EventScript_16B885
+	goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchOne
-	msgbox gUnknown_8195289
+	msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere
 	releaseall
 	end
-EventScript_16B885:: @ 816B885
+VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885
-	msgbox gUnknown_81952A8
+	msgbox VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened
 	playse SE_PIN
 	waitse
-	call EventScript_16B6BC
+	call VermilionCity_Gym_EventScript_SetOneBeamOff
 	special DrawWholeMapView
-	setflag FLAG_TEMP_1
+	setflag FOUND_FIRST_SWITCH
 	releaseall
 	end
-EventScript_16B89E:: @ 816B89E
+VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E
-	compare VAR_0x8005, VAR_0x8008
+	compare SWITCH2_ID, TRASH_CAN_ID
-	goto_if_eq EventScript_16B8CB
+	goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo
-	msgbox gUnknown_819536C
+	msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset
-	clearflag FLAG_TEMP_1
+	clearflag FOUND_FIRST_SWITCH
 	special Special_SetVermilionTrashCans
-	copyvar VAR_TEMP_0, VAR_0x8004
+	copyvar VAR_TEMP_0, SWITCH1_ID
-	copyvar VAR_TEMP_1, VAR_0x8005
+	copyvar VAR_TEMP_1, SWITCH2_ID
-	call EventScript_16B8EF
+	call VermilionCity_Gym_EventScript_SetBeamsOn
 	special DrawWholeMapView
 	releaseall
 	end
-EventScript_16B8CB:: @ 816B8CB
+VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB
-	msgbox gUnknown_8195330
+	msgbox VermilionCity_Gym_Text_SecondLockOpened
 	closemessage
-	call EventScript_16B717
+	call VermilionCity_Gym_EventScript_SetBeamsOff
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
 	waitse
@@ -182,105 +187,105 @@ EventScript_16B8CB:: @ 816B8CB
 	releaseall
 	end
-EventScript_16B8E5:: @ 816B8E5
+VermilionCity_Gym_EventScript_LocksAlreadyOpen:: @ 816B8E5
-	msgbox gUnknown_8195289
+	msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere
 	releaseall
 	end
-EventScript_16B8EF:: @ 816B8EF
+VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF
-	setmetatile 3, 6, 681, 1
+	setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_On, 1
-	setmetatile 4, 6, 682, 1
+	setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On, 1
-	setmetatile 5, 6, 645, 1
+	setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop, 1
-	setmetatile 6, 6, 683, 1
+	setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_On, 1
-	setmetatile 7, 6, 684, 1
+	setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_On, 1
-	setmetatile 3, 7, 689, 1
+	setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_On, 1
-	setmetatile 4, 7, 690, 1
+	setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_On, 1
-	setmetatile 5, 7, 653, 1
+	setmetatile 5, 7, METATILE_VermilionGym_Beam_MidBottom, 1
-	setmetatile 6, 7, 691, 1
+	setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_On, 1
-	setmetatile 7, 7, 692, 1
+	setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_On, 1
 	return
-VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
+VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A
 	famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_LT_SURGE, Text_194BA4, Text_194E03, EventScript_16B97C, NO_MUSIC
+	trainerbattle_single TRAINER_LEADER_LT_SURGE, VermilionCity_Gym_Text_LtSurgeIntro, VermilionCity_Gym_Text_LtSurgeDefeat, VermilionCity_Gym_EventScript_DefeatedLtSurge, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM34_FROM_SURGE, EventScript_16B9AF
+	goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM43
-	msgbox gUnknown_8194C8E
+	msgbox VermilionCity_Gym_Text_LtSurgePostBattle
 	release
 	end
-EventScript_16B97C:: @ 816B97C
+VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C
 	famechecker FAMECHECKER_LTSURGE, 1
-	call_if_unset FLAG_GOT_HM05, EventScript_16B9AB
+	call_if_unset FLAG_GOT_HM05, VermilionCity_Gym_EventScript_ShowOaksAide
 	clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL
 	setflag FLAG_DEFEATED_LT_SURGE
 	setflag FLAG_BADGE03_GET
 	set_gym_trainers 3
-	goto EventScript_16B9AF
+	goto VermilionCity_Gym_EventScript_GiveTM43
 	end
-EventScript_16B9AB:: @ 816B9AB
+VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB
 	clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
 	return
-EventScript_16B9AF:: @ 816B9AF
+VermilionCity_Gym_EventScript_GiveTM43:: @ 816B9AF
-	msgbox gUnknown_8194CFA
+	msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis
 	checkitemspace ITEM_TM34, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16B9F0
+	goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM43
-	giveitem_msg gUnknown_8194D87, ITEM_TM34
+	giveitem_msg VermilionCity_Gym_Text_ReceivedTM43FromLtSurge, ITEM_TM34
 	setflag FLAG_GOT_TM34_FROM_SURGE
-	msgbox gUnknown_8194DA8
+	msgbox VermilionCity_Gym_Text_ExplainTM34
 	release
 	end
-EventScript_16B9F0:: @ 816B9F0
+VermilionCity_Gym_EventScript_NoRoomForTM43:: @ 816B9F0
-	msgbox gUnknown_8194DE3
+	msgbox VermilionCity_Gym_Text_MakeRoomInYourBag
 	release
 	end
-VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA
+VermilionCity_Gym_EventScript_Dwayne:: @ 816B9FA
-	trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1
+	trainerbattle_single TRAINER_SAILOR_DWAYNE, VermilionCity_Gym_Text_DwayneIntro, VermilionCity_Gym_Text_DwayneDefeat
 	famechecker FAMECHECKER_LTSURGE, 4
-	msgbox gUnknown_8195004, MSGBOX_AUTOCLOSE
+	msgbox VermilionCity_Gym_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE
 	end
-VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E
+VermilionCity_Gym_EventScript_Baily:: @ 816BA1E
-	trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F
+	trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat
-	msgbox gUnknown_8194F76, MSGBOX_AUTOCLOSE
+	msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE
 	end
-VermilionCity_Gym_EventScript_16BA35:: @ 816BA35
+VermilionCity_Gym_EventScript_Tucker:: @ 816BA35
-	trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D
+	trainerbattle_single TRAINER_GENTLEMAN_TUCKER, VermilionCity_Gym_Text_TuckerIntro, VermilionCity_Gym_Text_TuckerDefeat, VermilionCity_Gym_EventScript_DefeatedTucker
 	famechecker FAMECHECKER_LTSURGE, 3
-	msgbox gUnknown_8194EBD, MSGBOX_AUTOCLOSE
+	msgbox VermilionCity_Gym_Text_TuckerPostBattle, MSGBOX_AUTOCLOSE
 	end
-EventScript_16BA5D:: @ 816BA5D
+VermilionCity_Gym_EventScript_DefeatedTucker:: @ 816BA5D
 	famechecker FAMECHECKER_LTSURGE, 2
 	release
 	end
-VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C
+VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_LT_SURGE, EventScript_16BA81
+	goto_if_set FLAG_DEFEATED_LT_SURGE, VermilionCity_Gym_EventScript_GymGuyPostVictory
-	msgbox gUnknown_81950B4
+	msgbox VermilionCity_Gym_Text_GymGuyAdvice
 	release
 	end
-EventScript_16BA81:: @ 816BA81
+VermilionCity_Gym_EventScript_GymGuyPostVictory:: @ 816BA81
-	msgbox gUnknown_81951EC
+	msgbox VermilionCity_Gym_Text_GymGuyPostVictory
 	release
 	end
-VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B
+VermilionCity_Gym_EventScript_GymStatue:: @ 816BA8B
 	lockall
-	goto_if_set FLAG_BADGE03_GET, EventScript_16BA9F
+	goto_if_set FLAG_BADGE03_GET, VermilionCity_Gym_EventScript_GymStatuePostVictory
-	msgbox gUnknown_819520B
+	msgbox VermilionCity_Gym_Text_GymStatue
 	releaseall
 	end
-EventScript_16BA9F:: @ 816BA9F
+VermilionCity_Gym_EventScript_GymStatuePostVictory:: @ 816BA9F
-	msgbox gUnknown_8195248
+	msgbox VermilionCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
@@ -1,4 +1,4 @@
-Text_194BA4:: @ 8194BA4
+VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4
    .string "Hey, kid! What do you think you're\n"
    .string "doing here?\p"
    .string "You won't live long in combat!\n"
@@ -9,13 +9,13 @@ Text_194BA4:: @ 8194BA4
    .string "paralysis!\p"
    .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$"
-gUnknown_8194C8E:: @ 8194C8E
+VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E
    .string "A little word of advice, kid!\p"
    .string "Electricity is sure powerful!\p"
    .string "But, it's useless against GROUND-\n"
    .string "type POKéMON!$"
-gUnknown_8194CFA:: @ 8194CFA
+VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA
    .string "The THUNDERBADGE cranks up your\n"
    .string "POKéMON's SPEED!\p"
    .string "It also lets your POKéMON FLY\n"
@@ -23,58 +23,58 @@ gUnknown_8194CFA:: @ 8194CFA
    .string "You're special, kid!\n"
    .string "Take this!$"
-gUnknown_8194D87:: @ 8194D87
+VermilionCity_Gym_Text_ReceivedTM43FromLtSurge:: @ 8194D87
    .string "{PLAYER} received TM34\n"
    .string "from LT. SURGE.$"
-gUnknown_8194DA8:: @ 8194DA8
+VermilionCity_Gym_Text_ExplainTM34:: @ 8194DA8
    .string "TM34 contains SHOCK WAVE!\p"
    .string "Teach it to an ELECTRIC POKéMON!$"
-gUnknown_8194DE3:: @ 8194DE3
+VermilionCity_Gym_Text_MakeRoomInYourBag:: @ 8194DE3
    .string "Yo, kid, make room in your BAG!$"
-Text_194E03:: @ 8194E03
+VermilionCity_Gym_Text_LtSurgeDefeat:: @ 8194E03
    .string "Now that's a shocker!\p"
    .string "You're the real deal, kid!\p"
    .string "Fine, then, take the THUNDERBADGE!$"
-Text_194E57:: @ 8194E57
+VermilionCity_Gym_Text_TuckerIntro:: @ 8194E57
    .string "When I was in the Army, LT. SURGE\n"
    .string "was my strict CO.\p"
    .string "He was a hard taskmaster.$"
-Text_194EA5:: @ 8194EA5
+VermilionCity_Gym_Text_TuckerDefeat:: @ 8194EA5
    .string "Stop!\n"
    .string "You're very good!$"
-gUnknown_8194EBD:: @ 8194EBD
+VermilionCity_Gym_Text_TuckerPostBattle:: @ 8194EBD
    .string "It's not easy opening that door.\p"
    .string "LT. SURGE was always famous for\n"
    .string "his cautious nature in the Army.$"
-Text_194F1F:: @ 8194F1F
+VermilionCity_Gym_Text_BailyIntro:: @ 8194F1F
    .string "I'm a lightweight, but I'm good\n"
    .string "with electricity!\p"
    .string "That's why I joined this GYM.$"
-Text_194F6F:: @ 8194F6F
+VermilionCity_Gym_Text_BailyDefeat:: @ 8194F6F
    .string "Fried!$"
-gUnknown_8194F76:: @ 8194F76
+VermilionCity_Gym_Text_BailyPostBattle:: @ 8194F76
    .string "Okay, I'll talk!\p"
    .string "LT. SURGE said he hid door\n"
    .string "switches inside something.$"
-Text_194FBD:: @ 8194FBD
+VermilionCity_Gym_Text_DwayneIntro:: @ 8194FBD
    .string "This is no place for kids!\n"
    .string "Not even if you're good!$"
-Text_194FF1:: @ 8194FF1
+VermilionCity_Gym_Text_DwayneDefeat:: @ 8194FF1
    .string "Wow!\n"
    .string "Surprised me!$"
-gUnknown_8195004:: @ 8195004
+VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004
    .string "LT. SURGE installed the traps in\n"
    .string "the GYM himself.\p"
    .string "He set up double locks everywhere.\n"
@@ -82,7 +82,7 @@ gUnknown_8195004:: @ 8195004
    .string "When you open the first lock, the\n"
    .string "second lock is right next to it.$"
-gUnknown_81950B4:: @ 81950B4
+VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4
    .string "Yo!\n"
    .string "Champ in the making!\p"
    .string "LT. SURGE has a nickname.\p"
@@ -97,42 +97,42 @@ gUnknown_81950B4:: @ 81950B4
    .string "He's locked himself in, so it won't\n"
    .string "be easy getting to him.$"
-gUnknown_81951EC:: @ 81951EC
+VermilionCity_Gym_Text_GymGuyPostVictory:: @ 81951EC
    .string "Whew!\n"
    .string "That match was electric!$"
-gUnknown_819520B:: @ 819520B
+VermilionCity_Gym_Text_GymStatue:: @ 819520B
    .string "VERMILION POKéMON GYM\n"
    .string "LEADER: LT. SURGE\p"
    .string "WINNING TRAINERS:\n"
    .string "{RIVAL}$"
-gUnknown_8195248:: @ 8195248
+VermilionCity_Gym_Text_GymStatuePlayerWon:: @ 8195248
    .string "VERMILION POKéMON GYM\n"
    .string "LEADER: LT. SURGE\p"
    .string "WINNING TRAINERS:\n"
    .string "{RIVAL}, {PLAYER}$"
-gUnknown_8195289:: @ 8195289
+VermilionCity_Gym_Text_NopeOnlyTrashHere:: @ 8195289
    .string "Nope!\n"
    .string "There's only trash here.$"
-gUnknown_81952A8:: @ 81952A8
+VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened:: @ 81952A8
    .string "Hey! There's a switch under the\n"
    .string "trash! Turn it on!\p"
    .string "The first electric lock opened!$"
-Text_1952FB:: @ 81952FB
+VermilionCity_Gym_Text_AnotherSwitchInTrash:: @ 81952FB
    .string "ガサゴソ‥！\n"
    .string "おっと！　ゴミばこの　そこに\l"
    .string "また　スイッチが　あった！\l"
    .string "おして　みよう！　‥　ポチッとな$"
-gUnknown_8195330:: @ 8195330
+VermilionCity_Gym_Text_SecondLockOpened:: @ 8195330
    .string "The second electric lock opened!\n"
    .string "The motorized door opened!$"
-gUnknown_819536C:: @ 819536C
+VermilionCity_Gym_Text_OnlyTrashLocksWereReset:: @ 819536C
    .string "Nope!\n"
    .string "There's only trash here.\p"
    .string "Hey!\n"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_House1_EventScript_16B3A7",
+      "script": "VermilionCity_House1_EventScript_FishingGuru",
      "flag": "0"
    }
  ],
@@ -1,35 +1,35 @@
 VermilionCity_House1_MapScripts:: @ 816B3A6
 	.byte 0
-VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7
+VermilionCity_House1_EventScript_FishingGuru:: @ 816B3A7
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF
+	goto_if_set FLAG_GOT_OLD_ROD, VermilionCity_House1_EventScript_AlreadyGotOldRod
-	msgbox gUnknown_8193EC1, MSGBOX_YESNO
+	msgbox VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16B3D9
+	goto_if_eq VermilionCity_House1_EventScript_GiveOldRod
-	msgbox gUnknown_8194028
+	msgbox VermilionCity_House1_Text_OhThatsSoDisappointing
 	release
 	end
-EventScript_16B3CF:: @ 816B3CF
+VermilionCity_House1_EventScript_AlreadyGotOldRod:: @ 816B3CF
-	msgbox gUnknown_8194045
+	msgbox VermilionCity_House1_Text_HowAreTheFishBiting
 	release
 	end
-EventScript_16B3D9:: @ 816B3D9
+VermilionCity_House1_EventScript_GiveOldRod:: @ 816B3D9
 	checkitemspace ITEM_OLD_ROD, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16B41A
+	goto_if_eq VermilionCity_House1_EventScript_NoRoomForOldRod
 	additem ITEM_OLD_ROD
-	msgbox gUnknown_8193F2A
+	msgbox VermilionCity_House1_Text_TakeThisAndFish
-	msgreceiveditem gUnknown_8193F81, ITEM_OLD_ROD
+	msgreceiveditem VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru, ITEM_OLD_ROD
 	setflag FLAG_GOT_OLD_ROD
-	msgbox gUnknown_8193FAF
+	msgbox VermilionCity_House1_Text_FishingIsAWayOfLife
 	release
 	end
-EventScript_16B41A:: @ 816B41A
+VermilionCity_House1_EventScript_NoRoomForOldRod:: @ 816B41A
-	msgbox gUnknown_819406F
+	msgbox VermilionCity_House1_Text_NoRoomForNiceGift
 	release
 	end
@@ -1,39 +1,33 @@
-Text_193E82:: @ 8193E82
+VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish:: @ 8193EC1
    .string "この　あいだ　やまおくで\n"
    .string "きんのたまを　ひろい　ましてね！\p"
    .string "つかえない　しなもの　ですが\n"
    .string "うったら　なんと　5000¥でした$"
 gUnknown_8193EC1:: @ 8193EC1
    .string "I'm the FISHING GURU!\p"
    .string "I simply looove fishing!\n"
    .string "I can't bear to go without.\p"
    .string "Tell me, do you like to fish?$"
-gUnknown_8193F2A:: @ 8193F2A
+VermilionCity_House1_Text_TakeThisAndFish:: @ 8193F2A
    .string "Grand! I like your style.\n"
    .string "I think we can be friends.\p"
    .string "Take this and fish, young friend!$"
-gUnknown_8193F81:: @ 8193F81
+VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru:: @ 8193F81
    .string "{PLAYER} received an OLD ROD from\n"
    .string "the FISHING GURU.$"
-gUnknown_8193FAF:: @ 8193FAF
+VermilionCity_House1_Text_FishingIsAWayOfLife:: @ 8193FAF
    .string "Fishing is a way of life!\n"
    .string "It is like the finest poetry.\p"
    .string "From the seas to rivers, go out\n"
    .string "and land the big one, my friend.$"
-gUnknown_8194028:: @ 8194028
+VermilionCity_House1_Text_OhThatsSoDisappointing:: @ 8194028
    .string "Oh…\n"
    .string "That's so disappointing…$"
-gUnknown_8194045:: @ 8194045
+VermilionCity_House1_Text_HowAreTheFishBiting:: @ 8194045
    .string "Hello there, {PLAYER}!\p"
    .string "How are the fish biting?$"
-gUnknown_819406F:: @ 819406F
+VermilionCity_House1_Text_NoRoomForNiceGift:: @ 819406F
    .string "Oh, no!\p"
    .string "I had a nice gift for you, but you\n"
    .string "have no room for it!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_House2_EventScript_16B5D7",
+      "script": "VermilionCity_House2_EventScript_Elyssa",
      "flag": "0"
    }
  ],
@@ -1,39 +1,39 @@
 VermilionCity_House2_MapScripts:: @ 816B5D6
 	.byte 0
-VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
+VermilionCity_House2_EventScript_Elyssa:: @ 816B5D7
 	lock
 	faceplayer
 	setvar VAR_0x8008, INGAME_TRADE_FARFETCHD
 	call EventScript_GetInGameTradeSpeciesInfo
-	goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649
+	goto_if_set FLAG_DID_CH_DING_TRADE, VermilionCity_House2_EventScript_AlreadyTraded
-	msgbox gUnknown_81949CB, MSGBOX_YESNO
+	msgbox VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16B631
+	goto_if_eq VermilionCity_House2_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
 	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge EventScript_16B631
+	goto_if_ge VermilionCity_House2_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne EventScript_16B63B
+	goto_if_ne VermilionCity_House2_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
-	msgbox gUnknown_8194A44
+	msgbox VermilionCity_House2_Text_ThankYou
 	setflag FLAG_DID_CH_DING_TRADE
 	release
 	end
-EventScript_16B631:: @ 816B631
+VermilionCity_House2_EventScript_DeclineTrade:: @ 816B631
-	msgbox gUnknown_81949FD
+	msgbox VermilionCity_House2_Text_ThatsTooBad
 	release
 	end
-EventScript_16B63B:: @ 816B63B
+VermilionCity_House2_EventScript_NotRequestedMon:: @ 816B63B
 	getspeciesname 0, VAR_0x8009
-	msgbox gUnknown_8194A0D
+	msgbox VermilionCity_House2_Text_ThisIsNoMon
 	release
 	end
-EventScript_16B649:: @ 816B649
+VermilionCity_House2_EventScript_AlreadyTraded:: @ 816B649
-	msgbox gUnknown_8194A4F
+	msgbox VermilionCity_House2_Text_HowIsMyOldMon
 	release
 	end
@@ -0,0 +1,20 @@
 VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon:: @ 81949CB
 	.string "Hi!\n"
 	.string "Do you have a {STR_VAR_1}?\p"
 	.string "Want to trade it for my\n"
 	.string "{STR_VAR_2}?$"
 VermilionCity_House2_Text_ThatsTooBad:: @ 81949FD
 	.string "That's too bad.$"
 VermilionCity_House2_Text_ThisIsNoMon:: @ 8194A0D
 	.string "…This is no {STR_VAR_1}.\p"
 	.string "If you get one, please trade it\n"
 	.string "to me!$"
 VermilionCity_House2_Text_ThankYou:: @ 8194A44
 	.string "Thank you!$"
 VermilionCity_House2_Text_HowIsMyOldMon:: @ 8194A4F
 	.string "How is my old {STR_VAR_2}?\p"
 	.string "My {STR_VAR_1} is doing great!$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_Mart_EventScript_16B666",
+      "script": "VermilionCity_Mart_EventScript_Clerk",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_Mart_EventScript_16B654",
+      "script": "VermilionCity_Mart_EventScript_CooltrainerF",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 2,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_Mart_EventScript_16B65D",
+      "script": "VermilionCity_Mart_EventScript_BaldingMan",
      "flag": "0"
    }
  ],
@@ -1,27 +1,27 @@
 VermilionCity_Mart_MapScripts:: @ 816B653
 	.byte 0
-VermilionCity_Mart_EventScript_16B654:: @ 816B654
+VermilionCity_Mart_EventScript_CooltrainerF:: @ 816B654
-	msgbox gUnknown_8194B65, MSGBOX_NPC
+	msgbox VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer, MSGBOX_NPC
 	end
-VermilionCity_Mart_EventScript_16B65D:: @ 816B65D
+VermilionCity_Mart_EventScript_BaldingMan:: @ 816B65D
-	msgbox gUnknown_8194A77, MSGBOX_NPC
+	msgbox VermilionCity_Mart_Text_TeamRocketAreWickedPeople, MSGBOX_NPC
 	end
-VermilionCity_Mart_EventScript_16B666:: @ 816B666
+VermilionCity_Mart_EventScript_Clerk:: @ 816B666
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16B68C
+	pokemart VermilionCity_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 	.align 2
-Items_16B68C:: @ 816B68C
+VermilionCity_Mart_Items:: @ 816B68C
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -1,4 +1,4 @@
-gUnknown_8194A77:: @ 8194A77
+VermilionCity_Mart_Text_TeamRocketAreWickedPeople:: @ 8194A77
    .string "There are wicked people who will\n"
    .string "use POKéMON for criminal acts.\p"
    .string "TEAM ROCKET traffics in rare\n"
@@ -8,7 +8,7 @@ gUnknown_8194A77:: @ 8194A77
    .string "That's the sort of horrid people\n"
    .string "they are, TEAM ROCKET.$"
-gUnknown_8194B65:: @ 8194B65
+VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer:: @ 8194B65
    .string "I think POKéMON can be good or\n"
    .string "bad. It depends on the TRAINER.$"
@@ -23,7 +23,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B433",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_Nurse",
      "flag": "0"
    },
    {
@@ -36,7 +36,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B43C",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_Man",
      "flag": "0"
    },
    {
@@ -49,7 +49,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B445",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_Hiker",
      "flag": "0"
    },
    {
@@ -62,7 +62,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_16B44E",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_Youngster",
      "flag": "0"
    },
    {
@@ -75,7 +75,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_1A8D08",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman",
      "flag": "0"
    },
    {
@@ -88,7 +88,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge",
      "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL"
    },
    {
@@ -101,7 +101,7 @@
      "movement_range_y": 1,
      "trainer_type": 0,
      "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
+      "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge",
      "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL"
    }
  ],
--- a/Show More
+++ b/Show More