diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-12-30 09:00:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 09:00:08 -0500 |
| commit | 643cc62f7369f6728b07442d0f6be70174ffbfa1 (patch) | |
| tree | ad31ab122f15ed188ef9715b2f5c3e760f29280f /src | |
| parent | 4192a40adf85e4825775f16a33df6e84d6ec0bcb (diff) | |
| parent | 50522fdea49d327361ba19bbc92c9c879343616d (diff) | |
Merge pull request #1584 from sphericalice/patch-1
Remove some magic numbers from TryPushBoulder
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6cf468b3e..3c0276a27 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -735,13 +735,13 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction) { u8 objectEventId = GetObjectEventIdByXY(x, y); - if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) + if (objectEventId != OBJECT_EVENTS_COUNT && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) { x = gObjectEvents[objectEventId].currentCoords.x; y = gObjectEvents[objectEventId].currentCoords.y; MoveCoords(direction, &x, &y); if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE - && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) + && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == FALSE) { StartStrengthAnim(objectEventId, direction); return TRUE; |