From 27d04023f7dfaff16df1f51fa289e3da939a385d Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Tue, 19 Jul 2022 04:06:08 +0300
Subject: [PATCH] Match sub_080279AC

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

diff --git a/asm/enemy/chuchuBoss.s b/asm/enemy/chuchuBoss.s
index 1a2478c3..90985728 100644
--- a/asm/enemy/chuchuBoss.s
+++ b/asm/enemy/chuchuBoss.s
@@ -12,38 +12,6 @@
 
 
 
-	thumb_func_start sub_080279AC
-sub_080279AC: @ 0x080279AC
-	push {r4, r5, r6, lr}
-	mov ip, r1
-	movs r3, #4
-	subs r3, r3, r2
-	ldrh r1, [r1, #0x2e]
-	ldrh r4, [r0, #0x2e]
-	subs r1, r1, r4
-	mov r6, ip
-	adds r6, #0x62
-	strb r1, [r6]
-	mov r2, ip
-	ldrh r1, [r2, #0x32]
-	ldrh r2, [r0, #0x32]
-	adds r0, r2, r3
-	subs r1, r1, r0
-	mov r5, ip
-	adds r5, #0x63
-	strb r1, [r5]
-	mov r0, ip
-	strh r4, [r0, #0x2e]
-	adds r2, r2, r3
-	strh r2, [r0, #0x32]
-	ldr r1, [r0, #0x48]
-	ldrb r0, [r6]
-	strb r0, [r1]
-	mov r2, ip
-	ldr r1, [r2, #0x48]
-	ldrb r0, [r5]
-	strb r0, [r1, #1]
-	pop {r4, r5, r6, pc}
 
 	thumb_func_start sub_080279E8
 sub_080279E8: @ 0x080279E8
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index 9652752a..c7182d4f 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -1634,3 +1634,15 @@ void sub_08027984(ChuchuBossEntity* this) {
     sub_080279AC(this, pEVar1, pEVar1->base.type);
     sub_080279AC(this, pEVar2, pEVar2->base.type);
 }
+
+void sub_080279AC(ChuchuBossEntity* this, Entity* param_2, s32 param_3) {
+    s32 temp;
+
+    temp = 4 - param_3;
+    param_2->spriteOffsetX = param_2->x.HALF_U.HI - super->x.HALF_U.HI;
+    param_2->spriteOffsetY = param_2->y.HALF.HI - (super->y.HALF.HI + temp);
+    param_2->x.HALF.HI = super->x.HALF_U.HI;
+    param_2->y.HALF.HI = super->y.HALF.HI + temp;
+    param_2->hitbox->offset_x = param_2->spriteOffsetX;
+    param_2->hitbox->offset_y = param_2->spriteOffsetY;
+}