Fixes for C23 Support (#2138)
* fixes for c23 support * include global.h in m4a.c & remove <string.h> include
This commit is contained in:
@@ -38,14 +38,13 @@ EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {};
|
||||
EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {};
|
||||
|
||||
// static declarations
|
||||
|
||||
static u8 ObjectEventCB2_NoMovement2();
|
||||
static u8 ObjectEventCB2_NoMovement2(void);
|
||||
static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *, u8);
|
||||
static void npc_clear_strange_bits(struct ObjectEvent *);
|
||||
static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16);
|
||||
static void PlayerAllowForcedMovementIfMovingSameDirection();
|
||||
static bool8 TryDoMetatileBehaviorForcedMovement();
|
||||
static u8 GetForcedMovementByMetatileBehavior();
|
||||
static void PlayerAllowForcedMovementIfMovingSameDirection(void);
|
||||
static bool8 TryDoMetatileBehaviorForcedMovement(void);
|
||||
static u8 GetForcedMovementByMetatileBehavior(void);
|
||||
|
||||
static bool8 ForcedMovement_None(void);
|
||||
static bool8 ForcedMovement_Slip(void);
|
||||
@@ -318,7 +317,7 @@ static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct Obj
|
||||
|
||||
void MovementType_Player(struct Sprite *sprite)
|
||||
{
|
||||
UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2);
|
||||
UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, (bool8 (*)(struct ObjectEvent *, struct Sprite *))ObjectEventCB2_NoMovement2);
|
||||
}
|
||||
|
||||
static u8 ObjectEventCB2_NoMovement2(void)
|
||||
|
||||
Reference in New Issue
Block a user