summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKEKW555 <152369890+KEKW555@users.noreply.github.com>2023-12-28 09:50:15 +0530
committerGitHub <noreply@github.com>2023-12-28 09:50:15 +0530
commit2816176661b0262387408411f95b0c02af3a7d41 (patch)
treef17b9fb2e2bb82a222339999453d409ebb8c6dc8 /src
parent5fb324d54a4f05ed72334938a658c94f6517cddc (diff)
Remove sub_0809CBE4 fake match
Diffstat (limited to 'src')
-rw-r--r--src/object/frozenOctorok.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/object/frozenOctorok.c b/src/object/frozenOctorok.c
index 7aaaac94..6f46ac27 100644
--- a/src/object/frozenOctorok.c
+++ b/src/object/frozenOctorok.c
@@ -421,16 +421,9 @@ void sub_0809CB70(FrozenOctorokEntity* this, s32 angle, s32 radius) {
}
void sub_0809CBE4(FrozenOctorokEntity* this) {
- u16 tmp1;
- FORCE_REGISTER(u8 tmp4, r4);
- u8* tmp3 = &this->unk_79;
- tmp1 = super->subtimer;
- tmp4 = *tmp3;
- tmp1 += tmp4;
- this->unk_79 = tmp1;
+ this->unk_79 += super->subtimer;
if ((s8)super->subtimer < 0) {
- u8 tmp_r0 = super->timer;
- if (tmp1 << 0x18 < -tmp_r0 << 0x18) {
+ if ((s8)this->unk_79 < (s8)-super->timer) {
super->subtimer = -super->subtimer;
SoundReq(SFX_19E);
}