diff options
48 files changed, 204 insertions, 254 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b53e7d03a..985a13475 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10297,28 +10297,7 @@ gUnknown_81BDEDF:: @ 81BDEDF .string "I hope you enjoy the Wireless\n" .string "Communication System.$" -CeladonCity_EventScript_1BDF13:: @ 81BDF13 -CeladonCity_Gym_EventScript_1BDF13:: @ 81BDF13 -FiveIsland_Meadow_EventScript_1BDF13:: @ 81BDF13 -PewterCity_EventScript_1BDF13:: @ 81BDF13 -Route10_EventScript_1BDF13:: @ 81BDF13 -Route12_EventScript_1BDF13:: @ 81BDF13 -Route14_EventScript_1BDF13:: @ 81BDF13 -Route16_EventScript_1BDF13:: @ 81BDF13 -Route25_EventScript_1BDF13:: @ 81BDF13 -Route2_EventScript_1BDF13:: @ 81BDF13 -Route8_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_BerryForest_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_BondBridge_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_EventScript_1BDF13:: @ 81BDF13 -Route9_EventScript_1BDF13:: @ 81BDF13 -Route13_EventScript_1BDF13:: @ 81BDF13 -TwoIsland_EventScript_1BDF13:: @ 81BDF13 -FuchsiaCity_EventScript_1BDF13:: @ 81BDF13 -VermilionCity_EventScript_1BDF13:: @ 81BDF13 -VermilionCity_EventScript_1BDF13:: @ 81BDF13 -CeruleanCity_EventScript_1BDF13:: @ 81BDF13 -ViridianCity_EventScript_1BDF13:: @ 81BDF13 +EventScript_InteractWithCutTreeObject:: @ 81BDF13 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 @@ -10381,22 +10360,7 @@ gUnknown_81BDFE3:: @ 81BDFE3 .string "This tree looks like it can be CUT\n" .string "down!$" -CeruleanCave_2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_Exterior_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_SummitPath_2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_1F_EventScript_1BE00C:: @ 81BE00C -SevenIsland_SevaultCanyon_EventScript_1BE00C:: @ 81BE00C -FourIsland_EventScript_1BE00C:: @ 81BE00C -OneIsland_KindleRoad_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B3F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C -RockTunnel_B1F_EventScript_1BE00C:: @ 81BE00C -CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C -CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C +EventScript_InteractWithRockSmashRockObject:: @ 81BE00C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 @@ -10462,22 +10426,7 @@ gUnknown_81BE0E2:: @ 81BE0E2 .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D -MtEmber_RubyPath_B2F_EventScript_1BE11D:: @ 81BE11D -MtEmber_Summit_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_1F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B2F_EventScript_1BE11D:: @ 81BE11D -SevenIsland_SevaultCanyon_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_1F_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_3F_EventScript_1BE11D:: @ 81BE11D -SixIsland_RuinValley_EventScript_1BE11D:: @ 81BE11D -FuchsiaCity_Building1_EventScript_1BE11D:: @ 81BE11D -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D:: @ 81BE11D -MtEmber_RubyPath_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D +EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 @@ -10578,6 +10527,7 @@ gUnknown_81BE33F:: @ 81BE33F gUnknown_81BE378:: @ 81BE378 .string "{STR_VAR_1} used WATERFALL.$" +@ Unused leftover from R/S EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index cde6bab6d..0f323d993 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 098fc8124..539f0cb0d 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" } ], diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 5cf16b51a..a2373d45c 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_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": "CeruleanCave_1F_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": "CeruleanCave_1F_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": "CeruleanCave_1F_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": "CeruleanCave_1F_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": "CeruleanCave_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" } ], diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index d1be328e6..d52fa3da5 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_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": "CeruleanCave_2F_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": "CeruleanCave_2F_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": "CeruleanCave_2F_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": "CeruleanCave_2F_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": "CeruleanCave_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_18" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_19" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1A" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1B" } ], diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 48b268644..9f93a9557 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_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": "CeruleanCave_B1F_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": "CeruleanCave_B1F_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": "CeruleanCave_B1F_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": "CeruleanCave_B1F_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": "CeruleanCave_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_18" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_19" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index aafb25196..f3fcae4ab 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -148,7 +148,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index f99c9e3b2..1ac91ff3c 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index fda49733c..54e4e9849 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 77be7a872..9b484daec 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -169,7 +169,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -182,7 +182,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -195,7 +195,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -208,7 +208,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_15" }, { diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index f58cdb457..7fbd2870c 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_Building1_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 02d1f7af5..1b6927eb8 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -127,7 +127,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -192,7 +192,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -205,7 +205,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -218,7 +218,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -231,7 +231,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 6abd98bf7..b0d678752 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index fa402af9b..b56e52770 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 827013757..76a7c17e2 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index f2e7702e0..5fd04b480 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_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_B2F_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_B2F_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_B2F_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_B2F_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_B2F_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_B2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 78628172b..5b72aa5c3 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" } ], 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" } ], diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index b038efc4a..1715ccf58 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_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_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 7a395c4f4..5712426b2 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_18" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_19" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 376cee21f..b618253aa 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -198,7 +198,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -211,7 +211,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -224,7 +224,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -237,7 +237,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -250,7 +250,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_18" }, { @@ -263,7 +263,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_19" }, { @@ -276,7 +276,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1A" }, { @@ -289,7 +289,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1B" }, { @@ -302,7 +302,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1C" }, { @@ -315,7 +315,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1D" }, { @@ -328,7 +328,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1E" }, { @@ -341,7 +341,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1F" }, { @@ -354,7 +354,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index f55677242..2f51e7462 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 086b21910..c904e3b4b 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_14" }, { @@ -205,7 +205,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -218,7 +218,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -231,7 +231,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -244,7 +244,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_18" }, { @@ -257,7 +257,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_19" }, { @@ -270,7 +270,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1A" }, { @@ -283,7 +283,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1B" }, { @@ -296,7 +296,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1C" }, { @@ -309,7 +309,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1D" }, { @@ -322,7 +322,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1E" }, { @@ -335,7 +335,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1F" }, { @@ -348,7 +348,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_11" } ], diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 952975df7..04ea2bf57 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index d7d02aca5..9d660528e 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -208,7 +208,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 1037ef1a5..86a682dfb 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route13_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 5d3b29b57..831e178d6 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index e962e58ad..f6dc03f3e 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 037722cdc..c211c5b72 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_15" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_16" }, { diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 04d0aa55b..a17f32488 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -159,7 +159,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 03bc38642..9a15eca59 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 876e3e38b..e6fff0498 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index fbb66d878..95261f368 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 66, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 67, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index d0a54af61..ded9935d2 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 68, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 69, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index caf197521..cc9d54955 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 70, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 71, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index d45a2ad7f..a1068f489 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 77, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { @@ -62,7 +62,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { @@ -75,7 +75,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { @@ -88,7 +88,7 @@ "movement_range_y": 0, "trainer_type": 76, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3" } ], diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index 578534c90..f8c9c1a1f 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_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": "SevenIsland_SeavaultCanyon_TanobyKey_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": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 8953ac2a4..ecc28a62d 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_12" }, { @@ -151,7 +151,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_13" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_15" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_16" }, { @@ -203,7 +203,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_17" }, { @@ -216,7 +216,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -229,7 +229,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "script": "EventScript_InteractWithRockSmashRockObject", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 69669971c..d31b0fe31 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -107,7 +107,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -120,7 +120,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -133,7 +133,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -146,7 +146,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -159,7 +159,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -172,7 +172,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -185,7 +185,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -198,7 +198,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 0c47fc9a7..49100e7a0 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 273c978ac..0e14592f6 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_15" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_16" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_17" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_18" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_19" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_1A" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 0d36c9b38..02ac7426c 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -120,7 +120,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { @@ -133,7 +133,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 704b95e20..64aba9d7f 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -94,7 +94,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index ac31003b7..e9d3a097d 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f4cef7142..4fb068476 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 22f727361..dfbe906bd 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 7130a06f4..13e9e1481 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -101,7 +101,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 0, "trainer_type": 88, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { @@ -127,7 +127,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index dbf0659a5..081e17e98 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -52,7 +52,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_11" }, { @@ -130,7 +130,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" }, { |