dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding local IDs to map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/maps/SlateportCity/map.json
View File

@@ -31,6 +31,7 @@
],
"object_events": [
{
"local_id": "LOCALID_SLATEPORT_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 21,
"y": 11,
@@ -44,6 +45,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_MAN_1",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 34,
"y": 29,
@@ -57,6 +59,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 5,
"y": 13,
@@ -83,6 +86,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_1",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 31,
"y": 27,
@@ -96,6 +100,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_COOK",
"graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 5,
"y": 43,
@@ -109,6 +114,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 20,
"y": 37,
@@ -122,6 +128,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_GIRL",
"graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 8,
"y": 42,
@@ -135,6 +142,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_TY",
"graphics_id": "OBJ_EVENT_GFX_CAMERAMAN",
"x": 29,
"y": 13,
@@ -148,6 +156,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
},
{
"local_id": "LOCALID_SLATEPORT_GABBY",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_F",
"x": 28,
"y": 14,
@@ -161,6 +170,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
},
{
"local_id": "LOCALID_SLATEPORT_CAPT_STERN",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 28,
"y": 13,
@@ -252,6 +262,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_2",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 30,
"y": 27,
@@ -265,6 +276,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_3",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 29,
"y": 27,
@@ -357,6 +369,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_4",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 22,
"y": 27,
@@ -370,6 +383,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_5",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23,
"y": 27,
@@ -383,6 +397,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_6",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 24,
"y": 27,
@@ -396,6 +411,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_7",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 21,
"y": 26,
@@ -409,6 +425,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_8",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 20,
"y": 26,
@@ -422,6 +439,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_9",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 26,
"y": 27,
@@ -448,6 +466,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"local_id": "LOCALID_SLATEPORT_GRUNT_11",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 25,
"y": 27,
@@ -474,6 +493,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SLATEPORT_SCOTT",
"graphics_id": "OBJ_EVENT_GFX_SCOTT",
"x": 10,
"y": 12,

159
data/maps/SlateportCity/scripts.inc
View File

@@ -1,26 +1,3 @@
.set LOCALID_FAT_MAN, 1
.set LOCALID_MAN_1, 2
.set LOCALID_RICH_BOY, 3
.set LOCALID_GRUNT_1, 5
.set LOCALID_COOK, 6
.set LOCALID_OLD_WOMAN, 7
.set LOCALID_GIRL, 8
.set LOCALID_TY, 9
.set LOCALID_GABBY, 10
.set LOCALID_CAPT_STERN, 11
.set LOCALID_GRUNT_2, 18
.set LOCALID_GRUNT_3, 19
.set LOCALID_GRUNT_4, 26
.set LOCALID_GRUNT_5, 27
.set LOCALID_GRUNT_6, 28
.set LOCALID_GRUNT_7, 29
.set LOCALID_GRUNT_8, 30
.set LOCALID_GRUNT_9, 31
.set LOCALID_GRUNT_11, 33
.set LOCALID_SCOTT, 35
@ Note: LOCALID_SLATEPORT_ENERGY_GURU is a local id for this map used elsewhere. It's defined in event_objects.h
SlateportCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
@@ -40,33 +17,33 @@ SlateportCity_EventScript_EnterSlateport::
return
SlateportCity_EventScript_MovePeopleForSternInterview::
setobjectxyperm LOCALID_CAPT_STERN, 28, 13
setobjectxyperm LOCALID_OLD_WOMAN, 25, 13
setobjectxyperm LOCALID_RICH_BOY, 25, 14
setobjectxyperm LOCALID_COOK, 27, 16
setobjectxyperm LOCALID_GIRL, 28, 16
setobjectxyperm LOCALID_FAT_MAN, 29, 16
setobjectxyperm LOCALID_MAN_1, 31, 14
setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
setobjectmovementtype LOCALID_RICH_BOY, MOVEMENT_TYPE_FACE_UP_AND_RIGHT
setobjectmovementtype LOCALID_COOK, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_GIRL, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_FAT_MAN, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_MAN_1, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_SLATEPORT_CAPT_STERN, 28, 13
setobjectxyperm LOCALID_SLATEPORT_OLD_WOMAN, 25, 13
setobjectxyperm LOCALID_SLATEPORT_RICH_BOY, 25, 14
setobjectxyperm LOCALID_SLATEPORT_COOK, 27, 16
setobjectxyperm LOCALID_SLATEPORT_GIRL, 28, 16
setobjectxyperm LOCALID_SLATEPORT_FAT_MAN, 29, 16
setobjectxyperm LOCALID_SLATEPORT_MAN_1, 31, 14
setobjectmovementtype LOCALID_SLATEPORT_CAPT_STERN, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_SLATEPORT_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
setobjectmovementtype LOCALID_SLATEPORT_RICH_BOY, MOVEMENT_TYPE_FACE_UP_AND_RIGHT
setobjectmovementtype LOCALID_SLATEPORT_COOK, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_SLATEPORT_GIRL, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_SLATEPORT_FAT_MAN, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_SLATEPORT_MAN_1, MOVEMENT_TYPE_FACE_LEFT
return
SlateportCity_EventScript_SetReadyForScottScene::
setflag FLAG_HIDE_MAP_NAME_POPUP
getplayerxy VAR_0x8004, VAR_0x8005
goto_if_eq VAR_0x8004, 30, SlateportCity_EventScript_MoveScottLeft
setobjectxyperm LOCALID_SCOTT, 23, 27
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_SLATEPORT_SCOTT, 23, 27
setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
return
SlateportCity_EventScript_MoveScottLeft::
setobjectxyperm LOCALID_SCOTT, 22, 27
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_SLATEPORT_SCOTT, 22, 27
setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
return
SlateportCity_OnFrame:
@@ -75,17 +52,17 @@ SlateportCity_OnFrame:
SlateportCity_EventScript_ScottScene::
lockall
addobject LOCALID_SCOTT
addobject LOCALID_SLATEPORT_SCOTT
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottApproachPlayer
applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottApproachPlayer
waitmovement 0
msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 60
msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT
closemessage
@@ -98,11 +75,11 @@ SlateportCity_EventScript_ScottScene::
setflag FLAG_ENABLE_SCOTT_MATCH_CALL
msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExit
applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExit
waitmovement 0
removeobject LOCALID_SCOTT
setobjectxyperm LOCALID_SCOTT, 10, 12
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_DOWN
removeobject LOCALID_SLATEPORT_SCOTT
setobjectxyperm LOCALID_SLATEPORT_SCOTT, 10, 12
setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_SCOTT_STATE, 1
@@ -372,7 +349,7 @@ SlateportCity_EventScript_AquaGrunt1::
faceplayer
msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_1, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -382,7 +359,7 @@ SlateportCity_EventScript_AquaGrunt2::
faceplayer
msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_2, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -392,7 +369,7 @@ SlateportCity_EventScript_AquaGrunt3::
faceplayer
msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_3, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_3, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -402,7 +379,7 @@ SlateportCity_EventScript_AquaGrunt4::
faceplayer
msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_4, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_4, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -412,7 +389,7 @@ SlateportCity_EventScript_AquaGrunt5::
faceplayer
msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_5, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_5, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -422,7 +399,7 @@ SlateportCity_EventScript_AquaGrunt6::
faceplayer
msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_6, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_6, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -432,7 +409,7 @@ SlateportCity_EventScript_AquaGrunt7::
faceplayer
msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_7, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -442,7 +419,7 @@ SlateportCity_EventScript_AquaGrunt8::
faceplayer
msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_8, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_8, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -451,31 +428,31 @@ SlateportCity_EventScript_AquaGrunt9::
lock
faceplayer
playse SE_PIN
applymovement LOCALID_GRUNT_9, Common_Movement_ExclamationMark
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_GRUNT_9, Common_Movement_Delay48
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_Delay48
waitmovement 0
msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer
waitmovement 0
msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer
waitmovement 0
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -494,7 +471,7 @@ SlateportCity_EventScript_AquaGrunt11::
faceplayer
msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT_11, Common_Movement_FaceOriginalDirection
applymovement LOCALID_SLATEPORT_GRUNT_11, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -578,48 +555,48 @@ SlateportCity_EventScript_CaptStern::
msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT
msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GABBY, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_SLATEPORT_GABBY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 10
applymovement LOCALID_TY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_SLATEPORT_TY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 25
applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit
applymovement LOCALID_SLATEPORT_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
applymovement LOCALID_GABBY, SlateportCity_Movement_GabbyExit
applymovement LOCALID_TY, SlateportCity_Movement_TyExit
applymovement LOCALID_SLATEPORT_GABBY, SlateportCity_Movement_GabbyExit
applymovement LOCALID_SLATEPORT_TY, SlateportCity_Movement_TyExit
waitmovement 0
removeobject LOCALID_GABBY
removeobject LOCALID_TY
removeobject LOCALID_SLATEPORT_GABBY
removeobject LOCALID_SLATEPORT_TY
msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT
playbgm MUS_ENCOUNTER_AQUA, FALSE
msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT
applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_OLD_WOMAN, SlateportCity_Movement_OldWomanConcern
applymovement LOCALID_RICH_BOY, Common_Movement_QuestionMark
applymovement LOCALID_MAN_1, SlateportCity_Movement_ManConcern
applymovement LOCALID_SLATEPORT_COOK, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SLATEPORT_FAT_MAN, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SLATEPORT_OLD_WOMAN, SlateportCity_Movement_OldWomanConcern
applymovement LOCALID_SLATEPORT_RICH_BOY, Common_Movement_QuestionMark
applymovement LOCALID_SLATEPORT_MAN_1, SlateportCity_Movement_ManConcern
waitmovement 0
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT
playse SE_PIN
applymovement LOCALID_CAPT_STERN, Common_Movement_ExclamationMark
applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_CAPT_STERN, Common_Movement_Delay48
applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT
msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternEnterHarbor
applymovement LOCALID_SLATEPORT_CAPT_STERN, SlateportCity_Movement_SternEnterHarbor
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
waitmovement 0
removeobject LOCALID_CAPT_STERN
removeobject LOCALID_SLATEPORT_CAPT_STERN
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
@@ -899,18 +876,18 @@ SlateportCity_EventScript_ScottBattleTentScene::
waitmovement 0
opendoor 10, 12
waitdooranim
addobject LOCALID_SCOTT
addobject LOCALID_SLATEPORT_SCOTT
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExitBattleTent
applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExitBattleTent
waitmovement 0
closedoor 10, 12
waitdooranim
msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExitAfterBattleTent
applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExitAfterBattleTent
waitmovement 0
removeobject LOCALID_SCOTT
removeobject LOCALID_SLATEPORT_SCOTT
addvar VAR_SCOTT_STATE, 1
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
releaseall