ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 04:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename as StaticCollision instead

Browse Source
This commit is contained in:
cbt6 2021-10-27 02:20:12 +08:00
parent b3d779fd0d
commit bd9ea23925
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/field_player_avatar.c
View File

@ -69,8 +69,8 @@ static void PlayerNotOnBikeNotMoving(u8, u16);
static void PlayerNotOnBikeTurningInPlace(u8, u16); static void PlayerNotOnBikeTurningInPlace(u8, u16);
static void PlayerNotOnBikeMoving(u8, u16); static void PlayerNotOnBikeMoving(u8, u16);
static u8 CheckForPlayerAvatarCollision(u8); static u8 CheckForPlayerAvatarCollision(u8);
static u8 CheckForPlayerAvatarSomeCollision(u8); static u8 CheckForPlayerAvatarStaticCollision(u8);
static u8 CheckForObjectEventSomeCollision(struct ObjectEvent *, s16, s16, u8, u8); static u8 CheckForObjectEventStaticCollision(struct ObjectEvent *, s16, s16, u8, u8);
static bool8 CanStopSurfing(s16, s16, u8); static bool8 CanStopSurfing(s16, s16, u8);
static bool8 ShouldJumpLedge(s16, s16, u8); static bool8 ShouldJumpLedge(s16, s16, u8);
static bool8 TryPushBoulder(s16, s16, u8); static bool8 TryPushBoulder(s16, s16, u8);
@ -359,7 +359,7 @@ static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEve
return FALSE; return FALSE;
} }
if (CheckForPlayerAvatarSomeCollision(direction) == COLLISION_NONE) if (CheckForPlayerAvatarStaticCollision(direction) == COLLISION_NONE)
{ {
ObjectEventClearHeldMovement(playerObjEvent); ObjectEventClearHeldMovement(playerObjEvent);
return FALSE; return FALSE;
@ -660,7 +660,7 @@ static u8 CheckForPlayerAvatarCollision(u8 direction)
return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
} }
static u8 CheckForPlayerAvatarSomeCollision(u8 direction) static u8 CheckForPlayerAvatarStaticCollision(u8 direction)
{ {
s16 x, y; s16 x, y;
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@ -668,7 +668,7 @@ static u8 CheckForPlayerAvatarSomeCollision(u8 direction)
x = playerObjEvent->currentCoords.x; x = playerObjEvent->currentCoords.x;
y = playerObjEvent->currentCoords.y; y = playerObjEvent->currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
return CheckForObjectEventSomeCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); return CheckForObjectEventStaticCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
} }
u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior)
@ -694,7 +694,7 @@ u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u
return collision; return collision;
} }
static u8 CheckForObjectEventSomeCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) static u8 CheckForObjectEventStaticCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior)
{ {
u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction);