Document safari zone scripts

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"
     }
   ]
 }

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
+Route121_SafariZoneEntrance_OnFrame: @ 822BBC1
-	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
+	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
+Route121_SafariZoneEntrance_EventScript_WelcomeAttendant:: @ 822BBE6
-	msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC
+	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
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo
-	msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
+Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E
-	msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT
+	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
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone
-	msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	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
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase
-	call Route121_SafariZoneEntrance_EventScript_22BCBF
+	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
+	compare VAR_RESULT, PARTY_SIZE
-	goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9
+	goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
 	specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
 	compare VAR_RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
-	msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_PCIsFull, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9
+Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon:: @ 822BCE9
 	return
 
-Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA
+Route121_SafariZoneEntrance_EventScript_NoPokeblockCase:: @ 822BCEA
-	msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8
+Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
-	msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT
+	msgbox Route121_SafariZoneEntrance_Text_NotEnoughMoney, MSGBOX_DEFAULT
-	goto Route121_SafariZoneEntrance_EventScript_22BD06
+	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
+Route121_SafariZoneEntrance_EventScript_TrainerTipSign:: @ 822BD21
-	msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN
+	msgbox Route121_SafariZoneEntrance_Text_TrainerTip, MSGBOX_SIGN
 	end
 

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"
     },
     {

data/maps/SafariZone_North/scripts.inc

@@ -1,11 +1,11 @@
 SafariZone_North_MapScripts:: @ 823D253
 	.byte 0
 
-SafariZone_North_EventScript_23D254:: @ 823D254
+SafariZone_North_EventScript_Fisherman:: @ 823D254
-	msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC
+	msgbox SafariZone_North_Text_Fisherman, MSGBOX_NPC
 	end
 
-SafariZone_North_EventScript_23D25D:: @ 823D25D
+SafariZone_North_EventScript_Man:: @ 823D25D
-	msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC
+	msgbox SafariZone_North_Text_Man, MSGBOX_NPC
 	end
 

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"
     },
     {

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

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"
     },
     {

data/maps/SafariZone_Northwest/scripts.inc

@@ -1,7 +1,7 @@
 SafariZone_Northwest_MapScripts:: @ 823D249
 	.byte 0
 
-SafariZone_Northwest_EventScript_23D24A:: @ 823D24A
+SafariZone_Northwest_EventScript_Man:: @ 823D24A
-	msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC
+	msgbox SafariZone_Northwest_Text_Man, MSGBOX_NPC
 	end
 

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"
     }
   ],

data/maps/SafariZone_RestHouse/scripts.inc

@@ -1,15 +1,15 @@
 SafariZone_RestHouse_MapScripts:: @ 8242BE6
 	.byte 0
 
-SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7
+SafariZone_RestHouse_EventScript_Youngster:: @ 8242BE7
-	msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC
+	msgbox SafariZone_RestHouse_Text_Youngster, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0
+SafariZone_RestHouse_EventScript_PsychicM:: @ 8242BF0
-	msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC
+	msgbox SafariZone_RestHouse_Text_PsychicM, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9
+SafariZone_RestHouse_EventScript_FatMan:: @ 8242BF9
-	msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC
+	msgbox SafariZone_RestHouse_Text_FatMan, MSGBOX_NPC
 	end
 

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"
     }
   ],

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
+SafariZone_South_OnFrame: @ 823D284
-	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E
+	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
+SafariZone_South_EventScript_Boy:: @ 823D2CA
-	msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC
+	msgbox SafariZone_South_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D2D3:: @ 823D2D3
+SafariZone_South_EventScript_Man:: @ 823D2D3
-	msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC
+	msgbox SafariZone_South_Text_Man, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D2DC:: @ 823D2DC
+SafariZone_South_EventScript_Youngster:: @ 823D2DC
-	msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC
+	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
+	goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck
-	msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO
+	msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq SafariZone_South_EventScript_23D31A
+	goto_if_eq SafariZone_South_EventScript_ExitEarly
-	msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT
+	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
+SafariZone_South_EventScript_ExitEarly:: @ 823D31A
-	msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT
+	msgbox SafariZone_South_Text_ExitEarlyThankYouForPlaying, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
-	case DIR_NORTH, SafariZone_South_EventScript_23D33F
+	case DIR_NORTH, SafariZone_South_EventScript_ExitEarlyNorth
-	case DIR_EAST, SafariZone_South_EventScript_23D359
+	case DIR_EAST, SafariZone_South_EventScript_ExitEarlyEast
 	end
 
