Document safari zone scripts

16 files changed, 148 insertions, 146 deletions

diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json
index 90eedd773..6cf7b5791 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.json
+++ b/data/maps/Route121_SafariZoneEntrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_SafariZoneEntrance_EventScript_22BBE6",
+      "script": "Route121_SafariZoneEntrance_EventScript_WelcomeAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route121_SafariZoneEntrance_EventScript_22BBEF",
+      "script": "Route121_SafariZoneEntrance_EventScript_InfoAttendant",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route121_SafariZoneEntrance_EventScript_22BC18"
+      "script": "Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger"
     }
   ],
   "bg_events": [
@@ -102,7 +102,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route121_SafariZoneEntrance_EventScript_22BD21"
+      "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 88c4ac03d..054f6cee8 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -1,20 +1,20 @@
 Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_OnFrame
 	.byte 0
 
-Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
-	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
+Route121_SafariZoneEntrance_OnFrame: @ 822BBC1
+	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_ExitSafariZone
 	.2byte 0
 
-Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
+Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD
+	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone
 	waitmovement 0
 	setvar VAR_SAFARI_ZONE_STATE, 0
 	releaseall
 	end
 
-Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD
+Route121_SafariZoneEntrance_Movement_ExitSafariZone: @ 822BBDD
 	walk_up
 	walk_right
 	walk_right
@@ -25,59 +25,59 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD
 	walk_right
 	step_end
 
-Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6
-	msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC
+Route121_SafariZoneEntrance_EventScript_WelcomeAttendant:: @ 822BBE6
+	msgbox Route121_SafariZoneEntrance_Text_WelcomeToSafariZone, MSGBOX_NPC
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF
+Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF
 	lock
 	faceplayer
-	msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO
+	msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E
-	msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo
+	msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
-	msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT
+Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E
+	msgbox Route121_SafariZoneEntrance_Text_FirstTimeInfo, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
+Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	showmoneybox 0, 0, 0
-	msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO
+	msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48
-	msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone
+	msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
+Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA
-	call Route121_SafariZoneEntrance_EventScript_22BCBF
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase
+	call Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon
 	checkmoney 500, 0
 	compare VAR_RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney
 	playse SE_REGI
-	msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT
 	takemoney 500, 0
 	updatemoneybox 0, 0
-	msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message Route121_SafariZoneEntrance_Text_2A5052
+	message Route121_SafariZoneEntrance_Text_Received30SafariBalls
 	waitfanfare
-	msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
 	closemessage
 	hidemoneybox
 	nop
 	nop
-	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18
+	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone
 	waitmovement 0
 	special EnterSafariMode
 	setvar VAR_SAFARI_ZONE_STATE, 2
@@ -86,45 +86,45 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
 	waitstate
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF
+Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon:: @ 822BCBF
 	getpartysize
-	compare VAR_RESULT, 6
-	goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9
+	compare VAR_RESULT, PARTY_SIZE
+	goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
 	specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
 	compare VAR_RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9
-	msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
+	msgbox Route121_SafariZoneEntrance_Text_PCIsFull, MSGBOX_DEFAULT
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9
+Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon:: @ 822BCE9
 	return
 
-Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA
-	msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+Route121_SafariZoneEntrance_EventScript_NoPokeblockCase:: @ 822BCEA
+	msgbox Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase, MSGBOX_DEFAULT
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8
-	msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
+	msgbox Route121_SafariZoneEntrance_Text_NotEnoughMoney, MSGBOX_DEFAULT
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06
+Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
 	closemessage
 	hidemoneybox
 	nop
 	nop
-	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16
+	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16
+Route121_SafariZoneEntrance_Movement_BackAwayFromCounter: @ 822BD16
 	walk_right
 	step_end
 
-Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
+Route121_SafariZoneEntrance_Movement_EnterSafariZone: @ 822BD18
 	walk_left
 	walk_left
 	walk_left
@@ -135,7 +135,7 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
 	delay_16
 	step_end
 
-Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21
-	msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN
+Route121_SafariZoneEntrance_EventScript_TrainerTipSign:: @ 822BD21
+	msgbox Route121_SafariZoneEntrance_Text_TrainerTip, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index 0dafeb180..90ecec8c2 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_23D254",
+      "script": "SafariZone_North_EventScript_Fisherman",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_North_EventScript_23D25D",
+      "script": "SafariZone_North_EventScript_Man",
       "flag": "0"
     },
     {
diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc
index d98fdca88..365266b4b 100644
--- a/data/maps/SafariZone_North/scripts.inc
+++ b/data/maps/SafariZone_North/scripts.inc
@@ -1,11 +1,11 @@
 SafariZone_North_MapScripts:: @ 823D253
 	.byte 0
 
-SafariZone_North_EventScript_23D254:: @ 823D254
-	msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC
+SafariZone_North_EventScript_Fisherman:: @ 823D254
+	msgbox SafariZone_North_Text_Fisherman, MSGBOX_NPC
 	end
 
-SafariZone_North_EventScript_23D25D:: @ 823D25D
-	msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC
+SafariZone_North_EventScript_Man:: @ 823D25D
+	msgbox SafariZone_North_Text_Man, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json
index 798563263..d362f8de3 100644
--- a/data/maps/SafariZone_Northeast/map.json
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_23D3C6",
+      "script": "SafariZone_Northeast_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_23D3D8",
+      "script": "SafariZone_Northeast_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northeast_EventScript_23D3CF",
+      "script": "SafariZone_Northeast_EventScript_Woman",
       "flag": "0"
     },
     {
diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 207e2a584..a34d6ab95 100644
--- a/data/maps/SafariZone_Northeast/scripts.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
@@ -1,3 +1,4 @@
 SafariZone_Northeast_MapScripts:: @ 8242C02
 	.byte 0
 
+@ Event scripts for SafariZone_Northeast are in SafariZone_South/scripts.inc
diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json
index 6ead6d714..7805c872e 100644
--- a/data/maps/SafariZone_Northwest/map.json
+++ b/data/maps/SafariZone_Northwest/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Northwest_EventScript_23D24A",
+      "script": "SafariZone_Northwest_EventScript_Man",
       "flag": "0"
     },
     {
diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc
index a64c142fe..5e6261a2e 100644
--- a/data/maps/SafariZone_Northwest/scripts.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
@@ -1,7 +1,7 @@
 SafariZone_Northwest_MapScripts:: @ 823D249
 	.byte 0
 
-SafariZone_Northwest_EventScript_23D24A:: @ 823D24A
-	msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC
+SafariZone_Northwest_EventScript_Man:: @ 823D24A
+	msgbox SafariZone_Northwest_Text_Man, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json
index db0ba8048..fd9ae9dcb 100644
--- a/data/maps/SafariZone_RestHouse/map.json
+++ b/data/maps/SafariZone_RestHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_RestHouse_EventScript_242BE7",
+      "script": "SafariZone_RestHouse_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_RestHouse_EventScript_242BF0",
+      "script": "SafariZone_RestHouse_EventScript_PsychicM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_RestHouse_EventScript_242BF9",
+      "script": "SafariZone_RestHouse_EventScript_FatMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index e08cfe3da..bc5688f0f 100644
--- a/data/maps/SafariZone_RestHouse/scripts.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
@@ -1,15 +1,15 @@
 SafariZone_RestHouse_MapScripts:: @ 8242BE6
 	.byte 0
 
-SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7
-	msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC
+SafariZone_RestHouse_EventScript_Youngster:: @ 8242BE7
+	msgbox SafariZone_RestHouse_Text_Youngster, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0
-	msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC
+SafariZone_RestHouse_EventScript_PsychicM:: @ 8242BF0
+	msgbox SafariZone_RestHouse_Text_PsychicM, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9
-	msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC
+SafariZone_RestHouse_EventScript_FatMan:: @ 8242BF9
+	msgbox SafariZone_RestHouse_Text_FatMan, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json
index 371be2119..b23420ba4 100644
--- a/data/maps/SafariZone_South/map.json
+++ b/data/maps/SafariZone_South/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D2E5",
+      "script": "SafariZone_South_EventScript_ExitAttendant",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D2CA",
+      "script": "SafariZone_South_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D2D3",
+      "script": "SafariZone_South_EventScript_Man",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D2DC",
+      "script": "SafariZone_South_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D390",
+      "script": "SafariZone_South_EventScript_ConstructionWorker1",
       "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_South_EventScript_23D3A2",
+      "script": "SafariZone_South_EventScript_ConstructionWorker2",
       "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS"
     }
   ],
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index a6c3629bc..96a9a61ea 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -1,17 +1,17 @@
 SafariZone_South_MapScripts:: @ 823D279
 	map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_OnFrame
 	.byte 0
 
