diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index d12220d7..c1ab45a0 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -16,28 +16,6 @@ - thumb_func_start sub_08027B98 -sub_08027B98: @ 0x08027B98 - push {r4, lr} - mov ip, r0 - ldr r4, [sp, #8] - adds r0, #0x82 - strb r1, [r0] - subs r0, #1 - strb r2, [r0] - subs r0, #1 - strb r3, [r0] - cmp r4, #0xff - beq _08027BB4 - mov r0, ip - strb r4, [r0, #0xe] - b _08027BBA -_08027BB4: - movs r0, #1 - mov r1, ip - strb r0, [r1, #0xe] -_08027BBA: - pop {r4, pc} thumb_func_start sub_08027BBC sub_08027BBC: @ 0x08027BBC diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index db04b2ec..ddaeccc8 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -1744,3 +1744,14 @@ bool32 sub_08027AA4(ChuchuBossEntity* this) { } return FALSE; } + +void sub_08027B98(ChuchuBossEntity* this, u32 unk1, u32 unk2, u32 unk3, u32 unk4) { + this->unk_82.HALF.LO = unk1; + this->unk_81 = unk2; + this->unk_80 = unk3; + if (unk4 != 0xff) { + super->timer = unk4; + } else { + super->timer = 1; + } +}