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_4F/events.inc | 6 +++--- data/maps/MtPyre_4F/header.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/MtPyre_4F') diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index ffe568880..030039d18 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,8 +1,8 @@ -MtPyre_4F_EventObjects: @ 8534F90 +MtPyre_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE -MtPyre_4F_MapWarps: @ 8534FC0 +MtPyre_4F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F @@ -10,6 +10,6 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F -MtPyre_4F_MapEvents:: @ 8534FF0 +MtPyre_4F_MapEvents:: map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 1c41c3a6d..86edc3843 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,10 +1,10 @@ -MtPyre_4F: @ 84840B8 +MtPyre_4F: .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 140 + .2byte LAYOUT_MT_PYRE_4F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE -- 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_4F/events.inc | 15 ------- data/maps/MtPyre_4F/header.inc | 15 ------- data/maps/MtPyre_4F/map.json | 90 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 30 deletions(-) delete mode 100644 data/maps/MtPyre_4F/events.inc delete mode 100644 data/maps/MtPyre_4F/header.inc create mode 100644 data/maps/MtPyre_4F/map.json (limited to 'data/maps/MtPyre_4F') diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc deleted file mode 100644 index 030039d18..000000000 --- a/data/maps/MtPyre_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE - -MtPyre_4F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F - warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F - warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F - warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F - warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F - warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F - -MtPyre_4F_MapEvents:: - map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc deleted file mode 100644 index 86edc3843..000000000 --- a/data/maps/MtPyre_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F: - .4byte MtPyre_4F_Layout - .4byte MtPyre_4F_MapEvents - .4byte MtPyre_4F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_4F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json new file mode 100644 index 000000000..a7bf954e7 --- /dev/null +++ b/data/maps/MtPyre_4F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_MT_PYRE_4F", + "name": "MtPyre_4F", + "layout": "LAYOUT_MT_PYRE_4F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_4F_EventScript_231C6E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_4F_EventScript_291317", + "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- 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_4F/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/MtPyre_4F') diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index a7bf954e7..59d4dd110 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_4F_EventScript_231C6E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "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": "MtPyre_4F_EventScript_291317", "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" } -- cgit v1.2.3