diff --git a/asm/non_matching/object12/Object12_Action2.inc b/asm/non_matching/object12/Object12_Action2.inc
new file mode 100644
index 00000000..77e17507
--- /dev/null
+++ b/asm/non_matching/object12/Object12_Action2.inc
@@ -0,0 +1,70 @@
+	.syntax unified
+	push {r4, lr}
+	adds r4, r0, #0
+	ldrb r0, [r4, #0xe]
+	subs r0, #1
+	strb r0, [r4, #0xe]
+	lsls r0, r0, #0x18
+	cmp r0, #0
+	bne _080850A6
+	movs r0, #3
+	strb r0, [r4, #0xc]
+	movs r0, #0x1e
+	strb r0, [r4, #0xe]
+	adds r1, r4, #0
+	adds r1, #0x63
+	movs r0, #4
+	strb r0, [r1]
+	ldr r0, _080850A8 @ =gScreen
+	mov ip, r0
+	ldrh r1, [r0]
+	movs r2, #0x80
+	lsls r2, r2, #6
+	adds r0, r2, #0
+	orrs r0, r1
+	mov r1, ip
+	strh r0, [r1]
+	adds r1, #0x60
+	movs r0, #0x1f
+	strh r0, [r1]
+	adds r1, #2
+	movs r0, #0xf
+	strh r0, [r1]
+	movs r2, #0x2e
+	ldrsh r0, [r4, r2]
+	ldr r3, _080850AC @ =gRoomControls
+	movs r2, #0xa
+	ldrsh r1, [r3, r2]
+	subs r0, r0, r1
+	adds r1, r0, #0
+	subs r1, #0x18
+	movs r2, #0xff
+	ands r1, r2
+	lsls r1, r1, #8
+	adds r0, #0x18
+	ands r0, r2
+	orrs r1, r0
+	mov r0, ip
+	adds r0, #0x58
+	strh r1, [r0]
+	movs r1, #0x32
+	ldrsh r0, [r4, r1]
+	movs r4, #0xc
+	ldrsh r1, [r3, r4]
+	subs r0, r0, r1
+	adds r1, r0, #0
+	subs r1, #0x18
+	ands r1, r2
+	lsls r1, r1, #8
+	adds r0, #0x18
+	ands r0, r2
+	orrs r1, r0
+	mov r0, ip
+	adds r0, #0x5c
+	strh r1, [r0]
+_080850A6:
+	pop {r4, pc}
+	.align 2, 0
+_080850A8: .4byte gScreen
+_080850AC: .4byte gRoomControls
+	.syntax divided
diff --git a/asm/object/object12.s b/asm/object/object12.s
deleted file mode 100644
index dfdb643b..00000000
--- a/asm/object/object12.s
+++ /dev/null
@@ -1,249 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object12
-Object12: @ 0x08084FC0
-	push {lr}
-	ldr r2, _08084FD4 @ =gUnk_081205BC
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08084FD4: .4byte gUnk_081205BC
-
-	thumb_func_start sub_08084FD8
-sub_08084FD8: @ 0x08084FD8
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0808500C
-	adds r0, r4, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl CheckFlags
-	cmp r0, #0
-	beq _08084FF4
-	bl DeleteThisEntity
-_08084FF4:
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #7
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r4, #0
-	bl sub_080850FC
-	b _0808501C
-_0808500C:
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0xf0
-	strb r0, [r4, #0xe]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-	movs r0, #0x18
-	strb r0, [r4, #0x15]
-_0808501C:
-	movs r0, #0
-	strb r0, [r4, #0x1e]
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start nullsub_115
-nullsub_115: @ 0x08085024
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08085028
-sub_08085028: @ 0x08085028
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080850A6
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0x1e
-	strb r0, [r4, #0xe]
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #4
-	strb r0, [r1]
-	ldr r0, _080850A8 @ =gScreen
-	mov ip, r0
-	ldrh r1, [r0]
-	movs r2, #0x80
-	lsls r2, r2, #6
-	adds r0, r2, #0
-	orrs r0, r1
-	mov r1, ip
-	strh r0, [r1]
-	adds r1, #0x60
-	movs r0, #0x1f
-	strh r0, [r1]
-	adds r1, #2
-	movs r0, #0xf
-	strh r0, [r1]
-	movs r2, #0x2e
-	ldrsh r0, [r4, r2]
-	ldr r3, _080850AC @ =gRoomControls
-	movs r2, #0xa
-	ldrsh r1, [r3, r2]
-	subs r0, r0, r1
-	adds r1, r0, #0
-	subs r1, #0x18
-	movs r2, #0xff
-	ands r1, r2
-	lsls r1, r1, #8
-	adds r0, #0x18
-	ands r0, r2
-	orrs r1, r0
-	mov r0, ip
-	adds r0, #0x58
-	strh r1, [r0]
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	movs r4, #0xc
-	ldrsh r1, [r3, r4]
-	subs r0, r0, r1
-	adds r1, r0, #0
-	subs r1, #0x18
-	ands r1, r2
-	lsls r1, r1, #8
-	adds r0, #0x18
-	ands r0, r2
-	orrs r1, r0
-	mov r0, ip
-	adds r0, #0x5c
-	strh r1, [r0]
-_080850A6:
-	pop {r4, pc}
-	.align 2, 0
-_080850A8: .4byte gScreen
-_080850AC: .4byte gRoomControls
-
-	thumb_func_start sub_080850B0
-sub_080850B0: @ 0x080850B0
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xe]
-	subs r0, #1
-	strb r0, [r1, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080850C8
-	movs r0, #4
-	strb r0, [r1, #0xc]
-	movs r0, #0x60
-	strb r0, [r1, #0xe]
-_080850C8:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_080850CC
-sub_080850CC: @ 0x080850CC
-	push {r4, lr}
-	adds r4, r0, #0
-	bl LinearMoveUpdate
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080850F0
-	ldr r2, _080850F4 @ =gScreen
-	ldrh r1, [r2]
-	ldr r0, _080850F8 @ =0x0000DFFF
-	ands r0, r1
-	strh r0, [r2]
-	adds r0, r4, #0
-	bl DeleteEntity
-_080850F0:
-	pop {r4, pc}
-	.align 2, 0
-_080850F4: .4byte gScreen
-_080850F8: .4byte 0x0000DFFF
-
-	thumb_func_start sub_080850FC
-sub_080850FC: @ 0x080850FC
-	push {r4, r5, r6, lr}
-	movs r1, #0x2e
-	ldrsh r4, [r0, r1]
-	ldr r2, _0808518C @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r4, r4, r1
-	asrs r4, r4, #4
-	movs r3, #0x3f
-	ands r4, r3
-	movs r5, #0x32
-	ldrsh r1, [r0, r5]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r4, r1
-	adds r0, #0x38
-	ldrb r6, [r0]
-	ldr r5, _08085190 @ =0x0000403D
-	adds r1, r4, #0
-	subs r1, #0x41
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r1, r4, #0
-	subs r1, #0x40
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r1, r4, #0
-	subs r1, #0x3f
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	subs r1, r4, #1
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r0, r5, #0
-	adds r1, r4, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r1, r4, #1
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r1, r4, #0
-	adds r1, #0x3f
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r1, r4, #0
-	adds r1, #0x40
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl SetTile
-	adds r4, #0x41
-	adds r0, r5, #0
-	adds r1, r4, #0
-	adds r2, r6, #0
-	bl SetTile
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0808518C: .4byte gRoomControls
-_08085190: .4byte 0x0000403D
diff --git a/data/const/object/object12.s b/data/const/object/object12.s
deleted file mode 100644
index fe6d961a..00000000
--- a/data/const/object/object12.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081205BC:: @ 081205BC
-	.4byte sub_08084FD8
-	.4byte nullsub_115
-	.4byte sub_08085028
-	.4byte sub_080850B0
-	.4byte sub_080850CC
diff --git a/linker.ld b/linker.ld
index 95222f39..d40ae60d 100644
--- a/linker.ld
+++ b/linker.ld
@@ -638,7 +638,7 @@ SECTIONS {
         src/object/specialFx.o(.text);
         asm/object/object10.o(.text);
         src/object/object11.o(.text);
-        asm/object/object12.o(.text);
+        src/object/object12.o(.text);
         src/object/railtrack.o(.text);
         src/object/lilypadLarge.o(.text);
         asm/object/object15.o(.text);
@@ -1356,7 +1356,7 @@ SECTIONS {
         data/animations/object/specialFx.o(.rodata);
         data/const/object/object10.o(.rodata);
         src/object/object11.o(.rodata);
-        data/const/object/object12.o(.rodata);
+        src/object/object12.o(.rodata);
         data/const/object/railtrack.o(.rodata);
         data/animations/object/railtrack.o(.rodata);
         data/const/object/lilypadLarge.o(.rodata);
diff --git a/src/object/object12.c b/src/object/object12.c
new file mode 100644
index 00000000..bc5aa3d6
--- /dev/null
+++ b/src/object/object12.c
@@ -0,0 +1,98 @@
+/**
+ * @file object12.c
+ * @ingroup Objects
+ *
+ * @brief Object12 object
+ */
+
+#define NENT_DEPRECATED
+#include "global.h"
+#include "object.h"
+#include "functions.h"
+#include "screen.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unk_68[30];
+    /*0x86*/ u16 unk_86;
+} Object12Entity;
+
+void Object12_Init(Object12Entity*);
+void Object12_Action1(Object12Entity*);
+void Object12_Action2(Object12Entity*);
+void Object12_Action3(Object12Entity*);
+void Object12_Action4(Object12Entity*);
+void sub_080850FC(Object12Entity*);
+
+void Object12(Object12Entity* this) {
+    static void (*const Object12_Actions[])(Object12Entity*) = {
+        Object12_Init, Object12_Action1, Object12_Action2, Object12_Action3, Object12_Action4,
+    };
+    Object12_Actions[super->action](this);
+}
+
+void Object12_Init(Object12Entity* this) {
+    if (super->type == 0) {
+        if (CheckFlags(this->unk_86)) {
+            DeleteThisEntity();
+        }
+        super->action = 1;
+        super->spritePriority.b0 = 7;
+        sub_080850FC(this);
+    } else {
+        super->action = 2;
+        super->actionDelay = 0xf0;
+        super->speed = 0x80;
+        super->direction = 0x18;
+    }
+    super->frameIndex = 0;
+}
+
+void Object12_Action1(Object12Entity* this) {
+}
+
+NONMATCH("asm/non_matching/object12/Object12_Action2.inc", void Object12_Action2(Object12Entity* this)) {
+    u32 tmp;
+    if (--super->actionDelay == 0) {
+        super->action = 3;
+        super->actionDelay = 0x1e;
+        super->spriteOffsetY = 4;
+        gScreen.lcd.displayControl |= 0x2000;
+        gScreen.controls.windowInsideControl = 0x1f;
+        gScreen.controls.windowOutsideControl = 0xf;
+        tmp = super->x.HALF.HI - gRoomControls.scroll_x;
+        gScreen.controls.window0HorizontalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
+        tmp = super->y.HALF.HI - gRoomControls.scroll_y;
+        gScreen.controls.window0VerticalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
+    }
+}
+END_NONMATCH
+
+void Object12_Action3(Object12Entity* this) {
+    if (--super->actionDelay == 0) {
+        super->action = 4;
+        super->actionDelay = 0x60;
+    }
+}
+
+void Object12_Action4(Object12Entity* this) {
+    LinearMoveUpdate(super);
+    if (--super->actionDelay == 0) {
+        gScreen.lcd.displayControl &= 0xdfff;
+        DeleteEntity(super);
+    }
+}
+
+void sub_080850FC(Object12Entity* this) {
+    u32 position = COORD_TO_TILE(super);
+    u32 layer = super->collisionLayer;
+    SetTile(0x403d, position - 0x41, layer);
+    SetTile(0x403d, position - 0x40, layer);
+    SetTile(0x403d, position - 0x3f, layer);
+    SetTile(0x403d, position - 1, layer);
+    SetTile(0x403d, position, layer);
+    SetTile(0x403d, position + 1, layer);
+    SetTile(0x403d, position + 0x3f, layer);
+    SetTile(0x403d, position + 0x40, layer);
+    SetTile(0x403d, position + 0x41, layer);
+}
diff --git a/src/object/object3D.c b/src/object/object3D.c
index e3bf2991..0416ac2c 100644
--- a/src/object/object3D.c
+++ b/src/object/object3D.c
@@ -19,14 +19,17 @@ typedef struct {
     /*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, };
+    static void (*const Object3D_Actions[])(Object3DEntity*) = {
+        Object3D_Init,
+        Object3D_Action1,
+        Object3D_Action2,
+    };
     Object3D_Actions[super->action](this);
 }
 
@@ -37,15 +40,14 @@ void Object3D_Init(Object3DEntity* this) {
     this->unk_68 = 0x80;
     super->updatePriority = 6;
     sub_0801E1B8(0x1f17, 0);
-    sub_0801E1EC(super->x.HALF.HI, super->y.HALF.HI,
-                 this->unk_68);
+    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};
+    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};
+    static const u16 gUnk_081216C8[] = { 206, 19, 334, 208, 16, 334, 207, 1, 334, 0 };
 #endif
     const u16* ptr;
     this->unk_68 -= 2;
@@ -57,7 +59,7 @@ void Object3D_Action1(Object3DEntity* this) {
         ResetPaletteTable(0);
         ResetPalettes();
         gGFXSlots.unk0 = 1;
-        ptr = &gUnk_081216C8[super->type* 3];
+        ptr = &gUnk_081216C8[super->type * 3];
         LoadFixedGFX(super, ptr[0]);
         LoadObjPalette(super, ptr[1]);
         super->spriteIndex = ptr[2];
@@ -68,7 +70,7 @@ void Object3D_Action1(Object3DEntity* this) {
         super->spriteSettings.draw = 2;
         super->spriteOrientation.flipY = 0;
         super->spriteRendering.b3 = 0;
-        super->spritePriority. b0 = 0;
+        super->spritePriority.b0 = 0;
         super->actionDelay = 0x1e;
         super->field_0xf = 0xff;
         super->spriteRendering.b0 = 3;
@@ -104,7 +106,7 @@ void Object3D_Action2(Object3DEntity* this) {
         }
         sub_0801E1EC(super->x.HALF.HI, super->y.HALF.HI, this->unk_68);
         if (0x80 < super->field_0xf) {
-            super->field_0xf-= 8;
+            super->field_0xf -= 8;
         }
         sub_0805EC9C(super, super->field_0xf, super->field_0xf, 0);
     } else {
diff --git a/src/object/object4B.c b/src/object/object4B.c
index 9181944f..7e76e856 100644
--- a/src/object/object4B.c
+++ b/src/object/object4B.c
@@ -26,7 +26,8 @@ void Object4B_Action7(Object4BEntity*);
 
 void Object4B(Object4BEntity* this) {
     static void (*const Object4B_Actions[])(Object4BEntity*) = {
-        Object4B_Init, Object4B_Action1, Object4B_Action2, Object4B_Action3, Object4B_Action4, Object4B_Action5, Object4B_Action6, Object4B_Action7,
+        Object4B_Init,    Object4B_Action1, Object4B_Action2, Object4B_Action3,
+        Object4B_Action4, Object4B_Action5, Object4B_Action6, Object4B_Action7,
     };
     Object4B_Actions[super->action](this);
 }