diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-07-16 09:04:59 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-07-16 09:04:59 +0300 |
| commit | 1112df0a2ac100c4d8a0a50bbddcb3b42276cc16 (patch) | |
| tree | cfa37cb1ef3cf2e135a5a0f63b2d8b6c2d2f4727 | |
| parent | 27f9666970ecd020b4ad556b03009bda6ac02705 (diff) | |
Match sub_080264AC
| -rw-r--r-- | asm/enemy/chuchuBoss.s | 20 | ||||
| -rw-r--r-- | src/enemy/chuchuBoss.c | 8 |
2 files changed, 8 insertions, 20 deletions
diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index d8f9c18a..75a52f58 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -12,26 +12,6 @@ - thumb_func_start sub_080264AC -sub_080264AC: @ 0x080264AC - push {r4, lr} - adds r4, r0, #0 - movs r1, #0xd0 - movs r2, #8 - bl sub_080277B8 - adds r0, r4, #0 - adds r0, #0x84 - ldr r0, [r0] - ldrb r0, [r0, #3] - cmp r0, #6 - beq _080264D2 - ldr r0, [r4, #0x54] - movs r1, #4 - bl InitAnimationForceUpdate - adds r0, r4, #0 - bl sub_08027D20 -_080264D2: - pop {r4, pc} thumb_func_start sub_080264D4 sub_080264D4: @ 0x080264D4 diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 2c5b7351..cb722832 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -619,3 +619,11 @@ void sub_0802647C(ChuchuBossEntity* this) { this->unk_84->unk_03++; } } + +void sub_080264AC(ChuchuBossEntity* this) { + sub_080277B8(this, 0xd0, 8); + if (this->unk_84->unk_03 != 6) { + InitAnimationForceUpdate(super->child, 4); + sub_08027D20(this); + } +} |