Document Safari Zone scripts

data/event_scripts.s

@@ -149,10 +149,10 @@ gStdScriptsEnd::
 	.include "data/maps/SafariZone_East/scripts.inc"
 	.include "data/maps/SafariZone_North/scripts.inc"
 	.include "data/maps/SafariZone_West/scripts.inc"
-	.include "data/maps/SafariZone_Building1/scripts.inc"
-	.include "data/maps/SafariZone_Building2/scripts.inc"
-	.include "data/maps/SafariZone_Building3/scripts.inc"
-	.include "data/maps/SafariZone_Building4/scripts.inc"
+	.include "data/maps/SafariZone_Center_RestHouse/scripts.inc"
+	.include "data/maps/SafariZone_East_RestHouse/scripts.inc"
+	.include "data/maps/SafariZone_North_RestHouse/scripts.inc"
+	.include "data/maps/SafariZone_West_RestHouse/scripts.inc"
 	.include "data/maps/SafariZone_SecretHouse/scripts.inc"
 	.include "data/maps/CeruleanCave_1F/scripts.inc"
 	.include "data/maps/CeruleanCave_2F/scripts.inc"
@@ -562,10 +562,10 @@ gStdScriptsEnd::
 	.include "data/maps/SafariZone_East/text.inc"
 	.include "data/maps/SafariZone_North/text.inc"
 	.include "data/maps/SafariZone_West/text.inc"
-	.include "data/maps/SafariZone_Building1/text.inc"
-	.include "data/maps/SafariZone_Building2/text.inc"
-	.include "data/maps/SafariZone_Building3/text.inc"
-	.include "data/maps/SafariZone_Building4/text.inc"
+	.include "data/maps/SafariZone_Center_RestHouse/text.inc"
+	.include "data/maps/SafariZone_East_RestHouse/text.inc"
+	.include "data/maps/SafariZone_North_RestHouse/text.inc"
+	.include "data/maps/SafariZone_West_RestHouse/text.inc"
 	.include "data/maps/SafariZone_SecretHouse/text.inc"
 	.include "data/maps/CeruleanCave_B1F/text.inc"
 	.include "data/maps/PokemonLeague_LoreleisRoom/text.inc"

data/layouts/layouts.json

@@ -2168,16 +2168,16 @@
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
     },
     {
-      "id": "LAYOUT_SAFARI_ZONE_BUILDING",
-      "name": "SafariZone_Building_Layout",
+      "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
+      "name": "SafariZone_RestHouse_Layout",
       "width": 13,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4BB4",
       "secondary_tileset": "gTileset_82D4F14",
-      "border_filepath": "data/layouts/SafariZone_Building/border.bin",
-      "blockdata_filepath": "data/layouts/SafariZone_Building/map.bin"
+      "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
     },
     {
       "id": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE",

data/maps/SafariZone_Building1/scripts.inc

@@ -1,10 +0,0 @@
-SafariZone_Building1_MapScripts:: @ 81623EB
-	.byte 0
-
-SafariZone_Building1_EventScript_1623EC:: @ 81623EC
-	msgbox gUnknown_8177A5A, MSGBOX_NPC
-	end
-
-SafariZone_Building1_EventScript_1623F5:: @ 81623F5
-	msgbox gUnknown_8177A82, MSGBOX_NPC
-	end

data/maps/SafariZone_Building2/scripts.inc

@@ -1,14 +0,0 @@
-SafariZone_Building2_MapScripts:: @ 81623FE
-	.byte 0
-
-SafariZone_Building2_EventScript_1623FF:: @ 81623FF
-	msgbox gUnknown_8177AE2, MSGBOX_NPC
-	end
-
-SafariZone_Building2_EventScript_162408:: @ 8162408
-	msgbox gUnknown_8177AAE, MSGBOX_NPC
-	end
-
-SafariZone_Building2_EventScript_162411:: @ 8162411
-	msgbox gUnknown_8177B16, MSGBOX_NPC
-	end

data/maps/SafariZone_Building3/scripts.inc

@@ -1,14 +0,0 @@
-SafariZone_Building3_MapScripts:: @ 816241A
-	.byte 0
-
-SafariZone_Building3_EventScript_16241B:: @ 816241B
-	msgbox gUnknown_8177BAB, MSGBOX_NPC
-	end
-
-SafariZone_Building3_EventScript_162424:: @ 8162424
-	msgbox gUnknown_8177B38, MSGBOX_NPC
-	end
-
-SafariZone_Building3_EventScript_16242D:: @ 816242D
-	msgbox gUnknown_8177BEC, MSGBOX_NPC
-	end

data/maps/SafariZone_Building4/scripts.inc

@@ -1,14 +0,0 @@
-SafariZone_Building4_MapScripts:: @ 8162436
-	.byte 0
-
-SafariZone_Building4_EventScript_162437:: @ 8162437
-	msgbox gUnknown_8177D39, MSGBOX_NPC
-	end
-
-SafariZone_Building4_EventScript_162440:: @ 8162440
-	msgbox gUnknown_8177CEB, MSGBOX_NPC
-	end
-
-SafariZone_Building4_EventScript_162449:: @ 8162449
-	msgbox gUnknown_8177D8B, MSGBOX_NPC
-	end

data/maps/SafariZone_Center/map.json

@@ -116,7 +116,7 @@
       "x": 29,
       "y": 25,
       "elevation": 0,
-      "dest_map": "MAP_SAFARI_ZONE_BUILDING1",
+      "dest_map": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE",
       "dest_warp_id": 1
     }
   ],
