diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-30 17:29:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 17:29:51 -0800 |
| commit | 37714644960c56650dd1067b86aafa685eaf01f4 (patch) | |
| tree | 40f875091f258e234ff5b0c8f56e08faa55e90d1 /src/object/cutsceneMiscObject.c | |
| parent | 9c87bcca8ea4b52199ed908c0ea28ab08b1d0747 (diff) | |
| parent | 2c7c9ae509d3a9909623c917c082a1ed45b76f46 (diff) | |
Merge pull request #680 from notyourav/f
BounceUpdate and other asm functions labeled
Diffstat (limited to 'src/object/cutsceneMiscObject.c')
| -rw-r--r-- | src/object/cutsceneMiscObject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c index 68f86a77..c2320d91 100644 --- a/src/object/cutsceneMiscObject.c +++ b/src/object/cutsceneMiscObject.c @@ -331,7 +331,7 @@ void CutsceneMiscObject_Type5(CutsceneMiscObjectEntity* this) { super->zVelocity = 0; SetEntityPriority(super, PRIO_PLAYER_EVENT); InitializeAnimation(super, 0); - if (GetTileUnderEntity(super) == 13) { + if (GetActTile(super) == 13) { super->action = 3; } break; @@ -550,7 +550,7 @@ void CutsceneMiscObject_Type11(CutsceneMiscObjectEntity* this) { InitAnimationForceUpdate(super, 0); } if (super->subAction != 0) { - if ((u32)sub_080044EC(super, 0x1800) <= 1) { + if ((u32)BounceUpdate(super, Q_8_8(24.0)) <= BOUNCE_INIT_NEXT) { super->subAction = 0; SetAffineInfo(super, 0x100, 0x100, 0xC000); } else { |