diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-30 18:52:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 18:52:58 -0700 |
| commit | b39144b38ae09263a286026144cdfeaed2b2e4be (patch) | |
| tree | d38e5b6e0cadcc4b8d3f54d2b6ef67ad94ca0d79 /src | |
| parent | ced56e2fa30db327ffe98f27455702133f40fcf8 (diff) | |
| parent | 1d1d0930844a1929eecc24e68e5c4041208c1321 (diff) | |
Merge pull request #479 from hatal175/sub_08036998
Match sub_08036998
Diffstat (limited to 'src')
| -rw-r--r-- | src/enemy/octorokBoss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index d7bc7015..f5ffe6d0 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -987,17 +987,18 @@ void sub_08036914(Entity* this, s32 angle, s32 radius) { this->spriteOffsetY = this->parent->spriteOffsetY; } -NONMATCH("asm/non_matching/octorokBoss/sub_08036998.inc", void sub_08036998(OctorokBossEntity* this)) { +void sub_08036998(OctorokBossEntity* this) { u32 tmp; s8* tmp2; - s8 tmp3; + s32 tmp3; s32 a, b; // TODO regalloc in this awful structure here tmp2 = &this->timer; - tmp = super->subtimer + (u8)*tmp2; + tmp = super->subtimer + (tmp3 = (u8)*tmp2); *tmp2 = tmp; - if ((s8)super->subtimer < 0) { + tmp3 = super->subtimer; + if ((s8)tmp3 < 0) { a = tmp; b = -super->timer; if (a << 0x18 < b << 0x18) { @@ -1009,7 +1010,6 @@ NONMATCH("asm/non_matching/octorokBoss/sub_08036998.inc", void sub_08036998(Octo } } } -END_NONMATCH /** Calculate tail angles regular */ ASM_FUNC("asm/non_matching/octorokBoss/sub_080369D0.inc", |