dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove interactwith from field move scripts

Browse Source
This commit is contained in:
GriffinR
2020-03-02 14:55:20 -05:00
parent dd5f3c3c3d
commit 42e6e9bd9c
49 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+4 -4
View File
@@ -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:
data/maps/CeladonCity/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/CeladonCity_Gym/map.json
+3 -3
View File
@@ -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"
}
],
data/maps/CeruleanCave_1F/map.json
+6 -6
View File
@@ -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"
}
],
data/maps/CeruleanCave_2F/map.json
+10 -10
View File
@@ -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"
}
],
data/maps/CeruleanCave_B1F/map.json
+9 -9
View File
@@ -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"
}
],
data/maps/CeruleanCity/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/FiveIsland_Meadow/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/FourIsland/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/FuchsiaCity/map.json
+4 -4
View File
@@ -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"
},
{
data/maps/FuchsiaCity_WardensHouse/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/MtEmber_Exterior/map.json
+11 -11
View File
@@ -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"
},
{
data/maps/MtEmber_RubyPath_1F/map.json
+5 -5
View File
@@ -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"
}
],
data/maps/MtEmber_RubyPath_B1F/map.json
+4 -4
View File
@@ -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"
}
],
data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+1 -1
View File
@@ -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"
}
],
data/maps/MtEmber_RubyPath_B2F/map.json
+7 -7
View File
@@ -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"
}
],
data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+2 -2
View File
@@ -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"
}
],
data/maps/MtEmber_RubyPath_B3F/map.json
+10 -10
View File
@@ -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"
}
],
data/maps/MtEmber_Summit/map.json
+4 -4
View File
@@ -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"
}
],
data/maps/MtEmber_SummitPath_2F/map.json
+9 -9
View File
@@ -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"
}
],
data/maps/OneIsland_KindleRoad/map.json
+13 -13
View File
@@ -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"
},
{
data/maps/PewterCity/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/RockTunnel_B1F/map.json
+15 -15
View File
@@ -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"
}
],
data/maps/Route10/map.json
+4 -4
View File
@@ -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"
}
],
data/maps/Route12/map.json
+2 -2
View File
@@ -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"
}
],
data/maps/Route13/map.json
+1 -1
View File
@@ -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"
}
],
data/maps/Route14/map.json
+3 -3
View File
@@ -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"
},
{
data/maps/Route16/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/Route2/map.json
+4 -4
View File
@@ -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"
},
{
data/maps/Route25/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/Route8/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/Route9/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/SeafoamIslands_1F/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/SeafoamIslands_B1F/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/SeafoamIslands_B2F/map.json
+2 -2
View File
@@ -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"
},
{
data/maps/SeafoamIslands_B3F/map.json
+4 -4
View File
@@ -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"
}
],
data/maps/SevenIsland_SevaultCanyon/map.json
+8 -8
View File
@@ -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"
},
{
data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+7 -7
View File
@@ -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"
}
],
data/maps/SixIsland_RuinValley/map.json
+8 -8
View File
@@ -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"
},
{
data/maps/ThreeIsland/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/ThreeIsland_BerryForest/map.json
+10 -10
View File
@@ -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"
},
{
data/maps/ThreeIsland_BondBridge/map.json
+2 -2
View File
@@ -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"
}
],
data/maps/TwoIsland/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/VermilionCity/map.json
+1 -1
View File
@@ -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"
},
{
data/maps/VictoryRoad_1F/map.json
+3 -3
View File
@@ -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"
}
],
data/maps/VictoryRoad_2F/map.json
+3 -3
View File
@@ -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"
},
{
data/maps/VictoryRoad_3F/map.json
+4 -4
View File
@@ -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"
},
{
data/maps/ViridianCity/map.json
+2 -2
View File
@@ -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"
},
{
data/scripts/field_moves.inc
+11 -11
View File
@@ -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