Move local IDs to map.json

2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
@@ -27,6 +27,7 @@
  ],
  "object_events": [
    {
+      "local_id": "LOCALID_ONE_ISLAND_BILL",
      "type": "object",
      "graphics_id": "OBJ_EVENT_GFX_BILL",
      "x": 12,
@@ -124,7 +125,7 @@
      "x": 14,
      "y": 6,
      "respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
-      "respawn_npc": 1
+      "respawn_npc": "LOCALID_ONE_ISLAND_NURSE"
    }
  ]
 }
@@ -1,5 +1,3 @@
-.equ LOCALID_BILL, 1
-
 OneIsland_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame
@@ -20,17 +18,17 @@ OneIsland_EventScript_EnterOneIslandFirstTime::
 	waitmovement 0
 	msgbox OneIsland_Text_BillLetsGoSeeCelio
 	closemessage
-	applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter
+	applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillWalkToPokeCenter
 	applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
 	waitmovement 0
 	opendoor 14, 5
 	waitdooranim
-	applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter
+	applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillEnterPokeCenter
 	applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
 	waitmovement 0
 	closedoor 14, 5
 	waitdooranim
-	removeobject LOCALID_BILL
+	removeobject LOCALID_ONE_ISLAND_BILL
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3
 	warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9
 	waitstate