-SafariZone_South_EventScript_23D33F:: @ 823D33F
+SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
-	applymovement 1, SafariZone_South_Movement_23D38A
+	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
+SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359
-	applymovement 1, SafariZone_South_Movement_23D38D
+	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
+SafariZone_South_EventScript_ConstructionWorker1:: @ 823D390
-	msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC
+	msgbox SafariZone_South_Text_AreaOffLimits1, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D399:: @ 823D399
+SafariZone_Southeast_EventScript_ExpansionZoneAttendant:: @ 823D399
-	msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC
+	msgbox SafariZone_Southeast_Text_ExpansionIsFinished, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_23D3A2:: @ 823D3A2
+SafariZone_South_EventScript_ConstructionWorker2:: @ 823D3A2
-	msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC
+	msgbox SafariZone_South_Text_AreaOffLimits2, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB
+SafariZone_Southeast_EventScript_LittleGirl:: @ 823D3AB
-	msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC
+	msgbox SafariZone_Southeast_Text_LittleGirl, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4
+SafariZone_Southeast_EventScript_FatMan:: @ 823D3B4
-	msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC
+	msgbox SafariZone_Southeast_Text_FatMan, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD
+SafariZone_Southeast_EventScript_RichBoy:: @ 823D3BD
-	msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC
+	msgbox SafariZone_Southeast_Text_RichBoy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6
+SafariZone_Northeast_EventScript_Boy:: @ 823D3C6
-	msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC
+	msgbox SafariZone_Northeast_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF
+SafariZone_Northeast_EventScript_Woman:: @ 823D3CF
-	msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC
+	msgbox SafariZone_Northeast_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8
+SafariZone_Northeast_EventScript_Girl:: @ 823D3D8
-	msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC
+	msgbox SafariZone_Northeast_Text_Girl, MSGBOX_NPC
 	end

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"
     }
   ],

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

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"
     }
   ]
 }

data/maps/SafariZone_Southwest/scripts.inc

@@ -1,11 +1,11 @@
 SafariZone_Southwest_MapScripts:: @ 823D266
 	.byte 0
 
-SafariZone_Southwest_EventScript_23D267:: @ 823D267
+SafariZone_Southwest_EventScript_Woman:: @ 823D267
-	msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC
+	msgbox SafariZone_Southwest_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Southwest_EventScript_23D270:: @ 823D270
+SafariZone_Southwest_EventScript_RestHouseSign:: @ 823D270
-	msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN
+	msgbox SafariZone_Southwest_Text_RestHouseSign, MSGBOX_SIGN
 	end
 

data/scripts/safari_zone.inc

@@ -1,103 +1,103 @@
-EventScript_2A4B4C:: @ 82A4B4C
+SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
-EventScript_2A4B5D:: @ 82A4B5D
+SafariZone_EventScript_Exit:: @ 82A4B5D
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-EventScript_2A4B6F:: @ 82A4B6F
+SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	lockall
-	msgbox Text_2A4BF4, MSGBOX_YESNO
+	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_2A4B85
+	goto_if_eq SafariZone_EventScript_Retire
 	releaseall
 	end
 
-EventScript_2A4B85:: @ 82A4B85
+SafariZone_EventScript_Retire:: @ 82A4B85
-	goto EventScript_2A4B5D
+	goto SafariZone_EventScript_Exit
 
-EventScript_2A4B8A:: @ 82A4B8A
+SafariZone_EventScript_TimesUp:: @ 82A4B8A
 	lockall
 	playse SE_PINPON
-	message Text_2A4C26
+	message SafariZone_Text_TimesUp
 	waitmessage
 	waitbuttonpress
 	releaseall
-	goto EventScript_2A4B5D
+	goto SafariZone_EventScript_Exit
 
-EventScript_2A4B9B:: @ 82A4B9B
+SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
 	lockall
 	playse SE_PINPON
-	message Text_2A4C56
+	message SafariZone_Text_OutOfBalls
 	waitmessage
 	waitbuttonpress
 	releaseall
-	goto EventScript_2A4B5D
+	goto SafariZone_EventScript_Exit
 
 EventScript_PokeBlockFeeder:: @ 82A4BAC
 	lockall
 	special GetPokeblockFeederInFront
-	compare VAR_RESULT, 65535
+	compare VAR_RESULT, 0xFFFF
-	goto_if_ne EventScript_2A4BEB
+	goto_if_ne SafariZone_EventScript_PokeblockPresent
-	msgbox Text_2A4C90, MSGBOX_YESNO
+	msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_2A4BD0
+	goto_if_eq SafariZone_EventScript_ChoosePokeblock
 	releaseall
 	end
 
