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_B3F/header.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B3F/header.inc (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc new file mode 100644 index 000000000..d0936221e --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B3F:: @ 834FDAC + .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 + .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C + .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 288 + .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_B3F/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc index d0936221e..bcf17a29f 100644 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C - .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C + .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 288 -- 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_B3F/events.inc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B3F/events.inc (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/events.inc b/data/maps/MtEmber_RubyPath_B3F/events.inc new file mode 100644 index 000000000..0bab7c507 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/events.inc @@ -0,0 +1,19 @@ +MtEmber_RubyPath_B3F_EventObjects: + object_event 1, 97, 0, 10, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 2, 97, 0, 26, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 3, 97, 0, 28, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 4, 96, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 21, 0, 0 + object_event 8, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 22, 0, 0 + object_event 9, 96, 0, 5, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 23, 0, 0 + object_event 10, 97, 0, 15, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + +MtEmber_RubyPath_B3F_MapWarps: + warp_def 1, 4, 0, 1, 361 + warp_def 19, 19, 3, 0, 363 + warp_def 5, 19, 3, 1, 352 + +MtEmber_RubyPath_B3F_MapEvents:: + map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_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_B3F/scripts.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B3F/scripts.inc (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc new file mode 100644 index 000000000..52191ba85 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -0,0 +1,17 @@ +MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 + .byte 0 + +MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 +MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 + lock + faceplayer + setflag FLAG_0x2DD + removeobject 1 + additem ITEM_RUBY, 1 + loadword 0, gUnknown_817ADC5 + setorcopyvar VAR_0x8000, 373 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end -- 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_B3F/events.inc | 19 ---- data/maps/MtEmber_RubyPath_B3F/header.inc | 8 -- data/maps/MtEmber_RubyPath_B3F/map.json | 172 ++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 27 deletions(-) delete mode 100644 data/maps/MtEmber_RubyPath_B3F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B3F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/map.json (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/events.inc b/data/maps/MtEmber_RubyPath_B3F/events.inc deleted file mode 100644 index 0bab7c507..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -MtEmber_RubyPath_B3F_EventObjects: - object_event 1, 97, 0, 10, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 26, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 28, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 4, 96, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 5, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 97, 0, 15, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - -MtEmber_RubyPath_B3F_MapWarps: - warp_def 1, 4, 0, 1, 361 - warp_def 19, 19, 3, 0, 363 - warp_def 5, 19, 3, 1, 352 - -MtEmber_RubyPath_B3F_MapEvents:: - map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc deleted file mode 100644 index bcf17a29f..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B3F:: @ 834FDAC - .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C - .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 288 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json new file mode 100644 index 000000000..3b681233c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B3F", + "name": "MtEmber_RubyPath_B3F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", + "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": "97", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 7, + "y": 2, + "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_B3F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 4, + "y": 3, + "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_B3F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 6, + "y": 6, + "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_B3F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 7, + "y": 6, + "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_B3F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 4, + "y": 5, + "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_B3F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 5, + "y": 2, + "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_B3F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "97", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 1 + } + ], + "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_B3F/scripts.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 52191ba85..520b3ba31 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,17 +1,17 @@ MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 - .byte 0 + .byte 0 MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 - lock - faceplayer - setflag FLAG_0x2DD - removeobject 1 - additem ITEM_RUBY, 1 - loadword 0, gUnknown_817ADC5 - setorcopyvar VAR_0x8000, 373 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - release - end + lock + faceplayer + setflag FLAG_0x2DD + removeobject 1 + additem ITEM_RUBY, 1 + loadword 0, gUnknown_817ADC5 + setorcopyvar VAR_0x8000, 373 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end -- cgit v1.2.3 From 32bb74b61936ba5e007eda113a60c6baa18950ad Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 May 2019 09:58:43 -0400 Subject: Name some std scripts, dism some Celadon text --- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 520b3ba31..23e8a361e 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -12,6 +12,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setorcopyvar VAR_0x8000, 373 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare release end -- cgit v1.2.3 From d4710d9ab81ff29277ba244767c55652d58016a5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 08:53:17 -0400 Subject: giveitemfanfaremsg --- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 23e8a361e..bc9266e8b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -8,10 +8,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setflag FLAG_0x2DD removeobject 1 additem ITEM_RUBY, 1 - loadword 0, gUnknown_817ADC5 - setorcopyvar VAR_0x8000, 373 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, BGM_FRLG_ME_KEYITEM release end -- 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_B3F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 3b681233c..bd2088c30 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/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, @@ -169,4 +169,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3 From 44e30e713664330179a41f08a90ad7f168fd82da Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 21 May 2019 17:00:28 -0400 Subject: split map text into map directories --- data/maps/MtEmber_RubyPath_B3F/text.inc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B3F/text.inc (limited to 'data/maps/MtEmber_RubyPath_B3F') diff --git a/data/maps/MtEmber_RubyPath_B3F/text.inc b/data/maps/MtEmber_RubyPath_B3F/text.inc new file mode 100644 index 000000000..4cf8b5a50 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/text.inc @@ -0,0 +1,3 @@ +gUnknown_817ADC5:: @ 817ADC5 + .string "{PLAYER} found a RUBY!$" + -- cgit v1.2.3