Merge branch 'master' into event_object_movement

3 files changed, 107 insertions, 105 deletions

diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
index ada89bce9..893790bd4 100644
--- a/data/maps/SixIsland_PatternBush/map.json
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_PATTERN_BUSH",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_3",
-  "unknown_18": 1,
-  "unknown_19": 7,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 48,
       "y": 15,
       "elevation": 3,
@@ -23,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_164590",
+      "script": "SixIsland_PatternBush_EventScript_Bethany",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
       "elevation": 3,
@@ -36,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645A7",
+      "script": "SixIsland_PatternBush_EventScript_Allison",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 51,
       "y": 6,
       "elevation": 3,
@@ -49,11 +51,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645BE",
+      "script": "SixIsland_PatternBush_EventScript_Garret",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 12,
       "y": 13,
       "elevation": 3,
@@ -62,11 +64,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645D5",
+      "script": "SixIsland_PatternBush_EventScript_Jonah",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 37,
       "y": 23,
       "elevation": 3,
@@ -75,11 +77,11 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_PatternBush_EventScript_1645EC",
+      "script": "SixIsland_PatternBush_EventScript_Vance",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 32,
       "y": 5,
       "elevation": 3,
@@ -88,11 +90,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_164603",
+      "script": "SixIsland_PatternBush_EventScript_Nash",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 52,
       "y": 20,
       "elevation": 3,
@@ -101,11 +103,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SixIsland_PatternBush_EventScript_16461A",
+      "script": "SixIsland_PatternBush_EventScript_Cordell",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 8,
       "y": 21,
       "elevation": 3,
@@ -114,11 +116,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SixIsland_PatternBush_EventScript_164631",
+      "script": "SixIsland_PatternBush_EventScript_Dalia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 39,
       "y": 6,
       "elevation": 3,
@@ -127,11 +129,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_164648",
+      "script": "SixIsland_PatternBush_EventScript_Joana",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 3,
       "y": 9,
       "elevation": 3,
@@ -140,11 +142,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_16465F",
+      "script": "SixIsland_PatternBush_EventScript_Riley",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 19,
       "y": 24,
       "elevation": 3,
@@ -153,11 +155,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_PatternBush_EventScript_164676",
+      "script": "SixIsland_PatternBush_EventScript_Marcy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 30,
       "y": 19,
       "elevation": 3,
@@ -166,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_16468D",
+      "script": "SixIsland_PatternBush_EventScript_Layton",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc
index 97a8a0a30..a9d9be019 100644
--- a/data/maps/SixIsland_PatternBush/scripts.inc
+++ b/data/maps/SixIsland_PatternBush/scripts.inc
@@ -6,75 +6,75 @@ SixIsland_PatternBush_OnTransition:: @ 816455F
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH
 	getplayerxy VAR_TEMP_1, VAR_TEMP_2
 	compare VAR_TEMP_1, 50
-	call_if_ge EventScript_16457E
+	call_if_ge SixIsland_PatternBush_EventScript_SetEscapeRightExit
 	compare VAR_TEMP_1, 49
-	call_if_le EventScript_164587
+	call_if_le SixIsland_PatternBush_EventScript_SetEscapeLeftExit
 	end
 
-EventScript_16457E:: @ 816457E
+SixIsland_PatternBush_EventScript_SetEscapeRightExit:: @ 816457E
 	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10
 	return
 
-EventScript_164587:: @ 8164587
+SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: @ 8164587
 	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10
 	return
 
-SixIsland_PatternBush_EventScript_164590:: @ 8164590
-	trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66
-	msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Bethany:: @ 8164590
+	trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat
+	msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7
-	trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028
-	msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Allison:: @ 81645A7
+	trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat
+	msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE
-	trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2
-	msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Garret:: @ 81645BE
+	trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat
+	msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5
-	trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196
-	msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Jonah:: @ 81645D5
+	trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat
+	msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC
-	trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275
-	msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Vance:: @ 81645EC
+	trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat
+	msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164603:: @ 8164603
-	trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D
-	msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Nash:: @ 8164603
+	trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat
+	msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16461A:: @ 816461A
-	trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5
-	msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Cordell:: @ 816461A
+	trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat
+	msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164631:: @ 8164631
-	trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458
-	msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Dalia:: @ 8164631
+	trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat
+	msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164648:: @ 8164648
-	trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552
-	msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Joana:: @ 8164648
+	trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat
+	msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16465F:: @ 816465F
-	trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609
-	msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Riley:: @ 816465F
+	trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat
+	msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164676:: @ 8164676
-	trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660
-	msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Marcy:: @ 8164676
+	trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat
+	msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16468D:: @ 816468D
-	trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB
-	msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE
+SixIsland_PatternBush_EventScript_Layton:: @ 816468D
+	trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat
+	msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SixIsland_PatternBush/text.inc b/data/maps/SixIsland_PatternBush/text.inc
index eddaf1ed9..4c4161fe9 100644
--- a/data/maps/SixIsland_PatternBush/text.inc
+++ b/data/maps/SixIsland_PatternBush/text.inc
@@ -1,154 +1,154 @@
-Text_17BF3A:: @ 817BF3A
+SixIsland_PatternBush_Text_BethanyIntro:: @ 817BF3A
     .string "I'm curious, how do you raise your\n"
     .string "POKéMON?$"
 
