Decompile barrelInside

3 files changed, 31 insertions, 96 deletions

diff --git a/asm/object/barrelInside.s b/asm/object/barrelInside.s
deleted file mode 100644
index e2c26772..00000000
--- a/asm/object/barrelInside.s
+++ /dev/null
@@ -1,95 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start BarrelInside
-BarrelInside: @ 0x08089134
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xc]
-	cmp r0, #0
-	bne _0808919C
-	movs r2, #1
-	movs r3, #1
-	strb r3, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, #0x18]
-	ldrb r0, [r5, #0xa]
-	strb r0, [r5, #0x1e]
-	movs r0, #0x10
-	strb r0, [r5, #0xe]
-	strb r3, [r5, #0xf]
-	ldrb r0, [r5, #0xa]
-	lsls r3, r0, #1
-	adds r3, r3, r0
-	ldr r0, _080891D4 @ =gUnk_08120C80
-	adds r3, r3, r0
-	ldrb r1, [r3]
-	lsls r1, r1, #6
-	ldrb r4, [r5, #0x19]
-	movs r2, #0x3f
-	adds r0, r2, #0
-	ands r0, r4
-	orrs r0, r1
-	strb r0, [r5, #0x19]
-	ldrb r0, [r3, #1]
-	movs r1, #0x29
-	adds r1, r1, r5
-	mov ip, r1
-	movs r1, #7
-	ands r1, r0
-	mov r0, ip
-	ldrb r4, [r0]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r4
-	orrs r0, r1
-	mov r1, ip
-	strb r0, [r1]
-	ldrb r0, [r3, #2]
-	lsls r0, r0, #6
-	ldrb r1, [r5, #0x1b]
-	ands r2, r1
-	orrs r2, r0
-	strb r2, [r5, #0x1b]
-_0808919C:
-	ldrb r0, [r5, #0xa]
-	cmp r0, #4
-	bne _080891D0
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r3, r0, #0x18
-	cmp r3, #0
-	bne _080891D0
-	movs r0, #0x10
-	strb r0, [r5, #0xe]
-	ldr r2, _080891D8 @ =gUnk_08120C92
-	ldrb r0, [r5, #0xf]
-	adds r1, r0, #1
-	strb r1, [r5, #0xf]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	strb r0, [r5, #0x1e]
-	lsls r1, r1, #0x18
-	lsrs r1, r1, #0x18
-	cmp r1, #3
-	bne _080891D0
-	strb r3, [r5, #0xf]
-_080891D0:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080891D4: .4byte gUnk_08120C80
-_080891D8: .4byte gUnk_08120C92
diff --git a/linker.ld b/linker.ld
index 7f8c90dd..298a389b 100644
--- a/linker.ld
+++ b/linker.ld
@@ -681,7 +681,7 @@ SECTIONS {
         asm/object/eyeSwitch.o(.text);
         asm/object/pressurePlate.o(.text);
         asm/object/bigBarrel.o(.text);
-        asm/object/barrelInside.o(.text);
+        src/object/barrelInside.o(.text);
         asm/object/pushableStatue.o(.text);
         asm/object/object28.o(.text);
         asm/object/ambientClouds.o(.text);
diff --git a/src/object/barrelInside.c b/src/object/barrelInside.c
new file mode 100644
index 00000000..a235f4f5
--- /dev/null
+++ b/src/object/barrelInside.c
@@ -0,0 +1,30 @@
+#include "entity.h"
+
+extern u8 gUnk_08120C80[];
+extern u8 gUnk_08120C92[];
+
+void BarrelInside(Entity* this) {
+    u8* ptr;
+    if (this->action == 0) {
+        this->action = 1;
+        this->spriteSettings.draw = 1;
+        this->frameIndex = this->type;
+        this->actionDelay = 0x10;
+        this->field_0xf = 1;
+        ptr = gUnk_08120C80 + this->type * 3;
+        this->spriteRendering.b3 = *ptr;
+        this->spritePriority.b0 = *(ptr + 1);
+        this->spriteOrientation.flipY = *(ptr + 2);
+    }
+
+    if (this->type == 4) {
+        if (--this->actionDelay == 0) {
+            u32 tmp;
+            this->actionDelay = 0x10;
+            this->frameIndex = gUnk_08120C92[this->field_0xf++];
+            if (this->field_0xf == 3) {
+                this->field_0xf = 0;
+            }
+        }
+    }
+}