From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- data/maps/MtEmber_RubyPath_B3F/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtEmber_RubyPath_B3F/map.json') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 386b21e43..5ea2b3e90 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", - "unknown_18": 1, + "allow_cycling": true, "unknown_19": 7, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- data/maps/MtEmber_RubyPath_B3F/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F/map.json') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 5ea2b3e90..47c4ce93c 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "allow_cycling": true, - "unknown_19": 7, - "elevator_flag": 0, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ -- cgit v1.2.3 From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- data/maps/MtEmber_RubyPath_B3F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F/map.json') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 47c4ce93c..698499402 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- data/maps/MtEmber_RubyPath_B3F/map.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F/map.json') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 698499402..29f75c76d 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, -- cgit v1.2.3 From 42e6e9bd9cc98d9edd214330aba2795766ec95af Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 14:55:20 -0500 Subject: Remove interactwith from field move scripts --- data/maps/MtEmber_RubyPath_B3F/map.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/MtEmber_RubyPath_B3F/map.json') diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 29f75c76d..c39ac4267 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { @@ -142,7 +142,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], -- cgit v1.2.3