@@ -127,14 +127,14 @@
       "x": 30,
       "y": 26,
       "elevation": 0,
-      "script": "SafariZone_Center_EventScript_162361"
+      "script": "SafariZone_Center_EventScript_RestHouseSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 25,
       "y": 27,
       "elevation": 0,
-      "script": "SafariZone_Center_EventScript_16236A"
+      "script": "SafariZone_Center_EventScript_TrainerTips"
     },
     {
       "type": "hidden_item",
@@ -151,7 +151,7 @@
       "x": 33,
       "y": 20,
       "elevation": 0,
-      "script": "SafariZone_Center_EventScript_162373"
+      "script": "SafariZone_Center_EventScript_AreaSign"
     }
   ]
 }

data/maps/SafariZone_Center/scripts.inc

@@ -6,14 +6,14 @@ SafariZone_Center_OnTransition:: @ 816235D
 	setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER
 	end
 
-SafariZone_Center_EventScript_162361:: @ 8162361
-	msgbox gUnknown_81777F2, MSGBOX_SIGN
+SafariZone_Center_EventScript_RestHouseSign:: @ 8162361
+	msgbox SafariZone_Center_Text_RestHouse, MSGBOX_SIGN
 	end
 
-SafariZone_Center_EventScript_16236A:: @ 816236A
-	msgbox gUnknown_81777FD, MSGBOX_SIGN
+SafariZone_Center_EventScript_TrainerTips:: @ 816236A
+	msgbox SafariZone_Center_Text_PressStartToCheckTime, MSGBOX_SIGN
 	end
 
-SafariZone_Center_EventScript_162373:: @ 8162373
-	msgbox gUnknown_817782F, MSGBOX_SIGN
+SafariZone_Center_EventScript_AreaSign:: @ 8162373
+	msgbox SafariZone_Center_Text_CenterArea, MSGBOX_SIGN
 	end

data/maps/SafariZone_Center/text.inc

@@ -1,11 +1,11 @@
-gUnknown_81777F2:: @ 81777F2
+SafariZone_Center_Text_RestHouse:: @ 81777F2
     .string "REST HOUSE$"
 
-gUnknown_81777FD:: @ 81777FD
+SafariZone_Center_Text_PressStartToCheckTime:: @ 81777FD
     .string "TRAINER TIPS\p"
     .string "Press START to check\n"
     .string "remaining time.$"
 
-gUnknown_817782F:: @ 817782F
+SafariZone_Center_Text_CenterArea:: @ 817782F
     .string "CENTER AREA$"
 

data/maps/SafariZone_Center_RestHouse/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFARI_ZONE_BUILDING1",
-  "name": "SafariZone_Building1",
-  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "id": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE",
+  "name": "SafariZone_Center_RestHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
   "music": "MUS_SHINKA",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building1_EventScript_1623F5",
+      "script": "SafariZone_Center_RestHouse_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building1_EventScript_1623EC",
+      "script": "SafariZone_Center_RestHouse_EventScript_Sara",
       "flag": "0"
     }
   ],

