diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-12-30 15:53:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 15:53:53 -0800 |
| commit | f8c22253849dff6fe08051fa3a4d13e09dbb8688 (patch) | |
| tree | a53aaadbe2b23b1bc2850554b1cca1ecb49d091c /src | |
| parent | 8b6601525fe74a54d717568441ae08796206351e (diff) | |
| parent | 631d979af1e6d367b1367eaa9201f345f4b4069c (diff) | |
Merge pull request #230 from hatal175/bombpeahat
Improve nonmatching sub_0802AFC8
Diffstat (limited to 'src')
| -rw-r--r-- | src/enemy/bombPeahat.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 45800c5c..79b485f0 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -473,28 +473,28 @@ void sub_0802AF9C(Entity* this) { } NONMATCH("asm/non_matching/bombPeahat/sub_0802AFC8.inc", void sub_0802AFC8(Entity* this)) { + u32 field_0xf = this->field_0xf; u32 flag = 8; - if (this->field_0xf < 0x29) { - u32 tmp; - + if (field_0xf < 0x29) { + u32 tmp, tmp2; flag = 4; if (this->field_0x82.HWORD & 0x8000) { this->field_0x82.HWORD -= 0x10; } else { this->field_0x82.HWORD += 0x10; } - if (0x7f < (this->field_0x82.HWORD & 0xf0) - 1) { + tmp2 = this->field_0x82.HWORD; + tmp = tmp2 & 0xf0; + if (tmp == 0 || tmp > 0x80) { this->field_0x82.HWORD ^= 0x8000; } - tmp = 0x130 - (this->field_0x82.HWORD & 0xf0); sub_0805EC9C(this, tmp, tmp, 0); } - if (this->field_0xf & flag) { - this->palette.b.b0 = 0; - } else { this->palette.b.b0 = this->palette.b.b4; + } else { + this->palette.b.b0 = 0; } } END_NONMATCH |