summaryrefslogtreecommitdiff
path: root/data/maps/Route109/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route109/scripts.inc')
-rw-r--r--data/maps/Route109/scripts.inc27
1 files changed, 15 insertions, 12 deletions
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index 39fa352e4..26da7f2b5 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -1,13 +1,16 @@
+@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
+@ These are labeled in DewfordTown/scripts.inc
+
Route109_MapScripts:: @ 81EE75F
.byte 0
Route109_EventScript_StartDepartForDewford:: @ 81EE760
call EventScript_BackupMrBrineyLocation
- setobjectpriority 2, MAP_ROUTE109, 0
+ setobjectpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0
- applymovement 2, Route109_Movement_BrineyEnterBoat
+ applymovement LOCALID_BRINEY_R109, Route109_Movement_BrineyEnterBoat
waitmovement 0
- removeobject 2
+ removeobject LOCALID_BRINEY_R109
switch VAR_FACING
case DIR_SOUTH, Route109_EventScript_EnterBoatSouth
case DIR_WEST, Route109_EventScript_EnterBoatWest
@@ -35,7 +38,7 @@ Route109_EventScript_EnterBoatWest:: @ 81EE7C5
Route109_EventScript_DoSailToDewford:: @ 81EE7D5
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
call Common_EventScript_PlayBrineysBoatMusic
- applymovement 1, Route109_Movement_SailToDewford
+ applymovement LOCALID_BOAT_R109, Route109_Movement_SailToDewford
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_SailToDewford
waitmovement 0
delay 50
@@ -43,22 +46,22 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5
showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerExitBoat
waitmovement 0
- addobject 4
+ addobject LOCALID_BOAT_DEWFORD
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
- setobjectxyperm 2, 12, 8
- addobject 2
- setobjectpriority 2, MAP_DEWFORD_TOWN, 0
- applymovement 2, Route109_Movement_BrineyExitBoat
+ setobjectxyperm LOCALID_BRINEY_DEWFORD, 12, 8
+ addobject LOCALID_BRINEY_DEWFORD
+ setobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
+ applymovement LOCALID_BRINEY_DEWFORD, Route109_Movement_BrineyExitBoat
waitmovement 0
clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
- hideobjectat 1, MAP_ROUTE109
+ hideobjectat LOCALID_BOAT_R109, MAP_ROUTE109
msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
- resetobjectpriority 2, MAP_DEWFORD_TOWN
- copyobjectxytoperm 2
+ resetobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN
+ copyobjectxytoperm LOCALID_BRINEY_DEWFORD
release
end