diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 5bd91cf9..1a2478c3 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -11,25 +11,6 @@ - thumb_func_start sub_08027984 -sub_08027984: @ 0x08027984 - push {r4, r5, r6, lr} - adds r4, r0, #0 - ldr r1, [r4, #0x54] - ldr r5, [r4, #0x68] - ldr r6, [r4, #0x50] - ldrb r2, [r1, #0xa] - bl sub_080279AC - ldrb r2, [r5, #0xa] - adds r0, r4, #0 - adds r1, r5, #0 - bl sub_080279AC - ldrb r2, [r6, #0xa] - adds r0, r4, #0 - adds r1, r6, #0 - bl sub_080279AC - pop {r4, r5, r6, pc} - .align 2, 0 thumb_func_start sub_080279AC sub_080279AC: @ 0x080279AC diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 9e138ff5..9652752a 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -1621,3 +1621,16 @@ void sub_08027870(ChuchuBossEntity* this) { LinearMoveAngle(&pEVar5->base, pEVar5->base.timer << 8, pEVar5->unk_82.HALF.HI); sub_08027984(this); } + +void sub_08027984(ChuchuBossEntity* this) { + ChuchuBossEntity* child; + ChuchuBossEntity* pEVar1; + ChuchuBossEntity* pEVar2; + + child = (ChuchuBossEntity*)super->child; + pEVar1 = this->unk_68; + pEVar2 = (ChuchuBossEntity*)super->parent; + sub_080279AC(this, child, child->base.type); + sub_080279AC(this, pEVar1, pEVar1->base.type); + sub_080279AC(this, pEVar2, pEVar2->base.type); +}