From 106438565299343b24f896ad5ee88301fb02a42f Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Thu, 8 Sep 2022 16:03:30 +0300
Subject: [PATCH] Match sub_08095EAC on site by pixel-stuck

---
 .../cutsceneMiscObject/sub_08095EAC.inc       | 70 -------------------
 src/object/cutsceneMiscObject.c               | 20 +++---
 2 files changed, 10 insertions(+), 80 deletions(-)
 delete mode 100644 asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc

diff --git a/asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc b/asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc
deleted file mode 100644
index ed92dd8a..00000000
--- a/asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-    .syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	mov sb, r0
-	adds r4, r1, #0
-	movs r0, #0x6a
-	movs r1, #0x1e
-	movs r2, #1
-	bl CreateObject
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _08095F2A
-	ldr r0, [r4, #4]
-	cmp r0, #0
-	bne _08095EE0
-	movs r7, #0x10
-	movs r6, #0x1f
-	movs r0, #0x80
-	lsls r0, r0, #7
-	mov sl, r0
-	movs r2, #0
-	mov r8, r2
-	b _08095F02
-_08095EE0:
-	movs r7, #8
-	movs r6, #0xf
-	movs r0, #0x80
-	lsls r0, r0, #0xb
-	mov sl, r0
-	ldr r4, _08095F34 @ =gUnk_08122B0E
-	bl Random
-	movs r1, #7
-	ands r1, r0
-	lsls r1, r1, #1
-	adds r1, r1, r4
-	movs r0, #0
-	ldrsh r2, [r1, r0]
-	mov r8, r2
-	movs r0, #0xff
-	strb r0, [r5, #0xb]
-_08095F02:
-	bl Random
-	adds r4, r0, #0
-	ands r4, r6
-	subs r4, r7, r4
-	bl Random
-	ands r6, r0
-	subs r3, r7, r6
-	lsls r4, r4, #0x10
-	lsls r3, r3, #0x10
-	mov r0, sb
-	adds r1, r5, #0
-	adds r2, r4, #0
-	bl PositionRelative
-	mov r2, sl
-	str r2, [r5, #0x20]
-	mov r0, r8
-	strh r0, [r5, #0x24]
-_08095F2A:
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08095F34: .4byte gUnk_08122B0E
-    .syntax divided
diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c
index 25a7107c..8d971ba2 100644
--- a/src/object/cutsceneMiscObject.c
+++ b/src/object/cutsceneMiscObject.c
@@ -1107,34 +1107,34 @@ void sub_08095E7C(CutsceneMiscObjectEntity* this, ScriptExecutionContext* ctx) {
     }
 }
 
-NONMATCH("asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc",
-         void sub_08095EAC(CutsceneMiscObjectEntity* this, ScriptExecutionContext* ctx)) {
+void sub_08095EAC(Entity* this, ScriptExecutionContext* ctx) {
     Entity* e = CreateObject(CUTSCENE_MISC_OBJECT, 0x1E, 1);
-    s32 x, y;
+    s32 x;
+    s16 y;
+    s32 a, b, speed;
+    s32 vel;
 
     if (e != NULL) {
-        s32 a, b, vel, speed;
         if (ctx->intVariable == 0) {
             a = 0x10;
             b = 0x1F;
-            vel = 0x4000;
+            vel = Q_16_16(0.25);
             speed = 0;
         } else {
             a = 0x8;
             b = 0xF;
-            vel = 0x40000;
+            vel = Q_16_16(4);
             speed = gUnk_08122B0E[Random() & 7];
             e->type2 = -1;
         }
 
-        x = a - (Random() & b);
-        y = a - (Random() & b);
-        PositionRelative(super, e, x << 16, y << 16);
+        x = (a - (Random() & b));
+        y = (a - (Random() & b));
+        PositionRelative(this, e, x << 16, y << 16);
         e->zVelocity = vel;
         e->speed = speed;
     }
 }
-END_NONMATCH
 
 #define local ((Type1F*)this)
 void sub_08095F38(CutsceneMiscObjectEntity* this) {