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_4F | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/SilphCo_4F')
| -rw-r--r-- | data/maps/SilphCo_4F/map.json | 16 | ||||
| -rw-r--r-- | data/maps/SilphCo_4F/scripts.inc | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 2bfb46286..813b7cfb6 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -176,56 +176,56 @@ "x": 3, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 15, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 15, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 176b6a4d3..b5ef8541d 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,15 +4,15 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_1A8213 + call_if FALSE, EventScript_Close4FDoor1 checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_1A8241 + call_if FALSE, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F 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_161766 msgbox gUnknown_81759F5 release |