dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better match for TryPushBoulder

Browse Source
This commit is contained in:
PikalaxALT
2020-03-23 21:46:52 -04:00
parent 5b3e9f376b
commit 58535acf88
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+4 -5
View File
@@ -583,6 +583,7 @@ bool8 ShouldJumpLedge(s16 x, s16 y, u8 z)
bool8 TryPushBoulder(s16 x, s16 y, u8 direction) bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
{ {
u8 objectEventId; u8 objectEventId;
u8 direction_ = direction;
if (!FlagGet(FLAG_SYS_USE_STRENGTH)) if (!FlagGet(FLAG_SYS_USE_STRENGTH))
return FALSE; return FALSE;
@@ -595,16 +596,14 @@ bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
x = gObjectEvents[objectEventId].currentCoords.x; x = gObjectEvents[objectEventId].currentCoords.x;
y = gObjectEvents[objectEventId].currentCoords.y; y = gObjectEvents[objectEventId].currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction_, &x, &y);
if (MapGridGetMetatileBehaviorAt(x, y) == MB_FALL_WARP || (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE && !MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)))) if (MapGridGetMetatileBehaviorAt(x, y) == MB_FALL_WARP || (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction_) == COLLISION_NONE && !MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y))))
{ {
StartStrengthAnim(objectEventId, direction); StartStrengthAnim(objectEventId, direction_);
return TRUE; return TRUE;
} }
else else
{ {
direction++;
direction--;
return FALSE; return FALSE;
} }
} }