summaryrefslogtreecommitdiff
path: root/data/maps/SilphCo_2F
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
commit31d31d326034fde26dedaf2dadb1c608e00fb92f (patch)
treebe13ed87df14390256c9a3e582fb11adbe4090b8 /data/maps/SilphCo_2F
parent26f7ba482384ad4f63063797a527b7fb33572aa1 (diff)
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/SilphCo_2F')
-rw-r--r--data/maps/SilphCo_2F/map.json16
-rw-r--r--data/maps/SilphCo_2F/scripts.inc4
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index a2d405b3a..d937d283c 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -137,56 +137,56 @@
"x": 5,
"y": 8,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A891B"
+ "script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 8,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A891B"
+ "script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 9,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A891B"
+ "script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 9,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A891B"
+ "script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 15,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A8935"
+ "script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 15,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A8935"
+ "script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 16,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A8935"
+ "script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 16,
"elevation": 0,
- "script": "SilphCo_2F_EventScript_1A8935"
+ "script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "hidden_item",
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
index 1d08e777b..caafb4f23 100644
--- a/data/maps/SilphCo_2F/scripts.inc
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641
SilphCo_2F_MapScript1_161647:: @ 8161647
checkflag FLAG_SILPH_2F_DOOR_1
- call_if FALSE, EventScript_1A8149
+ call_if FALSE, EventScript_Close2FDoor1
checkflag FLAG_SILPH_2F_DOOR_2
- call_if FALSE, EventScript_1A8177
+ call_if FALSE, EventScript_Close2FDoor2
end
SilphCo_2F_EventScript_16165A:: @ 816165A