-EventScript_2A4BD0:: @ 82A4BD0
+SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
 	fadescreen 1
 	special OpenPokeblockCaseOnFeeder
 	waitstate
-	compare VAR_RESULT, 65535
+	compare VAR_RESULT, 0xFFFF
-	goto_if_ne EventScript_2A4BE2
+	goto_if_ne SafariZone_EventScript_PokeblockPlaced
 	end
 
-EventScript_2A4BE2:: @ 82A4BE2
+SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2
-	message Text_2A4CEB
+	message SafariZone_Text_PokeblockWasPlaced
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-EventScript_2A4BEB:: @ 82A4BEB
+SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB
-	message Text_2A4CC5
+	message SafariZone_Text_PokeblockStillHere
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-Text_2A4BF4: @ 82A4BF4
+SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4
 	.string "Would you like to exit the SAFARI\n"
 	.string "ZONE right now?$"
 
-Text_2A4C26: @ 82A4C26
+SafariZone_Text_TimesUp: @ 82A4C26
 	.string "Ding-dong! Time's up!\n"
 	.string "Your SAFARI Game is over.$"
 
-Text_2A4C56: @ 82A4C56
+SafariZone_Text_OutOfBalls: @ 82A4C56
 	.string "You've run out of SAFARI BALLS.\n"
 	.string "Your SAFARI Game is over.$"
 
-Text_2A4C90: @ 82A4C90
+SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90
 	.string "Would you like to place a {POKEBLOCK}\n"
 	.string "on the {POKEBLOCK} FEEDER?$"
 
-Text_2A4CC5: @ 82A4CC5
+SafariZone_Text_PokeblockStillHere: @ 82A4CC5
 	.string "The {STR_VAR_1} you left\n"
 	.string "before is still here.$"
 
-Text_2A4CEB: @ 82A4CEB
+SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12
+Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "Here, you may witness many kinds of\n"
 	.string "POKéMON rarely seen in HOENN.\p"
@@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12
 	.string "for keeps!\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4E46: @ 82A4E46
+Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46
 	.string "Welcome to the SAFARI ZONE!\n"
 	.string "Is it your first time here?$"
 
-Route121_SafariZoneEntrance_Text_2A4E7E: @ 82A4E7E
+Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1
+Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
 	.string "When you enter the SAFARI ZONE, you\n"
 	.string "start with 30 SAFARI BALLS for\l"
 	.string "catching POKéMON.\p"
@@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1
 	.string "walked 500 steps.\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4F74: @ 82A4F74
+Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "All you can catch for just ¥500!\n"
 	.string "Would you like to play a SAFARI Game?$"
 
-Route121_SafariZoneEntrance_Text_2A4FD7: @ 82A4FD7
+Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7
 	.string "Okay.\n"
 	.string "Please play another time!$"
 
-Route121_SafariZoneEntrance_Text_2A4FF7: @ 82A4FF7
+Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7
 	.string "You don't have enough money.\n"
 	.string "Sorry.$"
 
-Route121_SafariZoneEntrance_Text_2A501B: @ 82A501B
+Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B
 	.string "That will be ¥500, please.$"
 
-Route121_SafariZoneEntrance_Text_2A5036: @ 82A5036
+Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036
 	.string "Here are your SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_2A5052: @ 82A5052
+Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052
 	.string "{PLAYER} received 30 SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_2A506F: @ 82A506F
+Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F
 	.string "We'll let you know when your game\n"
 	.string "is over.\p"
 	.string "So, until then, enjoy yourself, please!\n"
 	.string "Off you go on your wild excursion!$"
 
-Route121_SafariZoneEntrance_Text_2A50E5: @ 82A50E5
+Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5
 	.string "Excuse me!\n"
 	.string "Your PC BOX is full.$"
 
-Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105
+Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
 	.string "Excuse me!\n"
 	.string "You seem to be without a {POKEBLOCK} CASE.\p"
 	.string "Your SAFARI Game will be much more\n"
@@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105
 	.string "You may obtain a {POKEBLOCK} CASE from\n"
 	.string "the LILYCOVE CONTEST HALL.$"
 
-SafariZone_South_Text_2A51D4: @ 82A51D4
+SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4
 	.string "You still have time left. Would you like\n"
 	.string "to exit the SAFARI ZONE now?$"
 
-SafariZone_South_Text_2A521A: @ 82A521A
+SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A
 	.string "Please enjoy the rest of your wild\n"
 	.string "adventure!$"
 
-SafariZone_South_Text_2A5248: @ 82A5248
+SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248
 	.string "Okay.\p"
 	.string "I'll take back your remaining SAFARI\n"
 	.string "BALLS.\p"
 	.string "Thank you for playing.\n"
 	.string "We hope to see you again.$"
 
