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,5 +1,3 @@
.set LOCALID_LATI, 2
SouthernIsland_Interior_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition
@@ -12,7 +10,7 @@ SouthernIsland_Interior_OnResume:
SouthernIsland_Interior_EventScript_TryRemoveLati::
specialvar VAR_RESULT, GetBattleOutcome
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
removeobject LOCALID_LATI
removeobject LOCALID_SOUTHERN_ISLAND_LATI
return
SouthernIsland_Interior_OnTransition:
@@ -66,14 +64,14 @@ SouthernIsland_Interior_EventScript_Lati::
playmoncry VAR_TEMP_4, CRY_MODE_NORMAL
delay 30
waitmoncry
addobject LOCALID_LATI
addobject LOCALID_SOUTHERN_ISLAND_LATI
delay 30
applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown
applymovement LOCALID_LATI, SouthernIsland_Interior_Movement_LatiApproach
applymovement LOCALID_SOUTHERN_ISLAND_LATI, SouthernIsland_Interior_Movement_LatiApproach
waitmovement 0
delay 50
special RemoveCameraObject
setvar VAR_LAST_TALKED, LOCALID_LATI
setvar VAR_LAST_TALKED, LOCALID_SOUTHERN_ISLAND_LATI
call_if_eq VAR_ROAMER_POKEMON, 0, SouthernIsland_Interior_EventScript_SetLatiosBattleVars
call_if_ne VAR_ROAMER_POKEMON, 0, SouthernIsland_Interior_EventScript_SetLatiasBattleVars
setflag FLAG_SYS_CTRL_OBJ_DELETE