diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index db5472e7..d8f9c18a 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -11,30 +11,6 @@ - thumb_func_start sub_0802647C -sub_0802647C: @ 0x0802647C - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x80 - lsls r1, r1, #7 - bl GravityUpdate - cmp r0, #0 - bne _080264A6 - movs r0, #0x10 - movs r1, #0 - bl InitScreenShake - ldr r0, _080264A8 @ =0x000001A1 - bl SoundReq - adds r0, r4, #0 - adds r0, #0x84 - ldr r1, [r0] - ldrb r0, [r1, #3] - adds r0, #1 - strb r0, [r1, #3] -_080264A6: - pop {r4, pc} - .align 2, 0 -_080264A8: .4byte 0x000001A1 thumb_func_start sub_080264AC sub_080264AC: @ 0x080264AC diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 2ea8d84f..2c5b7351 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -611,3 +611,11 @@ void sub_08026414(ChuchuBossEntity* this) { SoundReq(SFX_1A2); } } + +void sub_0802647C(ChuchuBossEntity* this) { + if (GravityUpdate(super, 0x4000) == 0) { + InitScreenShake(0x10, 0); + SoundReq(SFX_1A1); + this->unk_84->unk_03++; + } +}