From c05b92e0413bfab8e8e2ded34e829e425d317746 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sat, 16 Jul 2022 09:40:21 +0300 Subject: [PATCH] Match sub_08026750 --- asm/enemy/chuchuBoss.s | 19 ------------------- src/enemy/chuchuBoss.c | 5 +++++ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s index e2bacff2..b23c3abd 100644 --- a/asm/enemy/chuchuBoss.s +++ b/asm/enemy/chuchuBoss.s @@ -16,25 +16,6 @@ - thumb_func_start sub_08026750 -sub_08026750: @ 0x08026750 - push {r4, lr} - adds r4, r0, #0 - bl sub_08027AA4 - ldr r1, _08026770 @ =gUnk_080CC258 - 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 -_08026770: .4byte gUnk_080CC258 - thumb_func_start sub_08026774 sub_08026774: @ 0x08026774 push {r4, lr} diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 77bb14b4..59bf6d76 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -736,3 +736,8 @@ void sub_08026634(ChuchuBossEntity* this) { } sub_08027870(super); } + +void sub_08026750(ChuchuBossEntity* this) { + sub_08027AA4(this); + gUnk_080CC258[this->unk_84->unk_03](this); +}