ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1584 from sphericalice/patch-1

Browse Source 
Remove some magic numbers from TryPushBoulder
This commit is contained in:
GriffinR 2021-12-30 09:00:08 -05:00 committed by GitHub
commit 643cc62f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field_player_avatar.c
View File

@ -735,13 +735,13 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
{ {
u8 objectEventId = GetObjectEventIdByXY(x, y); 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; x = gObjectEvents[objectEventId].currentCoords.x;
y = gObjectEvents[objectEventId].currentCoords.y; y = gObjectEvents[objectEventId].currentCoords.y;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE
&& MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == FALSE)
{ {
StartStrengthAnim(objectEventId, direction); StartStrengthAnim(objectEventId, direction);
return TRUE; return TRUE;