diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-10 00:35:06 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-10 00:35:06 -0800 |
| commit | 313cc336f21fcf81e3e336b4fe45ca5053771f93 (patch) | |
| tree | 9733b9af938fd26c5a6e56013af9c8a915de105e /src/object/button.c | |
| parent | e6eeeefc50d5e7e4578443ea1f976de694fdb852 (diff) | |
thumb interwork finished
Diffstat (limited to 'src/object/button.c')
| -rw-r--r-- | src/object/button.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/button.c b/src/object/button.c index 8bbd7bca..0a1c7fbb 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -15,8 +15,8 @@ void Button(Entity* this) { extern u32 sub_08081E3C(Entity*); void sub_08081AE0(Entity* this) { - this->flags &= 0x7F; - this->scriptedScene = 3; + COLLISION_OFF(this); + this->updateConditions = 3; this->y.HALF.HI++; if (this->cutsceneBeh.HWORD != 0) { this->collisionLayer = this->cutsceneBeh.HWORD; @@ -234,13 +234,13 @@ u32 sub_08081F00(u32* unk1, u32* unk2) { void sub_08081F24(Entity* this) { Entity* fx = CreateFx(this, FX_DASH, 0x40); if (fx) { - fx->scriptedScene = 3; + fx->updateConditions = 3; fx->x.HALF.HI += 7; fx->y.HALF.HI += 5; } fx = CreateFx(this, FX_DASH, 0x40); if (fx) { - fx->scriptedScene = 3; + fx->updateConditions = 3; fx->x.HALF.HI -= 7; fx->y.HALF.HI += 5; } |
