Merge pull request #271 from GriffinRichards/doc-twoisland

Document Two Island scripts

15 files changed, 277 insertions, 265 deletions

diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 668886176..8a258b635 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -31,7 +31,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16760F",
+      "script": "TwoIsland_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -44,7 +44,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167755",
+      "script": "TwoIsland_EventScript_Woman",
       "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN"
     },
     {
@@ -57,7 +57,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16775E",
+      "script": "TwoIsland_EventScript_Beauty",
       "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY"
     },
     {
@@ -70,7 +70,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_16774C",
+      "script": "TwoIsland_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -83,7 +83,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167777",
+      "script": "TwoIsland_EventScript_SuperNerd",
       "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD"
     },
     {
@@ -122,7 +122,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167789",
+      "script": "TwoIsland_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -135,7 +135,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_167780",
+      "script": "TwoIsland_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -176,21 +176,21 @@
       "x": 29,
       "y": 8,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_167792"
+      "script": "TwoIsland_EventScript_IslandSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 40,
       "y": 10,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_16779B"
+      "script": "TwoIsland_EventScript_JoyfulGameCornerSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 3,
       "elevation": 0,
-      "script": "TwoIsland_EventScript_1677A4"
+      "script": "TwoIsland_EventScript_FastCurrentSign"
     }
   ]
 }
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index acfb2c38b..530fd3928 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -5,137 +5,137 @@ TwoIsland_MapScripts:: @ 8167564
 TwoIsland_OnTransition:: @ 816756A
 	setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND
 	setflag FLAG_VISITED_TWO_ISLAND
-	call EventScript_167576
+	call TwoIsland_EventScript_SetShopState
 	end
 
-EventScript_167576:: @ 8167576
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597
-	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8
-	goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9
-	goto EventScript_1675E8
+TwoIsland_EventScript_SetShopState:: @ 8167576
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, TwoIsland_EventScript_SetShopStateAfterHoennLink
+	goto_if_set FLAG_SYS_GAME_CLEAR, TwoIsland_EventScript_SetShopStateAfterChampion
+	goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopStateAfterLostelleRescue
+	goto TwoIsland_EventScript_SetShopStateDefault
 	end
 
-EventScript_167597:: @ 8167597
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD
-	goto EventScript_167606
+TwoIsland_EventScript_SetShopStateAfterHoennLink:: @ 8167597
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_SetShopExpanded2
+	goto TwoIsland_EventScript_SetShopExpanded3
 	end
 
-EventScript_1675B8:: @ 81675B8
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
-	goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
-	goto EventScript_1675FD
+TwoIsland_EventScript_SetShopStateAfterChampion:: @ 81675B8
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial
+	goto_if_unset FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopInitial
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1
+	goto TwoIsland_EventScript_SetShopExpanded2
 	end
 
-EventScript_1675D9:: @ 81675D9
-	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
-	goto EventScript_1675F4
+TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: @ 81675D9
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial
+	goto TwoIsland_EventScript_SetShopExpanded1
 	end
 
-EventScript_1675E8:: @ 81675E8
-	goto EventScript_1675EE
+TwoIsland_EventScript_SetShopStateDefault:: @ 81675E8
+	goto TwoIsland_EventScript_SetShopInitial
 	end
 
-EventScript_1675EE:: @ 81675EE
+TwoIsland_EventScript_SetShopInitial:: @ 81675EE
 	setvar VAR_MAP_SCENE_TWO_ISLAND, 1
 	return
 
-EventScript_1675F4:: @ 81675F4
+TwoIsland_EventScript_SetShopExpanded1:: @ 81675F4
 	setvar VAR_MAP_SCENE_TWO_ISLAND, 2
 	clearflag FLAG_HIDE_TWO_ISLAND_WOMAN
 	return
 
-EventScript_1675FD:: @ 81675FD
+TwoIsland_EventScript_SetShopExpanded2:: @ 81675FD
 	setvar VAR_MAP_SCENE_TWO_ISLAND, 3
 	clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY
 	return
 
-EventScript_167606:: @ 8167606
+TwoIsland_EventScript_SetShopExpanded3:: @ 8167606
 	setvar VAR_MAP_SCENE_TWO_ISLAND, 4
 	clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD
 	return
 
-TwoIsland_EventScript_16760F:: @ 816760F
+TwoIsland_EventScript_Clerk:: @ 816760F
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND, 4
-	goto_if_eq EventScript_167646
+	goto_if_eq TwoIsland_EventScript_ClerkShopExpanded3
 	compare VAR_MAP_SCENE_TWO_ISLAND, 3
-	goto_if_eq EventScript_16765E
+	goto_if_eq TwoIsland_EventScript_ClerkShopExpanded2
 	compare VAR_MAP_SCENE_TWO_ISLAND, 2
-	goto_if_eq EventScript_167676
-	goto EventScript_16768E
+	goto_if_eq TwoIsland_EventScript_ClerkShopExpanded1
+	goto TwoIsland_EventScript_ClerkShopInitial
 	end
 
