diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-28 21:58:54 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-28 21:58:54 -0800 |
| commit | d07c41664190a12c4f56d2e71eae8aa41f40ce21 (patch) | |
| tree | 5b5fcbabc56e46060cd64bb3db9e3f07a119c998 /src/object/bird.c | |
| parent | 56688ac226db420c7b8ee7080f7185da58437fbc (diff) | |
message definitions
Diffstat (limited to 'src/object/bird.c')
| -rw-r--r-- | src/object/bird.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/object/bird.c b/src/object/bird.c index 2b4b0dac..485c0695 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -225,7 +225,7 @@ void Bird_Type8(BirdEntity* this) { super->speed = 0x300; } - if ((gPlayerEntity.flags & ENT_COLLIDE) && (gMessage.doTextBox & 0x7f) == 0 && + if ((gPlayerEntity.flags & ENT_COLLIDE) && (gMessage.state & MESSAGE_ACTIVE) == 0 && gPlayerEntity.action != PLAYER_SLEEP && gPlayerEntity.action != PLAYER_BOUNCE && gPlayerEntity.action != PLAYER_MINISH && gPlayerState.framestate != PL_STATE_CLIMB && gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_PARACHUTE && @@ -240,21 +240,21 @@ void Bird_Type8(BirdEntity* this) { super->speed = 0x300; this->gravity = Q_8_8(-32.0); PlayerDropHeldObject(); - sub_08078B48(); + PausePlayer(); ResetPlayerAnimationAndAction(); PutAwayItems(); gPlayerState.swim_state = 0; gPlayerState.jump_status = 0; gPlayerEntity.flags &= ~0x80; gPlayerEntity.spriteSettings.draw = 0; - gPriorityHandler.sys_priority = 6; + gPriorityHandler.event_priority = 6; gPauseMenuOptions.disabled = 1; } } } break; default: - sub_08078B48(); + PausePlayer(); gPlayerEntity.spriteSettings.draw = 0; break; } @@ -313,7 +313,7 @@ void Bird_Type9(BirdEntity* this) { SoundReq(SFX_123); super->spritePriority.b1 = 2; InitAnimationForceUpdate(super, 0); - sub_08078B48(); + PausePlayer(); } else if (super->action == 1) { gPlayerEntity.spriteSettings.draw = 0; child = super->child; @@ -324,7 +324,7 @@ void Bird_Type9(BirdEntity* this) { child->spriteRendering.b3 = super->spriteRendering.b3; child->spriteOrientation.flipY = super->spriteOrientation.flipY; } - sub_08078B48(); + PausePlayer(); if (gRoomControls.scroll_x + 0x78 < super->x.HALF.HI) { super->action++; super->spritePriority.b1 = 1; |