diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 2909ed75..7a66f221 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -18,32 +18,6 @@ - thumb_func_start sub_08026914 -sub_08026914: @ 0x08026914 - push {r4, lr} - sub sp, #4 - adds r4, r0, #0 - bl sub_080279E8 - cmp r0, #0 - beq _08026942 - movs r0, #0xff - str r0, [sp] - adds r0, r4, #0 - movs r1, #0x90 - movs r2, #0xb0 - movs r3, #4 - bl sub_08027B98 - adds r0, r4, #0 - movs r1, #0 - bl sub_08027548 - ldr r0, [r4, #0x54] - movs r1, #0 - bl InitAnimationForceUpdate -_08026942: - adds r0, r4, #0 - bl sub_080277F8 - add sp, #4 - pop {r4, pc} thumb_func_start sub_0802694C sub_0802694C: @ 0x0802694C diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index b16983ac..684152bd 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -819,3 +819,12 @@ void sub_080268EC(ChuchuBossEntity* this) { sub_08027D20(this); } } + +void sub_08026914(ChuchuBossEntity* this) { + if (sub_080279E8(this)) { + sub_08027B98(this, 0x90, 0xb0, 4, 0xff); + sub_08027548(this, 0); + InitAnimationForceUpdate(super->child, 0); + } + sub_080277F8(this); +}