summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/field_player_avatar.s25
-rw-r--r--data/maps/FuchsiaCity_WardensHouse/map.json2
-rw-r--r--data/maps/MtEmber_Exterior/map.json10
-rw-r--r--data/maps/MtEmber_RubyPath_B2F/map.json6
-rw-r--r--data/maps/MtEmber_RubyPath_B3F/map.json8
-rw-r--r--data/maps/MtEmber_Summit/map.json8
-rw-r--r--data/maps/SeafoamIslands_1F/map.json4
-rw-r--r--data/maps/SeafoamIslands_B1F/map.json4
-rw-r--r--data/maps/SeafoamIslands_B2F/map.json4
-rw-r--r--data/maps/SeafoamIslands_B3F/map.json12
-rw-r--r--data/maps/SeafoamIslands_B4F/map.json4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/map.json4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json14
-rw-r--r--data/maps/SixIsland_RuinValley/map.json16
-rw-r--r--data/maps/VictoryRoad_1F/map.json6
-rw-r--r--data/maps/VictoryRoad_2F/map.json6
-rw-r--r--data/maps/VictoryRoad_3F/map.json8
-rw-r--r--data/scripts/field_moves.inc4
18 files changed, 60 insertions, 85 deletions
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index bfa367941..f7b7a3493 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -3,31 +3,6 @@
.include "constants/constants.inc"
.section .rodata
.align 2
-gUnknown_835B820:: @ 835B820
- .byte 0x04, 0x04, 0x05, 0x06, 0x07
-
- .align 2
-gUnknown_835B828:: @ 835B828
- .4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike
- .4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike
- .4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike
- .4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike
- .4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike
-
-gUnknown_835B83C:: @ 835B83C
- .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
-
- .align 2
-gUnknown_835B844:: @ 835B844
- .4byte sub_805BE60
- .4byte sub_805BE74
- .4byte sub_805BE74
- .4byte sub_805BE90
- .4byte nullsub_23
- .4byte PlayerAvatarTransition_ReturnToField
- .4byte nullsub_22
- .4byte nullsub_22
-
gUnknown_835B864:: @ 835B864
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json
index a6d7e8044..74e75066a 100644
--- a/data/maps/FuchsiaCity_WardensHouse/map.json
+++ b/data/maps/FuchsiaCity_WardensHouse/map.json
@@ -29,7 +29,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 11,
"y": 6,
"elevation": 3,
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index 7499f0047..86fe279ca 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -120,7 +120,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 45,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 46,
"elevation": 3,
@@ -146,7 +146,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 36,
"y": 14,
"elevation": 3,
@@ -185,7 +185,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 14,
"elevation": 3,
@@ -198,7 +198,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 17,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
index e505dd6ab..e260e42bd 100644
--- a/data/maps/MtEmber_RubyPath_B2F/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 3,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 5,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 2,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
index 3107af9f3..1888f4506 100644
--- a/data/maps/MtEmber_RubyPath_B3F/map.json
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 10,
"y": 4,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 26,
"y": 12,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 28,
"y": 8,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 15,
"y": 13,
"elevation": 3,
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
index 9442cb532..92aabd11e 100644
--- a/data/maps/MtEmber_Summit/map.json
+++ b/data/maps/MtEmber_Summit/map.json
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_MOLTRES"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 10,
"y": 12,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 12,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 11,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index 9ec2b53ae..5962bae21 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 12,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 32,
"y": 9,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index b5a669e7d..684842b1c 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index a91d362c1..a12678c4f 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
index 25ad96266..9d9c4db52 100644
--- a/data/maps/SeafoamIslands_B3F/map.json
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 23,
"y": 8,
"elevation": 1,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 24,
"y": 8,
"elevation": 1,
@@ -42,7 +42,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 12,
"y": 16,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 13,
"y": 16,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 16,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index 4375e5fad..eeae9ad11 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 18,
"elevation": 1,
@@ -29,7 +29,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 9,
"y": 18,
"elevation": 1,
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index 0cb611d5e..7b579284e 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 13,
"y": 47,
"elevation": 3,
@@ -209,7 +209,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 47,
"elevation": 3,
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index cbcc15d02..8cb2b4fe3 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -16,7 +16,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 7,
"y": 6,
"elevation": 3,
@@ -29,7 +29,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 6,
"elevation": 3,
@@ -42,7 +42,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 9,
"elevation": 3,
@@ -55,7 +55,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 10,
"elevation": 3,
@@ -68,7 +68,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 9,
"elevation": 3,
@@ -94,7 +94,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index 8a5ff9436..c6bc3b25a 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -100,7 +100,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 10,
"elevation": 5,
@@ -113,7 +113,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 17,
"y": 12,
"elevation": 5,
@@ -126,7 +126,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 18,
"y": 11,
"elevation": 5,
@@ -139,7 +139,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 33,
"elevation": 3,
@@ -152,7 +152,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 34,
"elevation": 3,
@@ -165,7 +165,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 41,
"y": 32,
"elevation": 3,
@@ -178,7 +178,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 41,
"y": 33,
"elevation": 3,
@@ -191,7 +191,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 42,
"y": 33,
"elevation": 3,
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 75a812a17..1dc53b977 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -68,7 +68,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 7,
"y": 18,
"elevation": 3,
@@ -81,7 +81,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 4,
"y": 12,
"elevation": 3,
@@ -94,7 +94,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 16,
"y": 3,
"elevation": 3,
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 20ce486e2..023f96e1c 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -133,7 +133,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 8,
"y": 7,
"elevation": 3,
@@ -146,7 +146,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
@@ -159,7 +159,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 33,
"y": 19,
"elevation": 3,
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index cf2d28b45..a20c6a276 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -94,7 +94,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 19,
"y": 15,
"elevation": 3,
@@ -107,7 +107,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 33,
"y": 18,
"elevation": 0,
@@ -120,7 +120,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 35,
"y": 13,
"elevation": 3,
@@ -133,7 +133,7 @@
"flag": "0"
},
{
- "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 32,
"y": 5,
"elevation": 3,
diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc
index 282071755..7ae90849d 100644
--- a/data/scripts/field_moves.inc
+++ b/data/scripts/field_moves.inc
@@ -125,7 +125,7 @@ EventScript_StrengthBoulder:: @ 81BE11D
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
- goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
+ goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_AlreadyUsedStrength
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantMoveBoulder
@@ -147,7 +147,7 @@ EventScript_FldEffStrength:: @ 81BE16E
end
EventScript_UseStrength:: @ 81BE179
- setflag FLAG_SYS_STRENGTH_ACTIVE
+ setflag FLAG_SYS_USE_STRENGTH
msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 12:33:04 +0000