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_RIVAL, 2
Route103_MapScripts:: @ 81EC38E
map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route103_OnLoad
@@ -30,11 +32,11 @@ Route103_EventScript_RivalMay:: @ 81EC3DA
msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT
closemessage
playbgm MUS_GIRL_SUP, 1
applymovement 2, Common_Movement_FacePlayer
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
waitmovement 0
applymovement 2, Common_Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement 2, Common_Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox Route103_Text_MayLetsBattle, MSGBOX_DEFAULT
switch VAR_STARTER_MON
@@ -47,11 +49,11 @@ Route103_EventScript_RivalBrendan:: @ 81EC434
msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT
closemessage
playbgm MUS_BOY_SUP, 1
applymovement 2, Common_Movement_FacePlayer
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
waitmovement 0
applymovement 2, Common_Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement 2, Common_Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox Route103_Text_BrendanLetsBattle, MSGBOX_DEFAULT
switch VAR_STARTER_MON
@@ -111,35 +113,35 @@ Route103_EventScript_RivalExit:: @ 81EC50A
Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D
applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth
applymovement 2, Route103_Movement_RivalExitFacingNorth1
applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1
waitmovement 0
playse SE_DANSA
applymovement 2, Route103_EventScript_RivalExitFacingNorth2
applymovement LOCALID_RIVAL, Route103_EventScript_RivalExitFacingNorth2
waitmovement 0
goto Route103_EventScript_RivalEnd
end
Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest
applymovement 2, Route103_Movement_RivalExit1
applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
waitmovement 0
playse SE_DANSA
applymovement 2, Route103_Movement_RivalExit2
applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2
waitmovement 0
goto Route103_EventScript_RivalEnd
end
Route103_EventScript_RivalExitFacingSouth:: @ 81EC585
applymovement 2, Route103_Movement_RivalExit1
applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
waitmovement 0
playse SE_DANSA
applymovement 2, Route103_Movement_RivalExit2
applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2
waitmovement 0
goto Route103_EventScript_RivalEnd
end
Route103_EventScript_RivalEnd:: @ 81EC5A2
removeobject 2
removeobject LOCALID_RIVAL
setvar VAR_BIRCH_LAB_STATE, 4
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
setflag FLAG_DEFEATED_RIVAL_ROUTE103