-Text_17BF66:: @ 817BF66
+SixIsland_PatternBush_Text_BethanyDefeat:: @ 817BF66
     .string "You raise your POKéMON with a\n"
     .string "whole lot of love!$"
 
-gUnknown_817BF97:: @ 817BF97
+SixIsland_PatternBush_Text_BethanyPostBattle:: @ 817BF97
     .string "In the same way your mother raised\n"
     .string "you full of love, you should raise\l"
     .string "your POKéMON.$"
 
-Text_17BFEB:: @ 817BFEB
+SixIsland_PatternBush_Text_AllisonIntro:: @ 817BFEB
     .string "I'm working to preserve the natural\n"
     .string "ecology of POKéMON here.$"
 
-Text_17C028:: @ 817C028
+SixIsland_PatternBush_Text_AllisonDefeat:: @ 817C028
     .string "Oh, for someone so young, you are\n"
     .string "tremendous!$"
 
-gUnknown_817C056:: @ 817C056
+SixIsland_PatternBush_Text_AllisonPostBattle:: @ 817C056
     .string "I'm not saying that you shouldn't\n"
     .string "catch POKéMON.\p"
     .string "I just want people to raise their\n"
     .string "POKéMON responsibly.$"
 
-Text_17C0BE:: @ 817C0BE
+SixIsland_PatternBush_Text_GarretIntro:: @ 817C0BE
     .string "I caught a BUG POKéMON that lives\n"
     .string "only around here!$"
 
-Text_17C0F2:: @ 817C0F2
+SixIsland_PatternBush_Text_GarretDefeat:: @ 817C0F2
     .string "Heheh…\n"
     .string "Isn't my POKéMON awesome?$"
 
-gUnknown_817C113:: @ 817C113
+SixIsland_PatternBush_Text_GarretPostBattle:: @ 817C113
     .string "There's a girl near the BUSH who\n"
     .string "measures HERACROSS for TRAINERS.$"
 
-Text_17C155:: @ 817C155
+SixIsland_PatternBush_Text_JonahIntro:: @ 817C155
     .string "You know, it just doesn't feel right\n"
     .string "if I don't use BUG POKéMON.$"
 
-Text_17C196:: @ 817C196
+SixIsland_PatternBush_Text_JonahDefeat:: @ 817C196
     .string "It's okay, losing is a fun part of\n"
     .string "POKéMON's appeal, too.$"
 
-gUnknown_817C1D0:: @ 817C1D0
+SixIsland_PatternBush_Text_JonahPostBattle:: @ 817C1D0
     .string "By the way, “appeal” is a weird\n"
     .string "word, if you think about it.\p"
     .string "Like, is it like an orange peel?\n"
     .string "Or like a ringing bell?$"
 
-Text_17C246:: @ 817C246
+SixIsland_PatternBush_Text_VanceIntro:: @ 817C246
     .string "Yeah, yeah, yeah!\n"
     .string "Look at all the BUG POKéMON!$"
 
-Text_17C275:: @ 817C275
+SixIsland_PatternBush_Text_VanceDefeat:: @ 817C275
     .string "I got beat while I was still busy\n"
     .string "celebrating!$"
 
-gUnknown_817C2A4:: @ 817C2A4
+SixIsland_PatternBush_Text_VancePostBattle:: @ 817C2A4
     .string "I'm going to bring my little brother\n"
     .string "here next time.$"
 
-Text_17C2D9:: @ 817C2D9
+SixIsland_PatternBush_Text_NashIntro:: @ 817C2D9
     .string "Look, look! There are funny\n"
     .string "patterns on the ground.$"
 
