summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalCorridor/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SSTidalCorridor/scripts.inc')
-rw-r--r--data/maps/SSTidalCorridor/scripts.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index fae6efc1a..a055c6548 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,3 +1,6 @@
+.set LOCALID_SAILOR, 1
+.set LOCALID_SCOTT, 5
+
SSTidalCorridor_MapScripts:: @ 823BFCF
map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
.byte 0
@@ -191,20 +194,20 @@ SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
SSTidalCorridor_EventScript_ScottScene:: @ 823C219
lockall
- applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer
+ applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit
- applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott
- applymovement 5, SSTidalCorridor_Movement_ScottExit
+ applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott
+ applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottExit
waitmovement 0
playse SE_KAIDAN
waitse
- removeobject 5
- applymovement 1, SSTidalCorridor_Movement_SailorReturn
+ removeobject LOCALID_SCOTT
+ applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorReturn
waitmovement 0
delay 30
setflag FLAG_MET_SCOTT_ON_SS_TIDAL