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/CaveOfOrigin_UnusedRubySapphireMap3/events.inc | 4 ++-- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index a17416bd3..e1cacec43 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC +CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC +CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 75bd4189e..ec55cb0ff 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C +CaveOfOrigin_UnusedRubySapphireMap3: .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 161 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .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 --- .../CaveOfOrigin_UnusedRubySapphireMap3/events.inc | 7 ----- .../CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 15 ---------- .../CaveOfOrigin_UnusedRubySapphireMap3/map.json | 35 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 22 deletions(-) delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc deleted file mode 100644 index e1cacec43..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc deleted file mode 100644 index ec55cb0ff..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3: - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json new file mode 100644 index 000000000..2b7c6db19 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- 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/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/CaveOfOrigin_UnusedRubySapphireMap3') diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index baa40934a..51d9b8654 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E -- cgit v1.2.3