-Text_17C30D:: @ 817C30D
+SixIsland_PatternBush_Text_NashDefeat:: @ 817C30D
     .string "Super awesome!$"
 
-gUnknown_817C31C:: @ 817C31C
+SixIsland_PatternBush_Text_NashPostBattle:: @ 817C31C
     .string "The funny patterns on the ground…\p"
     .string "They look like the patterns on my\n"
     .string "grandpa's clothes.$"
 
-Text_17C373:: @ 817C373
+SixIsland_PatternBush_Text_CordellIntro:: @ 817C373
     .string "I bet you think I'm just some guy,\n"
     .string "don't you, eh?$"
 
-Text_17C3A5:: @ 817C3A5
+SixIsland_PatternBush_Text_CordellDefeat:: @ 817C3A5
     .string "I bet you think I'm weak,\n"
     .string "don't you, eh?$"
 
-gUnknown_817C3CE:: @ 817C3CE
+SixIsland_PatternBush_Text_CordellPostBattle:: @ 817C3CE
     .string "Ayup, you townies come around all\n"
     .string "so dandy with a hat that flashy…\p"
     .string "How about giving me that?$"
 
-Text_17C42B:: @ 817C42B
+SixIsland_PatternBush_Text_DaliaIntro:: @ 817C42B
     .string "Take a deep breath.\n"
     .string "Isn't the air delicious?$"
 
-Text_17C458:: @ 817C458
+SixIsland_PatternBush_Text_DaliaDefeat:: @ 817C458
     .string "If you'd like, I can teach you how\n"
     .string "to breathe properly.$"
 
-gUnknown_817C490:: @ 817C490
+SixIsland_PatternBush_Text_DaliaPostBattle:: @ 817C490
     .string "First, exhale.\n"
     .string "Blow everything out.\p"
     .string "When you can't exhale anymore,\n"
     .string "inhale the clean air!\p"
     .string "Isn't it refreshing?$"
 
-Text_17C4FE:: @ 817C4FE
+SixIsland_PatternBush_Text_JoanaIntro:: @ 817C4FE
     .string "I love BUG POKéMON.\n"
     .string "That's why I'm here all the time.\p"
     .string "Am I the only girl like that?$"
 
-Text_17C552:: @ 817C552
+SixIsland_PatternBush_Text_JoanaDefeat:: @ 817C552
     .string "I lost, but I'm still laughing.\n"
     .string "Am I the only girl like that?$"
 
-gUnknown_817C590:: @ 817C590
+SixIsland_PatternBush_Text_JoanaPostBattle:: @ 817C590
     .string "I'm going to keep on collecting\n"
     .string "BUG POKéMON.\p"
     .string "Am I the only girl like that?$"
 
-Text_17C5DB:: @ 817C5DB
+SixIsland_PatternBush_Text_RileyIntro:: @ 817C5DB
     .string "This is a good spot.\n"
     .string "I'll pitch my tent here.$"
 
-Text_17C609:: @ 817C609
+SixIsland_PatternBush_Text_RileyDefeat:: @ 817C609
     .string "Wimped out…$"
 
-gUnknown_817C615:: @ 817C615
+SixIsland_PatternBush_Text_RileyPostBattle:: @ 817C615
     .string "I'm going to observe the night sky\n"
     .string "here.$"
 
-Text_17C63E:: @ 817C63E
+SixIsland_PatternBush_Text_MarcyIntro:: @ 817C63E
     .string "Oh, yuck!\n"
     .string "I think a bug stung me!$"
 
-Text_17C660:: @ 817C660
+SixIsland_PatternBush_Text_MarcyDefeat:: @ 817C660
     .string "It wasn't a bug.\n"
     .string "I cut my shin on some grass.$"
 
-gUnknown_817C68E:: @ 817C68E
+SixIsland_PatternBush_Text_MarcyPostBattle:: @ 817C68E
     .string "A little cut like that…\n"
     .string "A little spit's enough to cure it!$"
 
-Text_17C6C9:: @ 817C6C9
+SixIsland_PatternBush_Text_LaytonIntro:: @ 817C6C9
     .string "Have you noticed something odd\n"
     .string "about these parts?$"
 
-Text_17C6FB:: @ 817C6FB
+SixIsland_PatternBush_Text_LaytonDefeat:: @ 817C6FB
     .string "Have you taken a good look around\n"
     .string "your feet?$"
 
-gUnknown_817C728:: @ 817C728
+SixIsland_PatternBush_Text_LaytonPostBattle:: @ 817C728
     .string "There are places here in PATTERN\n"
     .string "BUSH where grass won't grow.\p"
     .string "What could be the cause of such\n"