diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
| commit | 31d31d326034fde26dedaf2dadb1c608e00fb92f (patch) | |
| tree | be13ed87df14390256c9a3e582fb11adbe4090b8 /data/maps/SilphCo_10F | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/SilphCo_10F')
| -rw-r--r-- | data/maps/SilphCo_10F/map.json | 8 | ||||
| -rw-r--r-- | data/maps/SilphCo_10F/scripts.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index f3e5abafe..7176da07c 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -143,28 +143,28 @@ "x": 12, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 12, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 0b8e0e2cb..3efd6025e 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_1A84D6 + call_if FALSE, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release |