Merge branch 'master' into doc-ttower

3 files changed, 40 insertions, 40 deletions

diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index 25cc15fad..579f9e9b0 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -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"
     },
     {
diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc
index 565efd607..2f3d0ee06 100644
--- a/data/maps/SSAnne_Kitchen/scripts.inc
+++ b/data/maps/SSAnne_Kitchen/scripts.inc
@@ -1,53 +1,53 @@
 SSAnne_Kitchen_MapScripts:: @ 8160AB2
 	.byte 0
 
-SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3
-	msgbox gUnknown_81733F8, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef1:: @ 8160AB3
+	msgbox SSAnne_Kitchen_Text_BusyOutOfTheWay, MSGBOX_NPC
 	end
 
-SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC
-	msgbox gUnknown_8173429, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef2:: @ 8160ABC
+	msgbox SSAnne_Kitchen_Text_SawOddBerryInTrash, MSGBOX_NPC
 	end
 
-SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5
-	msgbox gUnknown_8173462, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef3:: @ 8160AC5
+	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
-	msgbox gUnknown_817359F
+SSAnne_Kitchen_EventScript_SalmonDuSalad:: @ 8160B03
+	msgbox SSAnne_Kitchen_Text_SalmonDuSalad
 	return
 
-EventScript_160B0C:: @ 8160B0C
-	msgbox gUnknown_81735DF
+SSAnne_Kitchen_EventScript_EelsAuBarbecue:: @ 8160B0C
+	msgbox SSAnne_Kitchen_Text_EelsAuBarbecue
 	return
 
-EventScript_160B15:: @ 8160B15
-	msgbox gUnknown_8173611
+SSAnne_Kitchen_EventScript_PrimeBeefsteak:: @ 8160B15
+	msgbox SSAnne_Kitchen_Text_PrimeBeefsteak
 	return
 
-SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E
-	msgbox gUnknown_81734A0, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef5:: @ 8160B1E
+	msgbox SSAnne_Kitchen_Text_PeelSpudsEveryDay, MSGBOX_NPC
 	end
 
-SSAnne_Kitchen_EventScript_160B27:: @ 8160B27
-	msgbox gUnknown_81734D3, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef6:: @ 8160B27
+	msgbox SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton, MSGBOX_NPC
 	end
 
-SSAnne_Kitchen_EventScript_160B30:: @ 8160B30
-	msgbox gUnknown_817353E, MSGBOX_NPC
+SSAnne_Kitchen_EventScript_Chef7:: @ 8160B30
+	msgbox SSAnne_Kitchen_Text_OnlyGetToPeelOnions, MSGBOX_NPC
 	end
diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc
index edd115076..24146ac8a 100644
--- a/data/maps/SSAnne_Kitchen/text.inc
+++ b/data/maps/SSAnne_Kitchen/text.inc
@@ -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?$"