Continue adding local IDs to map.json files

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

View File

@@ -1,7 +1,3 @@
.set LOCALID_RIVAL, 16
.set LOCALID_RIVAL_ON_BIKE, 25
.set LOCALID_SCOTT, 43
Route119_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
@@ -42,7 +38,7 @@ Route119_EventScript_RivalTrigger2::
Route119_EventScript_RivalEncounter::
lockall
addobject LOCALID_RIVAL_ON_BIKE
addobject LOCALID_ROUTE119_RIVAL_ON_BIKE
checkplayergender
call_if_eq VAR_RESULT, MALE, Route119_EventScript_PlayMayMusic
call_if_eq VAR_RESULT, FEMALE, Route119_EventScript_PlayBrendanMusic
@@ -54,8 +50,8 @@ Route119_EventScript_RivalEncounter::
delay 30
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2
removeobject LOCALID_RIVAL_ON_BIKE
addobject LOCALID_RIVAL
removeobject LOCALID_ROUTE119_RIVAL_ON_BIKE
addobject LOCALID_ROUTE119_RIVAL
delay 30
checkplayergender
goto_if_eq VAR_RESULT, MALE, Route119_EventScript_BattleMay
@@ -140,78 +136,78 @@ Route119_EventScript_RivalExitScottArrive::
closemessage
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2
removeobject LOCALID_RIVAL
addobject LOCALID_RIVAL_ON_BIKE
removeobject LOCALID_ROUTE119_RIVAL
addobject LOCALID_ROUTE119_RIVAL_ON_BIKE
delay 30
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_RivalExit1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_RivalExit2
removeobject LOCALID_RIVAL_ON_BIKE
removeobject LOCALID_ROUTE119_RIVAL_ON_BIKE
setvar VAR_ROUTE119_STATE, 1
savebgm MUS_DUMMY
fadedefaultbgm
delay 60
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetScottPos1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetScottPos2
addobject LOCALID_SCOTT
applymovement LOCALID_SCOTT, Route119_Movement_ScottEnter
addobject LOCALID_ROUTE119_SCOTT
applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottEnter
waitmovement 0
addvar VAR_SCOTT_STATE, 1
msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT
closemessage
call_if_eq VAR_TEMP_1, 1, Route119_EventScript_ScottExit1
call_if_eq VAR_TEMP_1, 2, Route119_EventScript_ScottExit2
removeobject LOCALID_SCOTT
removeobject LOCALID_ROUTE119_SCOTT
releaseall
end
Route119_EventScript_SetScottPos1::
setobjectxyperm LOCALID_SCOTT, 27, 25
setobjectxyperm LOCALID_ROUTE119_SCOTT, 27, 25
return
Route119_EventScript_SetScottPos2::
setobjectxyperm LOCALID_SCOTT, 28, 25
setobjectxyperm LOCALID_ROUTE119_SCOTT, 28, 25
return
Route119_EventScript_ScottExit1::
applymovement LOCALID_SCOTT, Route119_Movement_ScottExit1
applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit1
waitmovement 0
return
Route119_EventScript_ScottExit2::
applymovement LOCALID_SCOTT, Route119_Movement_ScottExit2
applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit2
waitmovement 0
return
Route119_EventScript_RivalEnter1::
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1
applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1
waitmovement 0
return
Route119_EventScript_RivalEnter2::
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2
applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2
waitmovement 0
return
Route119_EventScript_RivalExit1::
applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit1
applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalExit1
waitmovement 0
return
Route119_EventScript_RivalExit2::
applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2
applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit2
applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalExit2
waitmovement 0
return
Route119_EventScript_SetRivalPos1::
setobjectxyperm LOCALID_RIVAL, 25, 32
setobjectxyperm LOCALID_RIVAL_ON_BIKE, 25, 32
setobjectxyperm LOCALID_ROUTE119_RIVAL, 25, 32
setobjectxyperm LOCALID_ROUTE119_RIVAL_ON_BIKE, 25, 32
return
Route119_EventScript_SetRivalPos2::
setobjectxyperm LOCALID_RIVAL, 26, 32
setobjectxyperm LOCALID_RIVAL_ON_BIKE, 26, 32
setobjectxyperm LOCALID_ROUTE119_RIVAL, 26, 32
setobjectxyperm LOCALID_ROUTE119_RIVAL_ON_BIKE, 26, 32
return
Route119_Movement_PlayerWatchRivalExit1: