diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/event_object_movement.h | 2 | ||||
-rw-r--r-- | include/field_effect_helpers.h | 1 | ||||
-rw-r--r-- | include/field_player_avatar.h | 4 | ||||
-rw-r--r-- | include/quest_log.h | 1 | ||||
-rw-r--r-- | include/quest_log_player.h | 2 | ||||
-rw-r--r-- | include/strings.h | 5 |
6 files changed, 12 insertions, 3 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 12d3305e7..496b2f245 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -217,5 +217,7 @@ u8 GetJumpInPlaceTurnAroundMovementAction(u32 direction); u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction); u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction); +u8 sub_80641EC(u32 direction); +u8 sub_8063510(u8 direction); #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index a1fbe49b2..4505b2e48 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -24,5 +24,6 @@ u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); +void sub_80DC4A4(u8 spriteId, u8 value, s16 data1); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 1dcdb8e5d..51e29c060 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -19,12 +19,12 @@ void sub_805C780(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetPlayerAvatarGraphicsIdByStateId(u8); void SetPlayerAvatarStateMask(u8 mask); -void sub_805D9C4(struct Sprite *sprite); +void AlignFishingAnimationFrames(struct Sprite *sprite); void CreateStopSurfingTask_NoMusicChange(u8 direction); void sub_805DAE4(u8 direction); void SetPlayerAvatarTransitionFlags(u16 a); bool8 IsPlayerFacingSurfableFishableWater(void); -void sub_805D2C0(u8 secondaryId); +void StartFishing(u8 secondaryId); u8 GetPlayerAvatarObjectId(void); u8 PlayerGetZCoord(void); u8 GetPlayerAvatarGraphicsIdByCurrentState(void); diff --git a/include/quest_log.h b/include/quest_log.h index 70a5c2f30..28c69505b 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -58,5 +58,6 @@ void Special_UpdateTrainerFansAfterLinkBattle(void); void sub_8112628(u8 movementActionId); void sub_81126AC(u8 movementActionId, u8 duration); void sub_8112588(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration); +void sub_8112C9C(void); #endif //GUARD_QUEST_LOG_H diff --git a/include/quest_log_player.h b/include/quest_log_player.h index eedb6fa37..5aee3f2d0 100644 --- a/include/quest_log_player.h +++ b/include/quest_log_player.h @@ -4,7 +4,7 @@ #include "global.h" void sub_8150454(void); -bool8 sub_8150474(u8 a0); +bool32 sub_8150474(u8 a0); void sub_8150498(u8 a0); #endif //GUARD_QUEST_LOG_PLAYER_H diff --git a/include/strings.h b/include/strings.h index e7f274abd..37d856a86 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1463,4 +1463,9 @@ extern const u8 gUnknown_841B2C6[]; extern const u8 gUnknown_841B2E5[]; extern const u8 gUnknown_841B2DC[]; +// field_player_avatar +extern const u8 gText_PokemonOnHook[]; +extern const u8 gText_NotEvenANibble[]; +extern const u8 gText_ItGotAway[]; + #endif //GUARD_STRINGS_H |