-EventScript_167646:: @ 8167646
-	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6
+TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, TwoIsland_EventScript_ClerkShopSkipIntro
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
-	message Text_181CAE
+	message TwoIsland_Text_BringingItemsFromDistantLands
 	waitmessage
-	goto EventScript_167728
+	goto TwoIsland_EventScript_ShopExpanded3
 	end
 
-EventScript_16765E:: @ 816765E
-	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6
+TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_ClerkShopSkipIntro
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
-	message Text_181C77
+	message TwoIsland_Text_HopeYouGiveItYourBest
 	waitmessage
-	goto EventScript_167708
+	goto TwoIsland_EventScript_ShopExpanded2
 	end
 
-EventScript_167676:: @ 8167676
-	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6
+TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_ClerkShopSkipIntro
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
-	message Text_181B7C
+	message TwoIsland_Text_AddedMerchandiseForLostelle
 	waitmessage
-	goto EventScript_1676EC
+	goto TwoIsland_EventScript_ShopExpanded1
 	end
 
-EventScript_16768E:: @ 816768E
-	goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6
+TwoIsland_EventScript_ClerkShopInitial:: @ 816768E
+	goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_ClerkShopSkipIntro
 	setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
-	message Text_181AFE
+	message TwoIsland_Text_WelcomeToShopMerchandiseLimited
 	waitmessage
-	goto EventScript_1676D3
+	goto TwoIsland_EventScript_ShopInitial
 	end
 
-EventScript_1676A6:: @ 81676A6
+TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6
 	message Text_MayIHelpYou
 	waitmessage
 	compare VAR_MAP_SCENE_TWO_ISLAND, 4
-	goto_if_eq EventScript_167728
+	goto_if_eq TwoIsland_EventScript_ShopExpanded3
 	compare VAR_MAP_SCENE_TWO_ISLAND, 3
-	goto_if_eq EventScript_167708
+	goto_if_eq TwoIsland_EventScript_ShopExpanded2
 	compare VAR_MAP_SCENE_TWO_ISLAND, 2
-	goto_if_eq EventScript_1676EC
-	goto EventScript_1676D3
+	goto_if_eq TwoIsland_EventScript_ShopExpanded1
+	goto TwoIsland_EventScript_ShopInitial
 	end
 
-EventScript_1676D3:: @ 81676D3
-	pokemart Items_1676E4
+TwoIsland_EventScript_ShopInitial:: @ 81676D3
+	pokemart TwoIsland_Items_ShopInitial
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_1676E4:: @ 81676E4
+TwoIsland_Items_ShopInitial:: @ 81676E4
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_FRESH_WATER
 	.2byte ITEM_NONE
 	release
 	end
 
-EventScript_1676EC:: @ 81676EC
-	pokemart Items_1676FC
+TwoIsland_EventScript_ShopExpanded1:: @ 81676EC
+	pokemart TwoIsland_Items_ShopExpanded1
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_1676FC:: @ 81676FC
+TwoIsland_Items_ShopExpanded1:: @ 81676FC
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SODA_POP
@@ -144,14 +144,14 @@ Items_1676FC:: @ 81676FC
 	release
 	end
 
-EventScript_167708:: @ 8167708
-	pokemart Items_167718
+TwoIsland_EventScript_ShopExpanded2:: @ 8167708
+	pokemart TwoIsland_Items_ShopExpanded2
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_167718:: @ 8167718
+TwoIsland_Items_ShopExpanded2:: @ 8167718
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_LEMONADE
@@ -162,14 +162,14 @@ Items_167718:: @ 8167718
 	release
 	end
 
-EventScript_167728:: @ 8167728
-	pokemart Items_167738
+TwoIsland_EventScript_ShopExpanded3:: @ 8167728
+	pokemart TwoIsland_Items_ShopExpanded3
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_167738:: @ 8167738
+TwoIsland_Items_ShopExpanded3:: @ 8167738
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_REPEAT_BALL
 	.2byte ITEM_TIMER_BALL
@@ -182,42 +182,42 @@ Items_167738:: @ 8167738
 	release
 	end
 
-TwoIsland_EventScript_16774C:: @ 816774C
-	msgbox gUnknown_8181D2F, MSGBOX_NPC
+TwoIsland_EventScript_Sailor:: @ 816774C
+	msgbox TwoIsland_Text_FellowMovedFromCeladonCity, MSGBOX_NPC
 	end
 
-TwoIsland_EventScript_167755:: @ 8167755
-	msgbox gUnknown_8181DCA, MSGBOX_NPC
+TwoIsland_EventScript_Woman:: @ 8167755
+	msgbox TwoIsland_Text_ShopkeepersBrotherWorksGameCorner, MSGBOX_NPC
 	end
 
-TwoIsland_EventScript_16775E:: @ 816775E
+TwoIsland_EventScript_Beauty:: @ 816775E
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 4
-	msgbox gUnknown_8181E47
+	msgbox TwoIsland_Text_BrunoCameToIslandWhileBack
 	release
 	end
 
