From e5e2550466ef2754d21be021148a1a68756207f5 Mon Sep 17 00:00:00 2001 From: Geared <114871309+SketchyGear@users.noreply.github.com> Date: Fri, 26 Jun 2026 13:09:50 -0300 Subject: [PATCH 1/4] match sub_8058AE0 --- src/game/enemies/aotento.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/game/enemies/aotento.c b/src/game/enemies/aotento.c index c31b740c..f21cf332 100644 --- a/src/game/enemies/aotento.c +++ b/src/game/enemies/aotento.c @@ -287,16 +287,18 @@ bool32 sub_8058A00(Aotento *enemy) return FALSE; } -// (94.17%) https://decomp.me/scratch/nMoLp -NONMATCH("asm/non_matching/game/enemies/aotento__sub_8058AE0.inc", bool32 sub_8058AE0(Aotento *enemy)) +// thanks idefix helping in the matching +bool32 sub_8058AE0(Aotento *enemy) { + s32 q = Q(64); // a variable just for holding Q(64)? interesting... + enemy->qPos.y -= Q(gUnknown_080D1E50[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 - q) { + enemy->qPos.y = enemy->qUnk14.y - q; } - if (enemy->qPos.y == (enemy->qUnk14.y - Q(64))) { + if (enemy->qPos.y == (enemy->qUnk14.y - q)) { if (enemy->unkE == 0) { enemy->unkE = 90; @@ -318,7 +320,6 @@ NONMATCH("asm/non_matching/game/enemies/aotento__sub_8058AE0.inc", bool32 sub_80 return FALSE; } -END_NONMATCH void sub_8058B50(Aotento *enemy) { @@ -407,4 +408,4 @@ void TaskDestructor_Aotento(struct Task *t) { Aotento *enemy = TASK_DATA(t); VramFree(enemy->s.tiles); -} \ No newline at end of file +} From 7d3ca2d8c5bbb4f9bbd346e76535d5f2121a9854 Mon Sep 17 00:00:00 2001 From: Geared <114871309+SketchyGear@users.noreply.github.com> Date: Fri, 26 Jun 2026 13:11:05 -0300 Subject: [PATCH 2/4] testing time! --- .../game/enemies/aotento__sub_8058AE0.inc | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 asm/non_matching/game/enemies/aotento__sub_8058AE0.inc diff --git a/asm/non_matching/game/enemies/aotento__sub_8058AE0.inc b/asm/non_matching/game/enemies/aotento__sub_8058AE0.inc deleted file mode 100644 index 2b91a4da..00000000 --- a/asm/non_matching/game/enemies/aotento__sub_8058AE0.inc +++ /dev/null @@ -1,66 +0,0 @@ - -.syntax unified -.text - push {lr} - adds r2, r0, #0 @ r2 = enemy - ldr r1, _08058B1C @ =gUnknown_080D1E50 - 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, _08058B20 @ =0xFFFFC000 - adds r0, r0, r3 - cmp r1, r0 - bge _08058B00 - str r0, [r2, #0x20] -_08058B00: - ldr r0, [r2, #0x18] - ldr r1, _08058B20 @ =0xFFFFC000 - adds r0, r0, r1 - ldr r1, [r2, #0x20] - cmp r1, r0 - bne _08058B28 - ldrh r0, [r2, #0xe] - cmp r0, #0 - bne _08058B24 - movs r0, #0x5a - strh r0, [r2, #0xe] - movs r0, #1 - b _08058B4A - .align 2, 0 -_08058B1C: .4byte gUnknown_080D1E50 -_08058B20: .4byte 0xFFFFC000 -_08058B24: - subs r0, #1 - strh r0, [r2, #0xe] -_08058B28: - ldrh r0, [r2, #0x10] - cmp r0, #5 - bhi _08058B32 - adds r0, #1 - b _08058B46 -_08058B32: - ldrb r0, [r2, #6] - adds r0, #1 - strb r0, [r2, #6] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #2 - bls _08058B44 - movs r0, #2 - strb r0, [r2, #6] -_08058B44: - movs r0, #0 -_08058B46: - strh r0, [r2, #0x10] - movs r0, #0 -_08058B4A: - pop {r1} - bx r1 - .align 2, 0 - -.syntax divided From 84376fb5f0682563b3c41129031acdce2b0c5ed9 Mon Sep 17 00:00:00 2001 From: Geared <114871309+SketchyGear@users.noreply.github.com> Date: Fri, 26 Jun 2026 16:01:13 -0300 Subject: [PATCH 3/4] proper documentation --- src/game/enemies/aotento.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/game/enemies/aotento.c b/src/game/enemies/aotento.c index f21cf332..3f18f121 100644 --- a/src/game/enemies/aotento.c +++ b/src/game/enemies/aotento.c @@ -287,18 +287,17 @@ bool32 sub_8058A00(Aotento *enemy) return FALSE; } -// thanks idefix helping in the matching bool32 sub_8058AE0(Aotento *enemy) { - s32 q = Q(64); // a variable just for holding Q(64)? interesting... + s32 qJumpHeight = Q(64); enemy->qPos.y -= Q(gUnknown_080D1E50[enemy->unk6]); - if (enemy->qPos.y < enemy->qUnk14.y - q) { - enemy->qPos.y = enemy->qUnk14.y - q; + if (enemy->qPos.y < enemy->qUnk14.y - qJumpHeight) { + enemy->qPos.y = enemy->qUnk14.y - qJumpHeight; } - if (enemy->qPos.y == (enemy->qUnk14.y - q)) { + if (enemy->qPos.y == (enemy->qUnk14.y - qJumpHeight)) { if (enemy->unkE == 0) { enemy->unkE = 90; From 3ef6b9b00c5b5305fbb6b7adb1312cb3847882a4 Mon Sep 17 00:00:00 2001 From: Geared <114871309+SketchyGear@users.noreply.github.com> Date: Fri, 26 Jun 2026 16:09:33 -0300 Subject: [PATCH 4/4] one more to the list! --- .../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