diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 6af3aa95..ce6713c6 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -13,38 +13,6 @@ - thumb_func_start sub_0802653C -sub_0802653C: @ 0x0802653C - push {r4, r5, lr} - sub sp, #4 - adds r4, r0, #0 - ldr r1, _08026578 @ =gRoomControls - ldrh r5, [r1] - cmp r5, #0 - bne _08026572 - movs r0, #4 - strb r0, [r1, #0xe] - 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 - ldr r0, _0802657C @ =gPauseMenuOptions - strb r5, [r0] -_08026572: - add sp, #4 - pop {r4, r5, pc} - .align 2, 0 -_08026578: .4byte gRoomControls -_0802657C: .4byte gPauseMenuOptions thumb_func_start sub_08026580 sub_08026580: @ 0x08026580 diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 0ca38dcf..cb405e9d 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -645,3 +645,13 @@ void sub_0802650C(ChuchuBossEntity* this) { } sub_08027870(super); } + +void sub_0802653C(ChuchuBossEntity* this) { + if (gRoomControls.reload_flags == 0) { + gRoomControls.unk5 = 4; + sub_08027B98(this, 0x90, 0xb0, 4, 0xff); + sub_08027548(this, 0); + InitAnimationForceUpdate(super->child, 0); + gPauseMenuOptions.disabled = 0; + } +}