Move local IDs to map.json

This commit is contained in:
GriffinR
2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
+2 -1
View File
@@ -97,6 +97,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_VERMILION_FERRY_SAILOR",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 24,
@@ -307,7 +308,7 @@
"x": 15,
"y": 7,
"respawn_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_VERMILION_NURSE"
}
]
}
+1 -3
View File
@@ -1,5 +1,3 @@
.equ LOCALID_FERRY_SAILOR, 6
VermilionCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame
@@ -191,7 +189,7 @@ VermilionCity_EventScript_ExitedTicketCheck::
VermilionCity_EventScript_CheckTicket::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger