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,5 @@
.set LOCALID_WALLACE, 1
SkyPillar_Outside_MapScripts:: @ 82392A8
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition
map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad
@@ -34,7 +36,7 @@ SkyPillar_Outside_OnFrame: @ 82392FA
SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
lockall
applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer
applymovement LOCALID_WALLACE, SkyPillar_Outside_Movement_WallaceApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
@@ -51,7 +53,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar
applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar
applymovement LOCALID_WALLACE, SkyPillar_Outside_Movement_WallaceClimbSkyPillar
waitmovement 0
setvar VAR_0x8004, 1 @ vertical pan
setvar VAR_0x8005, 3 @ horizontal pan
@@ -60,13 +62,13 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
special ShakeCamera
waitstate
delay 20
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 10
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 20
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
delay 30
msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
@@ -83,7 +85,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
fadescreenswapbuffers FADE_TO_BLACK
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SOOTOPOLIS_CITY_STATE, 4
removeobject 1
removeobject LOCALID_WALLACE
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
fadescreenswapbuffers FADE_FROM_BLACK
releaseall