diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-31 17:36:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 17:36:15 -0800 |
| commit | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (patch) | |
| tree | f5364bb3cdb41fe41512d767c1de44f73963e498 /src/interrupts.c | |
| parent | 72c27b5393372081f558a4c610bab7d5c88d3e89 (diff) | |
| parent | 37ac9cb0fb2d9ccb64286bab2cdf648e6f2541c5 (diff) | |
Merge pull request #684 from notyourav/tiles
Tiles documentation
Diffstat (limited to 'src/interrupts.c')
| -rw-r--r-- | src/interrupts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interrupts.c b/src/interrupts.c index b27a43a7..f52a8da3 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -219,8 +219,8 @@ void PlayerUpdate(PlayerEntity* this) { } HandlePlayerLife(super); DoPlayerAction(this); - if ((super->z.WORD == 0) && (super->action == 1 || super->action == 9)) - sub_08008790(super, 8); + if ((super->z.WORD == 0) && (super->action == PLAYER_NORMAL || super->action == PLAYER_MINISH)) + DoTileInteractionHere(super, 8); sub_080171F0(); } sub_08078FB0(super); @@ -236,7 +236,7 @@ static void HandlePlayerLife(Entity* this) { gUnk_0200AF00.rActionInteractTile = R_ACTION_NONE; gUnk_0200AF00.rActionGrabbing = R_ACTION_NONE; - if ((gPlayerEntity.base.contactFlags & 0x80) && (gPlayerEntity.base.iframes > 0)) + if ((gPlayerEntity.base.contactFlags & CONTACT_TAKE_DAMAGE) && (gPlayerEntity.base.iframes > 0)) SoundReq(SFX_86); gPlayerState.flags &= ~(PL_FALLING | PL_CONVEYOR_PUSHED); @@ -323,7 +323,7 @@ static void sub_080171F0(void) { if (gPlayerEntity.unk_7a != 0) gPlayerEntity.unk_7a--; - gPlayerEntity.base.contactFlags &= ~0x80; + gPlayerEntity.base.contactFlags &= ~CONTACT_TAKE_DAMAGE; if (gPlayerEntity.base.action != PLAYER_DROWN) COPY_FLAG_FROM_TO(gPlayerState.flags, 0x2, 0x10000); |