diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index e295b612..aa715def 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -14,44 +14,6 @@ - thumb_func_start sub_08027A60 -sub_08027A60: @ 0x08027A60 - push {lr} - adds r2, r0, #0 - adds r0, #0x7c - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08027A78 - ldr r0, [r2, #0x74] - movs r1, #0x80 - lsls r1, r1, #7 - b _08027A7C -_08027A78: - ldr r0, [r2, #0x74] - ldr r1, _08027AA0 @ =0xFFFFC000 -_08027A7C: - adds r0, r0, r1 - str r0, [r2, #0x74] - adds r3, r2, #0 - adds r3, #0x7c - ldrb r0, [r3] - adds r2, r0, #1 - strb r2, [r3] - movs r0, #0x7f - ands r0, r2 - cmp r0, #0x28 - bne _08027A9C - movs r1, #0x80 - movs r0, #0x80 - ands r2, r0 - eors r2, r1 - strb r2, [r3] -_08027A9C: - pop {pc} - .align 2, 0 -_08027AA0: .4byte 0xFFFFC000 thumb_func_start sub_08027AA4 sub_08027AA4: @ 0x08027AA4 diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 9e586661..8595feef 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -1674,3 +1674,19 @@ bool32 sub_080279E8(ChuchuBossEntity* this) { } return FALSE; } + +void sub_08027A60(ChuchuBossEntity* this) { + int iVar1; + int iVar2; + u32 bVar3; + + if ((this->unk_7c & 0x80) != 0) { + this->unk_74.WORD += Q_16_16(0.25); + } else { + this->unk_74.WORD -= Q_16_16(0.25); + } + this->unk_7c++; + if ((this->unk_7c & 0x7f) == 0x28) { + this->unk_7c = (this->unk_7c & 0x80) ^ 0x80; + } +}