Decompile object66

3 files changed, 35 insertions, 100 deletions

diff --git a/asm/object/object66.s b/asm/object/object66.s
deleted file mode 100644
index 733fb640..00000000
--- a/asm/object/object66.s
+++ /dev/null
@@ -1,99 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object66
-Object66: @ 0x08094084
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r5, [r4, #0x50]
-	movs r1, #0x36
-	ldrsh r0, [r5, r1]
-	cmp r0, #0
-	beq _0809412A
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _080940CA
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r2]
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #5
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-_080940CA:
-	ldrh r0, [r5, #0x2e]
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r5, #0x32]
-	strh r0, [r4, #0x32]
-	ldrb r2, [r5, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r3, [r4, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r4, #0x1b]
-	ldrb r0, [r5, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r4, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r4, #0x19]
-	movs r0, #0x36
-	ldrsh r1, [r5, r0]
-	movs r0, #0x40
-	rsbs r0, r0, #0
-	cmp r1, r0
-	ble _08094108
-	movs r3, #0x80
-	lsls r3, r3, #1
-	movs r2, #0x80
-	lsls r2, r2, #2
-	b _0809411E
-_08094108:
-	movs r1, #0x36
-	ldrsh r0, [r5, r1]
-	adds r0, #0x40
-	lsls r2, r0, #1
-	movs r1, #0x80
-	lsls r1, r1, #1
-	subs r3, r1, r2
-	lsls r0, r0, #2
-	movs r1, #0x80
-	lsls r1, r1, #2
-	subs r2, r1, r0
-_0809411E:
-	adds r0, r4, #0
-	adds r1, r3, #0
-	movs r3, #0
-	bl sub_0805EC9C
-	b _0809412E
-_0809412A:
-	bl DeleteThisEntity
-_0809412E:
-	pop {r4, r5, pc}
diff --git a/linker.ld b/linker.ld
index 58e09d13..4262547d 100644
--- a/linker.ld
+++ b/linker.ld
@@ -726,7 +726,7 @@ SECTIONS {
         src/object/object63.o(.text);
         src/object/object64.o(.text);
         src/object/ladderHoleInBookshelf.o(.text);
-        asm/object/object66.o(.text);
+        src/object/object66.o(.text);
         asm/object/object67.o(.text);
         src/object/object68.o(.text);
         src/object/object69.o(.text);
diff --git a/src/object/object66.c b/src/object/object66.c
new file mode 100644
index 00000000..02f31e6c
--- /dev/null
+++ b/src/object/object66.c
@@ -0,0 +1,34 @@
+#define NENT_DEPRECATED
+#include "entity.h"
+#include "functions.h"
+
+void Object66(Entity* this) {
+    int iVar2;
+    int iVar4;
+    Entity* parent;
+
+    parent = this->parent;
+    if (parent->z.HALF.HI != 0) {
+        if (this->action == 0) {
+            this->action = 1;
+            this->spriteSettings.draw = 1;
+            this->spritePriority.b0 = 6;
+            this->spriteOffsetY = 5;
+            InitializeAnimation(this, 1);
+        }
+        this->x.HALF.HI = parent->x.HALF.HI;
+        this->y.HALF.HI = parent->y.HALF.HI;
+        this->spriteOrientation.flipY = parent->spriteOrientation.flipY;
+        this->spriteRendering.b3 = parent->spriteRendering.b3;
+        if (parent->z.HALF.HI > -0x40) {
+            iVar2 = 0x100;
+            iVar4 = 0x200;
+        } else {
+            iVar2 = 0x100 - 2 * (parent->z.HALF.HI + 0x40);
+            iVar4 = 0x200 - 4 * (parent->z.HALF.HI + 0x40);
+        }
+        sub_0805EC9C(this, iVar2, iVar4, 0);
+    } else {
+        DeleteThisEntity();
+    }
+}