-SafariZone_South_MapScript2_23D284: @ 823D284
-	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E
+SafariZone_South_OnFrame: @ 823D284
+	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_EnterSafariZone
 	.2byte 0
 
-SafariZone_South_EventScript_23D28E:: @ 823D28E
+SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5
+	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter
 	waitmovement 0
-	applymovement 1, SafariZone_South_Movement_23D2C7
+	applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor
 	waitmovement 0
 	setobjectxyperm 1, 32, 34
 	setvar VAR_SAFARI_ZONE_STATE, 0
@@ -20,133 +20,133 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E
 
 SafariZone_South_OnTransition: @ 823D2B1
 	compare VAR_SAFARI_ZONE_STATE, 2
-	call_if_eq SafariZone_South_EventScript_23D2BD
+	call_if_eq SafariZone_South_EventScript_SetExitAttendantAside
 	end
 
-SafariZone_South_EventScript_23D2BD:: @ 823D2BD
+SafariZone_South_EventScript_SetExitAttendantAside:: @ 823D2BD
 	setobjectxyperm 1, 31, 34
 	return
 
-SafariZone_South_Movement_23D2C5: @ 823D2C5
+SafariZone_South_Movement_PlayerEnter: @ 823D2C5
 	walk_down
 	step_end
 
