Merge branch 'master' into slot_machine

10 files changed, 16 insertions, 16 deletions

diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 1d3fc4db6..f00cd73f2 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -90,7 +90,7 @@ EventScript_1652C0:: @ 81652C0
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	setvar VAR_0x8005, 30
 	setvar VAR_0x8006, 0
-	special sub_8044838
+	special CreateObedientEnemyMon
 	setflag FLAG_0x807
 	special sub_807F9D8
 	waitstate
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index bac115e76..490afe501 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -113,7 +113,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
 
 EventScript_1640A2:: @ 81640A2
 	getplayerxy VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, player_get_direction_lower_nybble
+	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare_var_to_value VAR_RESULT, 2
 	call_if 1, EventScript_16412E
 	msgbox gUnknown_817B7AE
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
index a2ee86113..d9bcea13d 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
@@ -17,7 +17,7 @@ EventScript_16D2C8:: @ 816D2C8
 	closemessage
 	applymovement 255, Movement_16D367
 	waitmovement 0
-	special sub_80A0EEC
+	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
 	releaseall
 	end
@@ -29,7 +29,7 @@ EventScript_16D2F2:: @ 816D2F2
 	closemessage
 	applymovement 255, Movement_16D362
 	waitmovement 0
-	special sub_80A0EEC
+	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
 	releaseall
 	end
@@ -44,7 +44,7 @@ EventScript_16D312:: @ 816D312
 	closemessage
 	applymovement 255, Movement_16D362
 	waitmovement 0
-	special sub_80A0EEC
+	special ExitSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
 	releaseall
 	end
@@ -132,7 +132,7 @@ EventScript_16D3CA:: @ 816D3CA
 	call_if 1, EventScript_16D441
 	compare_var_to_value VAR_0x4002, 2
 	call_if 1, EventScript_16D457
-	special sub_80A0EC4
+	special EnterSafariMode
 	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
 	warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
 	waitstate
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index 34cca4e9b..8818c1d01 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -63,7 +63,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
 	setvar VAR_0x8004, SPECIES_LUGIA
 	setvar VAR_0x8005, 70
 	setvar VAR_0x8006, 0
-	special sub_8044838
+	special CreateObedientEnemyMon
 	setflag FLAG_0x807
 	special sub_807F9D8
 	waitstate
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index cb82149e8..d359d4d25 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -67,7 +67,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	setvar VAR_0x8004, SPECIES_HO_OH
 	setvar VAR_0x8005, 70
 	setvar VAR_0x8006, 0
-	special sub_8044838
+	special CreateObedientEnemyMon
 	setflag FLAG_0x807
 	special sub_807F9D8
 	waitstate
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index 5707c9938..cbcdba4e9 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -118,7 +118,7 @@ EventScript_17064A:: @ 817064A
 	setflag FLAG_0x235
 	setflag FLAG_0x031
 	setflag FLAG_0x234
-	setflag FLAG_0x834
+	setflag FLAG_SYS_NOT_SOMEONES_PC
 	goto EventScript_170640
 	end
 
diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc
index 0d08a0152..b0112c459 100644
--- a/data/maps/SSAnne_Exterior/scripts.inc
+++ b/data/maps/SSAnne_Exterior/scripts.inc
@@ -20,13 +20,13 @@ SSAnne_Exterior_160859:: @ 8160859
 	call_if 4, EventScript_1608AC
 	fadenewbgm BGM_FRLG_SURF
 	delay 50
-	special sub_815D334
+	special Special_SSAnneDepartureCutscene
 	waitstate
 	removeobject 1
 	applymovement 255, Movement_1608B7
 	waitmovement 0
 	setvar VAR_MAP_SCENE_VERMILION_CITY, 2
-	setvar VAR_0x4053, 0
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
 	warp MAP_VERMILION_CITY, 255, 23, 34
 	waitstate
 	releaseall
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
index 0b6b930c7..5acb601dc 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -223,7 +223,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
 	lockall
 	fadescreen 1
 	setvar VAR_0x8004, 1
-	special sub_80CD228
+	special Special_BattleRecords
 	waitstate
 	releaseall
 	end
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index 30efc81c4..d041e9157 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -207,7 +207,7 @@
       "x": 22,
       "y": 33,
       "elevation": 0,
-      "var": "VAR_0x4053",
+      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
       "var_value": 0,
       "script": "VermilionCity_EventScript_166B8A"
     },
@@ -216,7 +216,7 @@
       "x": 23,
       "y": 33,
       "elevation": 0,
-      "var": "VAR_0x4053",
+      "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
       "var_value": 0,
       "script": "VermilionCity_EventScript_166B91"
     },
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index 1f476abf3..c809fd7bd 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -200,7 +200,7 @@ VermilionCity_EventScript_166B91:: @ 8166B91
 
 VermilionCity_EventScript_166B98:: @ 8166B98
 	lockall
-	setvar VAR_0x4053, 0
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
 	releaseall
 	end
 
@@ -215,7 +215,7 @@ EventScript_166BA0:: @ 8166BA0
 	checkflag FLAG_0x234
 	goto_if 0, EventScript_166BDE
 	msgbox gUnknown_817FA77
-	setvar VAR_0x4053, 1
+	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
 	releaseall
 	end