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
+3
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_HIDEOUT_GIOVANNI",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_GIOVANNI",
"x": 19,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
"local_id": "LOCALID_SILPH_SCOPE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 20,
@@ -58,6 +60,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"local_id": "LOCALID_LIFT_KEY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 3,
+1 -5
View File
@@ -1,7 +1,3 @@
.equ LOCALID_GIOVANNI, 1
.equ LOCALID_SILPH_SCOPE, 2
.equ LOCALID_LIFT_KEY, 4
.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
RocketHideout_B4F_MapScripts::
@@ -31,7 +27,7 @@ RocketHideout_B4F_EventScript_Giovanni::
msgbox RocketHideout_B4F_Text_GiovanniPostBattle
fadescreen FADE_TO_BLACK
closemessage
removeobject LOCALID_GIOVANNI
removeobject LOCALID_HIDEOUT_GIOVANNI
addobject LOCALID_SILPH_SCOPE
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS