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_B5F/header.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B5F/header.inc (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc new file mode 100644 index 000000000..1a351c127 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B5F:: @ 834FD3C + .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 + .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C + .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 291 + .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_B5F/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc index 1a351c127..8fbb65498 100644 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C - .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C + .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 291 -- 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_B5F/events.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B5F/events.inc (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/events.inc b/data/maps/MtEmber_RubyPath_B5F/events.inc new file mode 100644 index 000000000..a9f1890eb --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/events.inc @@ -0,0 +1,11 @@ +MtEmber_RubyPath_B5F_EventObjects: + object_event 1, 99, 0, 7, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B5F_EventScript_163C49, 138, 0, 0 + +MtEmber_RubyPath_B5F_MapWarps: + warp_def 11, 7, 3, 0, 352 + +MtEmber_RubyPath_B5F_MapBGEvents: + bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB + +MtEmber_RubyPath_B5F_MapEvents:: + map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents -- 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_B5F/scripts.inc | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 data/maps/MtEmber_RubyPath_B5F/scripts.inc (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc new file mode 100644 index 000000000..91b69cf5b --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -0,0 +1,38 @@ +MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA + .byte 0 + +MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92C5 + getbraillestringwidth gUnknown_81A92C5 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92D0 + getbraillestringwidth gUnknown_81A92D0 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92DC + getbraillestringwidth gUnknown_81A92DC + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92E6 + getbraillestringwidth gUnknown_81A92E6 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92F2 + getbraillestringwidth gUnknown_81A92F2 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92FE + getbraillestringwidth gUnknown_81A92FE + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A930A + getbraillestringwidth gUnknown_81A930A + call EventScript_1A926C + braillemessage gUnknown_81A9316 + waitbuttonpress + releaseall + 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_B5F/events.inc | 11 ------- data/maps/MtEmber_RubyPath_B5F/header.inc | 8 ----- data/maps/MtEmber_RubyPath_B5F/map.json | 49 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 19 deletions(-) delete mode 100644 data/maps/MtEmber_RubyPath_B5F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B5F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B5F/map.json (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/events.inc b/data/maps/MtEmber_RubyPath_B5F/events.inc deleted file mode 100644 index a9f1890eb..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtEmber_RubyPath_B5F_EventObjects: - object_event 1, 99, 0, 7, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B5F_EventScript_163C49, 138, 0, 0 - -MtEmber_RubyPath_B5F_MapWarps: - warp_def 11, 7, 3, 0, 352 - -MtEmber_RubyPath_B5F_MapBGEvents: - bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB - -MtEmber_RubyPath_B5F_MapEvents:: - map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc deleted file mode 100644 index 8fbb65498..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B5F:: @ 834FD3C - .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C - .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 291 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json new file mode 100644 index 000000000..320bff06d --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B5F", + "name": "MtEmber_RubyPath_B5F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", + "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": "99", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163C49", + "flag": "138" + } + ], + "warp_events": [ + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 7, + "y": 2, + "elevation": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" + } + ] +} \ 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_B5F/scripts.inc | 70 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index 91b69cf5b..c3d8b7320 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -1,38 +1,38 @@ MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA - .byte 0 + .byte 0 MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB - lockall - setvar VAR_0x8005, 130 - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92C5 - getbraillestringwidth gUnknown_81A92C5 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92D0 - getbraillestringwidth gUnknown_81A92D0 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92DC - getbraillestringwidth gUnknown_81A92DC - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92E6 - getbraillestringwidth gUnknown_81A92E6 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92F2 - getbraillestringwidth gUnknown_81A92F2 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92FE - getbraillestringwidth gUnknown_81A92FE - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A930A - getbraillestringwidth gUnknown_81A930A - call EventScript_1A926C - braillemessage gUnknown_81A9316 - waitbuttonpress - releaseall - end + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92C5 + getbraillestringwidth gUnknown_81A92C5 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92D0 + getbraillestringwidth gUnknown_81A92D0 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92DC + getbraillestringwidth gUnknown_81A92DC + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92E6 + getbraillestringwidth gUnknown_81A92E6 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92F2 + getbraillestringwidth gUnknown_81A92F2 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92FE + getbraillestringwidth gUnknown_81A92FE + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A930A + getbraillestringwidth gUnknown_81A930A + call EventScript_1A926C + braillemessage gUnknown_81A9316 + waitbuttonpress + releaseall + 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_B5F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B5F') diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 320bff06d..e6b80acc1 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/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, @@ -46,4 +46,4 @@ "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" } ] -} \ No newline at end of file +} -- cgit v1.2.3