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/collision.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/collision.c')
| -rw-r--r-- | src/collision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/collision.c b/src/collision.c index 95595906..b8c0bbd3 100644 --- a/src/collision.c +++ b/src/collision.c @@ -391,7 +391,7 @@ CollisionResult sub_08017B1C(Entity* org, Entity* tgt, u32 direction, ColSetting CollisionResult sub_08017B58(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) { if ((tgt->gustJarState & 4) != 0) { if (tgt->gustJarTolerance) { - tgt->gustJarTolerance = tgt->gustJarTolerance - gPlayerState.gustJarSpeed; + tgt->gustJarTolerance = tgt->gustJarTolerance - gPlayerState.gustJarCharge; if ((s8)tgt->gustJarTolerance <= 0) { tgt->gustJarTolerance = 0; tgt->subAction = 2; |