diff --git a/asm/object/object3D.s b/asm/object/object3D.s
deleted file mode 100644
index 612f9772..00000000
--- a/asm/object/object3D.s
+++ /dev/null
@@ -1,245 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object3D
-Object3D: @ 0x0808CEF0
-	push {lr}
-	ldr r2, _0808CF04 @ =gUnk_081216BC
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0808CF04: .4byte gUnk_081216BC
-
-	thumb_func_start sub_0808CF08
-sub_0808CF08: @ 0x0808CF08
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldr r2, _0808CF50 @ =gArea
-	ldr r3, _0808CF54 @ =gRoomControls
-	ldrh r0, [r2, #0x12]
-	ldrh r1, [r3, #0xa]
-	subs r0, r0, r1
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r2, #0x14]
-	ldrh r1, [r3, #0xc]
-	subs r0, r0, r1
-	strh r0, [r4, #0x32]
-	adds r5, r4, #0
-	adds r5, #0x68
-	movs r0, #0x80
-	strh r0, [r5]
-	ldrb r1, [r4, #0x11]
-	subs r0, #0x90
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	ldr r0, _0808CF58 @ =0x00001F17
-	movs r1, #0
-	bl sub_0801E1B8
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	movs r2, #0x32
-	ldrsh r1, [r4, r2]
-	ldrh r2, [r5]
-	bl sub_0801E1EC
-	pop {r4, r5, pc}
-	.align 2, 0
-_0808CF50: .4byte gArea
-_0808CF54: .4byte gRoomControls
-_0808CF58: .4byte 0x00001F17
-
-	thumb_func_start sub_0808CF5C
-sub_0808CF5C: @ 0x0808CF5C
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r2, r5, #0
-	adds r2, #0x68
-	ldrh r0, [r2]
-	subs r0, #2
-	strh r0, [r2]
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0x14
-	bls _0808CF82
-	movs r1, #0x2e
-	ldrsh r0, [r5, r1]
-	movs r3, #0x32
-	ldrsh r1, [r5, r3]
-	ldrh r2, [r2]
-	bl sub_0801E1EC
-	b _0808D01E
-_0808CF82:
-	ldr r0, _0808D020 @ =gScreen
-	adds r0, #0x62
-	movs r1, #0x10
-	strh r1, [r0]
-	bl sub_0808D030
-	movs r0, #0
-	bl ResetPaletteTable
-	bl ResetPalettes
-	ldr r0, _0808D024 @ =gGFXSlots
-	movs r6, #1
-	strb r6, [r0]
-	ldrb r0, [r5, #0xa]
-	lsls r4, r0, #1
-	adds r4, r4, r0
-	lsls r4, r4, #1
-	ldr r0, _0808D028 @ =gUnk_081216C8
-	adds r4, r4, r0
-	ldrh r1, [r4]
-	adds r0, r5, #0
-	bl LoadFixedGFX
-	ldrh r1, [r4, #2]
-	adds r0, r5, #0
-	bl LoadObjPalette
-	ldrh r0, [r4, #4]
-	strh r0, [r5, #0x12]
-	ldrb r0, [r5, #0xa]
-	cmp r0, #2
-	bne _0808CFC6
-	strb r0, [r5, #0x1e]
-_0808CFC6:
-	movs r2, #2
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	subs r0, #6
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, #0x18]
-	ldrb r2, [r5, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	strb r0, [r5, #0x1b]
-	ldrb r0, [r5, #0x19]
-	ands r1, r0
-	strb r1, [r5, #0x19]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	movs r0, #0x1e
-	strb r0, [r5, #0xe]
-	movs r0, #0xff
-	strb r0, [r5, #0xf]
-	ldrb r0, [r5, #0x19]
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r5, #0x19]
-	movs r2, #0x80
-	lsls r2, r2, #1
-	adds r0, r5, #0
-	adds r1, r2, #0
-	movs r3, #0
-	bl sub_0805EC9C
-	ldr r0, _0808D02C @ =gArea
-	strh r6, [r0, #0x10]
-	movs r0, #5
-	movs r1, #8
-	bl SetFade
-_0808D01E:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0808D020: .4byte gScreen
-_0808D024: .4byte gGFXSlots
-_0808D028: .4byte gUnk_081216C8
-_0808D02C: .4byte gArea
-
-	thumb_func_start sub_0808D030
-sub_0808D030: @ 0x0808D030
-	push {r4, r5, lr}
-	ldr r4, _0808D058 @ =gUnk_03000020
-	movs r5, #0x80
-	adds r0, r4, #0
-	subs r0, #0x20
-	ldr r1, _0808D05C @ =0x00000B74
-	bl MemClear
-	movs r1, #0xa8
-	lsls r1, r1, #2
-	adds r0, r1, #0
-_0808D046:
-	strh r0, [r4]
-	adds r4, #8
-	subs r5, #1
-	cmp r5, #0
-	bne _0808D046
-	ldr r1, _0808D060 @ =gOAMControls
-	movs r0, #1
-	strb r0, [r1]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0808D058: .4byte gUnk_03000020
-_0808D05C: .4byte 0x00000B74
-_0808D060: .4byte gOAMControls
-
-	thumb_func_start sub_0808D064
-sub_0808D064: @ 0x0808D064
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	adds r1, r0, #0
-	adds r1, #0xff
-	strb r1, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r2, r0, #0x18
-	cmp r2, #0
-	beq _0808D0B4
-	adds r0, r4, #0
-	adds r0, #0x68
-	ldrh r3, [r0]
-	adds r1, r3, #0
-	adds r2, r0, #0
-	cmp r1, #0
-	beq _0808D08C
-	subs r0, r3, #2
-	strh r0, [r2]
-	b _0808D08E
-_0808D08C:
-	strh r1, [r2]
-_0808D08E:
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	movs r3, #0x32
-	ldrsh r1, [r4, r3]
-	ldrh r2, [r2]
-	bl sub_0801E1EC
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0x80
-	bls _0808D0A6
-	subs r0, #8
-	strb r0, [r4, #0xf]
-_0808D0A6:
-	ldrb r2, [r4, #0xf]
-	adds r0, r4, #0
-	adds r1, r2, #0
-	movs r3, #0
-	bl sub_0805EC9C
-	b _0808D0C2
-_0808D0B4:
-	ldr r1, _0808D0C4 @ =gArea
-	ldrb r0, [r1, #0xe]
-	adds r0, #1
-	strb r0, [r1, #0xe]
-	strh r2, [r1, #0x10]
-	bl DeleteThisEntity
-_0808D0C2:
-	pop {r4, pc}
-	.align 2, 0
-_0808D0C4: .4byte gArea
diff --git a/assets/assets.json b/assets/assets.json
index 595e079d..3827bac0 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -43357,27 +43357,6 @@
     "size": 4,
     "type": "animation"
   },
-  {
-    "path": "object3D/gUnk_081216C8_EU.bin",
-    "variants": [
-      "EU"
-    ],
-    "starts": {
-      "EU": 1183248
-    },
-    "size": 20
-  },
-  {
-    "path": "object3D/gUnk_081216C8_1_USA-JP-DEMO_USA-DEMO_JP.bin",
-    "variants": [
-      "USA",
-      "JP",
-      "DEMO_USA",
-      "DEMO_JP"
-    ],
-    "start": 1185480,
-    "size": 20
-  },
   {
     "path": "giantLeaf/gUnk_08121750.bin",
     "start": 1185616,
diff --git a/data/const/object/object3D.s b/data/const/object/object3D.s
deleted file mode 100644
index b1a6d6e2..00000000
--- a/data/const/object/object3D.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081216BC:: @ 081216BC
-	.4byte sub_0808CF08
-	.4byte sub_0808CF5C
-	.4byte sub_0808D064
-
-gUnk_081216C8:: @ 081216C8
-.ifdef EU
-    @ TODO only small differences
-	.incbin "object3D/gUnk_081216C8_EU.bin"
-.else
-	.incbin "object3D/gUnk_081216C8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
diff --git a/linker.ld b/linker.ld
index 8dcfcf60..95222f39 100644
--- a/linker.ld
+++ b/linker.ld
@@ -684,7 +684,7 @@ SECTIONS {
         asm/object/object76.o(.text);
         asm/object/code_0808C964.o(.text);
         src/object/macroPlayer.o(.text);
-        asm/object/object3D.o(.text);
+        src/object/object3D.o(.text);
         src/object/object3E.o(.text);
         src/object/giantLeaf.o(.text);
         src/object/fairy.o(.text);
@@ -1417,7 +1417,7 @@ SECTIONS {
         data/const/object/object75.o(.rodata);
         data/const/object/object76.o(.rodata);
         src/object/macroPlayer.o(.rodata);
-        data/const/object/object3D.o(.rodata);
+        src/object/object3D.o(.rodata);
         src/object/object3E.o(.rodata);
         data/const/object/giantLeaf.o(.rodata);
         src/object/fairy.o(.rodata);
diff --git a/src/object/object3D.c b/src/object/object3D.c
new file mode 100644
index 00000000..e3bf2991
--- /dev/null
+++ b/src/object/object3D.c
@@ -0,0 +1,115 @@
+/**
+ * @file object3D.c
+ * @ingroup Objects
+ *
+ * @brief Object3D object
+ */
+
+#define NENT_DEPRECATED
+#include "global.h"
+#include "object.h"
+#include "functions.h"
+#include "area.h"
+#include "screen.h"
+#include "main.h"
+#include "structures.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u16 unk_68;
+} Object3DEntity;
+
+
+void Object3D_Init(Object3DEntity*);
+void Object3D_Action1(Object3DEntity*);
+void Object3D_Action2(Object3DEntity*);
+void sub_0808D030(void);
+
+void Object3D(Object3DEntity* this) {
+    static void (*const Object3D_Actions[])(Object3DEntity*) = {Object3D_Init, Object3D_Action1, Object3D_Action2, };
+    Object3D_Actions[super->action](this);
+}
+
+void Object3D_Init(Object3DEntity* this) {
+    super->action = 1;
+    super->x.HALF.HI = gArea.curPortalX - gRoomControls.scroll_x;
+    super->y.HALF.HI = gArea.curPortalY - gRoomControls.scroll_y;
+    this->unk_68 = 0x80;
+    super->updatePriority = 6;
+    sub_0801E1B8(0x1f17, 0);
+    sub_0801E1EC(super->x.HALF.HI, super->y.HALF.HI,
+                 this->unk_68);
+}
+
+void Object3D_Action1(Object3DEntity* this) {
+#ifdef EU
+    static const u16 gUnk_081216C8[] = { 206, 19, 333, 208, 16, 333, 207, 1, 333, 0};
+#else
+    static const u16 gUnk_081216C8[] = { 206, 19, 334, 208, 16, 334, 207, 1, 334, 0};
+#endif
+    const u16* ptr;
+    this->unk_68 -= 2;
+    if (this->unk_68 >= 0x15) {
+        sub_0801E1EC(super->x.HALF.HI, super->y.HALF.HI, this->unk_68);
+    } else {
+        gScreen.controls.windowOutsideControl = 0x10;
+        sub_0808D030();
+        ResetPaletteTable(0);
+        ResetPalettes();
+        gGFXSlots.unk0 = 1;
+        ptr = &gUnk_081216C8[super->type* 3];
+        LoadFixedGFX(super, ptr[0]);
+        LoadObjPalette(super, ptr[1]);
+        super->spriteIndex = ptr[2];
+        if (super->type == 2) {
+            super->frameIndex = 2;
+        }
+        super->action = 2;
+        super->spriteSettings.draw = 2;
+        super->spriteOrientation.flipY = 0;
+        super->spriteRendering.b3 = 0;
+        super->spritePriority. b0 = 0;
+        super->actionDelay = 0x1e;
+        super->field_0xf = 0xff;
+        super->spriteRendering.b0 = 3;
+        sub_0805EC9C(super, 0x100, 0x100, 0);
+        gArea.field_0x10 = 1;
+        SetFade(5, 8);
+    }
+}
+
+void sub_0808D030(void) {
+    struct OamData* ptr;
+    s32 index;
+
+    ptr = gOAMControls.oam;
+    index = 0x80;
+    MemClear(&gOAMControls, 0xb74);
+    while (index != 0) {
+        // TODO split up into bitfield writes?
+        *(u16*)ptr = 0x2a0;
+        ptr++;
+        index--;
+    }
+    gOAMControls.field_0x0 = 1;
+}
+
+void Object3D_Action2(Object3DEntity* this) {
+    u32 tmp = super->actionDelay--;
+    if (tmp != 0) {
+        if (this->unk_68 != 0) {
+            this->unk_68 -= 2;
+        } else {
+            this->unk_68 = 0;
+        }
+        sub_0801E1EC(super->x.HALF.HI, super->y.HALF.HI, this->unk_68);
+        if (0x80 < super->field_0xf) {
+            super->field_0xf-= 8;
+        }
+        sub_0805EC9C(super, super->field_0xf, super->field_0xf, 0);
+    } else {
+        gArea.filler3[0]++;
+        gArea.field_0x10 = 0;
+        DeleteThisEntity();
+    }
+}