Move local IDs to map.json

data/maps/ViridianCity/map.json

@@ -60,6 +60,7 @@
       "flag": "FLAG_TEMP_11"
     },
     {
+      "local_id": "LOCALID_VIRIDIAN_OLD_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 34,
@@ -74,6 +75,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_TUTORIAL_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 21,
@@ -88,6 +90,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_VIRIDIAN_WOMAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 20,
@@ -281,7 +284,7 @@
       "x": 26,
       "y": 27,
       "respawn_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F",
-      "respawn_npc": 1
+      "respawn_npc": "LOCALID_VIRIDIAN_NURSE"
     }
   ]
 }

data/maps/ViridianCity/scripts.inc

@@ -1,7 +1,3 @@
-.set LOCALID_OLD_MAN,      3
-.set LOCALID_TUTORIAL_MAN, 4
-.set LOCALID_WOMAN,        5
-
 ViridianCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition
 	.byte 0
@@ -88,7 +84,7 @@ ViridianCity_EventScript_OldMan::
 	goto_if_eq VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1, ViridianCity_EventScript_OldManGymLeaderReturned
 	msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs
 	closemessage
-	applymovement LOCALID_OLD_MAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_VIRIDIAN_OLD_MAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -180,7 +176,7 @@ ViridianCity_EventScript_Woman::
 ViridianCity_EventScript_WomanRoadBlocked::
 	msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet
 	closemessage
-	applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_VIRIDIAN_WOMAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end