From 94b9110a010a87f087fb18a3aaf474a430cb5321 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sat, 16 Jul 2022 18:03:33 +0300 Subject: [PATCH] Match sub_080268C8 --- asm/enemy/chuchuBoss.s | 18 ------------------ src/enemy/chuchuBoss.c | 5 +++++ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index 753967b5..5df4b236 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -17,24 +17,6 @@ - thumb_func_start sub_080268C8 -sub_080268C8: @ 0x080268C8 - push {r4, lr} - adds r4, r0, #0 - bl sub_08027AA4 - ldr r1, _080268E8 @ =gUnk_080CC264 - adds r0, r4, #0 - adds r0, #0x84 - ldr r0, [r0] - ldrb r0, [r0, #3] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r1, [r0] - adds r0, r4, #0 - bl _call_via_r1 - pop {r4, pc} - .align 2, 0 -_080268E8: .4byte gUnk_080CC264 thumb_func_start sub_080268EC sub_080268EC: @ 0x080268EC diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 51977ad3..ca0b91c7 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -806,3 +806,8 @@ void sub_0802686C(ChuchuBossEntity* this) { SoundReq(SFX_1A1); } } + +void sub_080268C8(ChuchuBossEntity* this) { + sub_08027AA4(this); + gUnk_080CC264[this->unk_84->unk_03](this); +}