From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: Define layout constants --- data/maps/MtPyre_Summit/events.inc | 10 +++++----- data/maps/MtPyre_Summit/header.inc | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b112fbcfe..abe957f28 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,4 +1,4 @@ -MtPyre_Summit_EventObjects: @ 85351A0 +MtPyre_Summit_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 @@ -8,12 +8,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE -MtPyre_Summit_MapWarps: @ 8535260 +MtPyre_Summit_MapWarps: warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR -MtPyre_Summit_MapCoordEvents: @ 8535278 +MtPyre_Summit_MapCoordEvents: coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 @@ -21,10 +21,10 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 -MtPyre_Summit_MapBGEvents: @ 85352D8 +MtPyre_Summit_MapBGEvents: bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY -MtPyre_Summit_MapEvents:: @ 85352F0 +MtPyre_Summit_MapEvents:: map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29a28e99b..483afb989 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,10 +1,10 @@ -MtPyre_Summit: @ 8484128 +MtPyre_Summit: .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 303 + .2byte LAYOUT_MT_PYRE_SUMMIT .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 -- cgit v1.2.3 From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- data/maps/MtPyre_Summit/events.inc | 30 ----- data/maps/MtPyre_Summit/header.inc | 15 --- data/maps/MtPyre_Summit/map.json | 219 +++++++++++++++++++++++++++++++++++++ 3 files changed, 219 insertions(+), 45 deletions(-) delete mode 100644 data/maps/MtPyre_Summit/events.inc delete mode 100644 data/maps/MtPyre_Summit/header.inc create mode 100644 data/maps/MtPyre_Summit/map.json (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc deleted file mode 100644 index abe957f28..000000000 --- a/data/maps/MtPyre_Summit/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -MtPyre_Summit_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - -MtPyre_Summit_MapWarps: - warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - -MtPyre_Summit_MapCoordEvents: - coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 - -MtPyre_Summit_MapBGEvents: - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY - -MtPyre_Summit_MapEvents:: - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc deleted file mode 100644 index 483afb989..000000000 --- a/data/maps/MtPyre_Summit/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit: - .4byte MtPyre_Summit_Layout - .4byte MtPyre_Summit_MapEvents - .4byte MtPyre_Summit_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_SUMMIT - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json new file mode 100644 index 000000000..cc9efce09 --- /dev/null +++ b/data/maps/MtPyre_Summit/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit", + "layout": "LAYOUT_MT_PYRE_SUMMIT", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_23213C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_2321A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_2323FD", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232414", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_23242B", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232442", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" + } + ], + "warp_events": [ + { + "x": 22, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232018" + }, + { + "type": "trigger", + "x": 23, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232024" + }, + { + "type": "trigger", + "x": 24, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232030" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321EC" + }, + { + "type": "trigger", + "x": 23, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321F8" + }, + { + "type": "trigger", + "x": 24, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_232204" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 25, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC" + }, + { + "type": "hidden_item", + "x": 37, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" + } + ] +} \ No newline at end of file -- cgit v1.2.3 From 0b1bb9e4e934a26f8b165b00e08f8c2f8ed8953d Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 16 Feb 2019 16:44:48 -0500 Subject: use strings for map json coord_event var_value --- data/maps/MtPyre_Summit/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index cc9efce09..d729766d5 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -149,7 +149,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, { @@ -158,7 +158,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, { @@ -167,7 +167,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, { @@ -176,7 +176,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, { @@ -185,7 +185,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, { @@ -194,7 +194,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } ], -- cgit v1.2.3 From 19b76bffda07d8878c1ff1a9005e1b57c549ffce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Feb 2019 16:40:31 -0600 Subject: Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields --- data/maps/MtPyre_Summit/map.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index d729766d5..fedde68e8 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_23213C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_2321A2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_2323FD", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232414", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_23242B", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232442", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" } -- cgit v1.2.3 From cea5696f238acc7c2b868e46e92775f4a05ae1f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:18:43 -0500 Subject: Finish moving pokeruby vars --- data/maps/MtPyre_Summit/map.json | 12 ++++++------ data/maps/MtPyre_Summit/scripts.inc | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index fedde68e8..78780ba19 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -148,7 +148,7 @@ "x": 22, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, @@ -157,7 +157,7 @@ "x": 23, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, @@ -166,7 +166,7 @@ "x": 24, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, @@ -175,7 +175,7 @@ "x": 22, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, @@ -184,7 +184,7 @@ "x": 23, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, @@ -193,7 +193,7 @@ "x": 24, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f..8c83b1c56 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 + compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end @@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadedefaultbgm fadescreen 0 delay 20 - setvar VAR_0x40B9, 1 + setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 @@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 + compare VAR_MT_PYRE_STATE, 3 call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT @@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 removeobject 2 removeobject 8 - setvar VAR_0x40B9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end -- cgit v1.2.3 From 0de831fd290b44b6b7236fb849e2e0318f9ebe3f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:09:14 -0500 Subject: Name some common single-entry movements --- data/maps/MtPyre_Summit/scripts.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f..6b9805fbf 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return -- cgit v1.2.3 From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: Update map script files --- data/maps/MtPyre_Summit/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6b9805fbf..b7f6d73fc 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD -- cgit v1.2.3