diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2024-01-01 13:10:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:10:06 -0800 |
| commit | 6fb8b41a8e003d0a4997740f4178aeb0c3f24ead (patch) | |
| tree | 9ada8fe01cc0e308e32e385f9b6965971010cda0 /src/object/bush.c | |
| parent | 983412cc77d81692ad9431c0bd55f8d24e5554f8 (diff) | |
| parent | f5c6178ed4830769f65fbc74b18e3403eda05f86 (diff) | |
Merge pull request #686 from notyourav/followtest
document unused zelda follower and gust jar states
Diffstat (limited to 'src/object/bush.c')
| -rw-r--r-- | src/object/bush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/bush.c b/src/object/bush.c index d0fbc49e..895e6747 100644 --- a/src/object/bush.c +++ b/src/object/bush.c @@ -73,7 +73,7 @@ void Bush_Init(BushEntity* this) { } void Bush_Action1(BushEntity* this) { - if (((gPlayerState.field_0x1c & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { + if (((gPlayerState.gustJarState & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { RestorePrevTileEntity(COORD_TO_TILE(super), super->collisionLayer); DeleteThisEntity(); } @@ -108,7 +108,7 @@ void Bush_Action2SubAction2(BushEntity* this) { super->spriteOffsetX = 0; sub_0807B9B8(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } - if (((gPlayerState.field_0x1c & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { + if (((gPlayerState.gustJarState & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { Bush_Action2SubAction5(this); } if (sub_0806F3E4(super) && ((super->gustJarFlags & 0xf) == 1)) { |