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

@@ -15,6 +15,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_1",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 15,
"y": 6,
@@ -28,6 +29,7 @@
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_2",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 10,
"y": 8,
@@ -41,6 +43,7 @@
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_SHELLY",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 4,
"y": 6,
@@ -67,6 +70,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
},
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 18,
"y": 6,
@@ -93,6 +97,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
},
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 16,
"y": 6,
@@ -106,6 +111,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M"
},
{
"local_id": "LOCALID_WEATHER_INSTITUTE_2F_GRUNT_4",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 19,
"y": 6,

View File

@@ -1,10 +1,3 @@
.set LOCALID_GRUNT_1, 1
.set LOCALID_GRUNT_2, 2
.set LOCALID_SHELLY, 3
.set LOCALID_SCIENTIST, 5
.set LOCALID_GRUNT_3, 7
.set LOCALID_GRUNT_4, 8
Route119_WeatherInstitute_2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_OnTransition
.byte 0
@@ -16,18 +9,18 @@ Route119_WeatherInstitute_2F_OnTransition:
end
Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere::
setobjectxyperm LOCALID_SCIENTIST, 1, 6
setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 1, 6
setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
return
Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone::
setobjectxyperm LOCALID_SCIENTIST, 4, 6
setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 4, 6
setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
return
Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear::
setobjectxyperm LOCALID_SCIENTIST, 2, 2
setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, 2, 2
setobjectmovementtype LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, MOVEMENT_TYPE_FACE_UP
return
Route119_WeatherInstitute_2F_EventScript_Grunt5::
@@ -53,16 +46,16 @@ Route119_WeatherInstitute_2F_EventScript_Shelly::
Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::
msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT
closemessage
addobject LOCALID_GRUNT_3
applymovement LOCALID_GRUNT_3, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly
addobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3
applymovement LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly
applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay
waitmovement 0
msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT
closemessage
playse SE_PIN
applymovement LOCALID_SHELLY, Common_Movement_ExclamationMark
applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SHELLY, Common_Movement_Delay48
applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_Delay48
waitmovement 0
msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT
closemessage
@@ -72,17 +65,17 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::
fadescreen FADE_TO_BLACK
setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA
setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
removeobject LOCALID_GRUNT_1
removeobject LOCALID_GRUNT_2
removeobject LOCALID_SHELLY
removeobject LOCALID_GRUNT_4
removeobject LOCALID_GRUNT_3
removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_1
removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_2
removeobject LOCALID_WEATHER_INSTITUTE_2F_SHELLY
removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_4
removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3
applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
waitmovement 0
fadescreen FADE_FROM_BLACK
applymovement LOCALID_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer
applymovement LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer
waitmovement 0
copyobjectxytoperm LOCALID_SCIENTIST
copyobjectxytoperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST
goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
end