diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index af5eca52..f847c3ca 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -8,34 +8,6 @@ - - thumb_func_start sub_08026328 -sub_08026328: @ 0x08026328 - push {lr} - adds r2, r0, #0 - ldr r0, _08026354 @ =gPlayerEntity - ldrb r0, [r0, #0xc] - cmp r0, #0x17 - beq _08026352 - adds r1, r2, #0 - adds r1, #0x7d - movs r0, #0x78 - strb r0, [r1] - adds r0, r2, #0 - adds r0, #0x84 - ldr r1, [r0] - ldrb r0, [r1, #3] - adds r0, #1 - strb r0, [r1, #3] - movs r0, #0xa - movs r1, #0 - movs r2, #0 - bl sub_08078AC0 -_08026352: - pop {pc} - .align 2, 0 -_08026354: .4byte gPlayerEntity - thumb_func_start sub_08026358 sub_08026358: @ 0x08026358 push {r4, lr} diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index f6a1e040..8e0c8622 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -549,3 +549,11 @@ void sub_080262A8(ChuchuBossEntity* this) { SetTile(0x4022, 0x2c8, 1); } } + +void sub_08026328(ChuchuBossEntity* this) { + if (gPlayerEntity.action != 23) { + this->unk_7d = 0x78; + this->unk_84->unk_03++; + sub_08078AC0(10, 0, 0); + } +}