Merge pull request #671 from KEKW555/KEKW555-patch-1

Remove sub_0809CBE4 fake match
This commit is contained in:
Theo 2023-12-28 16:06:08 -08:00 committed by GitHub
commit 3153e42115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions

View File

@ -421,16 +421,9 @@ void sub_0809CB70(FrozenOctorokEntity* this, s32 angle, s32 radius) {
} }
void sub_0809CBE4(FrozenOctorokEntity* this) { void sub_0809CBE4(FrozenOctorokEntity* this) {
u16 tmp1; this->unk_79 += super->subtimer;
FORCE_REGISTER(u8 tmp4, r4);
u8* tmp3 = &this->unk_79;
tmp1 = super->subtimer;
tmp4 = *tmp3;
tmp1 += tmp4;
this->unk_79 = tmp1;
if ((s8)super->subtimer < 0) { if ((s8)super->subtimer < 0) {
u8 tmp_r0 = super->timer; if ((s8)this->unk_79 < (s8)-super->timer) {
if (tmp1 << 0x18 < -tmp_r0 << 0x18) {
super->subtimer = -super->subtimer; super->subtimer = -super->subtimer;
SoundReq(SFX_19E); SoundReq(SFX_19E);
} }