diff options
Diffstat (limited to 'data/maps/SeafloorCavern_Entrance/scripts.inc')
| -rw-r--r-- | data/maps/SeafloorCavern_Entrance/scripts.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index b9ff722e6..20f731044 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_GRUNT, 1 + SeafloorCavern_Entrance_MapScripts:: @ 823446E map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume .byte 0 @@ -13,9 +15,9 @@ SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort waitse playse SE_PIN - applymovement 1, Common_Movement_ExclamationMark + applymovement LOCALID_GRUNT, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Common_Movement_Delay48 + applymovement LOCALID_GRUNT, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, DIR_WEST @@ -26,10 +28,10 @@ SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485 call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth delay 30 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 - copyobjectxytoperm 1 + copyobjectxytoperm LOCALID_GRUNT msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -43,23 +45,23 @@ SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: @ 8234523 - applymovement 1, Common_Movement_WalkInPlaceFastestLeft + applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: @ 823452E - applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: @ 8234539 - applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return |