Move local IDs to map.json

data/maps/CeladonCity/map.json

@@ -41,6 +41,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
+      "local_id": "LOCALID_CELADON_FAT_MAN",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 38,
@@ -55,6 +56,7 @@
       "flag": "0"
     },
     {
+      "local_id": "LOCALID_CELADON_POLIWRATH",
       "type": "object",
       "graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
       "x": 36,
@@ -407,7 +409,7 @@
       "x": 48,
       "y": 12,
       "respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
-      "respawn_npc": 1
+      "respawn_npc": "LOCALID_CELADON_NURSE"
     }
   ]
 }

data/maps/CeladonCity/scripts.inc

@@ -1,6 +1,3 @@
-.set LOCALID_FAT_MAN,   2
-.set LOCALID_POLIWRATH, 3
-
 CeladonCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition
 	.byte 0
@@ -36,7 +33,7 @@ CeladonCity_EventScript_FatMan::
 	faceplayer
 	msgbox CeladonCity_Text_MyTrustedPalPoliwrath
 	closemessage
-	applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CELADON_FAT_MAN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -49,7 +46,7 @@ CeladonCity_EventScript_Poliwrath::
 	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry
-	applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
+	applymovement LOCALID_CELADON_POLIWRATH, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end