diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/event_object_movement.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 08713a602..d2f0a945b 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -153,7 +153,7 @@ #define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW 0x42 #define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW 0x43 #define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW 0x44 -#define MOVEMENT_ACTION_UNKNOWN_STEP_45 0x45 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x45 #define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x46 #define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x47 #define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x48 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 29254ec5d..1e63727fb 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -118,6 +118,7 @@ void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); u8 sub_8063F2C(u8 direction); u8 sub_8064194(u8 direction); +u8 sub_80641C0(u8 direction); void sub_805F378(s16 x, s16 y); diff --git a/include/overworld.h b/include/overworld.h index 3b7fd7bc1..4fceee38b 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -85,6 +85,8 @@ void sub_8084EBC(s16, s16); void sub_80555E0(void); void copy_saved_warp3_bank_and_enter_x_to_warp1(void); u8 IsMapTypeOutdoors(u8 mapType); +void sav1_reset_battle_music_maybe(void); +bool32 sub_8056124(u16 song); void player_avatar_init_params_reset(void); |