data/maps/SafariZone_Center_RestHouse/scripts.inc

@@ -0,0 +1,10 @@
+SafariZone_Center_RestHouse_MapScripts:: @ 81623EB
+	.byte 0
+
+SafariZone_Center_RestHouse_EventScript_Sara:: @ 81623EC
+	msgbox SafariZone_Center_Text_WhereDidErikGo, MSGBOX_NPC
+	end
+
+SafariZone_Center_RestHouse_EventScript_Scientist:: @ 81623F5
+	msgbox SafariZone_Center_Text_CatchingMonsAsGifts, MSGBOX_NPC
+	end

data/maps/SafariZone_Center_RestHouse/text.inc

@@ -1,8 +1,8 @@
-gUnknown_8177A5A:: @ 8177A5A
+SafariZone_Center_Text_WhereDidErikGo:: @ 8177A5A
     .string "SARA: Where did my boyfriend,\n"
     .string "ERIK, go?$"
 
-gUnknown_8177A82:: @ 8177A82
+SafariZone_Center_Text_CatchingMonsAsGifts:: @ 8177A82
     .string "I'm catching POKéMON to take home\n"
     .string "as gifts.$"
 

data/maps/SafariZone_East/map.json

@@ -113,7 +113,7 @@
       "x": 40,
       "y": 14,
       "elevation": 0,
-      "dest_map": "MAP_SAFARI_ZONE_BUILDING2",
+      "dest_map": "MAP_SAFARI_ZONE_EAST_REST_HOUSE",
       "dest_warp_id": 1
     }
   ],
@@ -124,21 +124,21 @@
       "x": 18,
       "y": 27,
       "elevation": 0,
-      "script": "SafariZone_East_EventScript_16238F"
+      "script": "SafariZone_East_EventScript_AreaSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 43,
       "y": 15,
       "elevation": 0,
-      "script": "SafariZone_East_EventScript_16237D"
+      "script": "SafariZone_East_EventScript_RestHouseSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 17,
       "y": 8,
       "elevation": 0,
-      "script": "SafariZone_East_EventScript_162386"
+      "script": "SafariZone_East_EventScript_TrainerTips"
     }
   ]
 }

data/maps/SafariZone_East/scripts.inc

@@ -1,14 +1,14 @@
 SafariZone_East_MapScripts:: @ 816237C
 	.byte 0
 
-SafariZone_East_EventScript_16237D:: @ 816237D
-	msgbox gUnknown_817783B, MSGBOX_SIGN
+SafariZone_East_EventScript_RestHouseSign:: @ 816237D
+	msgbox SafariZone_East_Text_RestHouse, MSGBOX_SIGN
 	end
 
-SafariZone_East_EventScript_162386:: @ 8162386
-	msgbox gUnknown_8177846, MSGBOX_SIGN
+SafariZone_East_EventScript_TrainerTips:: @ 8162386
+	msgbox SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk, MSGBOX_SIGN
 	end
 
-SafariZone_East_EventScript_16238F:: @ 816238F
-	msgbox gUnknown_8177884, MSGBOX_SIGN
+SafariZone_East_EventScript_AreaSign:: @ 816238F
+	msgbox SafariZone_East_Text_AreaSign, MSGBOX_SIGN
 	end

data/maps/SafariZone_East/text.inc

@@ -1,12 +1,12 @@
-gUnknown_817783B:: @ 817783B
+SafariZone_East_Text_RestHouse:: @ 817783B
     .string "REST HOUSE$"
 
-gUnknown_8177846:: @ 8177846
+SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk:: @ 8177846
     .string "TRAINER TIPS\p"
     .string "The remaining time declines only\n"
     .string "while you walk.$"
 
-gUnknown_8177884:: @ 8177884
+SafariZone_East_Text_AreaSign:: @ 8177884
     .string "AREA 1\n"
     .string "WEST: CENTER AREA$"
 

data/maps/SafariZone_East_RestHouse/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFARI_ZONE_BUILDING2",
-  "name": "SafariZone_Building2",
-  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "id": "MAP_SAFARI_ZONE_EAST_REST_HOUSE",
+  "name": "SafariZone_East_RestHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
   "music": "MUS_SHINKA",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building2_EventScript_162408",
