summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/field_player_avatar.s153
-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/PewterCity/scripts.inc2
-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
19 files changed, 61 insertions, 214 deletions
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
deleted file mode 100644
index 9ff7328c3..000000000
--- a/data/field_player_avatar.s
+++ /dev/null
@@ -1,153 +0,0 @@
-#include "constants/event_objects.h"
- .include "asm/macros.inc"
- .include "constants/constants.inc"
- .section .rodata
- .align 2
-gUnknown_835B764:: @ 835B764
- .4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
- .4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
- .4byte MetatileBehavior_IsWalkSouth, sub_805B750
- .4byte MetatileBehavior_IsWalkNorth, sub_805B768
- .4byte MetatileBehavior_IsWalkWest, sub_805B780
- .4byte MetatileBehavior_IsWalkEast, sub_805B798
- .4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
- .4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
- .4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
- .4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
- .4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
- .4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
- .4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
- .4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
- .4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
- .4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
- .4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
- .4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
- .4byte MetatileBehavior_IsWaterfall, sub_805B82C
- .4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
- .4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
- .4byte NULL, ForcedMovement_None
-
-gUnknown_835B814:: @ 835B814
- .4byte PlayerNotOnBikeNotMoving
- .4byte sub_805B9C4
- .4byte sub_805B9D4
-
-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
- .4byte MetatileBehavior_IsWestArrowWarp
- .4byte MetatileBehavior_IsEastArrowWarp
-
-gUnknown_835B874:: @ 835B874
- .byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL
- .byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE
- .byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF
- .byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM
- .byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH
- .byte OBJ_EVENT_GFX_RED_VS_SEEKER, OBJ_EVENT_GFX_GREEN_VS_SEEKER
-
-gUnknown_835B880:: @ 835B880
- .byte OBJ_EVENT_GFX_RS_BRENDAN
- .byte OBJ_EVENT_GFX_RS_MAY
-
-gUnknown_835B882:: @ 835B882
- @ Male
- .byte OBJ_EVENT_GFX_RED_NORMAL, 0x01
- .byte OBJ_EVENT_GFX_RED_BIKE, 0x02
- .byte OBJ_EVENT_GFX_RED_SURF, 0x08
- @ Female
- .byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01
- .byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02
- .byte OBJ_EVENT_GFX_GREEN_SURF, 0x08
-
-gUnknown_835B88E:: @ 835B88E
- .byte OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE
- .byte OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
-
-gUnknown_835B890:: @ 835B890
- .4byte MetatileBehavior_IsSouthArrowWarp
- .4byte MetatileBehavior_IsNorthArrowWarp
- .4byte MetatileBehavior_IsWestArrowWarp
- .4byte MetatileBehavior_IsEastArrowWarp
-
-gUnknown_835B8A0:: @ 835B8A0
- .4byte sub_805CD64
- .4byte sub_805CD84
- .4byte sub_805CE20
-
-gUnknown_835B8AC:: @ 835B8AC
- .4byte PlayerAvatar_DoSecretBaseMatJump
-
-gUnknown_835B8B0:: @ 835B8B0
- .4byte sub_805CFC4
- .4byte sub_805CFEC
- .4byte sub_805D064
- .4byte sub_805D0A4
-
-gUnknown_835B8C0:: @ 835B8C0
- .byte 0x03, 0x04, 0x02, 0x01
-
-gUnknown_835B8C4:: @ 835B8C4
- .byte 0x18, 0x18, 0x19, 0x1a, 0x1b
-
- .align 2
-gUnknown_835B8CC:: @ 835B8CC
- .4byte sub_805D33C
- .4byte fish1
- .4byte fish2
- .4byte sub_805D430
- .4byte sub_805D47C
- .4byte sub_805D508
- .4byte sub_805D574
- .4byte sub_805D580
- .4byte sub_805D5EC
- .4byte sub_805D66C
- .4byte sub_805D6C8
- .4byte sub_805D7C0
- .4byte sub_805D838
- .4byte sub_805D8AC
- .4byte sub_805D8D8
- .4byte sub_805D980
-
-gUnknown_835B90C:: @ 835B90C
- .2byte 0x0001, 0x0001, 0x0001
-
-gUnknown_835B912:: @ 835B912
- .2byte 0x0001, 0x0003, 0x0006
-
-gUnknown_835B918:: @ 835B918
- .string "·$"
-
-gUnknown_835B91A:: @ 835B91A
- .2byte 0x0024, 0x0021, 0x001e
-
-gUnknown_835B920:: @ 835B920
- .2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e
-
-gUnknown_835B92C:: @ 835B92C
- .byte 0x01, 0x03, 0x04, 0x02, 0x01
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/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc
index be854826b..c50fcdb2d 100644
--- a/data/maps/PewterCity/scripts.inc
+++ b/data/maps/PewterCity/scripts.inc
@@ -744,7 +744,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
msgbox PewterCity_Text_RunningShoesLetterFromMom
closemessage
removeobject LOCALID_AIDE
- setflag FLAG_SYS_RUNNING_SHOES
+ setflag FLAG_SYS_B_DASH
setvar VAR_MAP_SCENE_PEWTER_CITY, 2
return
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-08-06 00:08:17 +0000