-SafariZone_South_Text_2A52AB: @ 82A52AB
+SafariZone_South_Text_GoodLuck: @ 82A52AB
 	.string "Good luck!\p"
 	.string "If you need anything, don't hesitate\n"
 	.string "to tell me, please!$"
 
-SafariZone_South_Text_2A52EF: @ 82A52EF
+SafariZone_South_Text_Boy: @ 82A52EF
 	.string "Did you know?\p"
 	.string "If you put a {POKEBLOCK} in that square box,\n"
 	.string "POKéMON gather around.$"
 
-SafariZone_South_Text_2A533B: @ 82A533B
+SafariZone_South_Text_Man: @ 82A533B
 	.string "I want to keep going deeper, but I\n"
 	.string "forgot to bring a BIKE.\p"
 	.string "Something tells me that rare POKéMON\n"
 	.string "live in the outlying areas.$"
 
-SafariZone_Southwest_Text_2A53B7: @ 82A53B7
+SafariZone_Southwest_Text_Woman: @ 82A53B7
 	.string "Sometimes, when I toss a {POKEBLOCK} at \n"
 	.string "POKéMON, it gets ignored.\p"
 	.string "Do POKéMON have likes and dislikes\n"
 	.string "about what they eat?$"
 
-SafariZone_Northwest_Text_2A542C: @ 82A542C
+SafariZone_Northwest_Text_Man: @ 82A542C
 	.string "Gasp… Gasp…\n"
 	.string "I…made it out here…but…\p"
 	.string "I'm exhausted… I don't have the\n"
 	.string "energy to catch POKéMON…$"
 
-SafariZone_North_Text_2A5489: @ 82A5489
+SafariZone_North_Text_Fisherman: @ 82A5489
 	.string "I'm on a mission to find WATER POKéMON\n"
 	.string "you don't see in HOENN.\p"
 	.string "Do you have any idea where the lake is?$"
 
-SafariZone_North_Text_2A54F0: @ 82A54F0
+SafariZone_North_Text_Man: @ 82A54F0
 	.string "I'm going to catch a lot of rare POKéMON\n"
 	.string "here and trade them with my friends!$"
 
-SafariZone_South_Text_2A553E: @ 82A553E
+SafariZone_South_Text_Youngster: @ 82A553E
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
 	.string "I guess POKéMON must have eaten it\n"
 	.string "without me noticing.$"
 
-Route121_SafariZoneEntrance_Text_2A55BB: @ 82A55BB
+Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB
 	.string "SAFARI ZONE TRAINER TIP!\p"
 	.string "Throw {POKEBLOCK}S at wild POKéMON to make\n"
 	.string "them less likely to flee.$"
 
-SafariZone_Southwest_Text_2A5613: @ 82A5613
+SafariZone_Southwest_Text_RestHouseSign: @ 82A5613
 	.string "“Relieve your tired feet.”\n"
 	.string "REST HOUSE$"
 
-SafariZone_RestHouse_Text_2A5639: @ 82A5639
+SafariZone_RestHouse_Text_Youngster: @ 82A5639
 	.string "I don't have any {POKEBLOCK}S, but I caught\n"
 	.string "a good number of POKéMON.\p"
 	.string "You can improve your chances of making\n"
 	.string "a catch by getting closer to them\l"
 	.string "before throwing a SAFARI BALL.$"
 
-SafariZone_RestHouse_Text_2A56E1: @ 82A56E1
+SafariZone_RestHouse_Text_PsychicM: @ 82A56E1
 	.string "If you use {POKEBLOCK}S, wild POKéMON won't\n"
 	.string "be so quick to run away.\p"
 	.string "It's not much use to give {POKEBLOCK}S to\n"
 	.string "POKéMON that don't flee easily.$"
 
-SafariZone_RestHouse_Text_2A5764: @ 82A5764
+SafariZone_RestHouse_Text_FatMan: @ 82A5764
 	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
 	.string "POKéMON are attracted to it.\p"
 	.string "I think POKéMON with the same sort of\n"
 	.string "nature are drawn by a certain {POKEBLOCK}.$"
 
-SafariZone_South_Text_2A57EE: @ 82A57EE
+SafariZone_South_Text_AreaOffLimits1: @ 82A57EE
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_2A582D: @ 82A582D
+SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D
 	.string "The SAFARI ZONE's expansion project\n"
 	.string "is finished now.\p"
 	.string "We hope you will enjoy the new area.$"
 
