diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_objects.h | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/event_object_movement.h | 1 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 5 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 12 | ||||
| -rw-r--r-- | include/quest_log_player.h | 2 |
6 files changed, 16 insertions, 8 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 2d51cd74d..08634f5f2 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -98,7 +98,7 @@ #define OBJ_EVENT_GFX_POKEDEX 94 #define OBJ_EVENT_GFX_CUT_TREE 95 #define OBJ_EVENT_GFX_ROCK_SMASH_ROCK 96 -#define OBJ_EVENT_GFX_STRENGTH_BOULDER 97 +#define OBJ_EVENT_GFX_PUSHABLE_BOULDER 97 #define OBJ_EVENT_GFX_FOSSIL 98 #define OBJ_EVENT_GFX_RUBY 99 #define OBJ_EVENT_GFX_SAPPHIRE 100 diff --git a/include/constants/flags.h b/include/constants/flags.h index 417e68255..6fd532a0e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1321,7 +1321,7 @@ #define FLAG_SYS_VS_SEEKER_CHARGING (SYS_FLAGS + 0x1) #define FLAG_SYS_WHITE_FLUTE_ACTIVE (SYS_FLAGS + 0x3) #define FLAG_SYS_BLACK_FLUTE_ACTIVE (SYS_FLAGS + 0x4) -#define FLAG_SYS_STRENGTH_ACTIVE (SYS_FLAGS + 0x5) +#define FLAG_SYS_USE_STRENGTH (SYS_FLAGS + 0x5) #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) #define FLAG_0x808 (SYS_FLAGS + 0x8) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 3d5ea03f1..7bdeb08c5 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -199,5 +199,6 @@ extern const struct OamData gObjectEventBaseOam_32x32; extern const u16 gUnknown_8398648[]; extern const u16 gUnknown_8398688[]; extern const u8 gReflectionEffectPaletteMap[]; +u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z); #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 658ad7393..f5660a8a4 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -309,6 +309,11 @@ enum COLLISION_LEDGE_JUMP, COLLISION_PUSHED_BOULDER, COLLISION_UNKNOWN_WARP_6C_6D_6E_6F, + COLLISION_WHEELIE_HOP, + COLLISION_ISOLATED_VERTICAL_RAIL, + COLLISION_ISOLATED_HORIZONTAL_RAIL, + COLLISION_VERTICAL_RAIL, + COLLISION_HORIZONTAL_RAIL, }; // player running states diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 34f5bbd7b..a5f5a81b7 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -23,7 +23,7 @@ bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior); bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior); bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior); bool8 MetatileBehavior_IsLadder(u8 metatileBehavior); -bool8 MetatileBehavior_IsCaveDoor(u8 metatileBehavior); +bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior); bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior); bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior); bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior); @@ -98,11 +98,11 @@ bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior); bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior); bool8 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior); bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_14(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior); +bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior); +bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior); +bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior); +bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior); +bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior); bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior); diff --git a/include/quest_log_player.h b/include/quest_log_player.h index 9cde1747e..eedb6fa37 100644 --- a/include/quest_log_player.h +++ b/include/quest_log_player.h @@ -4,5 +4,7 @@ #include "global.h" void sub_8150454(void); +bool8 sub_8150474(u8 a0); +void sub_8150498(u8 a0); #endif //GUARD_QUEST_LOG_PLAYER_H |