From 18b64132fe8da5a37f27fe2e470accff162d9dbf Mon Sep 17 00:00:00 2001
From: Geared <114871309+SketchyGear@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:30:59 -0300
Subject: [PATCH 1/2] match sub_805F024

Co-authored-by: idefix02 <levadordu45@laposte.net>
---
 src/game/enemies/bu_bu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/enemies/bu_bu.c b/src/game/enemies/bu_bu.c
index 596888cd..21a5b68c 100644
--- a/src/game/enemies/bu_bu.c
+++ b/src/game/enemies/bu_bu.c
@@ -252,16 +252,17 @@ bool32 sub_805EEB4(BuBu *enemy)
     }
 }
 
-// NOTE: Unused
-// (94.17%) https://decomp.me/scratch/sd7x3
-NONMATCH("asm/non_matching/game/enemies/bubu__sub_805F024.inc", bool32 sub_805F024(BuBu *enemy))
+UNUSED bool32 sub_805F024(BuBu *enemy)
 {
+    s32 qJumpHeight = Q(64);
+
     enemy->qPos.y -= Q(gUnknown_080D1FAC[enemy->unk6]);
-    if (enemy->qPos.y < enemy->qUnk14.y - Q(64)) {
-        enemy->qPos.y = enemy->qUnk14.y - Q(64);
+
+    if (enemy->qPos.y < enemy->qUnk14.y - qJumpHeight) {
+        enemy->qPos.y = enemy->qUnk14.y - qJumpHeight;
     }
 
-    if (enemy->qPos.y == enemy->qUnk14.y - Q(64)) {
+    if (enemy->qPos.y == enemy->qUnk14.y - qJumpHeight) {
         if (enemy->unkE == 0) {
             enemy->unkE = 90;
             return TRUE;
@@ -282,7 +283,6 @@ NONMATCH("asm/non_matching/game/enemies/bubu__sub_805F024.inc", bool32 sub_805F0
 
     return FALSE;
 }
-END_NONMATCH
 
 void sub_805F094(void)
 {

From e4fbe7af71ae1021d7facfe8408fc395c07d45c1 Mon Sep 17 00:00:00 2001
From: Geared <114871309+SketchyGear@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:38:45 -0300
Subject: [PATCH 2/2] re-delete the re-added file

uhh, technical problems
---
 .../game/enemies/bubu__sub_805F024.inc        | 66 -------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 asm/non_matching/game/enemies/bubu__sub_805F024.inc

diff --git a/asm/non_matching/game/enemies/bubu__sub_805F024.inc b/asm/non_matching/game/enemies/bubu__sub_805F024.inc
deleted file mode 100644
index 1561b649..00000000
--- a/asm/non_matching/game/enemies/bubu__sub_805F024.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-
-.syntax unified
-.text
-	push {lr}
-	adds r2, r0, #0
-	ldr r1, _0805F060 @ =gUnknown_080D1FAC
-	ldrb r0, [r2, #6]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	lsls r0, r0, #8
-	ldr r1, [r2, #0x20]
-	subs r1, r1, r0
-	str r1, [r2, #0x20]
-	ldr r0, [r2, #0x18]
-	ldr r3, _0805F064 @ =0xFFFFC000
-	adds r0, r0, r3
-	cmp r1, r0
-	bge _0805F044
-	str r0, [r2, #0x20]
-_0805F044:
-	ldr r0, [r2, #0x18]
-	ldr r1, _0805F064 @ =0xFFFFC000
-	adds r0, r0, r1
-	ldr r1, [r2, #0x20]
-	cmp r1, r0
-	bne _0805F06C
-	ldrh r0, [r2, #0xe]
-	cmp r0, #0
-	bne _0805F068
-	movs r0, #0x5a
-	strh r0, [r2, #0xe]
-	movs r0, #1
-	b _0805F08E
-	.align 2, 0
-_0805F060: .4byte gUnknown_080D1FAC
-_0805F064: .4byte 0xFFFFC000
-_0805F068:
-	subs r0, #1
-	strh r0, [r2, #0xe]
-_0805F06C:
-	ldrh r0, [r2, #0x10]
-	cmp r0, #5
-	bhi _0805F076
-	adds r0, #1
-	b _0805F08A
-_0805F076:
-	ldrb r0, [r2, #6]
-	adds r0, #1
-	strb r0, [r2, #6]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #2
-	bls _0805F088
-	movs r0, #2
-	strb r0, [r2, #6]
-_0805F088:
-	movs r0, #0
-_0805F08A:
-	strh r0, [r2, #0x10]
-	movs r0, #0
-_0805F08E:
-	pop {r1}
-	bx r1
-	.align 2, 0
-
-.syntax divided