-SafariZone_South_Movement_23D2C7: @ 823D2C7
+SafariZone_South_Movement_ExitAttendantBlockDoor: @ 823D2C7
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SafariZone_South_EventScript_23D2CA:: @ 823D2CA
-	msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC
+SafariZone_South_EventScript_Boy:: @ 823D2CA
+	msgbox SafariZone_South_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D2D3:: @ 823D2D3
-	msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC
+SafariZone_South_EventScript_Man:: @ 823D2D3
+	msgbox SafariZone_South_Text_Man, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D2DC:: @ 823D2DC
-	msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC
+SafariZone_South_EventScript_Youngster:: @ 823D2DC
+	msgbox SafariZone_South_Text_Youngster, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D2E5:: @ 823D2E5
+SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_23D30D
-	msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO
+	goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck
+	msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq SafariZone_South_EventScript_23D31A
-	msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT
+	goto_if_eq SafariZone_South_EventScript_ExitEarly
+	msgbox SafariZone_South_Text_EnjoyTheRestOfYourAdventure, MSGBOX_DEFAULT
 	release
 	end
 
-SafariZone_South_EventScript_23D30D:: @ 823D30D
+SafariZone_South_EventScript_GoodLuck:: @ 823D30D
 	setflag FLAG_GOOD_LUCK_SAFARI_ZONE
-	msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT
+	msgbox SafariZone_South_Text_GoodLuck, MSGBOX_DEFAULT
 	release
 	end
 
-SafariZone_South_EventScript_23D31A:: @ 823D31A
-	msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT
+SafariZone_South_EventScript_ExitEarly:: @ 823D31A
+	msgbox SafariZone_South_Text_ExitEarlyThankYouForPlaying, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
-	case DIR_NORTH, SafariZone_South_EventScript_23D33F
-	case DIR_EAST, SafariZone_South_EventScript_23D359
+	case DIR_NORTH, SafariZone_South_EventScript_ExitEarlyNorth
+	case DIR_EAST, SafariZone_South_EventScript_ExitEarlyEast
 	end
 
-SafariZone_South_EventScript_23D33F:: @ 823D33F
-	applymovement 1, SafariZone_South_Movement_23D38A
+SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
+	applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385
+	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth
 	waitmovement 0
-	goto SafariZone_South_EventScript_23D373
+	goto SafariZone_South_EventScript_Exit
 	end
 
-SafariZone_South_EventScript_23D359:: @ 823D359
-	applymovement 1, SafariZone_South_Movement_23D38D
+SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359
+	applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387
+	applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast
 	waitmovement 0
-	goto SafariZone_South_EventScript_23D373
+	goto SafariZone_South_EventScript_Exit
 	end
 
-SafariZone_South_EventScript_23D373:: @ 823D373
+SafariZone_South_EventScript_Exit:: @ 823D373
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-SafariZone_South_Movement_23D385: @ 823D385
+SafariZone_South_Movement_PlayerExitNorth: @ 823D385
 	walk_up
 	step_end
 