-TwoIsland_EventScript_167777:: @ 8167777
-	msgbox gUnknown_8181F28, MSGBOX_NPC
+TwoIsland_EventScript_SuperNerd:: @ 8167777
+	msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC
 	end
 
-TwoIsland_EventScript_167780:: @ 8167780
-	msgbox gUnknown_8181F5D, MSGBOX_NPC
+TwoIsland_EventScript_Boy:: @ 8167780
+	msgbox TwoIsland_Text_OldWomanLivesOutOnCape, MSGBOX_NPC
 	end
 
-TwoIsland_EventScript_167789:: @ 8167789
-	msgbox gUnknown_8181FCE, MSGBOX_NPC
+TwoIsland_EventScript_LittleBoy:: @ 8167789
+	msgbox TwoIsland_Text_HaveYouTriedJumpingGame, MSGBOX_NPC
 	end
 
-TwoIsland_EventScript_167792:: @ 8167792
-	msgbox gUnknown_8181A88, MSGBOX_SIGN
+TwoIsland_EventScript_IslandSign:: @ 8167792
+	msgbox TwoIsland_Text_IslandSign, MSGBOX_SIGN
 	end
 
-TwoIsland_EventScript_16779B:: @ 816779B
-	msgbox gUnknown_8181AA7, MSGBOX_SIGN
+TwoIsland_EventScript_JoyfulGameCornerSign:: @ 816779B
+	msgbox TwoIsland_Text_JoyfulGameCornerSign, MSGBOX_SIGN
 	end
 
-TwoIsland_EventScript_1677A4:: @ 81677A4
-	msgbox gUnknown_8181AC8, MSGBOX_SIGN
+TwoIsland_EventScript_FastCurrentSign:: @ 81677A4
+	msgbox TwoIsland_Text_DangerFastCurrent, MSGBOX_SIGN
 	end
diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc
index fca7d80ee..c0834abb8 100644
--- a/data/maps/TwoIsland/text.inc
+++ b/data/maps/TwoIsland/text.inc
@@ -1,23 +1,23 @@
-gUnknown_8181A88:: @ 8181A88
+TwoIsland_Text_IslandSign:: @ 8181A88
     .string "TWO ISLAND\n"
     .string "Boon Island for Two$"
 
-gUnknown_8181AA7:: @ 8181AA7
+TwoIsland_Text_JoyfulGameCornerSign:: @ 8181AA7
     .string "Skip & Chomp!\n"
     .string "Joyful GAME CORNER$"
 
-gUnknown_8181AC8:: @ 8181AC8
+TwoIsland_Text_DangerFastCurrent:: @ 8181AC8
     .string "DANGER! FAST CURRENT!\n"
     .string "Fishing and surfing prohibited!$"
 
-Text_181AFE:: @ 8181AFE
+TwoIsland_Text_WelcomeToShopMerchandiseLimited:: @ 8181AFE
     .string "Oh!\n"
     .string "Hello, welcome to my shop!\p"
     .string "We've only opened up recently.\p"
     .string "Our merchandise is limited, but I\n"
     .string "hope we can serve your needs.$"
 
-Text_181B7C:: @ 8181B7C
+TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C
     .string "I can't tell you how grateful I am\n"
     .string "for your rescue of LOSTELLE.\p"
     .string "Thanks to your feat, the people of\n"
@@ -27,11 +27,11 @@ Text_181B7C:: @ 8181B7C
     .string "The people of THREE ISLAND\n"
     .string "helped me add to my merchandise.$"
 
-Text_181C77:: @ 8181C77
+TwoIsland_Text_HopeYouGiveItYourBest:: @ 8181C77
     .string "Hi! I'm giving it my best here.\n"
     .string "I hope you do too, {PLAYER}.$"
 
-Text_181CAE:: @ 8181CAE
+TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE
     .string "Oh, hello, {PLAYER}!\n"
     .string "Welcome!\p"
     .string "I've started bringing in items from\n"
@@ -39,7 +39,7 @@ Text_181CAE:: @ 8181CAE
     .string "I've got some rare items in, too.\n"
     .string "Please have a look!$"
 
-gUnknown_8181D2F:: @ 8181D2F
+TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F
     .string "That fellow there, he moved here\n"
     .string "from CELADON CITY.\p"
     .string "He started up a shop with his\n"
@@ -47,13 +47,13 @@ gUnknown_8181D2F:: @ 8181D2F
     .string "You have to wonder if he knew what\n"
     .string "he was getting into.$"
 
-gUnknown_8181DCA:: @ 8181DCA
+TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: @ 8181DCA
     .string "The shopkeeper's brother took\n"
     .string "a job at the GAME CORNER.\p"
     .string "He's trying to pull together money\n"
     .string "so they can buy more merchandise.$"
 
