Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-10-26 18:54:17 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix player facing direction on sideways stairs (#10830)

Browse Source
This commit is contained in:
Enrico Drago
2026-09-25 22:22:21 +02:00
committed by GitHub
parent 0a9c697c76
commit 9942e76a07
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/event_object_movement.c
View File

@@ -3629,12 +3629,24 @@ u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
void SetObjectEventDirection(struct ObjectEvent *objectEvent, enum Direction direction)
{
s8 d2;
objectEvent->previousMovementDirection = objectEvent->facingDirection;
if (!objectEvent->facingDirectionLocked)
{
d2 = direction;
objectEvent->facingDirection = d2;
enum Direction facingDirection = direction;
// Player interactions require cardinal facing even while moving diagonally on stairs.
if (objectEvent->isPlayer)
{
if (direction == DIR_SOUTHWEST || direction == DIR_NORTHWEST)
{
facingDirection = DIR_WEST;
}
else if (direction == DIR_SOUTHEAST || direction == DIR_NORTHEAST)
{
facingDirection = DIR_EAST;
}
}
objectEvent->facingDirection = facingDirection;
}
objectEvent->movementDirection = direction;
}
@@ -6500,12 +6512,6 @@ static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *objectEv
bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *objectEvent, s16 x, s16 y, enum Direction direction)
{
// This can rarely happen with a sub-frame perfect a press when going down sideways stairs and trying to surf
assertf(direction > DIR_NONE && direction < CARDINAL_DIRECTION_COUNT, "Tried to check if metatile is directionally impassable on a diagonal movement")
{
return TRUE;
}
if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](objectEvent->currentMetatileBehavior)
|| gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
return TRUE;