diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-29 11:26:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 11:26:17 -0800 |
| commit | d34aa9166f5d9f7958e586ae1daee3224eb11fa5 (patch) | |
| tree | c87bc54ed29b24788ecf741e8906735f00fa489f /src/object | |
| parent | f610f3f4e8eeea02f9262fabbf0d761358766a02 (diff) | |
| parent | 3c2b1d55221b7de681aef56632b4c6c1c2bb2812 (diff) | |
Merge pull request #331 from hatal175/framestate
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/lilypadLarge.c | 4 | ||||
| -rw-r--r-- | src/object/pullableLever.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c index 3466ce9c..9a7fe9d4 100644 --- a/src/object/lilypadLarge.c +++ b/src/object/lilypadLarge.c @@ -228,7 +228,7 @@ void sub_08085D10(LilypadLargeEntity* this) { } void sub_08085D28(LilypadLargeEntity* this) { - if (((gPlayerState.framestate != 0x13) && ((gPlayerState.flags & 2) != 0)) && + if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & 2) != 0)) && (sub_080002B4(super, 0, 0x18) == 0x11)) { super->action = 2; super->subAction = 0; @@ -240,7 +240,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil u32 r4; // horizontal direction? u32 r6; // vertical direction? if ((gPlayerState.flags & 2) != 0) { - if (gPlayerState.framestate != 0x12) { + if (gPlayerState.framestate != PL_STATE_DIE) { if (gPlayerState.jump_status == 0) { if ((super->direction & 7) == 0) { // North or South r4 = super->direction; diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c index 28109862..56acc72d 100644 --- a/src/object/pullableLever.c +++ b/src/object/pullableLever.c @@ -124,7 +124,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) { super->field_0xf = 2; } if (player->animationState >> 1 == super->type2) { - if (gPlayerState.framestate == 0x1a) { + if (gPlayerState.framestate == PL_STATE_PULL) { if (gPlayerState.heldObject & 2) { if (gPlayerEntity.frame & 2) { sub_0809153C(this); |