From 0e4883c719372baaa578e6b702632b18c46d1b8f Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Sat, 16 Jul 2022 17:59:06 +0300
Subject: [PATCH] Match sub_0802686C

---
 asm/enemy/chuchuBoss.s | 44 ------------------------------------------
 src/enemy/chuchuBoss.c | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s
index 0e2530ef..753967b5 100644
--- a/asm/enemy/chuchuBoss.s
+++ b/asm/enemy/chuchuBoss.s
@@ -17,50 +17,6 @@
 
 
 
-
-	thumb_func_start sub_0802686C
-sub_0802686C: @ 0x0802686C
-	push {r4, r5, lr}
-	sub sp, #4
-	adds r4, r0, #0
-	movs r1, #0x80
-	lsls r1, r1, #7
-	bl GravityUpdate
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _08026888
-	adds r0, r4, #0
-	bl ProcessMovement0
-	b _080268BE
-_08026888:
-	movs r0, #0x10
-	movs r1, #0
-	bl InitScreenShake
-	movs r0, #5
-	strb r0, [r4, #0xd]
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r0, [r0]
-	strb r5, [r0, #3]
-	str r5, [sp]
-	adds r0, r4, #0
-	movs r1, #0x80
-	movs r2, #0x80
-	movs r3, #0x80
-	bl sub_08027B98
-	adds r0, r4, #0
-	bl sub_08027870
-	ldr r0, [r4, #0x54]
-	movs r1, #3
-	bl InitAnimationForceUpdate
-	ldr r0, _080268C4 @ =0x000001A1
-	bl SoundReq
-_080268BE:
-	add sp, #4
-	pop {r4, r5, pc}
-	.align 2, 0
-_080268C4: .4byte 0x000001A1
-
 	thumb_func_start sub_080268C8
 sub_080268C8: @ 0x080268C8
 	push {r4, lr}
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index a573f3c9..015ad3d4 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -789,3 +789,17 @@ void sub_08026808(ChuchuBossEntity* this) {
     }
     sub_080277F8(this);
 }
+
+void sub_0802686C(ChuchuBossEntity* this) {
+    if (GravityUpdate(super, 0x4000) != 0) {
+        ProcessMovement0(super);
+    } else {
+        InitScreenShake(0x10, 0);
+        super->subAction = 5;
+        this->unk_84->unk_03 = 0;
+        sub_08027B98(this, 0x80, 0x80, 0x80, 0);
+        sub_08027870(super);
+        InitAnimationForceUpdate(super->child, 3);
+        SoundReq(SFX_1A1);
+    }
+}