Decompile ObjectA8

2022-02-17 21:03:23 +01:00 · 2022-02-17 21:03:23 +01:00 · b900556352
parent b35a3216dc
commit b900556352
9 changed files with 231 additions and 618 deletions
--- a/asm/object/objectA8.s
+++ b/asm/object/objectA8.s
@ -1,573 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0809FABC
-sub_0809FABC: @ 0x0809FABC
-	push {lr}
-	adds r3, r0, #0
-	movs r0, #1
-	strb r0, [r3, #0xc]
-	ldrb r0, [r3, #0xb]
-	cmp r0, #0
-	beq _0809FAD0
-	cmp r0, #2
-	beq _0809FADE
-	b _0809FAE6
-_0809FAD0:
-	movs r0, #0xf0
-	lsls r0, r0, #9
-	str r0, [r3, #0x20]
-	ldrh r0, [r3, #0x36]
-	adds r0, #8
-	strh r0, [r3, #0x36]
-	b _0809FAE6
-_0809FADE:
-	adds r0, r3, #0
-	bl sub_0809FECC
-	b _0809FB30
-_0809FAE6:
-	adds r1, r3, #0
-	adds r1, #0x38
-	movs r0, #3
-	strb r0, [r1]
-	adds r0, r3, #0
-	adds r0, #0x3c
-	movs r2, #0x17
-	strb r2, [r0]
-	adds r1, #8
-	movs r0, #0x48
-	strb r0, [r1]
-	subs r1, #1
-	movs r0, #7
-	strb r0, [r1]
-	adds r0, r3, #0
-	adds r0, #0x3b
-	strb r2, [r0]
-	ldr r0, _0809FB34 @ =gUnk_080FD1A8
-	str r0, [r3, #0x48]
-	movs r0, #1
-	strb r0, [r3, #0x1c]
-	ldrh r1, [r3, #0x2e]
-	adds r0, r3, #0
-	adds r0, #0x74
-	strh r1, [r0]
-	ldrh r0, [r3, #0x32]
-	adds r1, r3, #0
-	adds r1, #0x76
-	strh r0, [r1]
-	adds r0, r3, #0
-	movs r1, #3
-	bl SetDefaultPriority
-	movs r0, #0x9b
-	lsls r0, r0, #1
-	bl EnqueueSFX
-_0809FB30:
-	pop {pc}
-	.align 2, 0
-_0809FB34: .4byte gUnk_080FD1A8
-
-	thumb_func_start sub_0809FB38
-sub_0809FB38: @ 0x0809FB38
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, [r2, #0x34]
-	ldr r1, _0809FB60 @ =0xFFFF2000
-	adds r0, r0, r1
-	str r0, [r2, #0x34]
-	adds r0, r2, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0809FB74
-	ldrb r0, [r2, #0xe]
-	cmp r0, #0
-	beq _0809FB64
-	adds r1, r0, #0
-	lsls r0, r1, #4
-	subs r0, r0, r1
-	lsls r0, r0, #1
-	b _0809FB66
-	.align 2, 0
-_0809FB60: .4byte 0xFFFF2000
-_0809FB64:
-	movs r0, #0xf0
-_0809FB66:
-	strb r0, [r2, #0xe]
-	movs r0, #3
-	strb r0, [r2, #0xc]
-	movs r0, #1
-	strb r0, [r2, #0xf]
-	movs r0, #0x80
-	strh r0, [r2, #0x24]
-_0809FB74:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809FB78
-sub_0809FB78: @ 0x0809FB78
-	push {lr}
-	ldr r2, _0809FB8C @ =gUnk_08124840
-	ldrb r1, [r0, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809FB8C: .4byte gUnk_08124840
-
-	thumb_func_start sub_0809FB90
-sub_0809FB90: @ 0x0809FB90
-	movs r3, #1
-	movs r1, #1
-	strb r1, [r0, #0xd]
-	strb r1, [r0, #0x1d]
-	ldrb r2, [r0, #0x18]
-	subs r1, #5
-	ands r1, r2
-	orrs r1, r3
-	strb r1, [r0, #0x18]
-	bx lr
-
-	thumb_func_start sub_0809FBA4
-sub_0809FBA4: @ 0x0809FBA4
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, _0809FBC8 @ =gPlayerState
-	ldrb r1, [r0, #0x1c]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #1
-	bne _0809FBC2
-	adds r0, r2, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0x13
-	beq _0809FBCC
-_0809FBC2:
-	movs r0, #3
-	strb r0, [r2, #0xc]
-	b _0809FBD2
-	.align 2, 0
-_0809FBC8: .4byte gPlayerState
-_0809FBCC:
-	adds r0, r2, #0
-	bl sub_0806F4E8
-_0809FBD2:
-	pop {pc}
-
-	thumb_func_start sub_0809FBD4
-sub_0809FBD4: @ 0x0809FBD4
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r0, _0809FBFC @ =gPlayerState
-	ldrb r1, [r0, #0x1c]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #1
-	bne _0809FBF4
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r5, #0x7f
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, #0x13
-	beq _0809FC00
-_0809FBF4:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	b _0809FC22
-	.align 2, 0
-_0809FBFC: .4byte gPlayerState
-_0809FC00:
-	adds r0, r4, #0
-	bl sub_0806F3E4
-	cmp r0, #0
-	beq _0809FC22
-	ldrb r1, [r4, #0x10]
-	adds r0, r5, #0
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	ldr r0, _0809FC24 @ =gPlayerEntity
-	str r0, [r4, #0x54]
-	ldrb r0, [r4, #0xa]
-	movs r1, #0
-	bl GiveItem
-_0809FC22:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0809FC24: .4byte gPlayerEntity
-
-	thumb_func_start sub_0809FC28
-sub_0809FC28: @ 0x0809FC28
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0809FCAC
-	bl Random
-	adds r5, r0, #0
-	ldrb r0, [r4, #0x10]
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0x20
-	strb r0, [r4, #0xf]
-	ldr r2, _0809FC6C @ =gUnk_0812484C
-	lsrs r0, r5, #8
-	movs r1, #1
-	ands r0, r1
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	bl sub_0809FE9C
-	cmp r0, #0
-	beq _0809FC70
-	movs r0, #0x1f
-	ands r5, r0
-	strb r5, [r4, #0x15]
-	b _0809FC8A
-	.align 2, 0
-_0809FC6C: .4byte gUnk_0812484C
-_0809FC70:
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	movs r2, #0x32
-	ldrsh r1, [r4, r2]
-	adds r2, r4, #0
-	adds r2, #0x74
-	ldrh r2, [r2]
-	adds r3, r4, #0
-	adds r3, #0x76
-	ldrh r3, [r3]
-	bl CalculateDirectionTo
-	strb r0, [r4, #0x15]
-_0809FC8A:
-	ldrb r1, [r4, #0x15]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	beq _0809FCAC
-	movs r0, #0x10
-	eors r1, r0
-	lsrs r1, r1, #4
-	movs r0, #1
-	ands r1, r0
-	lsls r1, r1, #6
-	ldrb r2, [r4, #0x18]
-	movs r0, #0x41
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_0809FCAC:
-	adds r0, r4, #0
-	bl ProcessMovement1
-	bl AnyPrioritySet
-	cmp r0, #0
-	bne _0809FCF8
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0809FCF8
-	ldr r0, _0809FCFC @ =gRoomTransition
-	ldr r0, [r0]
-	movs r1, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _0809FCE0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0809FCE0
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_08081404
-_0809FCE0:
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0x3b
-	bhi _0809FCF8
-	ldrb r2, [r4, #0x18]
-	lsls r1, r2, #0x1e
-	lsrs r1, r1, #0x1e
-	movs r0, #1
-	eors r1, r0
-	subs r0, #5
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_0809FCF8:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0809FCFC: .4byte gRoomTransition
-
-	thumb_func_start sub_0809FD00
-sub_0809FD00: @ 0x0809FD00
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r2, [r4, #0x54]
-	ldrh r1, [r2, #8]
-	ldr r0, _0809FD18 @ =0x00000B08
-	cmp r1, r0
-	beq _0809FD1C
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_08081404
-	b _0809FD44
-	.align 2, 0
-_0809FD18: .4byte 0x00000B08
-_0809FD1C:
-	adds r0, r2, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	ldrh r0, [r4, #0x36]
-	subs r0, #1
-	strh r0, [r4, #0x36]
-	ldr r1, _0809FD48 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl IsColliding
-	cmp r0, #0
-	beq _0809FD44
-	adds r0, r4, #0
-	bl sub_0809FECC
-	ldrb r0, [r4, #0xa]
-	movs r1, #0
-	bl GiveItem
-_0809FD44:
-	pop {r4, pc}
-	.align 2, 0
-_0809FD48: .4byte gPlayerEntity
-
-	thumb_func_start sub_0809FD4C
-sub_0809FD4C: @ 0x0809FD4C
-	push {lr}
-	adds r1, r0, #0
-	movs r2, #6
-	strb r2, [r1, #0xc]
-	movs r0, #0x80
-	strb r0, [r1, #0xe]
-	strb r2, [r1, #0xf]
-	ldrb r2, [r1, #0x10]
-	movs r0, #0x7f
-	ands r0, r2
-	strb r0, [r1, #0x10]
-	ldrb r2, [r1, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r2
-	movs r2, #1
-	orrs r0, r2
-	strb r0, [r1, #0x18]
-	adds r3, r1, #0
-	adds r3, #0x29
-	ldrb r2, [r3]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r2
-	movs r2, #0x10
-	orrs r0, r2
-	strb r0, [r3]
-	adds r2, r1, #0
-	adds r2, #0x63
-	movs r0, #0xfb
-	strb r0, [r2]
-	ldr r0, [r1, #0x54]
-	bl CopyPosition
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809FD94
-sub_0809FD94: @ 0x0809FD94
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldr r6, [r5, #0x54]
-	ldr r2, _0809FE24 @ =gSineTable
-	ldrb r0, [r5, #0xe]
-	lsls r0, r0, #1
-	adds r0, r0, r2
-	movs r3, #0
-	ldrsh r1, [r0, r3]
-	lsls r0, r1, #2
-	adds r0, r0, r1
-	lsls r0, r0, #9
-	cmp r0, #0
-	bge _0809FDB4
-	ldr r1, _0809FE28 @ =0x0000FFFF
-	adds r0, r0, r1
-_0809FDB4:
-	asrs r0, r0, #0x10
-	ldrh r3, [r6, #0x2e]
-	adds r0, r0, r3
-	strh r0, [r5, #0x2e]
-	ldrb r0, [r5, #0xe]
-	adds r0, #0x40
-	lsls r0, r0, #1
-	adds r0, r0, r2
-	movs r2, #0
-	ldrsh r1, [r0, r2]
-	lsls r0, r1, #2
-	adds r0, r0, r1
-	lsls r0, r0, #8
-	cmp r0, #0
-	bge _0809FDD6
-	ldr r3, _0809FE28 @ =0x0000FFFF
-	adds r0, r0, r3
-_0809FDD6:
-	asrs r1, r0, #0x10
-	ldrh r0, [r6, #0x32]
-	subs r0, r0, r1
-	strh r0, [r5, #0x32]
-	ldrb r3, [r5, #0xe]
-	adds r0, r3, #0
-	adds r0, #8
-	strb r0, [r5, #0xe]
-	ldrh r0, [r6, #0x36]
-	strh r0, [r5, #0x36]
-	ldrb r2, [r6, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r4, [r5, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r4
-	orrs r0, r2
-	strb r0, [r5, #0x1b]
-	ldrb r0, [r6, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r5, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r5, #0x19]
-	subs r3, #0x39
-	lsls r3, r3, #0x18
-	lsrs r3, r3, #0x18
-	cmp r3, #0x7e
-	bhi _0809FE2C
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #8
-	rsbs r1, r1, #0
-	ands r1, r0
-	movs r0, #3
-	b _0809FE3A
-	.align 2, 0
-_0809FE24: .4byte gSineTable
-_0809FE28: .4byte 0x0000FFFF
-_0809FE2C:
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #8
-	rsbs r1, r1, #0
-	ands r1, r0
-	movs r0, #5
-_0809FE3A:
-	orrs r1, r0
-	strb r1, [r2]
-	ldrb r0, [r5, #0xf]
-	subs r0, #1
-	strb r0, [r5, #0xf]
-	lsls r0, r0, #0x18
-	adds r4, r5, #0
-	adds r4, #0x63
-	cmp r0, #0
-	bne _0809FE6C
-	movs r0, #6
-	strb r0, [r5, #0xf]
-	ldrb r0, [r4]
-	subs r0, #1
-	strb r0, [r4]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	movs r1, #0x16
-	rsbs r1, r1, #0
-	cmp r0, r1
-	bge _0809FE6C
-	adds r0, r5, #0
-	movs r1, #1
-	bl sub_08081404
-_0809FE6C:
-	movs r1, #0
-	ldrsb r1, [r4, r1]
-	movs r0, #0x11
-	rsbs r0, r0, #0
-	cmp r1, r0
-	bge _0809FE8A
-	ldrb r2, [r5, #0x18]
-	lsls r1, r2, #0x1e
-	lsrs r1, r1, #0x1e
-	movs r0, #1
-	eors r1, r0
-	subs r0, #5
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-_0809FE8A:
-	adds r1, r5, #0
-	adds r1, #0x87
-	ldrb r0, [r1]
-	cmp r0, #0xa
-	bls _0809FE98
-	movs r0, #0xa
-	strb r0, [r1]
-_0809FE98:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809FE9C
-sub_0809FE9C: @ 0x0809FE9C
-	push {lr}
-	adds r2, r0, #0
-	movs r1, #0x2e
-	ldrsh r0, [r2, r1]
-	adds r1, r2, #0
-	adds r1, #0x74
-	ldrh r1, [r1]
-	subs r0, r0, r1
-	adds r0, #0x48
-	cmp r0, #0x90
-	bhi _0809FEC8
-	movs r1, #0x32
-	ldrsh r0, [r2, r1]
-	adds r1, r2, #0
-	adds r1, #0x76
-	ldrh r1, [r1]
-	subs r0, r0, r1
-	adds r0, #0x30
-	cmp r0, #0x60
-	bhi _0809FEC8
-	movs r0, #1
-	b _0809FECA
-_0809FEC8:
-	movs r0, #0
-_0809FECA:
-	pop {pc}
-
-	thumb_func_start sub_0809FECC
-sub_0809FECC: @ 0x0809FECC
-	ldr r1, _0809FEDC @ =gPlayerEntity
-	str r1, [r0, #0x54]
-	movs r2, #0
-	movs r1, #5
-	strb r1, [r0, #0xc]
-	strb r2, [r0, #0xd]
-	bx lr
-	.align 2, 0
-_0809FEDC: .4byte gPlayerEntity
--- a/assets/assets.json
+++ b/assets/assets.json
@ -45396,11 +45396,6 @@
    "size": 20,
    "type": "animation"
  },
-  {
-    "path": "objectA8/gUnk_0812484C.bin",
-    "start": 1198156,
-    "size": 4
-  },
  {
    "path": "objectA9/gUnk_0812485C.bin",
    "start": 1198172,
--- a/data/const/object/objectA8.s
+++ b/data/const/object/objectA8.s
@ -1,22 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124824:: @ 08124824
-	.4byte sub_0809FABC
-	.4byte sub_0809FB38
-	.4byte sub_0809FB78
-	.4byte sub_0809FC28
-	.4byte sub_0809FD00
-	.4byte sub_0809FD4C
-	.4byte sub_0809FD94
-
-gUnk_08124840:: @ 08124840
-	.4byte sub_0809FB90
-	.4byte sub_0809FBA4
-	.4byte sub_0809FBD4
-
-gUnk_0812484C:: @ 0812484C
-	.incbin "objectA8/gUnk_0812484C.bin"
--- a/include/functions.h
+++ b/include/functions.h
@ -31,8 +31,9 @@ extern void GenericKnockback2(Entity*);
 extern LayerStruct* GetLayerByIndex(u32);
 extern u32 GetRandomByWeight(const u8*);
 extern u32 GetTileIndex(u32, u32);
-extern u32 IsColliding(Entity*, Entity*);
-extern u32 IsCollidingPlayer(Entity*);
+extern void GiveItem(u32, u32);
+extern bool32 IsColliding(Entity*, Entity*);
+extern bool32 IsCollidingPlayer(Entity*);
 extern bool32 IsProjectileOffScreen(Entity*);
 extern bool32 IsTileCollision(u8*, s32, s32, u32);
 extern void LinearMoveAngle(Entity*, u32, u32);
--- a/include/object.h
+++ b/include/object.h
@ -394,7 +394,7 @@ void MinishLight(Entity*);
 void FireballChain(Entity*);
 void ObjectA6(Entity*);
 void ObjectA7(Entity*);
-void ObjectA8(Entity*);
+void ObjectA8();
 void ObjectA9(Entity*);
 void WaterfallOpening(Entity*);
 void ObjectAB(Entity*);
--- a/linker.ld
+++ b/linker.ld
@ -817,7 +817,6 @@ SECTIONS {
        asm/object/objectA6.o(.text);
        asm/object/objectA7.o(.text);
        src/object/objectA8.o(.text);
-        asm/object/objectA8.o(.text);
        asm/object/objectA9.o(.text);
        asm/object/waterfallOpening.o(.text);
        asm/object/objectAB.o(.text);
@ -1571,7 +1570,7 @@ SECTIONS {
        data/const/object/minishLight.o(.rodata);
        data/const/object/objectA6.o(.rodata);
        data/animations/object/objectA6.o(.rodata);
-        data/const/object/objectA8.o(.rodata);
+        src/object/objectA8.o(.rodata);
        data/const/object/objectA9.o(.rodata);
        data/const/object/waterfallOpening.o(.rodata);
        data/const/object/objectAB.o(.rodata);
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@ -14,6 +14,7 @@ extern u16 script_StockwellBuy[];
 extern u16 script_StockwellDogFood[];
 extern u8 gUnk_0810FDB8[];

+extern void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script);
 extern u32 gUnk_0810FDA0;
 extern u16 script_Stockwell;

--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@ -19,8 +19,6 @@ void sub_080813BC(Entity*);
 void sub_080810FC(Entity*);
 bool32 CheckShouldPlayItemGetCutscene(Entity*);

-extern void GiveItem(u32, u32);
-
 extern void (*const gUnk_0811E7D4[])(Entity*);
 extern void (*const gUnk_0811E7E8[])(Entity*);
 extern void (*const gUnk_0811E814[])(Entity*);
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@ -1,13 +1,47 @@
-#include "entity.h"
-#include "player.h"
+/**
+ * @file objectA8.c
+ * @ingroup Objects
+ *
+ * @brief ObjectA8 object
+ */
+
+#define NENT_DEPRECATED
+#include "global.h"
+#include "object.h"
 #include "functions.h"
 #include "item.h"

-extern void (*gUnk_08124824[])(Entity*);
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unk_68[0xc];
+    /*0x74*/ u16 unk_74;
+    /*0x76*/ u16 unk_76;
+    /*0x78*/ u8 unk_78[0xf];
+    /*0x87*/ u8 unk_87;
+} ObjectA8Entity;

-void ObjectA8(Entity* this) {
-    if ((this->bitfield & 0x80) != 0) {
-        switch (this->bitfield & 0x7f) {
+extern Hitbox gUnk_080FD1A8;
+
+void sub_0809FECC(ObjectA8Entity*);
+bool32 sub_0809FE9C(ObjectA8Entity*);
+void ObjectA8_Init(ObjectA8Entity*);
+void ObjectA8_Action1(ObjectA8Entity*);
+void ObjectA8_Action2(ObjectA8Entity*);
+void ObjectA8_Action3(ObjectA8Entity*);
+void ObjectA8_Action4(ObjectA8Entity*);
+void ObjectA8_Action5(ObjectA8Entity*);
+void ObjectA8_Action6(ObjectA8Entity*);
+void ObjectA8_Action2Subaction0(ObjectA8Entity*);
+void ObjectA8_Action2Subaction1(ObjectA8Entity*);
+void ObjectA8_Action2Subaction2(ObjectA8Entity*);
+
+void ObjectA8(ObjectA8Entity* this) {
+    static void (*const ObjectA8_Actions[])(ObjectA8Entity*) = {
+        ObjectA8_Init,    ObjectA8_Action1, ObjectA8_Action2, ObjectA8_Action3,
+        ObjectA8_Action4, ObjectA8_Action5, ObjectA8_Action6,
+    };
+    if ((super->bitfield & 0x80) != 0) {
+        switch (super->bitfield & 0x7f) {
            case 0:
            case 1:
            case 4:
@ -20,12 +54,192 @@ void ObjectA8(Entity* this) {
            case 0xc:
            case 0x1e:
            case 0x1f:
-                this->action = 5;
-                this->child = &gPlayerEntity;
-                CreateItemEntity(this->type, 0, 0);
+                super->action = 5;
+                super->child = &gPlayerEntity;
+                CreateItemEntity(super->type, 0, 0);
                DeleteThisEntity();
        }
    }
-    gUnk_08124824[this->action](this);
-    sub_08080CB4(this);
+    ObjectA8_Actions[super->action](this);
+    sub_08080CB4(super);
+}
+void ObjectA8_Init(ObjectA8Entity* this) {
+    super->action = 1;
+    switch (super->type2) {
+        case 0:
+            super->zVelocity = 0x1e000;
+            super->z.HALF.HI += 8;
+            break;
+        case 2:
+            sub_0809FECC(this);
+            return;
+    }
+    super->collisionLayer = 3;
+    super->field_0x3c = 0x17;
+    super->hurtType = 0x48;
+    super->hitType = 7;
+    super->flags2 = 0x17;
+    super->hitbox = (Hitbox*)&gUnk_080FD1A8;
+    super->field_0x1c = 1;
+    this->unk_74 = super->x.HALF.HI;
+    this->unk_76 = super->y.HALF.HI;
+    SetDefaultPriority(super, 3);
+    EnqueueSFX(SFX_136);
+}
+
+void ObjectA8_Action1(ObjectA8Entity* this) {
+    super->z.WORD -= 0xe000;
+    if (super->frame != 0) {
+        if (super->actionDelay != 0) {
+            super->actionDelay *= 0x1e;
+        } else {
+            super->actionDelay = 0xf0;
+        }
+        super->action = 3;
+        super->field_0xf = 1;
+        super->speed = 0x80;
+    }
+}
+
+void ObjectA8_Action2(ObjectA8Entity* this) {
+    static void (*const ObjectA8_Action2Subactions[])(ObjectA8Entity*) = {
+        ObjectA8_Action2Subaction0,
+        ObjectA8_Action2Subaction1,
+        ObjectA8_Action2Subaction2,
+    };
+    ObjectA8_Action2Subactions[super->subAction](this);
+}
+
+void ObjectA8_Action2Subaction0(ObjectA8Entity* this) {
+    super->subAction = 1;
+    super->field_0x1d = 1;
+    super->spriteSettings.draw = 1;
+}
+
+void ObjectA8_Action2Subaction1(ObjectA8Entity* this) {
+    if ((gPlayerState.field_0x1c & 0xf) != 1 || (super->bitfield & 0x7f) != 0x13) {
+        super->action = 3;
+    } else {
+        sub_0806F4E8(super);
+    }
+}
+
+void ObjectA8_Action2Subaction2(ObjectA8Entity* this) {
+    if ((gPlayerState.field_0x1c & 0xf) != 1 || (super->bitfield & 0x7f) != 0x13) {
+        super->action = 3;
+    } else {
+        if (sub_0806F3E4(super)) {
+            super->flags &= ~ENT_COLLIDE;
+            super->action = 5;
+            super->child = &gPlayerEntity;
+            GiveItem(super->type, 0);
+        }
+    }
+}
+
+void ObjectA8_Action3(ObjectA8Entity* this) {
+    static const u8 gUnk_0812484C[] = {
+        128,
+        96,
+        0,
+        0,
+    };
+    if (--super->field_0xf == 0) {
+        u32 rand = Random();
+        super->flags |= ENT_COLLIDE;
+        super->field_0xf = 0x20;
+        super->speed = gUnk_0812484C[rand >> 8 & 1];
+        if (sub_0809FE9C(this)) {
+            super->direction = rand & 0x1f;
+        } else {
+            super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_74, this->unk_76);
+        }
+        if ((super->direction & 0xf) != 0) {
+            super->spriteSettings.flipX = ((super->direction ^ 0x10) >> 4);
+        }
+    }
+    ProcessMovement1(super);
+    if ((AnyPrioritySet() == 0) && (super->type == 0)) {
+        if (((gRoomTransition.frameCount & 1) != 0) && (--super->actionDelay == 0)) {
+            sub_08081404(super, 0);
+        }
+        if (super->actionDelay < 0x3c) {
+            super->spriteSettings.draw ^= 1;
+        }
+    }
+}
+
+void ObjectA8_Action4(ObjectA8Entity* this) {
+    if (*(u16*)&super->child->kind != 0xb08) {
+        sub_08081404(super, 0);
+    } else {
+        CopyPosition(super->child, super);
+        super->z.HALF.HI--;
+        if (IsColliding(super, &gPlayerEntity)) {
+            sub_0809FECC(this);
+            GiveItem(super->type, 0);
+        }
+    }
+}
+
+void ObjectA8_Action5(ObjectA8Entity* this) {
+    super->action = 6;
+    super->actionDelay = 0x80;
+    super->field_0xf = 6;
+    super->flags &= ~ENT_COLLIDE;
+    super->spriteSettings.draw = 1;
+    super->spritePriority.b1 = 2;
+    super->spriteOffsetY = -5;
+    CopyPosition(super->child, super);
+}
+
+void ObjectA8_Action6(ObjectA8Entity* this) {
+    s32 tmp;
+    Entity* child = super->child;
+    tmp = gSineTable[super->actionDelay] * 0xa00;
+    if (tmp < 0) {
+        tmp += 0xffff;
+    }
+    super->x.HALF.HI = (s16)(tmp >> 0x10) + child->x.HALF.HI;
+    tmp = gSineTable[super->actionDelay + 0x40] * 0x500;
+    if (tmp < 0) {
+        tmp += 0xffff;
+    }
+    super->y.HALF.HI = super->child->y.HALF.HI - (tmp >> 0x10);
+    super->actionDelay += 8;
+    super->z.HALF.HI = super->child->z.HALF.HI;
+    super->spriteOrientation.flipY = super->child->spriteOrientation.flipY;
+    super->spriteRendering.b3 = super->child->spriteRendering.b3;
+    if ((u8)(super->actionDelay - 0x41) < 0x7f) {
+        super->spritePriority.b0 = 3;
+    } else {
+        super->spritePriority.b0 = 5;
+    }
+    if (--super->field_0xf == 0) {
+        super->field_0xf = 6;
+        if (((--super->spriteOffsetY) * 0x1000000) >> 0x18 < -0x16) {
+            sub_08081404(super, 1);
+        }
+    }
+    if (super->spriteOffsetY < -0x11) {
+        super->spriteSettings.draw ^= 1;
+    }
+    if (this->unk_87 > 10) {
+        this->unk_87 = 0xa;
+    }
+}
+
+bool32 sub_0809FE9C(ObjectA8Entity* this) {
+    if (((super->x.HALF.HI - (u32)this->unk_74) + 0x48 < 0x91) &&
+        ((super->y.HALF.HI - (u32)this->unk_76) + 0x30 < 0x61)) {
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+void sub_0809FECC(ObjectA8Entity* this) {
+    super->child = &gPlayerEntity;
+    super->action = 5;
+    super->subAction = 0;
 }