diff options
49 files changed, 215 insertions, 215 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 7d5432f8e..58a6b6e76 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1664,16 +1664,16 @@ _0806D5A4: lsrs r0, 24 cmp r0, 0x1 bne _0806D5D8 - ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall + ldr r0, _0806D5D4 @ =EventScript_Waterfall b _0806D5E2 .align 2, 0 _0806D5D0: .4byte 0x00000826 -_0806D5D4: .4byte EventScript_InteractWithWaterfall +_0806D5D4: .4byte EventScript_Waterfall _0806D5D8: - ldr r0, _0806D5DC @ =EventScript_81BE2FF + ldr r0, _0806D5DC @ =EventScript_CantUseWaterfall b _0806D5E2 .align 2, 0 -_0806D5DC: .4byte EventScript_81BE2FF +_0806D5DC: .4byte EventScript_CantUseWaterfall _0806D5E0: movs r0, 0 _0806D5E2: diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index d4d0122ca..34395c3f8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index d9f291300..67a97d71d 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" } ], diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index ee32088bc..b1d9c02d0 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -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" } ], diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index a19dac4e7..b3e7eeb9e 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -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": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" } ], diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index cb873d731..26df88f09 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -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": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 885c7207a..a6d771035 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -150,7 +150,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 30195a833..123b7f994 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index b7b3da95a..46e268c42 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -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_12" }, { diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 6ed4ef5a5..89f795961 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -171,7 +171,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -184,7 +184,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -197,7 +197,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -210,7 +210,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 92a3165d1..da8c3259f 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -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" }, { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 2ffa70dbb..68e70f765 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -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_12" }, { @@ -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_13" }, { @@ -129,7 +129,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -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" }, { @@ -155,7 +155,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -168,7 +168,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" }, { @@ -181,7 +181,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" }, { @@ -194,7 +194,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -207,7 +207,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -220,7 +220,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" }, { @@ -233,7 +233,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" }, { diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 3f6153369..820cda01a 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -25,7 +25,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" }, { @@ -38,7 +38,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" }, { @@ -51,7 +51,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" }, { @@ -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_15" }, { @@ -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_16" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 5a9ed2ccc..0bc285563 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -25,7 +25,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" }, { @@ -38,7 +38,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" }, { @@ -51,7 +51,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" }, { @@ -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_15" } ], diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index c7d4e2f34..0c7d4ecaf 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -25,7 +25,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" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 4c83d7a9b..aa5683183 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/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" } ], diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 375c6beb5..812ce3863 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -25,7 +25,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" }, { @@ -38,7 +38,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" } ], 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" } ], diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 286baa86a..7c7e60831 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -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": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 9698a5529..5b29a3546 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -25,7 +25,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" }, { @@ -38,7 +38,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" }, { @@ -51,7 +51,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" }, { @@ -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_15" }, { @@ -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_16" }, { @@ -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_17" }, { @@ -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_18" }, { @@ -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_19" }, { @@ -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_1A" } ], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 972dbc2e7..d2a12ac4d 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -200,7 +200,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" }, { @@ -213,7 +213,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" }, { @@ -226,7 +226,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" }, { @@ -239,7 +239,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" }, { @@ -252,7 +252,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -265,7 +265,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -278,7 +278,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -291,7 +291,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { @@ -304,7 +304,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" }, { @@ -317,7 +317,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" }, { @@ -330,7 +330,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" }, { @@ -343,7 +343,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" }, { @@ -356,7 +356,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 070637f7f..ed52917a3 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 6d172a9f6..89ec864cd 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -168,7 +168,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" }, { @@ -181,7 +181,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" }, { @@ -194,7 +194,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" }, { @@ -207,7 +207,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" }, { @@ -220,7 +220,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" }, { @@ -233,7 +233,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" }, { @@ -246,7 +246,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -259,7 +259,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -272,7 +272,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -285,7 +285,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { @@ -298,7 +298,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" }, { @@ -311,7 +311,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" }, { @@ -324,7 +324,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" }, { @@ -337,7 +337,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" }, { @@ -350,7 +350,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" } ], diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index b2127adf5..59d998a4b 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" } ], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index ee56fb220..d9baf947c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -145,7 +145,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -210,7 +210,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 923408ff2..d3d4c520f 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 69e679b74..ec17c5556 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index f6f26ac5f..e9ddd5030 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index e02cbd20e..d9dacd473 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c20a76f4a..82c80ddf4 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -161,7 +161,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 70f83ee31..ffc181a4d 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e8cedc59c..4bf88e47c 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 518817209..e542dd610 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 66, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 67, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 6091f5d8c..253b640b3 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 68, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 69, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index b602137cc..05f393cf0 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": 70, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { @@ -38,7 +38,7 @@ "movement_range_y": 0, "trainer_type": 71, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index fb01fff9c..d84d79b54 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -51,7 +51,7 @@ "movement_range_y": 0, "trainer_type": 77, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { @@ -64,7 +64,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 76, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 6096e0c49..d7dd34a32 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -140,7 +140,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" }, { @@ -153,7 +153,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -166,7 +166,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" }, { @@ -179,7 +179,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" }, { @@ -192,7 +192,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" }, { @@ -205,7 +205,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" }, { @@ -218,7 +218,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -231,7 +231,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithRockSmashRockObject", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index a27961b23..73ae71224 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/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": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 8d2d508fb..1d3cbdae1 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -109,7 +109,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -122,7 +122,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -148,7 +148,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -161,7 +161,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -174,7 +174,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -187,7 +187,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -200,7 +200,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 77ca11bf1..f68701fc0 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 989079f14..d88a902a3 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_17" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_18" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_19" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1A" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1B" }, { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 104b2684a..69654076e 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 295cb3844..8fa55df36 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 292d223d8..a4d26bf49 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f6c6811d1..dc76fd235 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -77,7 +77,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 184187cf3..d9d29a361 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -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" }, { @@ -155,7 +155,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 76ea5245c..e3fb362d5 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -103,7 +103,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -116,7 +116,7 @@ "movement_range_y": 0, "trainer_type": 88, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { @@ -129,7 +129,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithStrengthBoulderObject", + "script": "EventScript_StrengthBoulder", "flag": "0" }, { @@ -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" }, { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 93237caec..e99c93c4a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -54,7 +54,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -132,7 +132,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "EventScript_InteractWithCutTreeObject", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 73ee4d947..b26aa534c 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -1,4 +1,4 @@ -EventScript_InteractWithCutTreeObject:: @ 81BDF13 +EventScript_CutTree:: @ 81BDF13 goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree @@ -15,24 +15,24 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_CutTree + goto EventScript_CutTreeDown end EventScript_FldEffCut:: @ 81BDF6B lockall dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto EventScript_CutTree + goto EventScript_CutTreeDown end -EventScript_CutTree:: @ 81BDF76 - applymovement VAR_LAST_TALKED, Movement_CutTree +EventScript_CutTreeDown:: @ 81BDF76 + applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Movement_CutTree:: @ 81BDF85 +Movement_CutTreeDown:: @ 81BDF85 cut_tree step_end @@ -58,7 +58,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3 .string "This tree looks like it can be CUT\n" .string "down!$" -EventScript_InteractWithRockSmashRockObject:: @ 81BE00C +EventScript_RockSmash:: @ 81BE00C goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock @@ -121,7 +121,7 @@ Text_MonMaySmashRock:: @ 81BE0E2 .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D +EventScript_StrengthBoulder:: @ 81BE11D goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder @@ -182,7 +182,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -EventScript_InteractWithWaterfall:: @ 81BE2B7 +EventScript_Waterfall:: @ 81BE2B7 goto_if_questlog EventScript_ReleaseEnd lockall checkpartymove MOVE_WATERFALL @@ -197,7 +197,7 @@ EventScript_InteractWithWaterfall:: @ 81BE2B7 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_EndWaterfall -EventScript_81BE2FF:: @ 81BE2FF +EventScript_CantUseWaterfall:: @ 81BE2FF lockall EventScript_WaterCrashingDown: msgbox Text_WallOfWaterCrashingDown @@ -217,7 +217,7 @@ Text_MonUsedWaterfall:: @ 81BE378 .string "{STR_VAR_1} used WATERFALL.$" @ Unused leftover from R/S -EventScript_InteractWithDeepWater:: @ 81BE38B +EventScript_DeepWater:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE |