Add local object event ids for referenced objects
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
.set LOCALID_RIVAL, 16
|
||||
.set LOCALID_RIVAL_ON_BIKE, 25
|
||||
.set LOCALID_SCOTT, 43
|
||||
|
||||
Route119_MapScripts:: @ 81F4424
|
||||
map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
|
||||
@@ -40,7 +44,7 @@ Route119_EventScript_RivalTrigger2:: @ 81F447D
|
||||
|
||||
Route119_EventScript_RivalEncounter:: @ 81F4488
|
||||
lockall
|
||||
addobject 25 @ Rival on bike
|
||||
addobject LOCALID_RIVAL_ON_BIKE
|
||||
checkplayergender
|
||||
compare VAR_RESULT, MALE
|
||||
call_if_eq Route119_EventScript_PlayMayMusic
|
||||
@@ -58,8 +62,8 @@ Route119_EventScript_RivalEncounter:: @ 81F4488
|
||||
call_if_eq Route119_EventScript_SetRivalPos1
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq Route119_EventScript_SetRivalPos2
|
||||
removeobject 25
|
||||
addobject 16 @ Rival on foot
|
||||
removeobject LOCALID_RIVAL_ON_BIKE
|
||||
addobject LOCALID_RIVAL
|
||||
delay 30
|
||||
checkplayergender
|
||||
compare VAR_RESULT, MALE
|
||||
@@ -148,14 +152,14 @@ Route119_EventScript_RivalExitScottArrive:: @ 81F460F
|
||||
call_if_eq Route119_EventScript_SetRivalPos1
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq Route119_EventScript_SetRivalPos2
|
||||
removeobject 16 @ Rival on foot
|
||||
addobject 25 @ Rival on bike
|
||||
removeobject LOCALID_RIVAL
|
||||
addobject LOCALID_RIVAL_ON_BIKE
|
||||
delay 30
|
||||
compare VAR_TEMP_1, 1
|
||||
call_if_eq Route119_EventScript_RivalExit1
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq Route119_EventScript_RivalExit2
|
||||
removeobject 25
|
||||
removeobject LOCALID_RIVAL_ON_BIKE
|
||||
setvar VAR_ROUTE119_STATE, 1
|
||||
savebgm MUS_DUMMY
|
||||
fadedefaultbgm
|
||||
@@ -164,8 +168,8 @@ Route119_EventScript_RivalExitScottArrive:: @ 81F460F
|
||||
call_if_eq Route119_EventScript_SetScottPos1
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq Route119_EventScript_SetScottPos2
|
||||
addobject 43 @ Scott
|
||||
applymovement 43, Route119_Movement_ScottEnter
|
||||
addobject LOCALID_SCOTT
|
||||
applymovement LOCALID_SCOTT, Route119_Movement_ScottEnter
|
||||
waitmovement 0
|
||||
addvar VAR_SCOTT_STATE, 1
|
||||
msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT
|
||||
@@ -174,58 +178,58 @@ Route119_EventScript_RivalExitScottArrive:: @ 81F460F
|
||||
call_if_eq Route119_EventScript_ScottExit1
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq Route119_EventScript_ScottExit2
|
||||
removeobject 43
|
||||
removeobject LOCALID_SCOTT
|
||||
releaseall
|
||||
end
|
||||
|
||||
Route119_EventScript_SetScottPos1:: @ 81F46A0
|
||||
setobjectxyperm 43, 27, 25
|
||||
setobjectxyperm LOCALID_SCOTT, 27, 25
|
||||
return
|
||||
|
||||
Route119_EventScript_SetScottPos2:: @ 81F46A8
|
||||
setobjectxyperm 43, 28, 25
|
||||
setobjectxyperm LOCALID_SCOTT, 28, 25
|
||||
return
|
||||
|
||||
Route119_EventScript_ScottExit1:: @ 81F46B0
|
||||
applymovement 43, Route119_Movement_ScottExit1
|
||||
applymovement LOCALID_SCOTT, Route119_Movement_ScottExit1
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_ScottExit2:: @ 81F46BB
|
||||
applymovement 43, Route119_Movement_ScottExit2
|
||||
applymovement LOCALID_SCOTT, Route119_Movement_ScottExit2
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_RivalEnter1:: @ 81F46C6
|
||||
applymovement 25, Route119_Movement_RivalEnter1
|
||||
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_RivalEnter2:: @ 81F46D1
|
||||
applymovement 25, Route119_Movement_RivalEnter2
|
||||
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_RivalExit1:: @ 81F46DC
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1
|
||||
applymovement 25, Route119_Movement_RivalExit1
|
||||
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit1
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_RivalExit2:: @ 81F46EE
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2
|
||||
applymovement 25, Route119_Movement_RivalExit2
|
||||
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit2
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
Route119_EventScript_SetRivalPos1:: @ 81F4700
|
||||
setobjectxyperm 16, 25, 32
|
||||
setobjectxyperm 25, 25, 32
|
||||
setobjectxyperm LOCALID_RIVAL, 25, 32
|
||||
setobjectxyperm LOCALID_RIVAL_ON_BIKE, 25, 32
|
||||
return
|
||||
|
||||
Route119_EventScript_SetRivalPos2:: @ 81F470F
|
||||
setobjectxyperm 16, 26, 32
|
||||
setobjectxyperm 25, 26, 32
|
||||
setobjectxyperm LOCALID_RIVAL, 26, 32
|
||||
setobjectxyperm LOCALID_RIVAL_ON_BIKE, 26, 32
|
||||
return
|
||||
|
||||
Route119_Movement_PlayerWatchRivalExit1: @ 81F471E
|
||||
|
||||
Reference in New Issue
Block a user