From f5683b5c46b802cf75491d931a33d2fbe52a332c Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 10:44:26 -0400 Subject: move headers and connections into map dirs --- data/maps/MtEmber_RubyPath_B1F/header.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B1F/header.inc (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc new file mode 100644 index 000000000..bf10f81e3 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B1F:: @ 834FD74 + .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 + .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 + .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 286 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 -- cgit v1.2.3 From 799e971efef15b66345b255d57e94780733f667a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 11:03:10 -0400 Subject: fix map events names --- data/maps/MtEmber_RubyPath_B1F/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc index bf10f81e3..659721b8b 100644 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74 .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 - .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 + .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 286 -- cgit v1.2.3 From fb1ae058073d64305cb5dbae873095febdd36d74 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 12:08:12 -0400 Subject: move map events to map directories --- data/maps/MtEmber_RubyPath_B1F/events.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B1F/events.inc (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/events.inc b/data/maps/MtEmber_RubyPath_B1F/events.inc new file mode 100644 index 000000000..73d8954bc --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/events.inc @@ -0,0 +1,12 @@ +MtEmber_RubyPath_B1F_EventObjects: + object_event 1, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 18, 0, 0 + object_event 2, 96, 0, 1, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 19, 0, 0 + object_event 3, 96, 0, 3, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 20, 0, 0 + object_event 4, 96, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 21, 0, 0 + +MtEmber_RubyPath_B1F_MapWarps: + warp_def 9, 21, 0, 1, 359 + warp_def 6, 1, 0, 0, 361 + +MtEmber_RubyPath_B1F_MapEvents:: + map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 -- cgit v1.2.3 From 4e5d818f89caae9153dd53ba321900e0d4e16c1e Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 6 May 2019 22:13:57 -0400 Subject: dump event scripts --- data/maps/MtEmber_RubyPath_B1F/scripts.inc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B1F/scripts.inc (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc new file mode 100644 index 000000000..f0b3378d4 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 + .byte 0 -- cgit v1.2.3 From 55d66b51770b4f657ed55822e7e76f6d6e3261d8 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 13 May 2019 19:44:24 -0400 Subject: convert map data to json --- data/maps/MtEmber_RubyPath_B1F/events.inc | 12 ----- data/maps/MtEmber_RubyPath_B1F/header.inc | 8 --- data/maps/MtEmber_RubyPath_B1F/map.json | 87 +++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 20 deletions(-) delete mode 100644 data/maps/MtEmber_RubyPath_B1F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B1F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F/map.json (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/events.inc b/data/maps/MtEmber_RubyPath_B1F/events.inc deleted file mode 100644 index 73d8954bc..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtEmber_RubyPath_B1F_EventObjects: - object_event 1, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 1, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 3, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 21, 0, 0 - -MtEmber_RubyPath_B1F_MapWarps: - warp_def 9, 21, 0, 1, 359 - warp_def 6, 1, 0, 0, 361 - -MtEmber_RubyPath_B1F_MapEvents:: - map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc deleted file mode 100644 index 659721b8b..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B1F:: @ 834FD74 - .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 - .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 286 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json new file mode 100644 index 000000000..df6b4fcb5 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B1F", + "name": "MtEmber_RubyPath_B1F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 9, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3 From 7dca612936fda9254239e0e350a45c56a766053a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:07 -0400 Subject: Fix indentation in .inc files --- data/maps/MtEmber_RubyPath_B1F/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc index f0b3378d4..6a5f9cefb 100644 --- a/data/maps/MtEmber_RubyPath_B1F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 - .byte 0 + .byte 0 -- cgit v1.2.3 From cfc43d11115ab3258592801665caef9cfe859589 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Fri, 17 May 2019 14:14:21 +0100 Subject: Label weather --- data/maps/MtEmber_RubyPath_B1F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B1F') diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index df6b4fcb5..e60856ad9 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3