Add local object event ids for referenced objects

This commit is contained in:
GriffinR
2020-06-21 01:56:57 -04:00
parent 46f4a4bbf7
commit fac6288156
192 changed files with 2857 additions and 2205 deletions

View File

@@ -1,3 +1,24 @@
.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
SlateportCity_MapScripts:: @ 81DCC61
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
@@ -19,20 +40,20 @@ SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
return
SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99
setobjectxyperm 11, 28, 13
setobjectxyperm 7, 25, 13
setobjectxyperm 3, 25, 14
setobjectxyperm 6, 27, 16
setobjectxyperm 8, 28, 16
setobjectxyperm 1, 29, 16
setobjectxyperm 2, 31, 14
setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT
setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
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
return
SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
@@ -40,13 +61,13 @@ SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 30
goto_if_eq SlateportCity_EventScript_MoveScottLeft
setobjectxyperm 35, 23, 27
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_SCOTT, 23, 27
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
return
SlateportCity_EventScript_MoveScottLeft:: @ 81DCD06
setobjectxyperm 35, 22, 27
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_SCOTT, 22, 27
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
return
SlateportCity_OnFrame: @ 81DCD12
@@ -55,17 +76,17 @@ SlateportCity_OnFrame: @ 81DCD12
SlateportCity_EventScript_ScottScene:: @ 81DCD1C
lockall
addobject 35
addobject LOCALID_SCOTT
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
applymovement 35, SlateportCity_Movement_ScottApproachPlayer
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottApproachPlayer
waitmovement 0
msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT
closemessage
applymovement 35, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 60
msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT
applymovement 35, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT
closemessage
@@ -78,11 +99,11 @@ SlateportCity_EventScript_ScottScene:: @ 81DCD1C
setflag FLAG_ENABLE_SCOTT_MATCH_CALL
msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT
closemessage
applymovement 35, SlateportCity_Movement_ScottExit
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExit
waitmovement 0
removeobject 35
setobjectxyperm 35, 10, 12
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
removeobject LOCALID_SCOTT
setobjectxyperm LOCALID_SCOTT, 10, 12
setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_SCOTT_STATE, 1
@@ -360,7 +381,7 @@ SlateportCity_EventScript_AquaGrunt1:: @ 81DD009
faceplayer
msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT
closemessage
applymovement 5, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -370,7 +391,7 @@ SlateportCity_EventScript_AquaGrunt2:: @ 81DD020
faceplayer
msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT
closemessage
applymovement 18, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -380,7 +401,7 @@ SlateportCity_EventScript_AquaGrunt3:: @ 81DD037
faceplayer
msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT
closemessage
applymovement 19, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_3, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -390,7 +411,7 @@ SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E
faceplayer
msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT
closemessage
applymovement 26, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_4, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -400,7 +421,7 @@ SlateportCity_EventScript_AquaGrunt5:: @ 81DD065
faceplayer
msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT
closemessage
applymovement 27, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_5, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -410,7 +431,7 @@ SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C
faceplayer
msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT
closemessage
applymovement 28, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_6, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -420,7 +441,7 @@ SlateportCity_EventScript_AquaGrunt7:: @ 81DD093
faceplayer
msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT
closemessage
applymovement 29, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -430,7 +451,7 @@ SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA
faceplayer
msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT
closemessage
applymovement 30, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_8, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -439,31 +460,31 @@ SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1
lock
faceplayer
playse SE_PIN
applymovement 31, Common_Movement_ExclamationMark
applymovement LOCALID_GRUNT_9, Common_Movement_ExclamationMark
waitmovement 0
applymovement 31, Common_Movement_Delay48
applymovement LOCALID_GRUNT_9, Common_Movement_Delay48
waitmovement 0
msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT
closemessage
applymovement 31, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
applymovement 31, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
applymovement 31, Common_Movement_FacePlayer
applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer
waitmovement 0
msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT
closemessage
applymovement 31, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
applymovement 31, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT
closemessage
applymovement 31, Common_Movement_FacePlayer
applymovement LOCALID_GRUNT_9, Common_Movement_FacePlayer
waitmovement 0
applymovement 31, SlateportCity_Movement_DelayAquaGrunt
applymovement LOCALID_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt
waitmovement 0
applymovement 31, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_9, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -482,7 +503,7 @@ SlateportCity_EventScript_AquaGrunt11:: @ 81DD153
faceplayer
msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT
closemessage
applymovement 33, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT_11, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -565,48 +586,48 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8
msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT
msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT
closemessage
applymovement 10, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_GABBY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 10
applymovement 9, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_TY, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
delay 25
applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit
applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
applymovement 10, SlateportCity_Movement_GabbyExit
applymovement 9, SlateportCity_Movement_TyExit
applymovement LOCALID_GABBY, SlateportCity_Movement_GabbyExit
applymovement LOCALID_TY, SlateportCity_Movement_TyExit
waitmovement 0
removeobject 10
removeobject 9
removeobject LOCALID_GABBY
removeobject LOCALID_TY
msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT
applymovement 11, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT
playbgm MUS_AQA_0, 0
msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement 7, SlateportCity_Movement_OldWomanConcern
applymovement 3, Common_Movement_QuestionMark
applymovement 2, SlateportCity_Movement_ManConcern
applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_OLD_WOMAN, SlateportCity_Movement_OldWomanConcern
applymovement LOCALID_RICH_BOY, Common_Movement_QuestionMark
applymovement LOCALID_MAN_1, SlateportCity_Movement_ManConcern
waitmovement 0
applymovement 11, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT
playse SE_PIN
applymovement 11, Common_Movement_ExclamationMark
applymovement LOCALID_CAPT_STERN, Common_Movement_ExclamationMark
waitmovement 0
applymovement 11, Common_Movement_Delay48
applymovement LOCALID_CAPT_STERN, Common_Movement_Delay48
waitmovement 0
applymovement 11, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT
msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
closemessage
applymovement 11, SlateportCity_Movement_SternEnterHarbor
applymovement LOCALID_CAPT_STERN, SlateportCity_Movement_SternEnterHarbor
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
waitmovement 0
removeobject 11
removeobject LOCALID_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
@@ -891,18 +912,18 @@ SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
waitmovement 0
opendoor 10, 12
waitdooranim
addobject 35
addobject LOCALID_SCOTT
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
applymovement 35, SlateportCity_Movement_ScottExitBattleTent
applymovement LOCALID_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 35, SlateportCity_Movement_ScottExitAfterBattleTent
applymovement LOCALID_SCOTT, SlateportCity_Movement_ScottExitAfterBattleTent
waitmovement 0
removeobject 35
removeobject LOCALID_SCOTT
addvar VAR_SCOTT_STATE, 1
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
releaseall