+      "script": "SafariZone_East_RestHouse_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building2_EventScript_1623FF",
+      "script": "SafariZone_East_RestHouse_EventScript_Rocker",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building2_EventScript_162411",
+      "script": "SafariZone_East_RestHouse_EventScript_BaldingMan",
       "flag": "0"
     }
   ],

data/maps/SafariZone_East_RestHouse/scripts.inc

@@ -0,0 +1,14 @@
+SafariZone_East_RestHouse_MapScripts:: @ 81623FE
+	.byte 0
+
+SafariZone_East_RestHouse_EventScript_Rocker:: @ 81623FF
+	msgbox SafariZone_East_Text_CaughtChanseyAllWorthwhile, MSGBOX_NPC
+	end
+
+SafariZone_East_RestHouse_EventScript_Scientist:: @ 8162408
+	msgbox SafariZone_East_Text_HowManyDidYouCatch, MSGBOX_NPC
+	end
+
+SafariZone_East_RestHouse_EventScript_BaldingMan:: @ 8162411
+	msgbox SafariZone_East_Text_TiredFromAllTheFun, MSGBOX_NPC
+	end

data/maps/SafariZone_East_RestHouse/text.inc

@@ -1,12 +1,12 @@
-gUnknown_8177AAE:: @ 8177AAE
+SafariZone_East_Text_HowManyDidYouCatch:: @ 8177AAE
     .string "How many did you catch?\n"
     .string "I'm bushed from the effort!$"
 
-gUnknown_8177AE2:: @ 8177AE2
+SafariZone_East_Text_CaughtChanseyAllWorthwhile:: @ 8177AE2
     .string "I caught a CHANSEY!\p"
     .string "That makes this all worthwhile.$"
 
-gUnknown_8177B16:: @ 8177B16
+SafariZone_East_Text_TiredFromAllTheFun:: @ 8177B16
     .string "Whew!\n"
     .string "I'm tired from all the fun!$"
 

data/maps/SafariZone_North/map.json

@@ -142,7 +142,7 @@
       "x": 43,
       "y": 8,
       "elevation": 0,
-      "dest_map": "MAP_SAFARI_ZONE_BUILDING3",
+      "dest_map": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE",
       "dest_warp_id": 1
     }
   ],
@@ -153,35 +153,35 @@
       "x": 13,
       "y": 27,
       "elevation": 0,
-      "script": "SafariZone_North_EventScript_1623A2"
+      "script": "SafariZone_North_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 23,
       "y": 31,
       "elevation": 0,
-      "script": "SafariZone_North_EventScript_1623AB"
+      "script": "SafariZone_North_EventScript_AreaSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 29,
       "y": 32,
       "elevation": 0,
-      "script": "SafariZone_North_EventScript_1623B4"
+      "script": "SafariZone_North_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 34,
       "y": 28,
       "elevation": 0,
-      "script": "SafariZone_North_EventScript_1623BD"
+      "script": "SafariZone_North_EventScript_TrainerTips3"
     },
     {
       "type": "bg_event_type_0",
       "x": 44,
       "y": 9,
       "elevation": 0,
-      "script": "SafariZone_North_EventScript_162399"
+      "script": "SafariZone_North_EventScript_RestHouseSign"
     }
   ]
 }

data/maps/SafariZone_North/scripts.inc

@@ -1,22 +1,22 @@
 SafariZone_North_MapScripts:: @ 8162398
 	.byte 0
 
-SafariZone_North_EventScript_162399:: @ 8162399
-	msgbox gUnknown_817789D, MSGBOX_SIGN
+SafariZone_North_EventScript_RestHouseSign:: @ 8162399
+	msgbox SafariZone_North_Text_RestHouse, MSGBOX_SIGN
 	end
 
-SafariZone_North_EventScript_1623A2:: @ 81623A2
-	msgbox gUnknown_81778A8, MSGBOX_SIGN
+SafariZone_North_EventScript_TrainerTips1:: @ 81623A2
+	msgbox SafariZone_North_Text_SecretHouseStillAhead, MSGBOX_SIGN
 	end
 
-SafariZone_North_EventScript_1623AB:: @ 81623AB
-	msgbox gUnknown_81778D6, MSGBOX_SIGN
+SafariZone_North_EventScript_AreaSign:: @ 81623AB
+	msgbox SafariZone_North_Text_Area2, MSGBOX_SIGN
 	end
 
