diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-26 17:51:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 17:51:56 -0500 |
| commit | 2efbd5f549bd03cfdaea2c84d48d5fb706034464 (patch) | |
| tree | 2454365b3478382c4246dc850f700f661377ed46 /src/field_player_avatar.c | |
| parent | 4188dd405c07943da9fb6d5c048d5845a94e0669 (diff) | |
| parent | 3d0326106ed683911da66eee1bf94becadc7a2db (diff) | |
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 150c352fc..964a62187 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -708,8 +708,8 @@ static u8 CheckForObjectEventStaticCollision(struct ObjectEvent *objectEvent, s1 static bool8 CanStopSurfing(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - && MapGridGetZCoordAt(x, y) == 3 - && GetObjectEventIdByXYZ(x, y, 3) == OBJECT_EVENTS_COUNT) + && MapGridGetElevationAt(x, y) == 3 + && GetObjectEventIdByPosition(x, y, 3) == OBJECT_EVENTS_COUNT) { CreateStopSurfingTask(direction); return TRUE; @@ -1168,7 +1168,7 @@ u8 GetPlayerMovementDirection(void) return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; } -u8 PlayerGetZCoord(void) +u8 PlayerGetElevation(void) { return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation; } @@ -1306,7 +1306,7 @@ bool8 IsPlayerFacingSurfableFishableWater(void) MoveCoords(playerObjEvent->facingDirection, &x, &y); if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == COLLISION_ELEVATION_MISMATCH - && PlayerGetZCoord() == 3 + && PlayerGetElevation() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; else |