From 68f21e2dfdb174d2733262b5db6f2ab203aeda9e Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Sun, 13 Mar 2022 16:34:18 +0100
Subject: [PATCH] Decompile Object36

---
 asm/object/object36.s        | 370 -----------------------------------
 asm/object/objectE.s         |  64 ------
 assets/assets.json           |  10 -
 data/const/object/object36.s |  16 --
 linker.ld                    |   4 +-
 src/object/object36.c        | 153 +++++++++++++++
 6 files changed, 155 insertions(+), 462 deletions(-)
 delete mode 100644 asm/object/object36.s
 delete mode 100644 asm/object/objectE.s
 delete mode 100644 data/const/object/object36.s
 create mode 100644 src/object/object36.c

diff --git a/asm/object/object36.s b/asm/object/object36.s
deleted file mode 100644
index e46576e4..00000000
--- a/asm/object/object36.s
+++ /dev/null
@@ -1,370 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object36
-Object36: @ 0x0808BB18
-	push {lr}
-	ldr r2, _0808BB2C @ =gUnk_08121440
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0808BB2C: .4byte gUnk_08121440
-
-	thumb_func_start sub_0808BB30
-sub_0808BB30: @ 0x0808BB30
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #0x17
-	bl CheckGlobalFlag
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0808BB4C
-	movs r0, #0x4a
-	bl LoadGfxGroup
-	bl DeleteThisEntity
-	b _0808BBD4
-_0808BB4C:
-	movs r3, #1
-	strb r3, [r4, #0xc]
-	ldrb r0, [r4, #0x10]
-	movs r2, #0x80
-	orrs r0, r2
-	strb r0, [r4, #0x10]
-	movs r0, #0x78
-	strb r0, [r4, #0xe]
-	strb r1, [r4, #0xf]
-	ldrb r0, [r4, #0x19]
-	movs r1, #0xc0
-	orrs r0, r1
-	strb r0, [r4, #0x19]
-	movs r0, #0x29
-	adds r0, r0, r4
-	mov ip, r0
-	ldrb r1, [r0]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	mov r1, ip
-	strb r0, [r1]
-	ldrb r1, [r4, #0x1b]
-	movs r0, #0x3f
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x1b]
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	adds r0, #0x3f
-	strb r3, [r0]
-	adds r1, r4, #0
-	adds r1, #0x3c
-	movs r0, #7
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #0x48
-	strb r0, [r1]
-	subs r1, #5
-	movs r0, #4
-	strb r0, [r1]
-	ldr r0, _0808BBD8 @ =gHitbox_0
-	str r0, [r4, #0x48]
-	movs r0, #2
-	strb r0, [r4, #0x1e]
-	ldr r0, _0808BBDC @ =gPlayerEntity
-	adds r0, #0x38
-	ldrb r1, [r0]
-	adds r0, r4, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	adds r0, r4, #0
-	bl sub_0808BDB0
-	ldr r0, [r4, #0x50]
-	ldr r1, [r0, #0x20]
-	movs r2, #0xb8
-	lsls r2, r2, #1
-	adds r0, r2, #0
-	subs r0, r0, r1
-	strh r0, [r4, #0x32]
-	adds r0, r4, #0
-	bl sub_0808BBE0
-_0808BBD4:
-	pop {r4, pc}
-	.align 2, 0
-_0808BBD8: .4byte gHitbox_0
-_0808BBDC: .4byte gPlayerEntity
-
-	thumb_func_start sub_0808BBE0
-sub_0808BBE0: @ 0x0808BBE0
-	push {lr}
-	adds r3, r0, #0
-	movs r1, #0x32
-	ldrsh r0, [r3, r1]
-	ldr r1, _0808BC20 @ =gRoomControls
-	movs r2, #0xc
-	ldrsh r1, [r1, r2]
-	subs r1, r0, r1
-	cmp r1, #0x9f
-	bhi _0808BC2C
-	adds r0, r1, #0
-	cmp r1, #0
-	bge _0808BBFC
-	adds r0, #0xf
-_0808BBFC:
-	asrs r1, r0, #4
-	ldr r0, _0808BC24 @ =gUnk_08121474
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	adds r2, r3, #0
-	adds r2, #0x63
-	strb r0, [r2]
-	lsls r0, r1, #2
-	ldr r1, _0808BC28 @ =gUnk_0812144C
-	adds r0, r0, r1
-	ldrh r1, [r0]
-	ldrh r2, [r0, #2]
-	adds r0, r3, #0
-	movs r3, #0
-	bl sub_0805EC9C
-	b _0808BC38
-	.align 2, 0
-_0808BC20: .4byte gRoomControls
-_0808BC24: .4byte gUnk_08121474
-_0808BC28: .4byte gUnk_0812144C
-_0808BC2C:
-	adds r2, r3, #0
-	adds r2, #0x41
-	ldrb r1, [r2]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r2]
-_0808BC38:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0808BC3C
-sub_0808BC3C: @ 0x0808BC3C
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldr r2, _0808BC98 @ =gRoomControls
-	ldrh r0, [r2, #6]
-	adds r0, #0x78
-	movs r4, #0
-	strh r0, [r5, #0x2e]
-	ldr r0, [r5, #0x50]
-	ldr r1, [r0, #0x20]
-	ldr r0, _0808BC9C @ =0xFFFFFE90
-	adds r1, r1, r0
-	ldrh r0, [r2, #8]
-	subs r0, r0, r1
-	strh r0, [r5, #0x32]
-	adds r0, r5, #0
-	bl sub_0808BBE0
-	adds r0, r5, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x93
-	bne _0808BCE4
-	ldrb r0, [r5, #0xe]
-	subs r2, r0, #1
-	strb r2, [r5, #0xe]
-	ldrb r1, [r5, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	lsls r0, r2, #0x18
-	cmp r0, #0
-	bne _0808BCA0
-	movs r0, #0x17
-	bl SetGlobalFlag
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	movs r0, #0x80
-	strb r0, [r5, #0xf]
-	adds r0, r5, #0
-	adds r0, #0x63
-	strb r4, [r0]
-	b _0808BCFE
-	.align 2, 0
-_0808BC98: .4byte gRoomControls
-_0808BC9C: .4byte 0xFFFFFE90
-_0808BCA0:
-	movs r6, #1
-	ands r2, r6
-	cmp r2, #0
-	beq _0808BCCA
-	bl Random
-	movs r4, #3
-	ands r0, r4
-	ldr r1, _0808BCDC @ =0x0000FFFE
-	adds r0, r0, r1
-	ldrh r1, [r5, #0x2e]
-	adds r0, r0, r1
-	strh r0, [r5, #0x2e]
-	bl Random
-	ands r0, r4
-	ldr r1, _0808BCE0 @ =0x0000FFFF
-	adds r0, r0, r1
-	ldrh r1, [r5, #0x32]
-	adds r0, r0, r1
-	strh r0, [r5, #0x32]
-_0808BCCA:
-	ldrb r0, [r5, #0xf]
-	cmp r0, #1
-	beq _0808BCFE
-	strb r6, [r5, #0xf]
-	movs r0, #0x4a
-	bl LoadGfxGroup
-	b _0808BCFE
-	.align 2, 0
-_0808BCDC: .4byte 0x0000FFFE
-_0808BCE0: .4byte 0x0000FFFF
-_0808BCE4:
-	movs r0, #0x78
-	strb r0, [r5, #0xe]
-	ldrb r1, [r5, #0x18]
-	subs r0, #0x7c
-	ands r0, r1
-	strb r0, [r5, #0x18]
-	ldrb r0, [r5, #0xf]
-	cmp r0, #0
-	beq _0808BCFE
-	strb r4, [r5, #0xf]
-	movs r0, #0x49
-	bl LoadGfxGroup
-_0808BCFE:
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_0808BD00
-sub_0808BD00: @ 0x0808BD00
-	push {lr}
-	movs r0, #0x17
-	bl SetGlobalFlag
-	movs r0, #0x72
-	bl SoundReq
-	bl DeleteThisEntity
-	pop {pc}
-
-	thumb_func_start sub_0808BD14
-sub_0808BD14: @ 0x0808BD14
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xf]
-	cmp r0, #0
-	beq _0808BD34
-	subs r0, #8
-	strb r0, [r5, #0xf]
-	ldrb r0, [r5, #0xf]
-	movs r2, #0x80
-	lsls r2, r2, #2
-	subs r2, r2, r0
-	adds r0, r5, #0
-	adds r1, r2, #0
-	movs r3, #0
-	bl sub_0805EC9C
-_0808BD34:
-	adds r0, r5, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x93
-	bne _0808BD74
-	ldr r4, _0808BD70 @ =gPlayerEntity
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl GetFacingDirection
-	strb r0, [r5, #0x15]
-	adds r0, r5, #0
-	bl LinearMoveUpdate
-	movs r0, #0x2e
-	ldrsh r1, [r4, r0]
-	movs r0, #0x32
-	ldrsh r2, [r4, r0]
-	subs r2, #6
-	adds r0, r5, #0
-	movs r3, #0x1c
-	bl EntityWithinDistance
-	cmp r0, #0
-	beq _0808BDAE
-	adds r0, r5, #0
-	bl sub_0808BD00
-	b _0808BDAE
-	.align 2, 0
-_0808BD70: .4byte gPlayerEntity
-_0808BD74:
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0808BD8A
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	movs r0, #0x1e
-	strb r0, [r5, #0xe]
-	b _0808BDAE
-_0808BD8A:
-	ldrb r2, [r5, #0x18]
-	lsls r1, r2, #0x1e
-	lsrs r1, r1, #0x1e
-	movs r0, #1
-	eors r1, r0
-	subs r0, #5
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0808BDAE
-	adds r0, r5, #0
-	bl sub_0808BD00
-_0808BDAE:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_0808BDB0
-sub_0808BDB0: @ 0x0808BDB0
-	push {r4, r5, r6, lr}
-	adds r3, r0, #0
-	ldr r4, _0808BDD4 @ =gEntityLists + 48
-	ldr r2, [r4, #4]
-	movs r0, #0
-	str r0, [r3, #0x50]
-	cmp r2, r4
-	beq _0808BDE6
-	ldr r6, _0808BDD8 @ =0x0000FFFF
-	ldr r5, _0808BDDC @ =0x00000C09
-_0808BDC4:
-	ldrh r1, [r2, #8]
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, r5
-	bne _0808BDE0
-	str r2, [r3, #0x50]
-	b _0808BDE6
-	.align 2, 0
-_0808BDD4: .4byte gEntityLists + 48
-_0808BDD8: .4byte 0x0000FFFF
-_0808BDDC: .4byte 0x00000C09
-_0808BDE0:
-	ldr r2, [r2, #4]
-	cmp r2, r4
-	bne _0808BDC4
-_0808BDE6:
-	pop {r4, r5, r6, pc}
diff --git a/asm/object/objectE.s b/asm/object/objectE.s
deleted file mode 100644
index 3e760cf7..00000000
--- a/asm/object/objectE.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectE
-ObjectE: @ 0x08084458
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _08084472
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x14
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	bl sub_08004168
-	b _080844C2
-_08084472:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	bne _080844C2
-	movs r0, #0x2e
-	ldrsh r1, [r4, r0]
-	ldr r2, _080844C4 @ =gRoomControls
-	ldrh r0, [r2, #6]
-	subs r1, r1, r0
-	asrs r1, r1, #4
-	movs r3, #0x3f
-	ands r1, r3
-	movs r5, #0x32
-	ldrsh r0, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r0, r0, r2
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	adds r0, r4, #0
-	adds r0, #0x38
-	ldrb r2, [r0]
-	movs r0, #0x35
-	bl sub_0807B7D8
-	adds r0, r4, #0
-	movs r1, #0
-	movs r2, #0x40
-	bl CreateFx
-	movs r0, #0x93
-	lsls r0, r0, #1
-	bl SoundReq
-	bl DeleteThisEntity
-_080844C2:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080844C4: .4byte gRoomControls
diff --git a/assets/assets.json b/assets/assets.json
index 48bcb6a2..bf175ea0 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -43250,16 +43250,6 @@
     "size": 18,
     "type": "animation"
   },
-  {
-    "path": "object36/gUnk_0812144C.bin",
-    "start": 1184844,
-    "size": 40
-  },
-  {
-    "path": "object36/gUnk_08121474.bin",
-    "start": 1184884,
-    "size": 12
-  },
   {
     "path": "animations/gSpriteAnimations_JarPortal_0.bin",
     "start": 1184924,
diff --git a/data/const/object/object36.s b/data/const/object/object36.s
deleted file mode 100644
index f01a62bc..00000000
--- a/data/const/object/object36.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121440:: @ 08121440
-	.4byte sub_0808BB30
-	.4byte sub_0808BC3C
-	.4byte sub_0808BD14
-
-gUnk_0812144C:: @ 0812144C
-	.incbin "object36/gUnk_0812144C.bin"
-
-gUnk_08121474:: @ 08121474
-	.incbin "object36/gUnk_08121474.bin"
diff --git a/linker.ld b/linker.ld
index e39f434f..92a881e0 100644
--- a/linker.ld
+++ b/linker.ld
@@ -674,7 +674,7 @@ SECTIONS {
         src/object/bollard.o(.text);
         src/object/warpPoint.o(.text);
         src/object/object35.o(.text);
-        asm/object/object36.o(.text);
+        src/object/object36.o(.text);
         asm/object/object37.o(.text);
         src/object/jarPortal.o(.text);
         src/object/bossDoor.o(.text);
@@ -1405,7 +1405,7 @@ SECTIONS {
         data/animations/object/warpPoint.o(.rodata);
         src/object/object35.o(.rodata);
         data/animations/object/object35.o(.rodata);
-        data/const/object/object36.o(.rodata);
+        src/object/object36.o(.rodata);
         data/const/object/object37.o(.rodata);
         data/const/object/jarPortal.o(.rodata);
         data/animations/object/jarPortal.o(.rodata);
diff --git a/src/object/object36.c b/src/object/object36.c
new file mode 100644
index 00000000..83150e0f
--- /dev/null
+++ b/src/object/object36.c
@@ -0,0 +1,153 @@
+/**
+ * @file object36.c
+ * @ingroup Objects
+ *
+ * @brief Object36 object
+ */
+
+#define NENT_DEPRECATED
+#include "global.h"
+#include "object.h"
+#include "functions.h"
+#include "hitbox.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+} Object36Entity;
+
+void sub_0808BB30(Object36Entity*);
+void sub_0808BC3C(Object36Entity*);
+void sub_0808BD14(Object36Entity*);
+void sub_0808BDB0(Object36Entity*);
+void sub_0808BBE0(Object36Entity*);
+void sub_0808BD00(Object36Entity*);
+
+void Object36(Object36Entity* this) {
+    static void (*const gUnk_08121440[])(Object36Entity*) = {
+        sub_0808BB30,
+        sub_0808BC3C,
+        sub_0808BD14,
+    };
+    gUnk_08121440[super->action](this);
+}
+
+void sub_0808BB30(Object36Entity* this) {
+    if (CheckGlobalFlag(LV1TARU_OPEN)) {
+        LoadGfxGroup(0x4a);
+        DeleteThisEntity();
+    } else {
+        super->action = 1;
+        super->flags |= ENT_COLLIDE;
+        super->actionDelay = 0x78;
+        super->field_0xf = 0;
+        super->spriteRendering.b3 = 3;
+        super->spritePriority.b0 = 4;
+        super->spriteOrientation.flipY = 2;
+        super->speed = 0x300;
+        super->hitType = 1;
+        super->field_0x3c = 7;
+        super->hurtType = 0x48;
+        super->flags2 = 4;
+        super->hitbox = (Hitbox*)&gHitbox_0;
+        super->frameIndex = 2;
+        super->collisionLayer = gPlayerEntity.collisionLayer;
+        sub_0808BDB0(this);
+        super->y.HALF.HI = 0x170 - (super->parent)->zVelocity;
+        sub_0808BBE0(this);
+    }
+}
+
+void sub_0808BBE0(Object36Entity* this) {
+    static const u16 gUnk_0812144C[] = { 192, 256, 208, 240, 224, 224, 240, 208, 256, 192,
+                                         256, 192, 240, 208, 224, 224, 208, 240, 192, 256 };
+    static const u8 gUnk_08121474[] = {
+        248, 250, 252, 254, 0, 0, 2, 4, 6, 8, 0, 0,
+    };
+    const u16* ptr;
+    s32 diff = super->y.HALF.HI - gRoomControls.scroll_y;
+    if ((u32)diff < 0xa0) {
+        diff /= 0x10;
+        super->spriteOffsetY = gUnk_08121474[diff];
+        ptr = &gUnk_0812144C[diff * 2];
+        sub_0805EC9C(super, ptr[0], ptr[1], 0);
+    } else {
+        super->bitfield &= 0x7f;
+    }
+}
+
+void sub_0808BC3C(Object36Entity* this) {
+    s32 tmp;
+    super->x.HALF.HI = gRoomControls.origin_x + 0x78;
+    tmp = -0x170;
+    super->y.HALF.HI = gRoomControls.origin_y - ((super->parent)->zVelocity + tmp);
+    sub_0808BBE0(this);
+    if (super->bitfield == 0x93) {
+        super->actionDelay--;
+        super->spriteSettings.draw = 1;
+        if (super->actionDelay == 0) {
+            SetGlobalFlag(LV1TARU_OPEN);
+            super->action = 2;
+            super->field_0xf = 0x80;
+            super->spriteOffsetY = 0;
+        } else {
+            if ((super->actionDelay & 1) != 0) {
+                super->x.HALF.HI += ((Random() & 3) - 2);
+                super->y.HALF.HI += ((Random() & 3) - 1);
+            }
+            if (super->field_0xf != 1) {
+                super->field_0xf = 1;
+                LoadGfxGroup(0x4a);
+            }
+        }
+    } else {
+        super->actionDelay = 0x78;
+        super->spriteSettings.draw = 0;
+        if (super->field_0xf != 0) {
+            super->field_0xf = 0;
+            LoadGfxGroup(0x49);
+        }
+    }
+}
+
+void sub_0808BD00(Object36Entity* this) {
+    SetGlobalFlag(LV1TARU_OPEN);
+    SoundReq(SFX_SECRET);
+    DeleteThisEntity();
+}
+
+void sub_0808BD14(Object36Entity* this) {
+
+    if (super->field_0xf != 0) {
+        super->field_0xf -= 8;
+        sub_0805EC9C(super, 0x200 - super->field_0xf, 0x200 - super->field_0xf, 0);
+    }
+    if (super->bitfield == 0x93) {
+        super->direction = GetFacingDirection(super, &gPlayerEntity);
+        LinearMoveUpdate(super);
+        if (EntityWithinDistance(super, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 6, 0x1c)) {
+            sub_0808BD00(this);
+        }
+    } else {
+        if ((super->flags & ENT_COLLIDE) != 0) {
+            super->flags &= ~ENT_COLLIDE;
+            super->actionDelay = 0x1e;
+        } else {
+            super->spriteSettings.draw ^= 1;
+            if (--super->actionDelay == 0) {
+                sub_0808BD00(this);
+            }
+        }
+    }
+}
+
+void sub_0808BDB0(Object36Entity* this) {
+    LinkedList* list = &gEntityLists[6];
+    Entity* it = list->first;
+    super->parent = NULL;
+    for (; it != (Entity*)list; it = it->next) {
+        if (it->kind == 0x9 && it->id == 0xc) {
+            super->parent = it;
+            return;
+        }
+    }
+}