diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 8765e69b..6af3aa95 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -12,31 +12,6 @@ - thumb_func_start sub_0802650C -sub_0802650C: @ 0x0802650C - push {lr} - adds r2, r0, #0 - ldr r0, [r2, #0x54] - adds r0, #0x81 - ldrb r0, [r0] - cmp r0, #0 - bne _0802652C - adds r0, r2, #0 - adds r0, #0x84 - ldr r1, [r0] - ldrb r0, [r1, #3] - adds r0, #1 - strb r0, [r1, #3] - ldr r1, _08026534 @ =gRoomControls - ldr r0, _08026538 @ =gPlayerEntity - str r0, [r1, #0x30] -_0802652C: - adds r0, r2, #0 - bl sub_08027870 - pop {pc} - .align 2, 0 -_08026534: .4byte gRoomControls -_08026538: .4byte gPlayerEntity thumb_func_start sub_0802653C sub_0802653C: @ 0x0802653C diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 5653fa2b..0ca38dcf 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -637,3 +637,11 @@ void sub_080264D4(ChuchuBossEntity* this) { } sub_080277F8(this); } + +void sub_0802650C(ChuchuBossEntity* this) { + if (((ChuchuBossEntity*)super->child)->unk_80[1] == 0) { + this->unk_84->unk_03++; + gRoomControls.camera_target = &gPlayerEntity; + } + sub_08027870(super); +}