-gUnknown_8181E47:: @ 8181E47
+TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47
     .string "Listen, listen.\n"
     .string "Did you know?\p"
     .string "A famous TRAINER came to the\n"
@@ -64,17 +64,17 @@ gUnknown_8181E47:: @ 8181E47
     .string "found out that they were all sold\l"
     .string "out of Rage Candybars.$"
 
-gUnknown_8181F28:: @ 8181F28
+TwoIsland_Text_BuyRareItemsHere:: @ 8181F28
     .string "The discerning TRAINER knows to\n"
     .string "buy rare items here!$"
 
-gUnknown_8181F5D:: @ 8181F5D
+TwoIsland_Text_OldWomanLivesOutOnCape:: @ 8181F5D
     .string "There's an old woman who lives in\n"
     .string "a cottage out on the cape.\p"
     .string "She gives the eye to POKéMON.\n"
     .string "It's a bit unnerving.$"
 
-gUnknown_8181FCE:: @ 8181FCE
+TwoIsland_Text_HaveYouTriedJumpingGame:: @ 8181FCE
     .string "Boing! Boing!\n"
     .string "Have you tried the jumping game?\p"
     .string "The POKéMON you can enter…\n"
diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc
index efba30945..d472e9e6c 100644
--- a/data/maps/TwoIsland_CapeBrink_House/scripts.inc
+++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc
@@ -1,2 +1,4 @@
 TwoIsland_CapeBrink_House_MapScripts:: @ 817206B
 	.byte 0
+
+@ See move_tutors.inc
diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json
index 076ea39f7..5b7d86ab5 100644
--- a/data/maps/TwoIsland_Harbor/map.json
+++ b/data/maps/TwoIsland_Harbor/map.json
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_Harbor_EventScript_171806",
+      "script": "TwoIsland_Harbor_EventScript_Sailor",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc
index 8c2eab36d..c59f8cf53 100644
--- a/data/maps/TwoIsland_Harbor/scripts.inc
+++ b/data/maps/TwoIsland_Harbor/scripts.inc
@@ -1,7 +1,7 @@
 TwoIsland_Harbor_MapScripts:: @ 8171805
 	.byte 0
 
-TwoIsland_Harbor_EventScript_171806:: @ 8171806
+TwoIsland_Harbor_EventScript_Sailor:: @ 8171806
 	lock
 	faceplayer
 	message Text_WhereDoYouWantToSail
diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json
index 2f45c143f..208519ec4 100644
--- a/data/maps/TwoIsland_House/map.json
+++ b/data/maps/TwoIsland_House/map.json
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_House_EventScript_171619",
+      "script": "TwoIsland_House_EventScript_MoveManiac",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
index 9177de9cb..692f374fd 100644
--- a/data/maps/TwoIsland_House/scripts.inc
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -1,122 +1,127 @@
+.equ CHECKED_MUSHROOMS,  FLAG_TEMP_1
+.equ HAS_BIG_MUSHROOM,   FLAG_TEMP_2
+.equ HAS_TINY_MUSHROOMS, FLAG_TEMP_3
+.equ HAS_BOTH_MUSHROOMS, FLAG_TEMP_4
+
 TwoIsland_House_MapScripts:: @ 8171618
 	.byte 0
 
-TwoIsland_House_EventScript_171619:: @ 8171619
+TwoIsland_House_EventScript_MoveManiac:: @ 8171619
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
-	clearflag FLAG_TEMP_2
-	clearflag FLAG_TEMP_3
-	clearflag FLAG_TEMP_4
-	goto_if_set FLAG_TEMP_1, EventScript_17164F
-	msgbox gUnknown_81A2B88
-	setflag FLAG_TEMP_1
-	goto EventScript_17164F
+	clearflag HAS_BIG_MUSHROOM
+	clearflag HAS_TINY_MUSHROOMS
+	clearflag HAS_BOTH_MUSHROOMS
+	goto_if_set CHECKED_MUSHROOMS, TwoIsland_House_EventScript_CheckPlayerHasMushrooms
+	msgbox TwoIsland_House_Text_TeachMonMoveForMushroom
+	setflag CHECKED_MUSHROOMS
+	goto TwoIsland_House_EventScript_CheckPlayerHasMushrooms
 	end
 
-EventScript_17164F:: @ 817164F
+TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F
 	checkitem ITEM_BIG_MUSHROOM, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_1717A8
+	call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom
 	checkitem ITEM_TINY_MUSHROOM, 2
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_1717AC
-	goto_if_set FLAG_TEMP_2, EventScript_171687
-	goto_if_set FLAG_TEMP_3, EventScript_171696
-	goto EventScript_17179E
+	call_if_eq TwoIsland_House_EventScript_SetHasTinyMushrooms
+	goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms
+	goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_CheckAlsoHasBigMushroom
+	goto TwoIsland_House_EventScript_EndTutorMove
 	end
 
