Finish adding local IDs to map.json files

This commit is contained in:
GriffinR
2024-10-12 12:39:50 -04:00
parent cb66ea6653
commit bf17d54b52
82 changed files with 508 additions and 533 deletions
+4
View File
@@ -15,6 +15,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_TRAINER_HILL_ATTENDANT",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 11,
"y": 6,
@@ -28,6 +29,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_TRAINER_HILL_NURSE",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 4,
"y": 9,
@@ -54,6 +56,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_TRAINER_HILL_GIRL",
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 5,
"y": 14,
@@ -67,6 +70,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_TRAINER_HILL_MAN",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 14,
"y": 15,
+5 -10
View File
@@ -1,8 +1,3 @@
.set LOCALID_ATTENDANT, 1
.set LOCALID_NURSE, 2
.set LOCALID_GIRL, 4
.set LOCALID_MAN, 5
TrainerHill_Entrance_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
@@ -39,10 +34,10 @@ TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant::
end
TrainerHill_Entrance_OnReturn:
addobject LOCALID_NURSE
addobject LOCALID_ATTENDANT
addobject LOCALID_MAN
addobject LOCALID_GIRL
addobject LOCALID_TRAINER_HILL_NURSE
addobject LOCALID_TRAINER_HILL_ATTENDANT
addobject LOCALID_TRAINER_HILL_MAN
addobject LOCALID_TRAINER_HILL_GIRL
end
TrainerHill_Entrance_OnLoad:
@@ -101,7 +96,7 @@ TrainerHill_Entrance_EventScript_EndExitChallenge::
end
TrainerHill_Entrance_EventScript_Nurse::
setvar VAR_0x800B, LOCALID_NURSE
setvar VAR_0x800B, LOCALID_TRAINER_HILL_NURSE
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress