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/BattleFrontier_BattlePikeRandomRoom2/events.inc | 4 ++-- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2') diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 41a58ad3b..0d929a2ae 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 +BattleFrontier_BattlePikeRandomRoom2_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 506a31496..6ab11ae02 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom2: @ 8485564 +BattleFrontier_BattlePikeRandomRoom2: .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 353 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 .byte MAPSEC_BATTLE_FRONTIER .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 --- .../events.inc | 6 ---- .../header.inc | 15 ---------- .../BattleFrontier_BattlePikeRandomRoom2/map.json | 34 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 21 deletions(-) delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2') diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc deleted file mode 100644 index 0d929a2ae..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc deleted file mode 100644 index 6ab11ae02..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2: - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json new file mode 100644 index 000000000..437e7fcfd --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "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/BattleFrontier_BattlePikeRandomRoom2/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2') diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index 437e7fcfd..a07464a15 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "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": "0x0", "flag": "0" } -- 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/BattleFrontier_BattlePikeRandomRoom2/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2') diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index f46760e17..5d438d8bd 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D -- cgit v1.2.3