-EventScript_171687:: @ 8171687
-	call_if_set FLAG_TEMP_3, EventScript_1717B0
-	goto EventScript_1716A5
+TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms:: @ 8171687
+	call_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_SetHasBothMushrooms
+	goto TwoIsland_House_EventScript_AskTutorMon
 	end
 
-EventScript_171696:: @ 8171696
-	call_if_set FLAG_TEMP_2, EventScript_1717B0
-	goto EventScript_1716A5
+TwoIsland_House_EventScript_CheckAlsoHasBigMushroom:: @ 8171696
+	call_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_SetHasBothMushrooms
+	goto TwoIsland_House_EventScript_AskTutorMon
 	end
 
-EventScript_1716A5:: @ 81716A5
-	msgbox gUnknown_81A2C63, MSGBOX_YESNO
+TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5
+	msgbox TwoIsland_House_Text_WantMeToTeachMove, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_17179E
-	goto EventScript_1716BE
+	goto_if_eq TwoIsland_House_EventScript_EndTutorMove
+	goto TwoIsland_House_EventScript_ChooseMonToTutor
 	end
 
-EventScript_1716BE:: @ 81716BE
-	msgbox gUnknown_81A2CC3
+TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE
+	msgbox TwoIsland_House_Text_TutorWhichMon
 	special Special_SelectMoveTutorMon
 	waitstate
-	compare VAR_0x8004, 6
-	goto_if_ge EventScript_17179E
+	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge TwoIsland_House_EventScript_EndTutorMove
 	special Special_IsSelectedMonEgg
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_171790
+	compare VAR_RESULT, TRUE
+	goto_if_eq TwoIsland_House_EventScript_CantTutorEgg
 	compare VAR_0x8005, 0
-	goto_if_eq EventScript_171782
-	goto EventScript_1716F4
+	goto_if_eq TwoIsland_House_EventScript_NoMoveToTutorMon
+	goto TwoIsland_House_EventScript_ChooseMoveToTeach
 	end
 
-EventScript_1716F4:: @ 81716F4
-	msgbox gUnknown_81A2CE1
+TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4
+	msgbox TwoIsland_House_Text_TeachWhichMove
 	special DisplayMoveTutorMenu
 	waitstate
 	compare VAR_0x8004, 0
-	goto_if_eq EventScript_1716BE
-	goto_if_set FLAG_TEMP_4, EventScript_17175B
-	goto_if_set FLAG_TEMP_2, EventScript_171727
-	goto_if_set FLAG_TEMP_3, EventScript_171741
+	goto_if_eq TwoIsland_House_EventScript_ChooseMonToTutor
+	goto_if_set HAS_BOTH_MUSHROOMS, TwoIsland_House_EventScript_ChooseMushroom
+	goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_GiveBigMushroom
+	goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_GiveTinyMushrooms
 	end
 
-EventScript_171727:: @ 8171727
+TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727
 	removeitem ITEM_BIG_MUSHROOM, 1
 	textcolor 3
-	msgbox gUnknown_81A2DB3
+	msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
 	call EventScript_1A6675
-	goto EventScript_17179E
+	goto TwoIsland_House_EventScript_EndTutorMove
 	end
 
-EventScript_171741:: @ 8171741
+TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741
 	removeitem ITEM_TINY_MUSHROOM, 2
 	textcolor 3
-	msgbox gUnknown_81A2D85
+	msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
 	call EventScript_1A6675
-	goto EventScript_17179E
+	goto TwoIsland_House_EventScript_EndTutorMove
 	end
 
-EventScript_17175B:: @ 817175B
-	message Text_1A2D43
+TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B
+	message TwoIsland_House_Text_IllNeedMushroomOrTwo
 	waitmessage
 	multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE
 	switch VAR_RESULT
-	case 0, EventScript_171741
-	case 1, EventScript_171727
+	case 0, TwoIsland_House_EventScript_GiveTinyMushrooms
+	case 1, TwoIsland_House_EventScript_GiveBigMushroom
 	end
 
-EventScript_171782:: @ 8171782
-	msgbox gUnknown_81A2CFC
-	goto EventScript_1716BE
+TwoIsland_House_EventScript_NoMoveToTutorMon:: @ 8171782
+	msgbox TwoIsland_House_Text_NoMoveICanTeachThatMon
+	goto TwoIsland_House_EventScript_ChooseMonToTutor
 	end
 
-EventScript_171790:: @ 8171790
-	msgbox gUnknown_81A2E20
-	goto EventScript_1716BE
+TwoIsland_House_EventScript_CantTutorEgg:: @ 8171790
+	msgbox TwoIsland_House_Text_CantTeachAnEgg
+	goto TwoIsland_House_EventScript_ChooseMonToTutor
 	end
 
-EventScript_17179E:: @ 817179E
-	msgbox gUnknown_81A2DE0
+TwoIsland_House_EventScript_EndTutorMove:: @ 817179E
+	msgbox TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove
 	release
 	end
 
-EventScript_1717A8:: @ 81717A8
-	setflag FLAG_TEMP_2
+TwoIsland_House_EventScript_SetHasBigMushroom:: @ 81717A8
+	setflag HAS_BIG_MUSHROOM
 	return
 
