diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-02 11:23:04 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-02 11:23:04 -0500 |
| commit | ceeed6247dbeca94fdb073441b98a885da44ffe1 (patch) | |
| tree | 93e2c1f0b966e704922a14ca7df62f955a0f2c96 /src/event_object_80688E4.c | |
| parent | ba7403c74e214fe798095e99949461aaadd274c7 (diff) | |
Port object event flags from emerald
Diffstat (limited to 'src/event_object_80688E4.c')
| -rw-r--r-- | src/event_object_80688E4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/event_object_80688E4.c b/src/event_object_80688E4.c index 4ce976b6d..133052642 100644 --- a/src/event_object_80688E4.c +++ b/src/event_object_80688E4.c @@ -10,11 +10,11 @@ static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite); bool8 FreezeObjectEvent(struct ObjectEvent * objectEvent) { - if (objectEvent->mapobj_bit_6 || objectEvent->mapobj_bit_8) + if (objectEvent->heldMovementActive || objectEvent->frozen) return TRUE; - objectEvent->mapobj_bit_8 = TRUE; - objectEvent->mapobj_bit_23 = gSprites[objectEvent->spriteId].animPaused; - objectEvent->mapobj_bit_24 = gSprites[objectEvent->spriteId].affineAnimPaused; + objectEvent->frozen = TRUE; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; gSprites[objectEvent->spriteId].animPaused = TRUE; gSprites[objectEvent->spriteId].affineAnimPaused = TRUE; return FALSE; @@ -42,11 +42,11 @@ void FreezeObjectEventsExceptOne(u8 noFreeze) void UnfreezeObjectEvent(struct ObjectEvent * objectEvent) { - if (objectEvent->active && objectEvent->mapobj_bit_8) + if (objectEvent->active && objectEvent->frozen) { - objectEvent->mapobj_bit_8 = FALSE; - gSprites[objectEvent->spriteId].animPaused = objectEvent->mapobj_bit_23; - gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->mapobj_bit_24; + objectEvent->frozen = FALSE; + gSprites[objectEvent->spriteId].animPaused = objectEvent->spriteAnimPausedBackup; + gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->spriteAffineAnimPausedBackup; } } |