From a7bca8aa92b7696047bcb3da8607ac7981647630 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:02:34 -0400 Subject: Hidden item flags --- 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 5bc2edf77..dae0284dc 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -169,4 +169,4 @@ ], "coord_events": [], "bg_events": [] -} +} \ No newline at end of file -- cgit v1.2.3 From a16d9af699f367458d6832377a2806659d303bbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:13:35 -0400 Subject: Document renewable_hidden_items --- 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 dae0284dc..5bc2edf77 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -169,4 +169,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3 From d98d4d887c16e8fa13360e3f243bf019844d3c41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 15:05:51 -0400 Subject: Set map.json files with map_obj_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 5bc2edf77..4318d5b87 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "20" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "21" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "22" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "23" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, -- cgit v1.2.3 From a8b767965a92352de03780fb4671d2a469343d28 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 15:49:26 -0400 Subject: auto-assign map object hide/show flags --- data/maps/MtEmber_RubyPath_B3F/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 4318d5b87..e208baa96 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "18" + "flag": "FLAG_0x012" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "19" + "flag": "FLAG_0x013" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "20" + "flag": "FLAG_0x014" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "21" + "flag": "FLAG_0x015" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "22" + "flag": "FLAG_0x016" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "23" + "flag": "FLAG_0x017" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", -- cgit v1.2.3 From 2ff8af13d5a259fa0ca07afe3ecf4792b6871a80 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 20:30:38 -0400 Subject: Hide/show flags through 07F --- data/maps/MtEmber_RubyPath_B3F/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 e208baa96..4eacf9440 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", -- cgit v1.2.3 From 8efca06db2f5517a5383ac50525c4331cf99ec2d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 15:54:50 -0400 Subject: Cut, Strength, Rock Smash script names --- 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 4eacf9440..ac41ffbcb 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -140,7 +140,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], -- cgit v1.2.3