-SafariZone_North_EventScript_1623B4:: @ 81623B4
-	msgbox gUnknown_81778DD, MSGBOX_SIGN
+SafariZone_North_EventScript_TrainerTips2:: @ 81623B4
+	msgbox SafariZone_North_Text_ZigzagThroughTallGrass, MSGBOX_SIGN
 	end
 
-SafariZone_North_EventScript_1623BD:: @ 81623BD
-	msgbox gUnknown_8177935, MSGBOX_SIGN
+SafariZone_North_EventScript_TrainerTips3:: @ 81623BD
+	msgbox SafariZone_North_Text_WinFreeHMFindSecretHouse, MSGBOX_SIGN
 	end

data/maps/SafariZone_North/text.inc

@@ -1,20 +1,20 @@
-gUnknown_817789D:: @ 817789D
+SafariZone_North_Text_RestHouse:: @ 817789D
     .string "REST HOUSE$"
 
-gUnknown_81778A8:: @ 81778A8
+SafariZone_North_Text_SecretHouseStillAhead:: @ 81778A8
     .string "TRAINER TIPS\p"
     .string "The SECRET HOUSE is still ahead.$"
 
-gUnknown_81778D6:: @ 81778D6
+SafariZone_North_Text_Area2:: @ 81778D6
     .string "AREA 2$"
 
-gUnknown_81778DD:: @ 81778DD
+SafariZone_North_Text_ZigzagThroughTallGrass:: @ 81778DD
     .string "TRAINER TIPS\p"
     .string "POKéMON hide in tall grass.\p"
     .string "Zigzag through grassy areas to\n"
     .string "flush them out.$"
 
-gUnknown_8177935:: @ 8177935
+SafariZone_North_Text_WinFreeHMFindSecretHouse:: @ 8177935
     .string "TRAINER TIPS\p"
     .string "Win a free HM for finding the\n"
     .string "SECRET HOUSE.$"

data/maps/SafariZone_North_RestHouse/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFARI_ZONE_BUILDING3",
-  "name": "SafariZone_Building3",
-  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "id": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE",
+  "name": "SafariZone_North_RestHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
   "music": "MUS_SHINKA",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building3_EventScript_16242D",
+      "script": "SafariZone_North_RestHouse_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building3_EventScript_162424",
+      "script": "SafariZone_North_RestHouse_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building3_EventScript_16241B",
+      "script": "SafariZone_North_RestHouse_EventScript_Fisher",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building3_EventScript_1ACED3",
+      "script": "SafariZone_North_RestHouse_EventScript_BaldingMan",
       "flag": "0"
     }
   ],

data/maps/SafariZone_North_RestHouse/scripts.inc

@@ -0,0 +1,14 @@
+SafariZone_North_RestHouse_MapScripts:: @ 816241A
+	.byte 0
+
+SafariZone_North_RestHouse_EventScript_Fisher:: @ 816241B
+	msgbox SafariZone_East_Text_PrizeInDeepestPartOfSafariZone, MSGBOX_NPC
+	end
+
+SafariZone_North_RestHouse_EventScript_Scientist:: @ 8162424
+	msgbox SafariZone_East_Text_KeepAnyItemFoundOnSafari, MSGBOX_NPC
+	end
+
+SafariZone_North_RestHouse_EventScript_Gentleman:: @ 816242D
+	msgbox SafariZone_East_Text_MyEeveeEvolvedIntoFlareon, MSGBOX_NPC
+	end

data/maps/SafariZone_North_RestHouse/text.inc

@@ -1,14 +1,14 @@
-gUnknown_8177B38:: @ 8177B38
+SafariZone_East_Text_KeepAnyItemFoundOnSafari:: @ 8177B38
     .string "You can keep any item you find in\n"
     .string "the SAFARI ZONE.\p"
     .string "But, you'll run out of time if you\n"
     .string "try for all of them at once.$"
 
-gUnknown_8177BAB:: @ 8177BAB
+SafariZone_East_Text_PrizeInDeepestPartOfSafariZone:: @ 8177BAB
     .string "Go to the deepest part of the\n"
     .string "SAFARI ZONE. You will win a prize!$"
 
