diff options
| -rw-r--r-- | data/maps/events/VictoryRoad_B1F.inc | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 0f0679b56..575744050 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -15,7 +15,7 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 diff --git a/include/constants/flags.h b/include/constants/flags.h index 1eac4d49d..b9c1f8611 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -38,6 +38,11 @@ #define FLAG_TEMP_1E 0x1E #define FLAG_TEMP_1F 0x1F +// This flag was supposed to be used as a temporary flag (see above), but there +// was either an oversight or off-by-one error. Therefore, this one rock-smashable +// rock disappears forever after the player breaks it. +#define FLAG_VICTORY_ROAD_ROCK 0x20 + // scripts #define FLAG_PENDING_DAYCARE_EGG 0x86 |