diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 8639c573f..4fb826e84 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -155,6 +155,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CELADON_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 52, @@ -201,7 +202,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": -7, "y": 21, - "target_local_id": 7, + "target_local_id": "LOCALID_ROUTE16_CUT_TREE", "target_map": "MAP_ROUTE16" }, { diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 26f09531d..17fbb0701 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -172,7 +172,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 50, "y": 18, - "target_local_id": 10, + "target_local_id": "LOCALID_ROUTE9_CUT_TREE", "target_map": "MAP_ROUTE9" }, { @@ -191,6 +191,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_CAVE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 1, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 826d5dd23..68fd73d98 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -59,7 +59,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 32, "y": 9, - "target_local_id": 4, + "target_local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE", "target_map": "MAP_FIVE_ISLAND_MEADOW" } ], diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index b543265d1..0ca0d71df 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -69,6 +69,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 8, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index d9b8e5929..ad6795878 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -42,6 +42,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PALLET_FAT_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index c3b58cf4b..8f5b97b9a 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -195,6 +195,7 @@ "flag": "FLAG_TEMP_13" }, { + "local_id": "LOCALID_ROUTE14_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 433c045bb..2b33b5cc6 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -213,7 +213,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 73, "y": 7, - "target_local_id": 13, + "target_local_id": "LOCALID_ROUTE14_BORDER_TREE", "target_map": "MAP_ROUTE14" } ], diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 97a8592cb..c49959463 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -111,6 +111,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE16_CUT_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 41, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index ae86c838d..3f232d8d1 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 6, "y": 85, - "target_local_id": 8, + "target_local_id": "LOCALID_VIRIDIAN_BORDER_TREE", "target_map": "MAP_VIRIDIAN_CITY" } ], diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 3a9bbe242..7fdfa0dff 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -101,7 +101,7 @@ "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": -3, - "target_local_id": 2, + "target_local_id": "LOCALID_PALLET_FAT_MAN", "target_map": "MAP_PALLET_TOWN" } ], diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index e2f670a28..4eb75a89b 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 109, "y": 3, - "target_local_id": 12, + "target_local_id": "LOCALID_CERULEAN_CAVE_GUARD", "target_map": "MAP_CERULEAN_CITY" } ], diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 255dbe841..5539f5b37 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -31,7 +31,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": -8, "y": 12, - "target_local_id": 10, + "target_local_id": "LOCALID_CELADON_BORDER_TREE", "target_map": "MAP_CELADON_CITY" } ], diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index a60f193b4..8d961b931 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -153,6 +153,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE9_CUT_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 14208e2c4..d2ef743fb 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_SWORDS_DANCE_TUTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 45e036fe0..a49b48869 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": -2, - "target_local_id": 1, + "target_local_id": "LOCALID_SWORDS_DANCE_TUTOR", "target_map": "MAP_SEVEN_ISLAND" } ], diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 6f2d9bdc5..2fee18bb9 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -133,6 +133,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18,