-gUnknown_8177BEC:: @ 8177BEC
+SafariZone_East_Text_MyEeveeEvolvedIntoFlareon:: @ 8177BEC
     .string "My EEVEE evolved into FLAREON.\p"
     .string "But, a friend's EEVEE turned into a\n"
     .string "VAPOREON. I wonder why?$"

data/maps/SafariZone_SecretHouse/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_SecretHouse_EventScript_162453",
+      "script": "SafariZone_SecretHouse_EventScript_Attendant",
       "flag": "0"
     }
   ],

data/maps/SafariZone_SecretHouse/scripts.inc

@@ -1,26 +1,26 @@
 SafariZone_SecretHouse_MapScripts:: @ 8162452
 	.byte 0
 
-SafariZone_SecretHouse_EventScript_162453:: @ 8162453
+SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HM03, EventScript_1624A9
-	msgbox gUnknown_8177DC1
+	goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf
+	msgbox SafariZone_SecretHouse_Text_CongratsYouveWon
 	checkitemspace ITEM_HM03, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16249F
-	giveitem_msg gUnknown_8177E92, ITEM_HM03
-	msgbox gUnknown_8177EB7
+	goto_if_eq SafariZone_SecretHouse_EventScript_NoRoomForHM03
+	giveitem_msg SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant, ITEM_HM03
+	msgbox SafariZone_SecretHouse_Text_ExplainSurf
 	setflag FLAG_GOT_HM03
 	release
 	end
 
-EventScript_16249F:: @ 816249F
-	msgbox gUnknown_8177F72
+SafariZone_SecretHouse_EventScript_NoRoomForHM03:: @ 816249F
+	msgbox SafariZone_SecretHouse_Text_DontHaveRoomForPrize
 	release
 	end
 
-EventScript_1624A9:: @ 81624A9
-	msgbox gUnknown_8177EB7
+SafariZone_SecretHouse_EventScript_ExplainSurf:: @ 81624A9
+	msgbox SafariZone_SecretHouse_Text_ExplainSurf
 	release
 	end

data/maps/SafariZone_SecretHouse/text.inc

@@ -1,4 +1,4 @@
-gUnknown_8177DC1:: @ 8177DC1
+SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1
     .string "Ah! Finally!\p"
     .string "You're the first person to reach\n"
     .string "the SECRET HOUSE!\p"
@@ -9,11 +9,11 @@ gUnknown_8177DC1:: @ 8177DC1
     .string "Congratulations!\n"
     .string "You have won!$"
 
-gUnknown_8177E92:: @ 8177E92
+SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant:: @ 8177E92
     .string "{PLAYER} received HM03\n"
     .string "from the attendant!$"
 
-gUnknown_8177EB7:: @ 8177EB7
+SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7
     .string "HM03 is SURF.\p"
     .string "POKéMON will be able to ferry you\n"
     .string "across water using it.\p"
@@ -22,7 +22,7 @@ gUnknown_8177EB7:: @ 8177EB7
     .string "You're super lucky for winning this\n"
     .string "fabulous prize!$"
 
-gUnknown_8177F72:: @ 8177F72
+SafariZone_SecretHouse_Text_DontHaveRoomForPrize:: @ 8177F72
     .string "You don't have room for this\n"
     .string "fabulous prize!$"
 

data/maps/SafariZone_West/map.json

@@ -141,7 +141,7 @@
       "x": 19,
       "y": 18,
       "elevation": 0,
-      "dest_map": "MAP_SAFARI_ZONE_BUILDING4",
+      "dest_map": "MAP_SAFARI_ZONE_WEST_REST_HOUSE",
       "dest_warp_id": 1
     }
   ],
@@ -152,28 +152,28 @@
       "x": 27,
       "y": 9,
       "elevation": 0,
