Merge pull request #323 from hatal175/object2a

asm/object/object2A.s

@@ -1,145 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start sub_08089BA0
-sub_08089BA0: @ 0x08089BA0
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl GetNextFrame
-	ldrb r0, [r5, #0xa]
-	cmp r0, #4
-	bhi _08089BD0
-	lsls r0, r0, #2
-	ldr r1, _08089BB8 @ =_08089BBC
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08089BB8: .4byte _08089BBC
-_08089BBC: @ jump table
-	.4byte _08089BD0 @ case 0
-	.4byte _08089BD6 @ case 1
-	.4byte _08089BD6 @ case 2
-	.4byte _08089C4C @ case 3
-	.4byte _08089C72 @ case 4
-_08089BD0:
-	ldrb r0, [r5, #0xb]
-	cmp r0, #0
-	beq _08089CBA
-_08089BD6:
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	bne _08089CBA
-	ldrb r0, [r5, #0xa]
-	cmp r0, #2
-	bne _08089C42
-	ldr r0, [r5, #0x54]
-	ldrh r0, [r0, #6]
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	ldr r3, _08089C48 @ =gRoomControls
-	ldrh r2, [r3, #6]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	movs r4, #0x3f
-	ands r1, r4
-	movs r6, #0x32
-	ldrsh r2, [r5, r6]
-	ldrh r3, [r3, #8]
-	subs r2, r2, r3
-	asrs r2, r2, #4
-	ands r2, r4
-	lsls r2, r2, #6
-	orrs r1, r2
-	adds r2, r5, #0
-	adds r2, #0x38
-	ldrb r2, [r2]
-	bl sub_0807B7D8
-	adds r0, r5, #0
-	movs r1, #0
-	movs r2, #0x10
-	bl sub_0807AB44
-	subs r4, #0x4f
-	adds r0, r5, #0
-	movs r1, #0
-	adds r2, r4, #0
-	bl sub_0807AB44
-	adds r0, r5, #0
-	movs r1, #0x10
-	movs r2, #0
-	bl sub_0807AB44
-	adds r0, r5, #0
-	adds r1, r4, #0
-	movs r2, #0
-	bl sub_0807AB44
-_08089C42:
-	bl DeleteThisEntity
-	b _08089CBA
-	.align 2, 0
-_08089C48: .4byte gRoomControls
-_08089C4C:
-	ldr r0, [r5, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _08089C58
-	bl DeleteThisEntity
-_08089C58:
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08089C68
-	bl DeleteThisEntity
-_08089C68:
-	ldr r0, [r5, #0x50]
-	adds r1, r5, #0
-	bl CopyPosition
-	b _08089CBA
-_08089C72:
-	adds r0, r5, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl CheckFlags
-	adds r1, r0, #0
-	ldrb r0, [r5, #0xd]
-	cmp r0, #0
-	bne _08089C96
-	cmp r1, #0
-	bne _08089CBA
-	movs r0, #1
-	strb r0, [r5, #0xd]
-	ldrb r1, [r5, #0x18]
-	subs r0, #5
-	ands r0, r1
-	strb r0, [r5, #0x18]
-	b _08089CBA
-_08089C96:
-	cmp r1, #0
-	beq _08089CBA
-	movs r0, #0
-	strb r0, [r5, #0xd]
-	ldrb r1, [r5, #0x18]
-	subs r0, #4
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitializeAnimation
-	movs r0, #0x92
-	lsls r0, r0, #1
-	bl EnqueueSFX
-_08089CBA:
-	pop {r4, r5, r6, pc}

data/const/object/object2A.s

@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120DD0:: @ 08120DD0
-	.4byte sub_08089B18
-	.4byte sub_08089BA0

linker.ld

@@ -687,7 +687,6 @@ SECTIONS {
         asm/object/object28.o(.text);
         asm/object/ambientClouds.o(.text);
         src/object/object2A.o(.text);
-        asm/object/object2A.o(.text);
         asm/object/object2B.o(.text);
         asm/object/beanstalk.o(.text);
         src/object/smoke.o(.text);
@@ -1411,7 +1410,7 @@ SECTIONS {
         data/animations/object/pushableStatue.o(.rodata);
         data/const/object/ambientClouds.o(.rodata);
         data/animations/object/ambientClouds.o(.rodata);
-        data/const/object/object2A.o(.rodata);
+        src/object/object2A.o(.rodata);
         data/animations/object/object2A.o(.rodata);
         data/const/object/beanstalk.o(.rodata);
         data/animations/object/beanstalk.o(.rodata);

src/object/object2A.c

@@ -4,13 +4,15 @@
 #include "functions.h"
 #include "flags.h"
 
-extern void (*const gUnk_08120DD0[])(Entity*);
+extern void sub_0807AB44(Entity*, s32, s32);
+
+void (*const gUnk_08120DD0[])(Entity*);
 
 void Object2A(Entity* this) {
     gUnk_08120DD0[this->action](this);
 }
 
-void sub_08089B18(Entity* this) {
+void Object2A_Init(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = TRUE;
     if (this->type2 != 0) {
@@ -36,5 +38,61 @@ void sub_08089B18(Entity* this) {
                 return;
             }
     }
-    EnqueueSFX(0x124);
+    EnqueueSFX(SFX_124);
 }
+
+void sub_08089BA0(Entity* this) {
+    u32 val;
+    GetNextFrame(this);
+
+    switch (this->type) {
+        case 0:
+        default:
+            if (this->type2 == 0)
+                return;
+        case 1:
+        case 2:
+            if (--this->actionDelay != 0xff)
+                return;
+            if (this->type == 2) {
+                sub_0807B7D8(((u16*)this->child)[3], COORD_TO_TILE(this), this->collisionLayer);
+                sub_0807AB44(this, 0, 0x10);
+                sub_0807AB44(this, 0, -0x10);
+                sub_0807AB44(this, 0x10, 0);
+                sub_0807AB44(this, -0x10, 0);
+            }
+            DeleteThisEntity();
+            break;
+        case 3:
+            if (this->parent->next == NULL) {
+                DeleteThisEntity();
+            }
+            if (--this->actionDelay == 0) {
+                DeleteThisEntity();
+            }
+
+            CopyPosition(this->parent, this);
+            break;
+        case 4:
+            val = CheckFlags(this->field_0x86.HWORD);
+            if (this->subAction == 0) {
+                if (val)
+                    return;
+                this->subAction = 1;
+                this->spriteSettings.draw = 0;
+            } else {
+                if (!val)
+                    return;
+                this->subAction = 0;
+                this->spriteSettings.draw = 1;
+                InitializeAnimation(this, 0);
+                EnqueueSFX(SFX_124);
+            }
+            break;
+    }
+}
+
+void (*const gUnk_08120DD0[])(Entity*) = {
+    Object2A_Init,
+    sub_08089BA0,
+};