bigVortex.c OK

asm/bigVortex.s

@@ -1,259 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start BigVortex
-BigVortex: @ 0x08098CF4
-	push {lr}
-	adds r2, r0, #0
-	ldrb r0, [r2, #0xa]
-	cmp r0, #0
-	bne _08098D14
-	ldr r0, _08098D10 @ =gUnk_0812367C
-	ldrb r1, [r2, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r2, #0
-	bl _call_via_r1
-	b _08098D1A
-	.align 2, 0
-_08098D10: .4byte gUnk_0812367C
-_08098D14:
-	adds r0, r2, #0
-	bl sub_08098E3C
-_08098D1A:
-	pop {pc}
-
-	thumb_func_start sub_08098D1C
-sub_08098D1C: @ 0x08098D1C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r5, #1
-	strb r5, [r4, #0xc]
-	ldr r0, _08098D40 @ =0x0000FFF0
-	strh r0, [r4, #0x36]
-	adds r0, r4, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	cmp r0, #0
-	beq _08098D44
-	bl CheckFlags
-	cmp r0, #0
-	bne _08098D44
-	strb r5, [r4, #0xc]
-	b _08098D5A
-	.align 2, 0
-_08098D40: .4byte 0x0000FFF0
-_08098D44:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #7
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	bl sub_08098E88
-_08098D5A:
-	adds r0, r4, #0
-	movs r1, #6
-	bl sub_0805E3A0
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitAnimationForceUpdate
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08098D6C
-sub_08098D6C: @ 0x08098D6C
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl CheckFlags
-	cmp r0, #0
-	beq _08098D9A
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x2d
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #0x43
-	movs r2, #0
-	bl CreateFx
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _08098D9A
-	ldrh r0, [r1, #0x32]
-	adds r0, #8
-	strh r0, [r1, #0x32]
-_08098D9A:
-	pop {r4, pc}
-
-	thumb_func_start sub_08098D9C
-sub_08098D9C: @ 0x08098D9C
-	push {lr}
-	adds r2, r0, #0
-	ldrb r0, [r2, #0xe]
-	subs r0, #1
-	strb r0, [r2, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08098DC2
-	movs r0, #3
-	strb r0, [r2, #0xc]
-	ldrb r1, [r2, #0x18]
-	subs r0, #7
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r2, #0x18]
-	adds r0, r2, #0
-	bl sub_08098E88
-_08098DC2:
-	pop {pc}
-
-	thumb_func_start sub_08098DC4
-sub_08098DC4: @ 0x08098DC4
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldr r6, _08098E2C @ =gPlayerEntity
-	adds r1, r6, #0
-	movs r2, #8
-	movs r3, #8
-	bl sub_0800419C
-	cmp r0, #0
-	beq _08098E24
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl CopyPosition
-	adds r0, r5, #0
-	bl sub_08004542
-	adds r0, r6, #0
-	bl sub_08004542
-	adds r0, r6, #0
-	adds r0, #0x38
-	movs r4, #1
-	strb r4, [r0]
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl ResolveEntityOnTop
-	ldr r1, _08098E30 @ =gPlayerState
-	movs r0, #0x1f
-	strb r0, [r1, #0xc]
-	adds r0, r1, #0
-	adds r0, #0x38
-	strb r4, [r0]
-	ldrb r0, [r5, #0xb]
-	adds r1, #0x39
-	strb r0, [r1]
-	movs r1, #4
-	strb r1, [r5, #0xc]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #1
-	bne _08098E20
-	movs r0, #0x23
-	bl SetGlobalFlag
-_08098E20:
-	bl sub_08077B20
-_08098E24:
-	adds r0, r5, #0
-	bl UpdateAnimationSingleFrame
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08098E2C: .4byte gPlayerEntity
-_08098E30: .4byte gPlayerState
-
-	thumb_func_start sub_08098E34
-sub_08098E34: @ 0x08098E34
-	push {lr}
-	bl UpdateAnimationSingleFrame
-	pop {pc}
-
-	thumb_func_start sub_08098E3C
-sub_08098E3C: @ 0x08098E3C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _08098E5E
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	ldrb r1, [r4, #0xa]
-	adds r0, r4, #0
-	bl InitAnimationForceUpdate
-_08098E5E:
-	ldrb r1, [r4, #0xa]
-	movs r0, #2
-	ands r0, r1
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	lsls r0, r0, #1
-	ldr r1, _08098E84 @ =gUnk_08123690
-	adds r0, r0, r1
-	ldrh r1, [r0]
-	ldrh r2, [r0, #2]
-	adds r0, r4, #0
-	movs r3, #0
-	bl sub_0805EC9C
-	adds r0, r4, #0
-	bl UpdateAnimationSingleFrame
-	pop {r4, pc}
-	.align 2, 0
-_08098E84: .4byte gUnk_08123690
-
-	thumb_func_start sub_08098E88
-sub_08098E88: @ 0x08098E88
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r0, #0x82
-	movs r1, #1
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _08098EB0
-	ldr r3, _08098ED8 @ =0xFFFF0000
-	adds r0, r5, #0
-	adds r1, r4, #0
-	movs r2, #0
-	bl PositionRelative
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #8
-	strb r0, [r1]
-_08098EB0:
-	movs r0, #0x82
-	movs r1, #2
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _08098ED4
-	ldr r3, _08098EDC @ =0xFFFE0000
-	adds r0, r5, #0
-	adds r1, r4, #0
-	movs r2, #0
-	bl PositionRelative
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #0x10
-	strb r0, [r1]
-_08098ED4:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08098ED8: .4byte 0xFFFF0000
-_08098EDC: .4byte 0xFFFE0000

include/functions.h

@@ -256,4 +256,7 @@ extern u32 sub_080044EC(Entity*, u32);
 extern u32 sub_080002B8(Entity*);
 extern u32 sub_08049F84(Entity*, u32);
 extern void sub_0802F45C(Entity*);
+extern u32 sub_0800419C(Entity*, Entity*, u32, u32);
+extern void sub_08004542(Entity*);
+extern void sub_08077B20();
 #endif

linker.ld

@@ -805,7 +805,7 @@ SECTIONS {
 		asm/picoBloom.o(.text);
 		asm/object80.o(.text);
 		asm/object81.o(.text);
-		asm/bigVortex.o(.text);
+		src/object/bigVortex.o(.text);
 		asm/bigPushableLever.o(.text);
 		asm/smallIceBlock.o(.text);
 		asm/bigIceBlock.o(.text);

src/object/bigVortex.c

@@ -0,0 +1,111 @@
+#include "global.h"
+#include "entity.h"
+#include "functions.h"
+#include "flags.h"
+
+extern void sub_08098E3C(Entity*);
+extern void sub_08098E88(Entity*);
+
+extern void (*const gUnk_0812367C[])(Entity*);
+
+extern u16 gUnk_08123690[];
+
+void BigVortex(Entity* this) {
+    if ((this->entityType).form == 0) {
+        gUnk_0812367C[this->action](this);
+    } else {
+        sub_08098E3C(this);
+    }
+}
+
+void sub_08098D1C(Entity* this) {
+    u32 temp;
+    this->action = 1;
+    this->height.HALF.HI = -0x10;
+
+    temp = this->field_0x86;
+
+    if ((temp != 0) && !CheckFlags(temp)) {
+        this->action = 1;
+    } else {
+        this->action = 3;
+        this->spriteSettings.b.draw = TRUE;
+        sub_08098E88(this);
+    }
+    sub_0805E3A0(this, 6);
+    InitAnimationForceUpdate(this, 0);
+}
+
+void sub_08098D6C(Entity* this) {
+    Entity* ent;
+
+    if (CheckFlags(this->field_0x86)) {
+        this->action = 2;
+        this->actionDelay = 0x2d;
+        ent = CreateFx(this, 0x43, 0);
+        if (ent != NULL) {
+            ent->y.HALF.HI += 8;
+        }
+    }
+}
+
+void sub_08098D9C(Entity* this) {
+    if (--this->actionDelay == 0) {
+        this->action = 3;
+        this->spriteSettings.b.draw = TRUE;
+        sub_08098E88(this);
+    }
+}
+
+void sub_08098DC4(Entity* this) {
+
+    if (sub_0800419C(this, &gPlayerEntity, 8, 8) != 0) {
+        CopyPosition(this, &gPlayerEntity);
+        sub_08004542(this);
+        sub_08004542(&gPlayerEntity);
+        gPlayerEntity.collisionLayer = 1;
+        ResolveEntityOnTop(this, &gPlayerEntity);
+        gPlayerState.playerAction = 0x1f;
+        gPlayerState.field_0x34[4] = 1;
+        gPlayerState.field_0x34[5] = this->entityType.parameter;
+        this->action = 4;
+        if (this->entityType.parameter == 1) {
+            SetGlobalFlag(0x23);
+        }
+        sub_08077B20();
+    }
+    UpdateAnimationSingleFrame(this);
+}
+
+void sub_08098E34(Entity* this) {
+    UpdateAnimationSingleFrame(this);
+}
+
+void sub_08098E3C(Entity* this) {
+    u16* temp;
+
+    if (this->action == 0) {
+        this->action = 1;
+        this->spriteSettings.b.draw = TRUE;
+        InitAnimationForceUpdate(this, this->entityType.form);
+    }
+    temp = &gUnk_08123690[this->entityType.form & 2];
+    sub_0805EC9C(this, temp[0], temp[1], 0);
+    UpdateAnimationSingleFrame(this);
+}
+
+void sub_08098E88(Entity* this) {
+    Entity* ent1;
+    Entity* ent2;
+
+    ent1 = CreateObject(0x82, 1, 0);
+    if (ent1 != NULL) {
+        PositionRelative(this, ent1, 0, -0x10000);
+        ent1->spriteOffsetY = 8;
+    }
+    ent2 = CreateObject(0x82, 2, 0);
+    if (ent2 != NULL) {
+        PositionRelative(this, ent2, 0, -0x20000);
+        ent2->spriteOffsetY = 0x10;
+    }
+}