-      "script": "SafariZone_West_EventScript_1623D0"
+      "script": "SafariZone_West_EventScript_LostTeethNotice"
     },
     {
       "type": "bg_event_type_0",
       "x": 36,
       "y": 10,
       "elevation": 0,
-      "script": "SafariZone_West_EventScript_1623D9"
+      "script": "SafariZone_West_EventScript_TrainerTips"
     },
     {
       "type": "bg_event_type_0",
       "x": 35,
       "y": 26,
       "elevation": 0,
-      "script": "SafariZone_West_EventScript_1623E2"
+      "script": "SafariZone_West_EventScript_AreaSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 22,
       "y": 19,
       "elevation": 0,
-      "script": "SafariZone_West_EventScript_1623C7"
+      "script": "SafariZone_West_EventScript_RestHouseSign"
     },
     {
       "type": "hidden_item",

data/maps/SafariZone_West/scripts.inc

@@ -1,18 +1,18 @@
 SafariZone_West_MapScripts:: @ 81623C6
 	.byte 0
 
-SafariZone_West_EventScript_1623C7:: @ 81623C7
-	msgbox gUnknown_817796E, MSGBOX_SIGN
+SafariZone_West_EventScript_RestHouseSign:: @ 81623C7
+	msgbox SafariZone_West_Text_RestHouse, MSGBOX_SIGN
 	end
 
-SafariZone_West_EventScript_1623D0:: @ 81623D0
-	msgbox gUnknown_8177979, MSGBOX_SIGN
+SafariZone_West_EventScript_LostTeethNotice:: @ 81623D0
+	msgbox SafariZone_West_Text_PleaseFindWardensLostTeeth, MSGBOX_SIGN
 	end
 
-SafariZone_West_EventScript_1623D9:: @ 81623D9
-	msgbox gUnknown_81779F8, MSGBOX_SIGN
+SafariZone_West_EventScript_TrainerTips:: @ 81623D9
+	msgbox SafariZone_West_Text_SearchForSecretHouse, MSGBOX_SIGN
 	end
 
-SafariZone_West_EventScript_1623E2:: @ 81623E2
-	msgbox gUnknown_8177A41, MSGBOX_SIGN
+SafariZone_West_EventScript_AreaSign:: @ 81623E2
+	msgbox SafariZone_West_Text_AreaSign, MSGBOX_SIGN
 	end

data/maps/SafariZone_West/text.inc

@@ -1,7 +1,7 @@
-gUnknown_817796E:: @ 817796E
+SafariZone_West_Text_RestHouse:: @ 817796E
     .string "REST HOUSE$"
 
-gUnknown_8177979:: @ 8177979
+SafariZone_West_Text_PleaseFindWardensLostTeeth:: @ 8177979
     .string "REQUEST NOTICE\p"
     .string "Please find the SAFARI WARDEN's\n"
     .string "lost GOLD TEETH.\l"
@@ -9,12 +9,12 @@ gUnknown_8177979:: @ 8177979
     .string "Reward offered!\n"
     .string "Contact: WARDEN$"
 
-gUnknown_81779F8:: @ 81779F8
+SafariZone_West_Text_SearchForSecretHouse:: @ 81779F8
     .string "TRAINER TIPS\p"
     .string "Zone Exploration Campaign!\n"
     .string "The Search for the SECRET HOUSE!$"
 
-gUnknown_8177A41:: @ 8177A41
+SafariZone_West_Text_AreaSign:: @ 8177A41
     .string "AREA 3\n"
     .string "EAST: CENTER AREA$"
 

data/maps/SafariZone_West_RestHouse/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFARI_ZONE_BUILDING4",
-  "name": "SafariZone_Building4",
-  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "id": "MAP_SAFARI_ZONE_WEST_REST_HOUSE",
+  "name": "SafariZone_West_RestHouse",
+  "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
   "music": "MUS_SHINKA",
   "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building4_EventScript_162440",
+      "script": "SafariZone_West_RestHouse_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building4_EventScript_162437",
+      "script": "SafariZone_West_RestHouse_EventScript_Man",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SafariZone_Building4_EventScript_162449",
+      "script": "SafariZone_West_RestHouse_EventScript_CooltrainerF",
       "flag": "0"
     }
   ],

data/maps/SafariZone_West_RestHouse/scripts.inc

@@ -0,0 +1,14 @@
+SafariZone_West_RestHouse_MapScripts:: @ 8162436
+	.byte 0
+
+SafariZone_West_RestHouse_EventScript_Man:: @ 8162437
+	msgbox SafariZone_West_Text_BaitMakesMonStickAround, MSGBOX_NPC
+	end
+
+SafariZone_West_RestHouse_EventScript_Scientist:: @ 8162440
+	msgbox SafariZone_West_Text_RocksMakeMonRunButEasierCatch, MSGBOX_NPC
+	end
+
+SafariZone_West_RestHouse_EventScript_CooltrainerF:: @ 8162449
+	msgbox SafariZone_West_Text_HikedLotsDidntSeeMonIWanted, MSGBOX_NPC
+	end