-SafariZone_South_Text_2A5887: @ 82A5887
+SafariZone_South_Text_AreaOffLimits2: @ 82A5887
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_2A58C6: @ 82A58C6
+SafariZone_Southeast_Text_LittleGirl: @ 82A58C6
 	.string "Wow! Whee! I haven't seen any of\n"
 	.string "these POKéMON before!$"
 
-SafariZone_Southeast_Text_2A58FD: @ 82A58FD
+SafariZone_Southeast_Text_FatMan: @ 82A58FD
 	.string "The POKéMON in this area are all\n"
 	.string "new to me.\p"
 	.string "And I'm allowed to catch these rare\n"
 	.string "POKéMON! Too cool!$"
 
-SafariZone_Southeast_Text_2A5960: @ 82A5960
+SafariZone_Southeast_Text_RichBoy: @ 82A5960
 	.string "The POKéMON around here seem to be\n"
 	.string "from somewhere other than HOENN.$"
 
-SafariZone_Northeast_Text_2A59A4: @ 82A59A4
+SafariZone_Northeast_Text_Boy: @ 82A59A4
 	.string "I only have a couple SAFARI BALLS left.\p"
 	.string "I'm having a hard time trying to\n"
 	.string "decide what I should catch.$"
 
-SafariZone_Northeast_Text_2A5A09: @ 82A5A09
+SafariZone_Northeast_Text_Woman: @ 82A5A09
 	.string "I heard that you can see PIKACHU here.\n"
 	.string "Where might one be?$"
 
-SafariZone_Northeast_Text_2A5A44: @ 82A5A44
+SafariZone_Northeast_Text_Girl: @ 82A5A44
 	.string "Oh, boo!\n"
 	.string "I can't seem to catch anything!\p"
 	.string "I'll end up wasting the admission\n"

include/constants/vars.h

@@ -178,7 +178,7 @@
 #define VAR_UNUSED_0x40A1                    0x40A1 // Unused var
 #define VAR_SEAFLOOR_CAVERN_STATE            0x40A2
 #define VAR_CABLE_CAR_STATION_STATE          0x40A3
-#define VAR_SAFARI_ZONE_STATE                0x40A4
+#define VAR_SAFARI_ZONE_STATE                0x40A4  // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ
 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_1     0x40A5
 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_2     0x40A6
 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_3     0x40A7

src/safari_zone.c

@@ -23,10 +23,10 @@ struct PokeblockFeeder
 
 #define NUM_POKEBLOCK_FEEDERS 10
 
-extern const u8 EventScript_2A4B8A[];
+extern const u8 SafariZone_EventScript_TimesUp[];
-extern const u8 EventScript_2A4B6F[];
+extern const u8 SafariZone_EventScript_RetirePrompt[];
-extern const u8 EventScript_2A4B4C[];
+extern const u8 SafariZone_EventScript_OutOfBallsMidBattle[];
-extern const u8 EventScript_2A4B9B[];
+extern const u8 SafariZone_EventScript_OutOfBalls[];
 
 EWRAM_DATA u8 gNumSafariBalls = 0;
 EWRAM_DATA static u16 sSafariZoneStepCounter = 0;
@@ -83,7 +83,7 @@ bool8 SafariZoneTakeStep(void)
     sSafariZoneStepCounter--;
     if (sSafariZoneStepCounter == 0)
     {
-        ScriptContext1_SetupScript(EventScript_2A4B8A);
+        ScriptContext1_SetupScript(SafariZone_EventScript_TimesUp);
         return TRUE;
     }
     return FALSE;
@@ -91,7 +91,7 @@ bool8 SafariZoneTakeStep(void)
 
 void SafariZoneRetirePrompt(void)
 {
-    ScriptContext1_SetupScript(EventScript_2A4B6F);
+    ScriptContext1_SetupScript(SafariZone_EventScript_RetirePrompt);
 }
 
 void CB2_EndSafariBattle(void)
@@ -105,14 +105,14 @@ void CB2_EndSafariBattle(void)
     }
     else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS)
     {
-        ScriptContext2_RunNewScript(EventScript_2A4B4C);
+        ScriptContext2_RunNewScript(SafariZone_EventScript_OutOfBallsMidBattle);
         WarpIntoMap();
         gFieldCallback = sub_80AF6F0;
         SetMainCallback2(CB2_LoadMap);
     }
     else if (gBattleOutcome == B_OUTCOME_CAUGHT)
     {
-        ScriptContext1_SetupScript(EventScript_2A4B9B);
+        ScriptContext1_SetupScript(SafariZone_EventScript_OutOfBalls);
         ScriptContext1_Stop();
         SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
     }