Continue adding local IDs to map.json files

This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions

View File

@@ -15,6 +15,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_GROUDON",
"graphics_id": "OBJ_EVENT_GFX_GROUDON_FRONT",
"x": 16,
"y": 17,
@@ -28,6 +29,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_1",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 31,
"y": 22,
@@ -41,6 +43,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_2",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 30,
"y": 13,
@@ -54,6 +57,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_GRUNT_3",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 26,
"y": 13,
@@ -67,6 +71,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_TABITHA",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 22,
"y": 4,
@@ -80,6 +85,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_MAXIE",
"graphics_id": "OBJ_EVENT_GFX_MAXIE",
"x": 16,
"y": 21,
@@ -93,6 +99,7 @@
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
},
{
"local_id": "LOCALID_MAGMA_HIDEOUT_4F_GROUDON_SLEEPING",
"graphics_id": "OBJ_EVENT_GFX_GROUDON_ASLEEP",
"x": 16,
"y": 17,

View File

@@ -1,11 +1,3 @@
.set LOCALID_GROUDON, 1
.set LOCALID_GRUNT_1, 2
.set LOCALID_GRUNT_2, 3
.set LOCALID_GRUNT_3, 4
.set LOCALID_TABITHA, 5
.set LOCALID_MAXIE, 6
.set LOCALID_GROUDON_SLEEPING, 7
MagmaHideout_4F_MapScripts::
.byte 0
@@ -26,11 +18,11 @@ MagmaHideout_4F_EventScript_Maxie::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 150
removeobject LOCALID_GROUDON_SLEEPING
addobject LOCALID_GROUDON
removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON_SLEEPING
addobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON
waitstate
delay 60
applymovement LOCALID_GROUDON, MagmaHideout_4F_Movement_GroudonApproach
applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonApproach
waitmovement 0
special FadeOutOrbEffect
waitstate
@@ -40,9 +32,9 @@ MagmaHideout_4F_EventScript_Maxie::
setvar VAR_0x8007, 5 @ shake delay
special ShakeCamera
waitstate
applymovement LOCALID_GROUDON, MagmaHideout_4F_Movement_GroudonExit
applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonExit
waitmovement 0
removeobject LOCALID_GROUDON
removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON
delay 4
setvar VAR_0x8004, 2 @ vertical pan
setvar VAR_0x8005, 2 @ horizontal pan
@@ -51,14 +43,14 @@ MagmaHideout_4F_EventScript_Maxie::
special ShakeCamera
waitstate
delay 30
applymovement LOCALID_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround
applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround
waitmovement 0
msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 30
applymovement LOCALID_MAXIE, Common_Movement_FacePlayer
applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, Common_Movement_FacePlayer
waitmovement 0
msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT
closemessage
@@ -71,11 +63,11 @@ MagmaHideout_4F_EventScript_Maxie::
setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
setvar VAR_SLATEPORT_HARBOR_STATE, 1
fadescreen FADE_TO_BLACK
removeobject LOCALID_MAXIE
removeobject LOCALID_GRUNT_1
removeobject LOCALID_GRUNT_2
removeobject LOCALID_GRUNT_3
removeobject LOCALID_TABITHA
removeobject LOCALID_MAGMA_HIDEOUT_4F_MAXIE
removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_1
removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_2
removeobject LOCALID_MAGMA_HIDEOUT_4F_GRUNT_3
removeobject LOCALID_MAGMA_HIDEOUT_4F_TABITHA
setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
fadescreen FADE_FROM_BLACK
releaseall