data/maps/SafariZone_West_RestHouse/text.inc

@@ -1,4 +1,4 @@
-Text_177C47:: @ 8177C47
+SafariZone_West_Text_KogaPatrolsSafariEverySoOften:: @ 8177C47
     .string "The SAFARI ZONE's huge, wouldn't\n"
     .string "you say?\p"
     .string "FUCHSIA's GYM LEADER, KOGA, \n"
@@ -6,17 +6,17 @@ Text_177C47:: @ 8177C47
     .string "Thanks to him, we can play here\n"
     .string "knowing that we're safe.$"
 
-gUnknown_8177CEB:: @ 8177CEB
+SafariZone_West_Text_RocksMakeMonRunButEasierCatch:: @ 8177CEB
     .string "Tossing ROCKS at POKéMON might\n"
     .string "make them run, but they'll be\l"
     .string "easier to catch.$"
 
-gUnknown_8177D39:: @ 8177D39
+SafariZone_West_Text_BaitMakesMonStickAround:: @ 8177D39
     .string "Using BAIT will make POKéMON more\n"
     .string "likely to stick around if they get\l"
     .string "busy eating.$"
 
-gUnknown_8177D8B:: @ 8177D8B
+SafariZone_West_Text_HikedLotsDidntSeeMonIWanted:: @ 8177D8B
     .string "I hiked a lot, but I didn't see any\n"
     .string "POKéMON I wanted.$"
 

data/maps/map_groups.json

@@ -119,10 +119,10 @@
     "SafariZone_East",
     "SafariZone_North",
     "SafariZone_West",
-    "SafariZone_Building1",
-    "SafariZone_Building2",
-    "SafariZone_Building3",
-    "SafariZone_Building4",
+    "SafariZone_Center_RestHouse",
+    "SafariZone_East_RestHouse",
+    "SafariZone_North_RestHouse",
+    "SafariZone_West_RestHouse",
     "SafariZone_SecretHouse",
     "CeruleanCave_1F",
     "CeruleanCave_2F",

data/scripts/fame_checker.inc

@@ -110,11 +110,11 @@ FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: @ 81ACEB8
 	release
 	end
 
-SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
+SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
 	lock
 	faceplayer
 	famechecker FAMECHECKER_KOGA, 5
-	msgbox Text_177C47
+	msgbox SafariZone_West_Text_KogaPatrolsSafariEverySoOften
 	release
 	end
 

include/constants/layouts.h

@@ -180,7 +180,7 @@
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F 195
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F 196
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF 197
-#define LAYOUT_SAFARI_ZONE_BUILDING 198
+#define LAYOUT_SAFARI_ZONE_REST_HOUSE 198
 #define LAYOUT_SAFARI_ZONE_SECRET_HOUSE 199
 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE 200
 #define LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE 201

include/constants/map_groups.h

@@ -76,10 +76,10 @@
 #define MAP_SAFARI_ZONE_EAST                     (64 | (1 << 8))
 #define MAP_SAFARI_ZONE_NORTH                    (65 | (1 << 8))
 #define MAP_SAFARI_ZONE_WEST                     (66 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING1                (67 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING2                (68 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING3                (69 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING4                (70 | (1 << 8))
+#define MAP_SAFARI_ZONE_CENTER_REST_HOUSE        (67 | (1 << 8))
+#define MAP_SAFARI_ZONE_EAST_REST_HOUSE          (68 | (1 << 8))
+#define MAP_SAFARI_ZONE_NORTH_REST_HOUSE         (69 | (1 << 8))
+#define MAP_SAFARI_ZONE_WEST_REST_HOUSE          (70 | (1 << 8))
 #define MAP_SAFARI_ZONE_SECRET_HOUSE             (71 | (1 << 8))
 #define MAP_CERULEAN_CAVE_1F                     (72 | (1 << 8))
 #define MAP_CERULEAN_CAVE_2F                     (73 | (1 << 8))