-EventScript_1717AC:: @ 81717AC
-	setflag FLAG_TEMP_3
+TwoIsland_House_EventScript_SetHasTinyMushrooms:: @ 81717AC
+	setflag HAS_TINY_MUSHROOMS
 	return
 
-EventScript_1717B0:: @ 81717B0
-	setflag FLAG_TEMP_4
+TwoIsland_House_EventScript_SetHasBothMushrooms:: @ 81717B0
+	setflag HAS_BOTH_MUSHROOMS
 	return
diff --git a/data/maps/TwoIsland_House/text.inc b/data/maps/TwoIsland_House/text.inc
index 0f0aeda5e..6f8a37f97 100644
--- a/data/maps/TwoIsland_House/text.inc
+++ b/data/maps/TwoIsland_House/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81A2B88:: @ 81A2B88
+TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88
     .string "I'm the POKéMON MOVE MANIAC.\p"
     .string "I know every single move that\n"
     .string "POKéMON learn growing up.\p"
@@ -8,40 +8,40 @@ gUnknown_81A2B88:: @ 81A2B88
     .string "If you do that for me, I'll teach\n"
     .string "a move to one POKéMON.$"
 
-gUnknown_81A2C63:: @ 81A2C63
+TwoIsland_House_Text_WantMeToTeachMove:: @ 81A2C63
     .string "Sniff, sniff…\n"
     .string "Hm! You smell of MUSHROOMS!\p"
     .string "Do you want me to teach a move\n"
     .string "to a POKéMON of yours?$"
 
-gUnknown_81A2CC3:: @ 81A2CC3
+TwoIsland_House_Text_TutorWhichMon:: @ 81A2CC3
     .string "Which POKéMON needs tutoring?$"
 
-gUnknown_81A2CE1:: @ 81A2CE1
+TwoIsland_House_Text_TeachWhichMove:: @ 81A2CE1
     .string "Which move should I teach?$"
 
-gUnknown_81A2CFC:: @ 81A2CFC
+TwoIsland_House_Text_NoMoveICanTeachThatMon:: @ 81A2CFC
     .string "Sorry…\p"
     .string "It doesn't appear as if I have a\n"
     .string "move I can teach that POKéMON.$"
 
-Text_1A2D43:: @ 81A2D43
+TwoIsland_House_Text_IllNeedMushroomOrTwo:: @ 81A2D43
     .string "Then, I'll need a MUSHROOM or two.\n"
     .string "What are you going to give me?$"
 
-gUnknown_81A2D85:: @ 81A2D85
+TwoIsland_House_Text_HandedOverTwoTinyMushrooms:: @ 81A2D85
     .string "{PLAYER} handed over two\n"
     .string "TINYMUSHROOMS in exchange.$"
 
-gUnknown_81A2DB3:: @ 81A2DB3
+TwoIsland_House_Text_HandedOverOneBigMushroom:: @ 81A2DB3
     .string "{PLAYER} handed over one\n"
     .string "BIG MUSHROOM in exchange.$"
 
-gUnknown_81A2DE0:: @ 81A2DE0
+TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove:: @ 81A2DE0
     .string "If your POKéMON need to learn a\n"
     .string "move, I need a MUSHROOM or two.$"
 
-gUnknown_81A2E20:: @ 81A2E20
+TwoIsland_House_Text_CantTeachAnEgg:: @ 81A2E20
     .string "Hunh? There isn't a single move\n"
     .string "that I can teach an EGG.$"
 
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index d15bc7d3b..baf6a8db0 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_Lostelle",
       "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_171535",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_InfoMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
index 0bbb24423..fcba4720c 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -1,3 +1,7 @@
+.equ LOCALID_DADDY,    1
+.equ LOCALID_BIKER,    2
+.equ LOCALID_LOSTELLE, 3
+
 TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
 	map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
@@ -6,86 +10,86 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
 	.byte 0
 
 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5
-	call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF
+	call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos
 	end
 
-EventScript_1713EF:: @ 81713EF
-	setobjectxyperm 1, 6, 2
-	setobjectmovementtype 1, 8
-	setobjectmovementtype 3, 1
+TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: @ 81713EF
+	setobjectxyperm LOCALID_DADDY, 6, 2
+	setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	return
 
 TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant
 	.2byte 0
 
-EventScript_171416:: @ 8171416
+TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: @ 8171416
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
 	.2byte 0
 
-EventScript_171435:: @ 8171435
+TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
 	lockall
 	textcolor 0
-	msgbox gUnknown_81A28B2
+	msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
 	textcolor 1
 	special Special_BufferBigGuyOrBigGirlString
-	msgbox gUnknown_81A2931
+	msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
 	closemessage
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
 	releaseall
 	end
 
-EventScript_17145F:: @ 817145F
+TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F
 	lockall
 	textcolor 0
-	applymovement 1, Movement_171520
+	applymovement LOCALID_DADDY, Movement_171520
 	waitmovement 0
-	msgbox gUnknown_81A2408
+	msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
 	closemessage
-	applymovement 1, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, Movement_ExclamationMark
+	applymovement LOCALID_DADDY, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Movement_Delay48
+	applymovement LOCALID_DADDY, Movement_Delay48
 	waitmovement 0
-	applymovement 1, Movement_171527
+	applymovement LOCALID_DADDY, Movement_171527
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_81A2465
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle
 	closemessage
 	playse SE_DOOR
 	waitse
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C
 	waitmovement 0
 	playbgm MUS_SHOUNEN, 0
-	addobject 2
-	applymovement 2, Movement_17152F
+	addobject LOCALID_BIKER
+	applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
 	waitmovement 0
-	msgbox gUnknown_81A259A
-	applymovement 2, Movement_WalkInPlaceFastestRight
+	msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland
+	applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_81A2658
-	msgbox gUnknown_81A26D5
+	msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt
+	msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing
 	closemessage
-	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_KAIDAN
-	removeobject 2
+	removeobject LOCALID_BIKER
 	fadedefaultbgm
 	delay 60
-	msgbox gUnknown_81A270C
+	msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor
 	clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER
 	setvar VAR_MAP_SCENE_THREE_ISLAND, 2
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1
@@ -113,7 +117,7 @@ Movement_17152C:: @ 817152C
 	walk_in_place_fastest_right
 	step_end
 
-Movement_17152F:: @ 817152F
+TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F
 	walk_in_place_fastest_left
 	delay_8
 	walk_in_place_fastest_right
@@ -121,72 +125,73 @@ Movement_17152F:: @ 817152F
 	walk_in_place_fastest_up
 	step_end
 
-TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
+TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	goto_if_eq JoyfulGameCorner_EventScript_InfoMan2
-	goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555
-	msgbox gUnknown_81A285C
+	goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon
+	msgbox TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday
 	release
 	end
 
-EventScript_171555:: @ 8171555
-	msgbox gUnknown_81A288A
+TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: @ 8171555
+	msgbox TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon
 	release
 	end
 
-TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
+@ Only referred to as Lostelles Daddy in text
+TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant
-	goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5
+	goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
-	goto_if_eq EventScript_17158A
-	msgbox gUnknown_81A2743
+	goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland
 	release
 	end
 
-EventScript_17158A:: @ 817158A
-	goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4
-	msgbox gUnknown_81A296A
+TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
+	goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
+	msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
 	textcolor 3
 	playfanfare MUS_ME_WAZA
-	message Text_1A29F7
+	message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
 	waitmessage
 	waitfanfare
 	call EventScript_1A6675
 	removeitem ITEM_METEORITE, 1
-	msgbox gUnknown_81A2A24
-	goto EventScript_1715C4
+	msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill
+	goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
 	end
 
-EventScript_1715C4:: @ 81715C4
+TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4
 	checkitemspace ITEM_MOON_STONE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1715FF
+	goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone
 	additem ITEM_MOON_STONE
 	setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
-	msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE
+	msgreceiveditem TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy, ITEM_MOON_STONE
 	release
 	end
 
-EventScript_1715F5:: @ 81715F5
-	msgbox gUnknown_81A2AF5
+TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: @ 81715F5
+	msgbox TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning
 	release
 	end
 
-EventScript_1715FF:: @ 81715FF
+TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: @ 81715FF
 	setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE
-	msgbox gUnknown_81A2ACA
+	msgbox TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag
 	release
 	end
 
-TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C
+TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: @ 817160C
 	lock
 	faceplayer
-	msgbox gUnknown_81A2B53
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool
 	release
 	end
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
index 21f6dd8ec..3884e8a32 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/text.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81A2408:: @ 81A2408
+TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: @ 81A2408
     .string "Now, where's LOSTELLE gotten to\n"
     .string "today?\p"
     .string "She always brings me lunch every\n"
     .string "day right about now…$"
 
-gUnknown_81A2465:: @ 81A2465
+TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465
     .string "Hm? You, there!\n"
     .string "Are you a friend of LOSTELLE's?\p"
     .string "Have you seen LOSTELLE around?\n"
@@ -17,7 +17,7 @@ gUnknown_81A2465:: @ 81A2465
     .string "Please, help me find her!\n"
     .string "Please go search THREE ISLAND!$"
 
-gUnknown_81A259A:: @ 81A259A
+TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A
     .string "Hah? What is this GAME CORNER?\n"
     .string "How much sadder can this get?\p"
     .string "Those clowns…\p"
@@ -26,24 +26,24 @@ gUnknown_81A259A:: @ 81A259A
     .string "Hey, you! Is this the only THREE\n"
     .string "ISLAND around here?$"
 