-SafariZone_South_Movement_23D387: @ 823D387
+SafariZone_South_Movement_PlayerExitEast: @ 823D387
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-SafariZone_South_Movement_23D38A: @ 823D38A
+SafariZone_South_Movement_MoveExitAttendantNorth: @ 823D38A
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SafariZone_South_Movement_23D38D: @ 823D38D
+SafariZone_South_Movement_MoveExitAttendantEast: @ 823D38D
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-SafariZone_South_EventScript_23D390:: @ 823D390
-	msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC
+SafariZone_South_EventScript_ConstructionWorker1:: @ 823D390
+	msgbox SafariZone_South_Text_AreaOffLimits1, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D399:: @ 823D399
-	msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC
+SafariZone_Southeast_EventScript_ExpansionZoneAttendant:: @ 823D399
+	msgbox SafariZone_Southeast_Text_ExpansionIsFinished, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D3A2:: @ 823D3A2
-	msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC
+SafariZone_South_EventScript_ConstructionWorker2:: @ 823D3A2
+	msgbox SafariZone_South_Text_AreaOffLimits2, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB
-	msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC
+SafariZone_Southeast_EventScript_LittleGirl:: @ 823D3AB
+	msgbox SafariZone_Southeast_Text_LittleGirl, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4
-	msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC
+SafariZone_Southeast_EventScript_FatMan:: @ 823D3B4
+	msgbox SafariZone_Southeast_Text_FatMan, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD
-	msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC
+SafariZone_Southeast_EventScript_RichBoy:: @ 823D3BD
+	msgbox SafariZone_Southeast_Text_RichBoy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6
-	msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC
+SafariZone_Northeast_EventScript_Boy:: @ 823D3C6
+	msgbox SafariZone_Northeast_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF
-	msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC
+SafariZone_Northeast_EventScript_Woman:: @ 823D3CF
+	msgbox SafariZone_Northeast_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8
-	msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC
+SafariZone_Northeast_EventScript_Girl:: @ 823D3D8
+	msgbox SafariZone_Northeast_Text_Girl, MSGBOX_NPC
 	end
diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json
index cb293b149..f17a9acd3 100644
--- a/data/maps/SafariZone_Southeast/map.json
+++ b/data/maps/SafariZone_Southeast/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southeast_EventScript_23D3BD",
+      "script": "SafariZone_Southeast_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southeast_EventScript_23D3B4",
+      "script": "SafariZone_Southeast_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southeast_EventScript_23D3AB",
+      "script": "SafariZone_Southeast_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southeast_EventScript_23D399",
+      "script": "SafariZone_Southeast_EventScript_ExpansionZoneAttendant",
       "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION"
     }
   ],
diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc
index f88cd22fb..658d88e56 100644
--- a/data/maps/SafariZone_Southeast/scripts.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
@@ -1,3 +1,4 @@
 SafariZone_Southeast_MapScripts:: @ 8242C03
 	.byte 0
 
+@ Event scripts for SafariZone_Southeast are in SafariZone_South/scripts.inc
diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json
index 3784db801..261f7f49d 100644
--- a/data/maps/SafariZone_Southwest/map.json
+++ b/data/maps/SafariZone_Southwest/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SafariZone_Southwest_EventScript_23D267",
+      "script": "SafariZone_Southwest_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -69,7 +69,7 @@
       "y": 7,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SafariZone_Southwest_EventScript_23D270"
+      "script": "SafariZone_Southwest_EventScript_RestHouseSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc
index 069f22b49..c862f7906 100644
--- a/data/maps/SafariZone_Southwest/scripts.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
@@ -1,11 +1,11 @@
 SafariZone_Southwest_MapScripts:: @ 823D266
 	.byte 0
 
-SafariZone_Southwest_EventScript_23D267:: @ 823D267
-	msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC
+SafariZone_Southwest_EventScript_Woman:: @ 823D267
+	msgbox SafariZone_Southwest_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Southwest_EventScript_23D270:: @ 823D270
-	msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN
+SafariZone_Southwest_EventScript_RestHouseSign:: @ 823D270
+	msgbox SafariZone_Southwest_Text_RestHouseSign, MSGBOX_SIGN
 	end