diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-11-06 10:20:00 +0000 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-11-06 10:20:00 +0000 |
| commit | 4ec85404c0272c29152848d8bfc67ba6bb87d668 (patch) | |
| tree | f973feef513992eac6e7fa436164136f79c68812 /src | |
| parent | 2fd31d25bc2abd3a9a98a40cf8d6a2f7dd15ff2a (diff) | |
Match sub_08066570
Diffstat (limited to 'src')
| -rw-r--r-- | src/npc/npc23.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/npc/npc23.c b/src/npc/npc23.c index 6879c6a9..eccd933c 100644 --- a/src/npc/npc23.c +++ b/src/npc/npc23.c @@ -174,8 +174,9 @@ bool32 sub_0806650C(Entity* this) { return 1; } -NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* this)) { +void sub_08066570(Entity* this) { u32 direction; + s32 tmp; u32 dir1, dir2; bool32 cond; if ((this->frame & ANIM_DONE) == 0) { @@ -191,6 +192,7 @@ NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* th dir2 = (direction & 0x18); dir1 = (this->direction & 0x18); + tmp = 0x18; if (dir1 == dir2) { dir1 = (direction + 5) & 7; dir2 = (this->direction + 5) & 7; @@ -201,9 +203,8 @@ NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* th if (cond) { this->direction = direction; direction += 4; - direction &= 0x18; + direction &= tmp; direction >>= 3; InitializeAnimation(this, direction); } } -END_NONMATCH |