-gUnknown_81A2658:: @ 81A2658
+TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: @ 81A2658
     .string "Try waking up before you crawl out\n"
     .string "of bed, you punk.\p"
     .string "This is TWO ISLAND!\p"
     .string "Move it! Get your filthy motorbike\n"
     .string "out of my place!$"
 
-gUnknown_81A26D5:: @ 81A26D5
+TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: @ 81A26D5
     .string "Huh…\n"
     .string "Oh, oh, gotcha.\p"
     .string "Tch…\n"
     .string "These islands are confusing…$"
 
-gUnknown_81A270C:: @ 81A270C
+TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: @ 81A270C
     .string "Would you look at that?\n"
     .string "That punk scuffed up my floor.$"
 
-gUnknown_81A2743:: @ 81A2743
+TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743
     .string "Hey, but listen! I'm begging you,\n"
     .string "you have to go to THREE ISLAND.\p"
     .string "If anything were to happen to my\n"
@@ -55,26 +55,26 @@ gUnknown_81A2743:: @ 81A2743
     .string "That's why I have to get you to do\n"
     .string "me this big favor.$"
 
-gUnknown_81A285C:: @ 81A285C
+TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: @ 81A285C
     .string "I'm sorry.\n"
     .string "We're not running any games today.$"
 
-gUnknown_81A288A:: @ 81A288A
+TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: @ 81A288A
     .string "We'll get the games going soon\n"
     .string "for you!$"
 
-gUnknown_81A28B2:: @ 81A28B2
+TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: @ 81A28B2
     .string "So you rescued LOSTELLE?\n"
     .string "How can I thank you?\p"
     .string "LOSTELLE, darling, forgive me!\p"
     .string "Daddy didn't know you were scared\n"
     .string "and in trouble!$"
 
-gUnknown_81A2931:: @ 81A2931
+TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: @ 81A2931
     .string "LOSTELLE: It's okay, Daddy.\n"
     .string "I got to be friends with {PLAYER}!$"
 
-gUnknown_81A296A:: @ 81A296A
+TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A
     .string "Oh, what's that?\n"
     .string "You're saying that this is for me?\p"
     .string "How did you know that I love rare\n"
@@ -82,31 +82,31 @@ gUnknown_81A296A:: @ 81A296A
     .string "You sure know how to make a guy\n"
     .string "happy.$"
 
-Text_1A29F7:: @ 81A29F7
+TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: @ 81A29F7
     .string "{PLAYER} handed the METEORITE\n"
     .string "to LOSTELLE's daddy.$"
 
-gUnknown_81A2A24:: @ 81A2A24
+TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: @ 81A2A24
     .string "Oh, I see, this is from BILL!\n"
     .string "You have to thank him for me!\p"
     .string "You know, you've been fantastic.\n"
     .string "I want you to have this.$"
 
-gUnknown_81A2A9A:: @ 81A2A9A
+TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: @ 81A2A9A
     .string "{PLAYER} received a MOON STONE\n"
     .string "from LOSTELLE's daddy.$"
 
-gUnknown_81A2ACA:: @ 81A2ACA
+TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: @ 81A2ACA
     .string "Your BAG's not going to fit another\n"
     .string "thing…$"
 
-gUnknown_81A2AF5:: @ 81A2AF5
+TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: @ 81A2AF5
     .string "All right, I'll get the GAME CORNER\n"
     .string "running right away.\p"
     .string "You have to come visit with a\n"
     .string "friend.$"
 
-gUnknown_81A2B53:: @ 81A2B53
+TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: @ 81A2B53
     .string "Listen, listen!\p"
     .string "Please show me you being cool\n"
     .string "again!$"
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
index 7001ab1cc..18b930dfa 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_GBAKid",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5",
+      "script": "TwoIsland_PokemonCenter_1F_EventScript_BugCatcher",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
index 6661a61eb..4fbc3bce9 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
@@ -7,17 +7,17 @@ TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF
 	setrespawn SPAWN_TWO_ISLAND
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
+TwoIsland_PokemonCenter_1F_EventScript_Nurse:: @ 81717C3
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC
-	msgbox gUnknown_81A2E59, MSGBOX_NPC
+TwoIsland_PokemonCenter_1F_EventScript_GBAKid:: @ 81717CC
+	msgbox TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner, MSGBOX_NPC
 	end
 
-TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5
-	msgbox gUnknown_81A2EBE, MSGBOX_NPC
+TwoIsland_PokemonCenter_1F_EventScript_BugCatcher:: @ 81717D5
+	msgbox TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape, MSGBOX_NPC
 	end
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
index 514825cdf..c7c5561c0 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81A2E59:: @ 81A2E59
+TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner:: @ 81A2E59
     .string "Have you visited the GAME CORNER\n"
     .string "already?\p"
     .string "It's no good to go alone.\n"
     .string "You have to take a friend along.$"
 
-gUnknown_81A2EBE:: @ 81A2EBE
+TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape:: @ 81A2EBE
     .string "Not many people live on\n"
     .string "TWO ISLAND.\p"
     .string "There is this old lady who lives\n"