merge

.gitattributes

@@ -19,3 +19,5 @@ Makefile text eol=lf
 
 *.h linguist-language=C
 *.inc linguist-language=Assembly
+data/** linguist-language=data
+tools/** linguist-vendored

asm/beanstalkSubtask.s

@@ -3181,7 +3181,7 @@ sub_0801AE44: @ 0x0801AE44
 	bl LoadRoomGfx
 _0801AE5A:
 	bl sub_080809D4
-	bl sub_080805F8
+	bl UpdateIsDiggingCave
 	ldr r0, _0801AEE4 @ =gRoomTransition
 	adds r0, #0x2d
 	ldrb r0, [r0]

asm/enemy/flyingPot.s

@@ -1,560 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start FlyingPot
-FlyingPot: @ 0x0803704C
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_080012DC
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _08037070
-	ldr r0, _0803706C @ =gUnk_080012C8
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r5, #0
-	bl _call_via_r1
-	b _08037084
-	.align 2, 0
-_0803706C: .4byte gUnk_080012C8
-_08037070:
-	ldr r4, _08037088 @ =gUnk_080CF244
-	adds r0, r5, #0
-	bl GetNextFunction
-	lsls r0, r0, #2
-	adds r0, r0, r4
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl _call_via_r1
-_08037084:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08037088: .4byte gUnk_080CF244
-
-	thumb_func_start sub_0803708C
-sub_0803708C: @ 0x0803708C
-	push {lr}
-	ldr r2, _080370A0 @ =gUnk_080CF25C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080370A0: .4byte gUnk_080CF25C
-
-	thumb_func_start sub_080370A4
-sub_080370A4: @ 0x080370A4
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl sub_08037418
-	adds r0, r5, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x9d
-	bne _08037110
-	movs r0, #6
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	movs r0, #0xa8
-	lsls r0, r0, #0xa
-	str r0, [r5, #0x20]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #8
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r5, #0
-	adds r0, #0x74
-	ldrh r0, [r0]
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	ldr r3, _0803710C @ =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 SetTile
-	b _0803711E
-	.align 2, 0
-_0803710C: .4byte gRoomControls
-_08037110:
-	movs r1, #0x36
-	ldrsh r0, [r5, r1]
-	cmp r0, #0
-	beq _0803711E
-	adds r0, r5, #0
-	bl sub_08037408
-_0803711E:
-	ldr r1, _08037128 @ =gUnk_080CF244
-	adds r0, r5, #0
-	bl EnemyFunctionHandlerAfterCollision
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08037128: .4byte gUnk_080CF244
-
-	thumb_func_start sub_0803712C
-sub_0803712C: @ 0x0803712C
-	push {lr}
-	ldr r2, _08037140 @ =gUnk_080CF278
-	ldrb r1, [r0, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08037140: .4byte gUnk_080CF278
-
-	thumb_func_start sub_08037144
-sub_08037144: @ 0x08037144
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08037418
-	movs r1, #0
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	strb r1, [r4, #0xe]
-	movs r0, #0x30
-	strb r0, [r4, #0x1d]
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0803715C
-sub_0803715C: @ 0x0803715C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08037418
-	adds r0, r4, #0
-	bl sub_0806F520
-	cmp r0, #0
-	beq _08037176
-	adds r0, r4, #0
-	bl sub_0806F4E8
-	b _0803718A
-_08037176:
-	adds r1, r4, #0
-	adds r1, #0x62
-	strb r0, [r1]
-	movs r1, #0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, #0
-	beq _0803718A
-	adds r0, r4, #0
-	bl sub_08037408
-_0803718A:
-	pop {r4, pc}
-
-	thumb_func_start sub_0803718C
-sub_0803718C: @ 0x0803718C
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldrb r4, [r5, #0xe]
-	cmp r4, #0
-	bne _080371DA
-	bl sub_08037418
-	movs r0, #1
-	strb r0, [r5, #0xe]
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	adds r0, r5, #0
-	adds r0, #0x62
-	strb r4, [r0]
-	adds r0, #0x12
-	ldrh r0, [r0]
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	ldr r3, _080371EC @ =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 SetTile
-_080371DA:
-	adds r0, r5, #0
-	bl sub_0806F520
-	cmp r0, #0
-	beq _080371F0
-	adds r0, r5, #0
-	bl sub_0806F3E4
-	b _080371F6
-	.align 2, 0
-_080371EC: .4byte gRoomControls
-_080371F0:
-	adds r0, r5, #0
-	bl sub_08037408
-_080371F6:
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_080371F8
-sub_080371F8: @ 0x080371F8
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, _08037210 @ =gPlayerState
-	ldrb r1, [r0, #0x1c]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	bne _0803720E
-	adds r0, r2, #0
-	bl sub_08037408
-_0803720E:
-	pop {pc}
-	.align 2, 0
-_08037210: .4byte gPlayerState
-
-	thumb_func_start nullsub_161
-nullsub_161: @ 0x08037214
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08037218
-sub_08037218: @ 0x08037218
-	push {lr}
-	bl sub_08037408
-	pop {pc}
-
-	thumb_func_start sub_08037220
-sub_08037220: @ 0x08037220
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	movs r0, #2
-	strb r0, [r5, #0x1c]
-	ldrh r0, [r5, #0x32]
-	adds r0, #3
-	strh r0, [r5, #0x32]
-	movs r0, #0x2e
-	ldrsh r4, [r5, r0]
-	ldr r1, _0803727C @ =gRoomControls
-	ldrh r0, [r1, #6]
-	subs r4, r4, r0
-	asrs r4, r4, #4
-	movs r2, #0x3f
-	ands r4, r2
-	movs r3, #0x32
-	ldrsh r0, [r5, r3]
-	ldrh r1, [r1, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r4, r0
-	adds r6, r5, #0
-	adds r6, #0x38
-	ldrb r1, [r6]
-	adds r0, r4, #0
-	bl GetTileIndex
-	adds r1, r5, #0
-	adds r1, #0x74
-	strh r0, [r1]
-	movs r0, #0x80
-	lsls r0, r0, #7
-	ldrb r2, [r6]
-	adds r1, r4, #0
-	bl SetTile
-	adds r0, r5, #0
-	movs r1, #5
-	bl InitializeAnimation
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0803727C: .4byte gRoomControls
-
-	thumb_func_start sub_08037280
-sub_08037280: @ 0x08037280
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl sub_08037418
-	adds r0, r5, #0
-	bl GetTileTypeByEntity
-	movs r1, #0x80
-	lsls r1, r1, #7
-	cmp r0, r1
-	beq _080372CC
-	adds r0, r5, #0
-	adds r0, #0x74
-	ldrh r0, [r0]
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	ldr r3, _080372E4 @ =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 SetTile
-	adds r0, r5, #0
-	bl sub_08037408
-_080372CC:
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0x40
-	bl PlayerInRange
-	cmp r0, #0
-	beq _080372E2
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	movs r0, #0x1e
-	strb r0, [r5, #0xe]
-_080372E2:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080372E4: .4byte gRoomControls
-
-	thumb_func_start sub_080372E8
-sub_080372E8: @ 0x080372E8
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl sub_08037418
-	adds r3, r5, #0
-	adds r3, #0x62
-	ldr r2, _08037370 @ =gUnk_080CF290
-	ldrb r1, [r5, #0xe]
-	movs r6, #3
-	adds r0, r6, #0
-	ands r0, r1
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	ldrb r1, [r3]
-	adds r0, r0, r1
-	strb r0, [r3]
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r4, r0, #0x18
-	cmp r4, #0
-	bne _0803736E
-	strb r6, [r5, #0xc]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #8
-	orrs r0, r1
-	strb r0, [r2]
-	strb r4, [r3]
-	adds r1, r5, #0
-	adds r1, #0x3f
-	movs r0, #0xa0
-	strb r0, [r1]
-	subs r1, #4
-	movs r0, #0xf
-	strb r0, [r1]
-	ldr r0, _08037374 @ =gUnk_080FD34C
-	str r0, [r5, #0x48]
-	adds r0, r5, #0
-	adds r0, #0x74
-	ldrh r0, [r0]
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	ldr r3, _08037378 @ =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 SetTile
-_0803736E:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08037370: .4byte gUnk_080CF290
-_08037374: .4byte gUnk_080FD34C
-_08037378: .4byte gRoomControls
-
-	thumb_func_start sub_0803737C
-sub_0803737C: @ 0x0803737C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x34]
-	ldr r1, _080373A8 @ =0xFFFF0000
-	adds r0, r0, r1
-	str r0, [r4, #0x34]
-	movs r0, #0x36
-	ldrsh r1, [r4, r0]
-	movs r0, #6
-	rsbs r0, r0, #0
-	cmp r1, r0
-	bgt _080373A6
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r0, #0xa
-	strb r0, [r4, #0xe]
-	ldr r1, _080373AC @ =gPlayerEntity
-	adds r0, r4, #0
-	bl GetFacingDirection
-	strb r0, [r4, #0x15]
-_080373A6:
-	pop {r4, pc}
-	.align 2, 0
-_080373A8: .4byte 0xFFFF0000
-_080373AC: .4byte gPlayerEntity
-
-	thumb_func_start sub_080373B0
-sub_080373B0: @ 0x080373B0
-	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 _080373C4
-	movs r0, #5
-	strb r0, [r1, #0xc]
-_080373C4:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_080373C8
-sub_080373C8: @ 0x080373C8
-	push {r4, lr}
-	adds r4, r0, #0
-	bl ProcessMovement2
-	ldrh r0, [r4, #0x2a]
-	cmp r0, #0
-	beq _080373DC
-	adds r0, r4, #0
-	bl sub_08037408
-_080373DC:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080373E0
-sub_080373E0: @ 0x080373E0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x20]
-	cmp r0, #0
-	bge _080373F2
-	ldrb r0, [r4, #0x18]
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_080373F2:
-	movs r1, #0x80
-	lsls r1, r1, #6
-	adds r0, r4, #0
-	bl GravityUpdate
-	cmp r0, #0
-	bne _08037406
-	adds r0, r4, #0
-	bl sub_08037408
-_08037406:
-	pop {r4, pc}
-
-	thumb_func_start sub_08037408
-sub_08037408: @ 0x08037408
-	push {lr}
-	movs r1, #5
-	movs r2, #0
-	bl CreateFx
-	bl DeleteThisEntity
-	pop {pc}
-
-	thumb_func_start sub_08037418
-sub_08037418: @ 0x08037418
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	movs r1, #0x2e
-	ldrsh r0, [r5, r1]
-	ldr r3, _08037464 @ =gRoomControls
-	ldrh r1, [r3, #6]
-	subs r0, r0, r1
-	asrs r4, r0, #4
-	movs r2, #0x3f
-	ands r4, r2
-	movs r1, #0x32
-	ldrsh r0, [r5, r1]
-	ldrh r1, [r3, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r4, r0
-	adds r6, r5, #0
-	adds r6, #0x38
-	ldrb r1, [r6]
-	adds r0, r4, #0
-	bl GetTileIndex
-	ldr r1, _08037468 @ =0x00004067
-	cmp r0, r1
-	bne _08037460
-	adds r0, r5, #0
-	adds r0, #0x74
-	ldrh r0, [r0]
-	ldrb r2, [r6]
-	adds r1, r4, #0
-	bl SetTile
-	bl DeleteThisEntity
-_08037460:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08037464: .4byte gRoomControls
-_08037468: .4byte 0x00004067

asm/non_matching/kid/Kid_Head.inc

@@ -1,126 +0,0 @@
-    .syntax unified
-    .text
-
-	push {r4, r5, r6, r7, lr}
-	adds r5, r0, #0
-	ldrb r4, [r5, #0xa]
-	lsls r0, r4, #2
-	mov ip, r0
-	ldr r2, _08062868 @ =gUnk_0810C0A0
-	add r2, ip
-	adds r0, r5, #0
-	adds r0, #0x5a
-	ldrb r3, [r0]
-	movs r1, #0x1f
-	adds r0, r1, #0
-	ands r0, r3
-	ldrb r3, [r2]
-	adds r6, r0, r3
-	ldrb r0, [r5, #0x1e]
-	ands r1, r0
-	ldrb r2, [r2, #1]
-	adds r7, r1, r2
-	cmp r4, #8
-	bhi _08062946
-	ldr r0, _0806286C @ =_08062870
-	add r0, ip
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08062868: .4byte gUnk_0810C0A0
-_0806286C: .4byte _08062870 @ jump table
-_08062870:
-	.4byte _08062894 @ case 0
-	.4byte _08062894 @ case 1
-	.4byte _08062894 @ case 2
-	.4byte _08062894 @ case 3
-	.4byte _08062894 @ case 4
-	.4byte _08062894 @ case 5
-	.4byte _080628D8 @ case 6
-	.4byte _08062922 @ case 7
-	.4byte _08062922 @ case 8
-_08062894:
-	adds r0, r5, #0
-	adds r0, #0x5b
-	ldrb r1, [r0]
-	movs r0, #0x30
-	ands r0, r1
-	lsrs r4, r0, #4
-	cmp r4, #0
-	beq _080628A6
-	adds r4, #0x50
-_080628A6:
-	subs r4, #1
-	adds r0, r5, #0
-	movs r1, #0
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	adds r2, r4, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #2
-	b _08062916
-_080628D8:
-	adds r0, r5, #0
-	adds r0, #0x5b
-	ldrb r0, [r0]
-	movs r2, #0xf
-	ands r2, r0
-	cmp r2, #0
-	beq _080628E8
-	adds r2, #0x93
-_080628E8:
-	subs r2, #1
-	adds r0, r5, #0
-	movs r1, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	movs r2, #1
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-_08062916:
-	bl SetSpriteSubEntryOffsetData2
-	adds r0, r5, #0
-	bl sub_0807000C
-	b _08062946
-_08062922:
-	adds r0, r5, #0
-	movs r1, #0
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	bl sub_0807000C
-_08062946:
-	pop {r4, r5, r6, r7, pc}
-
-    .syntax divided

asm/non_matching/kid/sub_08062948.inc

@@ -1,141 +0,0 @@
-    .syntax unified
-    .text
-
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r6, r1, #0
-	ldrb r0, [r6, #0x18]
-	cmp r0, #0
-	bne _080629B4
-	adds r0, #1
-	strb r0, [r6, #0x18]
-	bl Random
-	movs r1, #0x3f
-	ands r0, r1
-	adds r0, #0x20
-	strh r0, [r6, #0x12]
-	bl Random
-	adds r1, r0, #0
-	movs r0, #0x18
-	ands r1, r0
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	beq _08062990
-	cmp r0, #8
-	bgt _0806297E
-	cmp r0, #0
-	beq _08062988
-	b _080629A6
-_0806297E:
-	cmp r0, #0x10
-	beq _08062998
-	cmp r0, #0x18
-	beq _080629A0
-	b _080629A6
-_08062988:
-	cmp r1, #0x10
-	bne _080629A6
-	movs r1, #8
-	b _080629A6
-_08062990:
-	cmp r1, #0x18
-	bne _080629A6
-	movs r1, #0x10
-	b _080629A6
-_08062998:
-	cmp r1, #0
-	bne _080629A6
-	movs r1, #0x18
-	b _080629A6
-_080629A0:
-	cmp r1, #8
-	bne _080629A6
-	movs r1, #0
-_080629A6:
-	strb r1, [r4, #0x15]
-	adds r0, r1, #0
-	bl sub_0806F5B0
-	strb r0, [r4, #0x14]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-_080629B4:
-	ldrb r0, [r4, #0x14]
-	lsrs r0, r0, #1
-	adds r1, r0, #4
-	adds r5, r4, #0
-	adds r5, #0x58
-	ldrb r0, [r5]
-	cmp r1, r0
-	beq _080629D2
-	adds r0, r4, #0
-	bl InitializeAnimation
-	ldrb r1, [r5]
-	adds r0, r4, #0
-	adds r0, #0x80
-	strh r1, [r0]
-_080629D2:
-	adds r0, r4, #0
-	bl ProcessMovement0
-	movs r3, #0x2e
-	ldrsh r1, [r4, r3]
-	adds r2, r4, #0
-	adds r2, #0x6c
-	movs r5, #0
-	ldrsh r0, [r2, r5]
-	subs r1, r1, r0
-	cmp r1, #0x10
-	ble _080629F4
-	ldrh r0, [r2]
-	adds r0, #0x10
-	strh r0, [r4, #0x2e]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_080629F4:
-	movs r3, #0x10
-	rsbs r3, r3, #0
-	cmp r1, r3
-	bge _08062A06
-	ldrh r0, [r2]
-	subs r0, #0x10
-	strh r0, [r4, #0x2e]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A06:
-	movs r0, #0x32
-	ldrsh r1, [r4, r0]
-	adds r2, r4, #0
-	adds r2, #0x6e
-	movs r5, #0
-	ldrsh r0, [r2, r5]
-	subs r1, r1, r0
-	cmp r1, #0x10
-	ble _08062A22
-	ldrh r0, [r2]
-	adds r0, #0x10
-	strh r0, [r4, #0x32]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A22:
-	cmp r1, r3
-	bge _08062A30
-	ldrh r0, [r2]
-	subs r0, #0x10
-	strh r0, [r4, #0x32]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A30:
-	ldrh r0, [r6, #0x12]
-	subs r0, #1
-	strh r0, [r6, #0x12]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	beq _08062A42
-	ldr r1, _08062A44 @ =gActiveScriptInfo
-	movs r0, #0
-	strb r0, [r1, #6]
-_08062A42:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08062A44: .4byte gActiveScriptInfo
-
-    .syntax divided

asm/non_matching/menu/kinstone_menu/sub_080A3B48.inc

@@ -0,0 +1,24 @@
+	.syntax unified
+	push {lr}
+	movs r1, #0
+	ldr r0, _080A3B6C @ =gSave
+	ldr r3, _080A3B70 @ =0x0000012B
+	adds r2, r0, r3
+	ldrb r0, [r2]
+	cmp r0, #0
+	beq _080A3B66
+_080A3B58:
+	adds r1, #1
+	cmp r1, #0x12
+	bhi _080A3B66
+	adds r0, r1, r2
+	ldrb r0, [r0]
+	cmp r0, #0
+	bne _080A3B58
+_080A3B66:
+	adds r0, r1, #0
+	pop {pc}
+	.align 2, 0
+_080A3B6C: .4byte gSave
+_080A3B70: .4byte 0x0000012B
+	.syntax divided

asm/non_matching/objectB9/sub_080A1270.inc

@@ -0,0 +1,144 @@
+	.syntax unified
+	push {r4, r5, r6, r7, lr}
+	mov r7, sl
+	mov r6, sb
+	mov r5, r8
+	push {r5, r6, r7}
+	sub sp, #8
+	mov sb, r0
+	movs r6, #0
+	ldr r0, [r0, #0x64]
+	str r0, [sp, #4]
+	mov r4, sb
+	adds r4, #0x70
+	ldr r0, _080A12F8 @ =gRoomControls
+	movs r2, #0xd8
+	lsls r2, r2, #2
+	adds r1, r2, #0
+	ldrh r3, [r0, #6]
+	adds r1, r1, r3
+	movs r7, #0xd4
+	lsls r7, r7, #2
+	adds r2, r7, #0
+	ldrh r0, [r0, #8]
+	adds r2, r2, r0
+	lsls r1, r1, #0x10
+	asrs r1, r1, #0x10
+	mov r8, r1
+	lsls r2, r2, #0x10
+	asrs r3, r2, #0x10
+	movs r0, #9
+	mov sl, r0
+	movs r1, #1
+	rsbs r1, r1, #0
+	adds r5, r1, #0
+_080A12B2:
+	ldr r7, [sp, #4]
+	ldr r2, [r7]
+	movs r0, #0
+	ldrsb r0, [r4, r0]
+	cmp r0, #0
+	bne _080A1300
+	ldr r0, [r2, #4]
+	cmp r0, #0
+	beq _080A132C
+	cmp r2, #0
+	beq _080A132C
+	movs r1, #0x2e
+	ldrsh r0, [r2, r1]
+	cmp r8, r0
+	bgt _080A132E
+	movs r7, #0x32
+	ldrsh r0, [r2, r7]
+	cmp r3, r0
+	bgt _080A132E
+	ldrb r0, [r2, #0xa]
+	adds r0, #1
+	strb r0, [r4]
+	movs r0, #1
+	strb r0, [r2, #0xb]
+	adds r6, #1
+	ldr r1, _080A12FC @ =CuccoMinigame_Sounds
+	ldrb r0, [r2, #0xa]
+	lsls r0, r0, #1
+	adds r0, r0, r1
+	ldrh r0, [r0]
+	str r3, [sp]
+	bl SoundReq
+	ldr r3, [sp]
+	b _080A132E
+	.align 2, 0
+_080A12F8: .4byte gRoomControls
+_080A12FC: .4byte CuccoMinigame_Sounds
+_080A1300:
+	cmp r0, #0
+	ble _080A132E
+	adds r6, #1
+	ldr r0, [r2, #4]
+	cmp r0, #0
+	beq _080A132C
+	cmp r2, #0
+	beq _080A132C
+	mov r1, r8
+	adds r1, #4
+	movs r7, #0x2e
+	ldrsh r0, [r2, r7]
+	cmp r1, r0
+	ble _080A131E
+	strh r1, [r2, #0x2e]
+_080A131E:
+	adds r1, r3, #4
+	movs r7, #0x32
+	ldrsh r0, [r2, r7]
+	cmp r1, r0
+	ble _080A132E
+	strh r1, [r2, #0x32]
+	b _080A132E
+_080A132C:
+	strb r5, [r4]
+_080A132E:
+	movs r0, #1
+	rsbs r0, r0, #0
+	add sl, r0
+	adds r4, #1
+	ldr r1, [sp, #4]
+	adds r1, #4
+	str r1, [sp, #4]
+	mov r2, sl
+	cmp r2, #0
+	bge _080A12B2
+	mov r0, sb
+	adds r0, #0x6a
+	strh r6, [r0]
+	ldr r0, _080A136C @ =gPlayerState
+	adds r0, #0x27
+	movs r1, #0xff
+	strb r1, [r0]
+	mov r1, sb
+	adds r1, #0x68
+	ldrh r0, [r1]
+	subs r0, #1
+	strh r0, [r1]
+	lsls r0, r0, #0x10
+	cmp r0, #0
+	bgt _080A1370
+	movs r0, #0xe2
+	bl SoundReq
+	bl sub_08050384
+	b _080A1376
+	.align 2, 0
+_080A136C: .4byte gPlayerState
+_080A1370:
+	ldr r1, _080A1384 @ =gActiveScriptInfo
+	movs r0, #0
+	strb r0, [r1, #6]
+_080A1376:
+	add sp, #8
+	pop {r3, r4, r5}
+	mov r8, r3
+	mov sb, r4
+	mov sl, r5
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+	_080A1384: .4byte gActiveScriptInfo
+	.syntax divided

asm/non_matching/scroll/sub_0807FDF8.inc

@@ -1,110 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _0807FE18 @ =gUpdateVisibleTiles
-	movs r0, #2
-	strb r0, [r1]
-	ldrh r0, [r4, #0x18]
-	adds r0, #1
-	strh r0, [r4, #0x18]
-	ldrb r0, [r4, #0x10]
-	cmp r0, #1
-	beq _0807FE44
-	cmp r0, #1
-	bgt _0807FE1C
-	cmp r0, #0
-	beq _0807FE26
-	b _0807FEB6
-	.align 2, 0
-_0807FE18: .4byte gUpdateVisibleTiles
-_0807FE1C:
-	cmp r0, #2
-	beq _0807FE68
-	cmp r0, #3
-	beq _0807FE94
-	b _0807FEB6
-_0807FE26:
-	ldrh r0, [r4, #0xc]
-	subs r0, #4
-	strh r0, [r4, #0xc]
-	ldr r1, [r4, #0x30]
-	ldr r0, _0807FE3C @ =gPlayerEntity
-	cmp r1, r0
-	bne _0807FE80
-	ldr r0, [r1, #0x30]
-	ldr r2, _0807FE40 @ =0xFFFFA000
-	b _0807FE7C
-	.align 2, 0
-_0807FE3C: .4byte gPlayerEntity
-_0807FE40: .4byte 0xFFFFA000
-_0807FE44:
-	ldrh r0, [r4, #0xa]
-	adds r0, #4
-	strh r0, [r4, #0xa]
-	ldr r1, [r4, #0x30]
-	ldr r0, _0807FE64 @ =gPlayerEntity
-	cmp r1, r0
-	bne _0807FE5C
-	ldr r0, [r1, #0x2c]
-	movs r2, #0x80
-	lsls r2, r2, #7
-	adds r0, r0, r2
-	str r0, [r1, #0x2c]
-_0807FE5C:
-	ldrh r0, [r4, #0x18]
-	cmp r0, #0x3c
-	bne _0807FEB6
-	b _0807FE86
-	.align 2, 0
-_0807FE64: .4byte gPlayerEntity
-_0807FE68:
-	ldrh r0, [r4, #0xc]
-	adds r0, #4
-	strh r0, [r4, #0xc]
-	ldr r1, [r4, #0x30]
-	ldr r0, _0807FE90 @ =gPlayerEntity
-	cmp r1, r0
-	bne _0807FE80
-	ldr r0, [r1, #0x30]
-	movs r2, #0xc0
-	lsls r2, r2, #7
-_0807FE7C:
-	adds r0, r0, r2
-	str r0, [r1, #0x30]
-_0807FE80:
-	ldrh r0, [r4, #0x18]
-	cmp r0, #0x28
-	bne _0807FEB6
-_0807FE86:
-	adds r0, r4, #0
-	bl sub_0807FEC8
-	b _0807FEB6
-	.align 2, 0
-_0807FE90: .4byte gPlayerEntity
-_0807FE94:
-	ldrh r0, [r4, #0xa]
-	subs r0, #4
-	strh r0, [r4, #0xa]
-	ldr r1, [r4, #0x30]
-	ldr r0, _0807FEC0 @ =gPlayerEntity
-	cmp r1, r0
-	bne _0807FEAA
-	ldr r0, [r1, #0x2c]
-	ldr r2, _0807FEC4 @ =0xFFFFC000
-	adds r0, r0, r2
-	str r0, [r1, #0x2c]
-_0807FEAA:
-	ldrh r0, [r4, #0x18]
-	cmp r0, #0x3c
-	bne _0807FEB6
-	adds r0, r4, #0
-	bl sub_0807FEC8
-_0807FEB6:
-	movs r0, #0
-	strh r0, [r4, #0x16]
-	bl sub_08080BC4
-	pop {r4, pc}
-	.align 2, 0
-_0807FEC0: .4byte gPlayerEntity
-_0807FEC4: .4byte 0xFFFFC000
-	.syntax divided

asm/non_matching/scroll/sub_0807FF6C.inc

@@ -1,57 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	movs r1, #1
-	strb r1, [r0, #3]
-	ldr r3, _0807FFC8 @ =gScreen
-	ldrh r1, [r3]
-	movs r2, #0x80
-	lsls r2, r2, #7
-	adds r0, r2, #0
-	orrs r0, r1
-	strh r0, [r3]
-	adds r2, r3, #0
-	adds r2, #0x60
-	ldrb r0, [r2]
-	movs r4, #0xb8
-	lsls r4, r4, #5
-	adds r1, r4, #0
-	orrs r0, r1
-	strh r0, [r2]
-	adds r2, #2
-	ldrh r1, [r2]
-	movs r0, #0xff
-	lsls r0, r0, #8
-	ands r0, r1
-	movs r1, #7
-	movs r4, #0
-	orrs r0, r1
-	strh r0, [r2]
-	adds r0, r3, #0
-	adds r0, #0x5a
-	movs r1, #0xf0
-	strh r1, [r0]
-	adds r0, #4
-	strh r1, [r0]
-	bl ResetPlayer
-	bl ResetPlayerAnimationAndAction
-	ldr r0, _0807FFCC @ =gUnk_03004030
-	ldrb r0, [r0, #8]
-	cmp r0, #0
-	beq _0807FFD4
-	ldr r1, _0807FFD0 @ =gPlayerEntity
-	movs r0, #4
-	strb r0, [r1, #0x14]
-	b _0807FFD8
-	.align 2, 0
-_0807FFC8: .4byte gScreen
-_0807FFCC: .4byte gUnk_03004030
-_0807FFD0: .4byte gPlayerEntity
-_0807FFD4:
-	ldr r0, _0807FFE0 @ =gPlayerEntity
-	strb r4, [r0, #0x14]
-_0807FFD8:
-	bl sub_080809D4
-	pop {r4, pc}
-	.align 2, 0
-_0807FFE0: .4byte gPlayerEntity
-	.syntax divided

asm/non_matching/scroll/sub_0807FFE4.inc

@@ -1,39 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r0, #2
-	strb r0, [r5, #3]
-	bl sub_080803D0
-	adds r0, #6
-	strh r0, [r5, #0x18]
-	ldr r4, _0808002C @ =gUnk_0200B640
-	bl sub_08080278
-	strh r0, [r4]
-	ldr r1, _08080030 @ =gUnk_08109194
-	ldr r0, _08080034 @ =gUnk_03004030
-	ldr r0, [r0]
-	ldrb r0, [r0, #3]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	ldr r0, [r0]
-	bl sub_080197D4
-	ldr r4, _08080038 @ =gMapDataTop
-	ldrh r1, [r5, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r5, #0x20]
-	lsrs r2, r2, #4
-	adds r0, r4, #0
-	bl sub_0807C8B0
-	ldr r0, _0808003C @ =gMapDataTopSpecial
-	subs r4, #4
-	adds r1, r4, #0
-	bl sub_0801AB08
-	pop {r4, r5, pc}
-	.align 2, 0
-_0808002C: .4byte gUnk_0200B640
-_08080030: .4byte gUnk_08109194
-_08080034: .4byte gUnk_03004030
-_08080038: .4byte gMapDataTop
-_0808003C: .4byte gMapDataTopSpecial
-	.syntax divided

asm/non_matching/scroll/sub_08080040.inc

@@ -1,102 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	adds r5, r0, #0
-	ldrh r4, [r5, #0x18]
-	subs r4, #6
-	strh r4, [r5, #0x18]
-	ldrh r0, [r5, #0x18]
-	lsls r0, r0, #1
-	movs r1, #3
-	bl __divsi3
-	strh r0, [r5, #0x1a]
-	lsls r4, r4, #0x10
-	lsrs r4, r4, #0x10
-	cmp r4, #0x2a
-	bls _080800C6
-	ldr r3, [r5, #0x30]
-	movs r1, #0x2e
-	ldrsh r0, [r3, r1]
-	movs r2, #0xa
-	ldrsh r1, [r5, r2]
-	subs r2, r0, r1
-	ldrh r1, [r5, #0x18]
-	subs r0, r2, r1
-	adds r7, r0, #0
-	adds r7, #8
-	cmp r7, #0
-	bge _08080078
-	movs r7, #0
-_08080078:
-	adds r0, r2, r1
-	adds r6, r0, #0
-	subs r6, #8
-	cmp r6, #0xf0
-	ble _08080084
-	movs r6, #0xf0
-_08080084:
-	movs r1, #0x32
-	ldrsh r0, [r3, r1]
-	movs r2, #0xc
-	ldrsh r1, [r5, r2]
-	subs r2, r0, r1
-	ldrh r1, [r5, #0x1a]
-	subs r0, r2, r1
-	adds r4, r0, #0
-	adds r4, #8
-	cmp r4, #0
-	bge _0808009C
-	movs r4, #0
-_0808009C:
-	adds r0, r2, r1
-	adds r3, r0, #0
-	subs r3, #8
-	cmp r3, #0xa0
-	ble _080800A8
-	movs r3, #0xa0
-_080800A8:
-	ldr r2, _080800F0 @ =gScreen
-	movs r1, #0xff
-	ands r7, r1
-	lsls r0, r7, #8
-	ands r6, r1
-	orrs r0, r6
-	adds r6, r2, #0
-	adds r6, #0x5a
-	strh r0, [r6]
-	ands r4, r1
-	lsls r0, r4, #8
-	ands r3, r1
-	orrs r0, r3
-	adds r2, #0x5e
-	strh r0, [r2]
-_080800C6:
-	ldrh r0, [r5, #0x18]
-	cmp r0, #0
-	bne _080800FC
-	movs r0, #3
-	strb r0, [r5, #3]
-	bl DeleteSleepingEntities
-	bl sub_0807C810
-	ldr r1, _080800F4 @ =gUnk_08109194
-	ldr r0, _080800F8 @ =gUnk_03004030
-	ldr r0, [r0]
-	ldrb r0, [r0, #3]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	ldr r0, [r0, #4]
-	bl sub_08080C80
-	b _08080102
-	.align 2, 0
-_080800F0: .4byte gScreen
-_080800F4: .4byte gUnk_08109194
-_080800F8: .4byte gUnk_03004030
-_080800FC:
-	ldr r1, _08080104 @ =gUpdateVisibleTiles
-	movs r0, #4
-	strb r0, [r1]
-_08080102:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08080104: .4byte gUpdateVisibleTiles
-	.syntax divided

asm/non_matching/scroll/sub_08080108.inc

@@ -1,56 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, lr}
-	movs r1, #4
-	strb r1, [r0, #3]
-	ldr r5, _08080178 @ =gMapDataBottom
-	movs r0, #0xc0
-	lsls r0, r0, #6
-	adds r1, r5, r0
-	movs r6, #0x80
-	lsls r6, r6, #6
-	adds r0, r5, #0
-	adds r2, r6, #0
-	bl MemCopy
-	ldr r4, _0808017C @ =gMapDataTop
-	movs r0, #0xc0
-	lsls r0, r0, #6
-	adds r1, r4, r0
-	adds r0, r4, #0
-	adds r2, r6, #0
-	bl MemCopy
-	bl sub_08080368
-	ldr r1, _08080180 @ =gUnk_02034480
-	ldr r0, _08080184 @ =gUnk_0200B640
-	ldrh r0, [r0]
-	strh r0, [r1]
-	ldr r0, _08080188 @ =gUnk_02022830
-	ldr r1, _0808018C @ =gUnk_020246B0
-	movs r2, #0xc0
-	lsls r2, r2, #5
-	bl MemCopy
-	subs r5, #4
-	adds r0, r5, #0
-	bl sub_08080B60
-	subs r4, #4
-	adds r0, r4, #0
-	bl sub_08080B60
-	bl sub_0807BBE4
-	bl sub_0807BC84
-	bl sub_0805E248
-	ldr r0, _08080190 @ =gMapDataBottomSpecial
-	adds r1, r5, #0
-	bl sub_0801AB08
-	ldr r0, _08080194 @ =gMapDataTopSpecial
-	adds r1, r4, #0
-	bl sub_0801AB08
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08080178: .4byte gMapDataBottom
-_0808017C: .4byte gMapDataTop
-_08080180: .4byte gUnk_02034480
-_08080184: .4byte gUnk_0200B640
-_08080188: .4byte gUnk_02022830
-_0808018C: .4byte gUnk_020246B0
-_08080190: .4byte gMapDataBottomSpecial
-_08080194: .4byte gMapDataTopSpecial
-	.syntax divided

asm/non_matching/scroll/sub_080801BC.inc

@@ -1,100 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	adds r5, r0, #0
-	ldrh r4, [r5, #0x18]
-	adds r4, #6
-	strh r4, [r5, #0x18]
-	ldrh r0, [r5, #0x18]
-	lsls r0, r0, #1
-	movs r1, #3
-	bl __divsi3
-	strh r0, [r5, #0x1a]
-	lsls r4, r4, #0x10
-	lsrs r4, r4, #0x10
-	cmp r4, #0x1e
-	bls _08080232
-	ldr r2, [r5, #0x30]
-	movs r0, #0x2e
-	ldrsh r1, [r2, r0]
-	movs r3, #0xa
-	ldrsh r0, [r5, r3]
-	subs r0, r1, r0
-	ldrh r1, [r5, #0x18]
-	subs r7, r0, r1
-	cmp r7, #0
-	bge _080801F0
-	movs r7, #0
-_080801F0:
-	adds r6, r0, r1
-	cmp r6, #0xf0
-	ble _080801F8
-	movs r6, #0xf0
-_080801F8:
-	movs r0, #0x32
-	ldrsh r1, [r2, r0]
-	movs r2, #0xc
-	ldrsh r0, [r5, r2]
-	subs r0, r1, r0
-	ldrh r1, [r5, #0x1a]
-	subs r4, r0, r1
-	cmp r4, #0
-	bge _0808020C
-	movs r4, #0
-_0808020C:
-	adds r3, r0, r1
-	cmp r3, #0xa0
-	ble _08080214
-	movs r3, #0xa0
-_08080214:
-	ldr r2, _08080260 @ =gScreen
-	movs r1, #0xff
-	ands r7, r1
-	lsls r0, r7, #8
-	ands r6, r1
-	orrs r0, r6
-	adds r6, r2, #0
-	adds r6, #0x5a
-	strh r0, [r6]
-	ands r4, r1
-	lsls r0, r4, #8
-	ands r3, r1
-	orrs r0, r3
-	adds r2, #0x5e
-	strh r0, [r2]
-_08080232:
-	ldrh r0, [r5, #0x1c]
-	cmp r0, #0
-	bne _08080268
-	strb r0, [r5, #2]
-	strh r0, [r5]
-	bl ResetSystemPriority
-	ldr r1, _08080260 @ =gScreen
-	ldrh r2, [r1]
-	ldr r0, _08080264 @ =0x0000BFFF
-	ands r0, r2
-	strh r0, [r1]
-	adds r2, r1, #0
-	adds r2, #0x60
-	ldrb r0, [r2]
-	strh r0, [r2]
-	adds r1, #0x62
-	ldrh r2, [r1]
-	movs r0, #0xff
-	lsls r0, r0, #8
-	ands r0, r2
-	strh r0, [r1]
-	b _08080272
-	.align 2, 0
-_08080260: .4byte gScreen
-_08080264: .4byte 0x0000BFFF
-_08080268:
-	ldr r0, _08080274 @ =gUpdateVisibleTiles
-	movs r1, #4
-	strb r1, [r0]
-	movs r0, #0
-	strh r0, [r5, #0x1c]
-_08080272:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08080274: .4byte gUpdateVisibleTiles
-	.syntax divided

asm/non_matching/ui/TextUIElement.inc

@@ -1,75 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #2]
-	ldr r1, _0801CDC0 @ =gUnk_0200AF00
-	cmp r0, #9
-	bne _0801CDD4
-	adds r0, r1, #0
-	adds r0, #0x2f
-	ldrb r2, [r0]
-	cmp r2, #0
-	bne _0801CDCE
-	ldr r0, _0801CDC4 @ =gArea
-	ldrb r0, [r0, #0x18]
-	cmp r0, #2
-	beq _0801CDC8
-	cmp r0, #3
-	beq _0801CDCC
-	adds r0, r1, #0
-	adds r0, #0x2c
-	ldrb r2, [r0]
-	b _0801CDCE
-	.align 2, 0
-_0801CDC0: .4byte gUnk_0200AF00
-_0801CDC4: .4byte gArea
-_0801CDC8:
-	movs r2, #0xb
-	b _0801CDCE
-_0801CDCC:
-	movs r2, #0xa
-_0801CDCE:
-	adds r0, r1, #0
-	adds r0, #0x32
-	strb r2, [r0]
-_0801CDD4:
-	adds r0, r1, #0
-	adds r0, #0x30
-	ldrb r1, [r4, #3]
-	adds r0, r0, r1
-	ldrb r2, [r0]
-	ldrb r1, [r4]
-	movs r0, #3
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4]
-	cmp r2, #0
-	beq _0801CE1E
-	ldr r1, _0801CE20 @ =gUnk_080C9044
-	movs r0, #0x80
-	lsls r0, r0, #0x12
-	ldrb r0, [r0, #7]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	adds r2, r2, r0
-	adds r0, r4, #0
-	adds r1, r2, #0
-	bl sub_0801CAFC
-	ldrb r0, [r4, #3]
-	bl FindUIElement
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0801CE1E
-	ldrh r0, [r1, #0xc]
-	strh r0, [r4, #0xc]
-	ldrh r0, [r1, #0xe]
-	strh r0, [r4, #0xe]
-	ldrb r0, [r4]
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r4]
-_0801CE1E:
-	pop {r4, pc}
-	.align 2, 0
-_0801CE20: .4byte gUnk_080C9044
-	.syntax divided

asm/non_matching/ui/sub_0801C25C.inc

@@ -1,75 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	movs r4, #0
-	ldr r5, _0801C2E4 @ =gUnk_0200AF34
-	adds r6, r5, #0
-	subs r6, #0x34
-	movs r7, #0xd
-	rsbs r7, r7, #0
-	ldr r3, _0801C2E8 @ =0x040000D4
-_0801C26C:
-	lsls r0, r4, #5
-	adds r2, r0, r5
-	ldrb r1, [r2]
-	movs r0, #3
-	ands r0, r1
-	cmp r0, #3
-	bne _0801C2A8
-	lsls r0, r1, #0x1c
-	lsrs r0, r0, #0x1e
-	cmp r0, #1
-	bne _0801C2A8
-	adds r0, r7, #0
-	ands r0, r1
-	movs r1, #8
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, [r2, #0x1c]
-	str r0, [r3]
-	ldrh r0, [r2, #0x1a]
-	lsls r0, r0, #5
-	ldr r1, _0801C2EC @ =0x06010000
-	adds r0, r0, r1
-	str r0, [r3, #4]
-	ldrb r0, [r2, #0x19]
-	lsls r0, r0, #3
-	movs r1, #0x84
-	lsls r1, r1, #0x18
-	orrs r0, r1
-	str r0, [r3, #8]
-	ldr r0, [r3, #8]
-_0801C2A8:
-	adds r4, #1
-	cmp r4, #0x17
-	ble _0801C26C
-	adds r2, r6, #0
-	ldrb r3, [r2, #0x13]
-	movs r0, #0x13
-	ldrsb r0, [r2, r0]
-	cmp r0, #0
-	bge _0801C2C8
-	movs r1, #0x7f
-	ands r1, r3
-	strb r1, [r2, #0x13]
-	movs r0, #0x8d
-	lsls r0, r0, #1
-	bl sub_0801C2F0
-_0801C2C8:
-	ldrb r2, [r6, #0x14]
-	movs r0, #0x14
-	ldrsb r0, [r6, r0]
-	cmp r0, #0
-	bge _0801C2E0
-	movs r1, #0x7f
-	ands r1, r2
-	strb r1, [r6, #0x14]
-	movs r0, #0x93
-	lsls r0, r0, #1
-	bl sub_0801C2F0
-_0801C2E0:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0801C2E4: .4byte gUnk_0200AF34
-_0801C2E8: .4byte 0x040000D4
-_0801C2EC: .4byte 0x06010000
-	.syntax divided

asm/object/bird.s

@@ -1,698 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0809D1F0
-sub_0809D1F0: @ 0x0809D1F0
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xc]
-	mov sb, r0
-	cmp r0, #0
-	beq _0809D224
-	cmp r0, #1
-	beq _0809D2B0
-	bl sub_08078B48
-	ldr r2, _0809D220 @ =gPlayerEntity
-	ldrb r1, [r2, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2, #0x18]
-	movs r1, #0x68
-	adds r1, r1, r5
-	mov r8, r1
-	b _0809D3A8
-	.align 2, 0
-_0809D220: .4byte gPlayerEntity
-_0809D224:
-	ldrb r1, [r5, #0xe]
-	cmp r1, #0
-	beq _0809D234
-	movs r0, #0xff
-	strb r0, [r5, #0x1e]
-	subs r0, r1, #1
-	strb r0, [r5, #0xe]
-	b _0809D488
-_0809D234:
-	movs r1, #1
-	strb r1, [r5, #0xc]
-	mov r2, sb
-	str r2, [r5, #0x20]
-	ldr r0, _0809D2A0 @ =0xFFEC0000
-	str r0, [r5, #0x34]
-	movs r0, #0xc0
-	lsls r0, r0, #1
-	strh r0, [r5, #0x24]
-	movs r0, #8
-	strb r0, [r5, #0x15]
-	adds r0, r5, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r2, [r5, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	strb r0, [r5, #0x19]
-	ldrb r0, [r5, #0x1b]
-	ands r1, r0
-	movs r0, #0x40
-	orrs r1, r0
-	strb r1, [r5, #0x1b]
-	ldr r0, _0809D2A4 @ =gRoomControls
-	ldrh r0, [r0, #0xa]
-	strh r0, [r5, #0x2e]
-	ldr r0, _0809D2A8 @ =gPlayerEntity
-	ldrh r0, [r0, #0x32]
-	strh r0, [r5, #0x32]
-	mov r3, sb
-	str r3, [r5, #0x54]
-	adds r0, r5, #0
-	movs r1, #6
-	bl SetDefaultPriority
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitAnimationForceUpdate
-	ldr r0, _0809D2AC @ =0x00000123
-	bl SoundReq
-	movs r0, #0x68
-	adds r0, r0, r5
-	mov r8, r0
-	b _0809D3A8
-	.align 2, 0
-_0809D2A0: .4byte 0xFFEC0000
-_0809D2A4: .4byte gRoomControls
-_0809D2A8: .4byte gPlayerEntity
-_0809D2AC: .4byte 0x00000123
-_0809D2B0:
-	ldr r6, _0809D430 @ =gPlayerEntity
-	adds r0, r6, #0
-	adds r0, #0x38
-	ldrb r1, [r0]
-	adds r0, r5, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	ldrh r0, [r5, #0x24]
-	adds r0, #8
-	strh r0, [r5, #0x24]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x10
-	movs r1, #0xc0
-	lsls r1, r1, #2
-	mov sl, r1
-	cmp r0, sl
-	ble _0809D2D6
-	mov r2, sl
-	strh r2, [r5, #0x24]
-_0809D2D6:
-	ldrb r1, [r6, #0x10]
-	movs r0, #0x80
-	ands r0, r1
-	movs r3, #0x68
-	adds r3, r3, r5
-	mov r8, r3
-	cmp r0, #0
-	beq _0809D3A8
-	ldr r0, _0809D434 @ =gMessage
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	bne _0809D3A8
-	ldrb r0, [r6, #0xc]
-	cmp r0, #0x1c
-	beq _0809D3A8
-	cmp r0, #6
-	beq _0809D3A8
-	cmp r0, #9
-	beq _0809D3A8
-	ldr r7, _0809D438 @ =gPlayerState
-	adds r0, r7, #0
-	adds r0, #0xa8
-	ldrb r0, [r0]
-	cmp r0, #0x18
-	beq _0809D3A8
-	cmp r0, #0xb
-	beq _0809D3A8
-	cmp r0, #8
-	beq _0809D3A8
-	bl sub_08079F8C
-	cmp r0, #0
-	beq _0809D3A8
-	adds r0, r5, #0
-	adds r1, r6, #0
-	movs r2, #0xe
-	movs r3, #0xe
-	bl EntityInRectRadius
-	cmp r0, #0
-	beq _0809D3A8
-	movs r1, #0x36
-	ldrsh r0, [r6, r1]
-	movs r2, #0x36
-	ldrsh r1, [r5, r2]
-	subs r0, r0, r1
-	subs r0, #8
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0x1f
-	bhi _0809D3A8
-	adds r0, r6, #0
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0809D3A8
-	movs r0, #0x95
-	movs r1, #0xa
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0809D3A8
-	str r4, [r5, #0x54]
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	movs r0, #8
-	strb r0, [r5, #0xe]
-	mov r3, sl
-	strh r3, [r5, #0x24]
-	movs r0, #0xe0
-	lsls r0, r0, #8
-	mov r1, r8
-	strh r0, [r1]
-	bl sub_08079184
-	bl sub_08078B48
-	bl ResetPlayerAnimationAndAction
-	bl sub_08077B20
-	adds r0, r7, #0
-	adds r0, #0x26
-	movs r2, #0
-	strb r2, [r0]
-	strb r2, [r7, #2]
-	ldrb r1, [r6, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r6, #0x10]
-	ldrb r1, [r6, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r6, #0x18]
-	ldr r1, _0809D43C @ =gPriorityHandler
-	movs r0, #6
-	strb r0, [r1]
-	ldr r0, _0809D440 @ =gUnk_02034490
-	mov r3, sb
-	strb r3, [r0]
-_0809D3A8:
-	adds r0, r5, #0
-	bl LinearMoveUpdate
-	mov r0, r8
-	movs r2, #0
-	ldrsh r1, [r0, r2]
-	adds r0, r5, #0
-	bl GravityUpdate
-	adds r0, r5, #0
-	bl UpdateAnimationSingleFrame
-	ldr r4, [r5, #0x54]
-	cmp r4, #0
-	beq _0809D454
-	ldr r2, _0809D430 @ =gPlayerEntity
-	movs r3, #0x2e
-	ldrsh r1, [r2, r3]
-	movs r3, #0x2e
-	ldrsh r0, [r5, r3]
-	subs r0, #8
-	cmp r1, r0
-	bge _0809D3DA
-	movs r0, #0
-	strb r0, [r5, #0xe]
-_0809D3DA:
-	ldrb r0, [r5, #0xe]
-	cmp r0, #0
-	bne _0809D448
-	ldr r2, _0809D444 @ =0xFFF80000
-	adds r0, r5, #0
-	adds r1, r4, #0
-	movs r3, #0
-	bl PositionRelative
-	ldrh r0, [r4, #0x36]
-	adds r0, #0x18
-	strh r0, [r4, #0x36]
-	adds r0, r5, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	adds r3, r4, #0
-	adds r3, #0x29
-	lsrs r1, r1, #0x1d
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r2, [r5, #0x19]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r3, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r4, #0x19]
-	ldrb r0, [r5, #0x1b]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r4, #0x1b]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r4, #0x1b]
-	b _0809D454
-	.align 2, 0
-_0809D430: .4byte gPlayerEntity
-_0809D434: .4byte gMessage
-_0809D438: .4byte gPlayerState
-_0809D43C: .4byte gPriorityHandler
-_0809D440: .4byte gUnk_02034490
-_0809D444: .4byte 0xFFF80000
-_0809D448:
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	adds r0, r2, #0
-	adds r1, r4, #0
-	bl CopyPosition
-_0809D454:
-	adds r0, r5, #0
-	bl CheckOnScreen
-	cmp r0, #0
-	bne _0809D488
-	ldrb r0, [r5, #0xc]
-	cmp r0, #2
-	bne _0809D478
-	ldr r0, _0809D494 @ =gSave
-	ldr r1, [r0, #0x40]
-	movs r2, #0x80
-	lsls r2, r2, #0x15
-	orrs r1, r2
-	str r1, [r0, #0x40]
-	movs r0, #9
-	movs r1, #0
-	bl MenuFadeIn
-_0809D478:
-	ldr r4, [r5, #0x54]
-	cmp r4, #0
-	beq _0809D484
-	adds r0, r4, #0
-	bl DeleteEntityAny
-_0809D484:
-	bl DeleteThisEntity
-_0809D488:
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0809D494: .4byte gSave
-
-	thumb_func_start sub_0809D498
-sub_0809D498: @ 0x0809D498
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xc]
-	cmp r0, #0
-	bne _0809D548
-	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]
-	ldr r0, _0809D534 @ =0xFFFD8000
-	str r0, [r5, #0x20]
-	ldr r0, _0809D538 @ =0xFFB4C000
-	str r0, [r5, #0x34]
-	adds r4, r5, #0
-	adds r4, #0x68
-	movs r0, #0xf0
-	lsls r0, r0, #8
-	strh r0, [r4]
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	strh r0, [r5, #0x24]
-	movs r0, #8
-	strb r0, [r5, #0x15]
-	adds r0, r5, #0
-	adds r0, #0x38
-	strb r3, [r0]
-	adds r6, r5, #0
-	adds r6, #0x29
-	ldrb r1, [r6]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r6]
-	ldrb r2, [r5, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	strb r0, [r5, #0x19]
-	ldrb r0, [r5, #0x1b]
-	ands r1, r0
-	movs r0, #0x40
-	orrs r1, r0
-	strb r1, [r5, #0x1b]
-	adds r0, r5, #0
-	movs r1, #6
-	bl SetDefaultPriority
-	ldr r0, _0809D53C @ =gRoomControls
-	ldrh r0, [r0, #0xa]
-	strh r0, [r5, #0x2e]
-	ldr r0, _0809D540 @ =gPlayerEntity
-	ldrh r0, [r0, #0x32]
-	strh r0, [r5, #0x32]
-	ldr r0, _0809D544 @ =0x00000123
-	bl SoundReq
-	ldrb r1, [r6]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #0x10
-	orrs r0, r1
-	strb r0, [r6]
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitAnimationForceUpdate
-	bl sub_08078B48
-	adds r7, r4, #0
-	b _0809D62E
-	.align 2, 0
-_0809D534: .4byte 0xFFFD8000
-_0809D538: .4byte 0xFFB4C000
-_0809D53C: .4byte gRoomControls
-_0809D540: .4byte gPlayerEntity
-_0809D544: .4byte 0x00000123
-_0809D548:
-	adds r7, r5, #0
-	adds r7, #0x68
-	cmp r0, #1
-	bne _0809D62E
-	ldr r6, _0809D658 @ =gPlayerEntity
-	ldrb r1, [r6, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	mov r8, r0
-	ands r0, r1
-	strb r0, [r6, #0x18]
-	ldr r4, [r5, #0x54]
-	cmp r4, #0
-	beq _0809D5B0
-	ldr r2, _0809D65C @ =0xFFF80000
-	adds r0, r5, #0
-	adds r1, r4, #0
-	movs r3, #0
-	bl PositionRelative
-	ldrh r0, [r4, #0x36]
-	adds r0, #0x18
-	strh r0, [r4, #0x36]
-	adds r0, r5, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	adds r3, r4, #0
-	adds r3, #0x29
-	lsrs r1, r1, #0x1d
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r2, [r5, #0x19]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r3, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r4, #0x19]
-	ldrb r0, [r5, #0x1b]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r4, #0x1b]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r4, #0x1b]
-_0809D5B0:
-	bl sub_08078B48
-	ldr r3, _0809D660 @ =gRoomControls
-	movs r1, #0xa
-	ldrsh r0, [r3, r1]
-	adds r0, #0x78
-	movs r2, #0x2e
-	ldrsh r1, [r5, r2]
-	cmp r0, r1
-	bge _0809D62E
-	ldrb r0, [r5, #0xc]
-	adds r0, #1
-	strb r0, [r5, #0xc]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #8
-	orrs r0, r1
-	strb r0, [r2]
-	cmp r4, #0
-	beq _0809D5E6
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-_0809D5E6:
-	str r6, [r3, #0x30]
-	ldrb r1, [r6, #0x18]
-	mov r0, r8
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r6, #0x18]
-	bl ResetPlayerAnimationAndAction
-	bl ResetPlayerEventPriority
-	ldr r1, _0809D664 @ =gUnk_02034490
-	movs r0, #0
-	strb r0, [r1]
-	movs r0, #0x52
-	bl CheckGlobalFlag
-	cmp r0, #0
-	bne _0809D62E
-	movs r0, #0x69
-	movs r1, #0
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0809D62E
-	ldr r1, _0809D668 @ =script_EzloTalkOcarina
-	bl StartCutscene
-	adds r1, r4, #0
-	adds r1, #0x84
-	str r0, [r1]
-	movs r0, #0x52
-	bl SetGlobalFlag
-_0809D62E:
-	adds r0, r5, #0
-	bl LinearMoveUpdate
-	movs r0, #0
-	ldrsh r1, [r7, r0]
-	adds r0, r5, #0
-	bl GravityUpdate
-	adds r0, r5, #0
-	bl UpdateAnimationSingleFrame
-	adds r0, r5, #0
-	bl CheckOnScreen
-	cmp r0, #0
-	bne _0809D652
-	bl DeleteThisEntity
-_0809D652:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0809D658: .4byte gPlayerEntity
-_0809D65C: .4byte 0xFFF80000
-_0809D660: .4byte gRoomControls
-_0809D664: .4byte gUnk_02034490
-_0809D668: .4byte script_EzloTalkOcarina
-
-	thumb_func_start sub_0809D66C
-sub_0809D66C: @ 0x0809D66C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _0809D694 @ =gPlayerEntity
-	ldrb r1, [r0, #0x1a]
-	lsls r1, r1, #0x1c
-	lsrs r1, r1, #0x1c
-	ldrb r2, [r4, #0x1a]
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x1a]
-	ldrb r0, [r4, #0xc]
-	cmp r0, #1
-	beq _0809D6EC
-	cmp r0, #1
-	bgt _0809D698
-	cmp r0, #0
-	beq _0809D6A2
-	b _0809D6FE
-	.align 2, 0
-_0809D694: .4byte gPlayerEntity
-_0809D698:
-	cmp r0, #2
-	beq _0809D6F4
-	cmp r0, #3
-	beq _0809D6FA
-	b _0809D6FE
-_0809D6A2:
-	movs r3, #1
-	movs r2, #1
-	strb r2, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x38
-	strb r2, [r0]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r2, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	strb r0, [r4, #0x19]
-	ldrb r0, [r4, #0x1b]
-	ands r1, r0
-	movs r0, #0x40
-	orrs r1, r0
-	strb r1, [r4, #0x1b]
-	adds r0, r4, #0
-	movs r1, #6
-	bl SetDefaultPriority
-	adds r0, r4, #0
-	movs r1, #0xe0
-	bl InitAnimationForceUpdate
-_0809D6EC:
-	adds r0, r4, #0
-	bl UpdateAnimationSingleFrame
-	b _0809D6FE
-_0809D6F4:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	b _0809D6FE
-_0809D6FA:
-	bl DeleteThisEntity
-_0809D6FE:
-	pop {r4, pc}
-
-	thumb_func_start CreateBird
-CreateBird: @ 0x0809D700
-	push {r4, lr}
-	sub sp, #4
-.ifdef EU
-	bl AreaIsOverworld @ TODO correct function?
-.else
-	bl AreaAllowsWarp
-.endif
-	cmp r0, #0
-	beq _0809D732
-	movs r0, #0
-	str r0, [sp]
-	movs r0, #6
-	movs r1, #0x95
-	movs r2, #6
-	movs r3, #8
-	bl FindEntity
-	adds r4, r0, #0
-	cmp r4, #0
-	bne _0809D732
-	movs r0, #0x95
-	movs r1, #8
-	movs r2, #0
-	bl CreateObject
-	cmp r0, #0
-	beq _0809D732
-	strb r4, [r0, #0xe]
-_0809D732:
-	add sp, #4
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809D738
-sub_0809D738: @ 0x0809D738
-	push {r4, lr}
-	movs r0, #0x95
-	movs r1, #9
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0809D77C
-	ldr r1, _0809D774 @ =gRoomControls
-	movs r0, #0
-	str r0, [r1, #0x30]
-	adds r0, r4, #0
-	movs r1, #6
-	bl SetDefaultPriority
-	bl SetPlayerEventPriority
-	movs r0, #0x95
-	movs r1, #0xa
-	movs r2, #0
-	bl CreateObject
-	cmp r0, #0
-	beq _0809D76C
-	str r0, [r4, #0x54]
-_0809D76C:
-	ldr r1, _0809D778 @ =gUnk_02034490
-	movs r0, #1
-	strb r0, [r1]
-	b _0809D780
-	.align 2, 0
-_0809D774: .4byte gRoomControls
-_0809D778: .4byte gUnk_02034490
-_0809D77C:
-	bl ResetPlayerAnimationAndAction
-_0809D780:
-	pop {r4, pc}
-	.align 2, 0

asm/object/fireballChain.s

@@ -1,61 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start FireballChain
-FireballChain: @ 0x0809F8A4
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, #0
-	ldr r0, _0809F904 @ =gEntCount
-	ldrb r0, [r0]
-	cmp r0, #0x42
-	bhi _0809F8FC
-	movs r5, #0
-_0809F8B6:
-	movs r0, #0x1d
-	bl CreateProjectile
-	adds r4, r0, #0
-	cmp r5, #0
-	bne _0809F8C6
-	mov r8, r4
-	adds r7, r4, #0
-_0809F8C6:
-	strb r5, [r4, #0xa]
-	mov r0, r8
-	str r0, [r4, #0x50]
-	str r7, [r4, #0x54]
-	adds r0, r6, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	adds r1, r4, #0
-	adds r1, #0x68
-	adds r3, r5, #1
-	movs r2, #7
-_0809F8DE:
-	ldrh r0, [r6, #0x2e]
-	strh r0, [r1]
-	adds r1, #2
-	ldrh r0, [r6, #0x32]
-	strh r0, [r1]
-	adds r1, #2
-	subs r2, #1
-	cmp r2, #0
-	bge _0809F8DE
-	adds r7, r4, #0
-	adds r5, r3, #0
-	cmp r5, #4
-	ble _0809F8B6
-	bl DeleteThisEntity
-_0809F8FC:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0809F904: .4byte gEntCount

asm/object/mazaalBossObject.s

@@ -1,384 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start MazaalBossObject
-MazaalBossObject: @ 0x0809AAEC
-	push {lr}
-	ldr r2, _0809AB00 @ =gUnk_08123D28
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809AB00: .4byte gUnk_08123D28
-
-	thumb_func_start sub_0809AB04
-sub_0809AB04: @ 0x0809AB04
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r0, #0x31
-	bl CheckFlags
-	cmp r0, #0
-	beq _0809AB22
-	adds r0, r5, #0
-	bl sub_0809AD68
-	adds r0, r5, #0
-	bl sub_0809AD8C
-	bl DeleteThisEntity
-_0809AB22:
-	movs r0, #0x36
-	movs r1, #0
-	bl CreateEnemy
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0809AB9C
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	str r4, [r5, #0x54]
-	ldr r2, _0809AB68 @ =gRoomTransition
-	adds r0, r2, #0
-	adds r0, #0x38
-	ldrb r1, [r0]
-	cmp r1, #0
-	beq _0809AB70
-	adds r0, #1
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0809AB52
-	bl DeleteThisEntity
-_0809AB52:
-	movs r0, #7
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	subs r0, #0xb
-	ands r0, r1
-	strb r0, [r5, #0x18]
-	ldr r0, _0809AB6C @ =gRoomControls
-	str r5, [r0, #0x30]
-	bl sub_080809D4
-	b _0809AB9C
-	.align 2, 0
-_0809AB68: .4byte gRoomTransition
-_0809AB6C: .4byte gRoomControls
-_0809AB70:
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	movs r0, #0x1e
-	strb r0, [r5, #0xe]
-	strb r1, [r5, #0x1e]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #7
-	orrs r0, r1
-	strb r0, [r2]
-	adds r1, r5, #0
-	adds r1, #0x63
-	movs r0, #0x20
-	strb r0, [r1]
-	ldr r1, _0809ABA0 @ =script_Object89Mazaal
-	adds r0, r5, #0
-	bl StartCutscene
-	adds r1, r5, #0
-	adds r1, #0x84
-	str r0, [r1]
-_0809AB9C:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0809ABA0: .4byte script_Object89Mazaal
-
-	thumb_func_start sub_0809ABA4
-sub_0809ABA4: @ 0x0809ABA4
-	push {lr}
-	movs r1, #0
-	bl ExecuteScriptForEntity
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809ABB0
-sub_0809ABB0: @ 0x0809ABB0
-	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 _0809ABCE
-	movs r0, #3
-	strb r0, [r2, #0xc]
-	movs r0, #0x78
-	strb r0, [r2, #0xe]
-	ldr r1, _0809ABD0 @ =gRoomControls
-	ldr r0, [r2, #0x54]
-	str r0, [r1, #0x30]
-_0809ABCE:
-	pop {pc}
-	.align 2, 0
-_0809ABD0: .4byte gRoomControls
-
-	thumb_func_start sub_0809ABD4
-sub_0809ABD4: @ 0x0809ABD4
-	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 _0809ABF2
-	movs r0, #4
-	strb r0, [r1, #0xc]
-	movs r0, #0x5a
-	strb r0, [r1, #0xe]
-	ldr r1, [r1, #0x54]
-	movs r0, #1
-	strb r0, [r1, #0xd]
-_0809ABF2:
-	pop {pc}
-
-	thumb_func_start sub_0809ABF4
-sub_0809ABF4: @ 0x0809ABF4
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, [r2, #0x54]
-	ldrb r0, [r0, #0xd]
-	cmp r0, #2
-	bls _0809AC36
-	ldrb r0, [r2, #0xe]
-	subs r0, #1
-	strb r0, [r2, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	bne _0809AC36
-	movs r0, #5
-	strb r0, [r2, #0xc]
-	movs r0, #8
-	strb r0, [r2, #0xe]
-	strb r1, [r2, #0xf]
-	ldrb r1, [r2, #0x19]
-	subs r0, #0x15
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	strb r0, [r2, #0x19]
-	ldr r1, _0809AC38 @ =gScreen
-	adds r2, r1, #0
-	adds r2, #0x66
-	movs r0, #0xf4
-	lsls r0, r0, #4
-	strh r0, [r2]
-	adds r1, #0x68
-	movs r0, #0x10
-	strh r0, [r1]
-_0809AC36:
-	pop {pc}
-	.align 2, 0
-_0809AC38: .4byte gScreen
-
-	thumb_func_start sub_0809AC3C
-sub_0809AC3C: @ 0x0809AC3C
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r3, #0xff
-	lsls r0, r0, #0x18
-	lsrs r5, r0, #0x18
-	cmp r5, #0
-	bne _0809AC9A
-	movs r0, #8
-	strb r0, [r4, #0xe]
-	ldrb r2, [r4, #0xf]
-	adds r2, #1
-	strb r2, [r4, #0xf]
-	adds r1, r2, #0
-	ands r1, r3
-	ldr r6, _0809AC9C @ =gScreen
-	lsls r3, r1, #8
-	movs r0, #0x10
-	subs r0, r0, r1
-	movs r1, #0xff
-	ands r0, r1
-	orrs r3, r0
-	adds r0, r6, #0
-	adds r0, #0x68
-	strh r3, [r0]
-	lsls r2, r2, #0x18
-	lsrs r2, r2, #0x18
-	cmp r2, #0xf
-	bls _0809AC9A
-	ldrb r1, [r4, #0x19]
-	movs r0, #0xd
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4, #0x19]
-	adds r0, r6, #0
-	adds r0, #0x66
-	strh r5, [r0]
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	movs r0, #0xf
-	strb r0, [r4, #0xe]
-	ldrb r1, [r4, #0x18]
-	subs r0, #0x13
-	ands r0, r1
-	strb r0, [r4, #0x18]
-_0809AC9A:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0809AC9C: .4byte gScreen
-
-	thumb_func_start sub_0809ACA0
-sub_0809ACA0: @ 0x0809ACA0
-	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 _0809ACC4
-	ldr r1, [r2, #0x54]
-	movs r0, #6
-	strb r0, [r1, #0xd]
-	ldr r0, _0809ACC8 @ =gRoomTransition
-	adds r0, #0x38
-	movs r1, #0xf1
-	strb r1, [r0]
-	adds r0, r2, #0
-	bl DeleteEntity
-_0809ACC4:
-	pop {pc}
-	.align 2, 0
-_0809ACC8: .4byte gRoomTransition
-
-	thumb_func_start sub_0809ACCC
-sub_0809ACCC: @ 0x0809ACCC
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, [r2, #0x54]
-	ldrb r0, [r0, #0xe]
-	cmp r0, #1
-	bne _0809ACE4
-	movs r0, #0
-	movs r1, #8
-	strb r1, [r2, #0xc]
-	strb r0, [r2, #0xd]
-	movs r0, #0xb4
-	strb r0, [r2, #0xe]
-_0809ACE4:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809ACE8
-sub_0809ACE8: @ 0x0809ACE8
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #1
-	beq _0809AD1E
-	cmp r0, #2
-	beq _0809AD3A
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0809AD58
-	movs r0, #0x5a
-	strb r0, [r4, #0xe]
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	movs r0, #0x73
-	bl SoundReq
-	movs r0, #0x31
-	bl SetFlag
-	adds r0, r4, #0
-	bl sub_0809AD8C
-	b _0809AD58
-_0809AD1E:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0809AD58
-	movs r0, #0x78
-	strb r0, [r4, #0xe]
-	movs r0, #2
-	strb r0, [r4, #0xd]
-	adds r0, r4, #0
-	bl sub_0809AD68
-	b _0809AD58
-_0809AD3A:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0809AD58
-	ldr r1, _0809AD5C @ =gRoomControls
-	ldr r0, _0809AD60 @ =gPlayerEntity
-	str r0, [r1, #0x30]
-	ldr r0, _0809AD64 @ =gPlayerState
-	adds r0, #0x8b
-	movs r1, #1
-	strb r1, [r0]
-	bl DeleteThisEntity
-_0809AD58:
-	pop {r4, pc}
-	.align 2, 0
-_0809AD5C: .4byte gRoomControls
-_0809AD60: .4byte gPlayerEntity
-_0809AD64: .4byte gPlayerState
-
-	thumb_func_start sub_0809AD68
-sub_0809AD68: @ 0x0809AD68
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	bl GetCurrentRoomProperty
-	bl LoadRoomEntityList
-	movs r0, #0x17
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _0809AD8A
-	ldrb r0, [r4, #0xb]
-	bl GetCurrentRoomProperty
-	bl LoadRoomEntityList
-_0809AD8A:
-	pop {r4, pc}
-
-	thumb_func_start sub_0809AD8C
-sub_0809AD8C: @ 0x0809AD8C
-	push {lr}
-	movs r0, #0x4f
-	movs r1, #0x22
-	movs r2, #0
-	bl CreateObject
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _0809ADAC
-	ldr r0, _0809ADB0 @ =gRoomControls
-	ldrh r1, [r0, #6]
-	adds r1, #0xb8
-	strh r1, [r2, #0x2e]
-	ldrh r0, [r0, #8]
-	adds r0, #8
-	strh r0, [r2, #0x32]
-_0809ADAC:
-	pop {pc}
-	.align 2, 0
-_0809ADB0: .4byte gRoomControls

asm/object/minecart.s

@@ -1,322 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_08091C0C
-sub_08091C0C: @ 0x08091C0C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08004168
-	ldr r1, _08091C30 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl CopyPosition
-	adds r0, r4, #0
-	bl GetTileUnderEntity
-	cmp r0, #0x68
-	beq _08091C46
-	cmp r0, #0x68
-	bhi _08091C34
-	cmp r0, #0x67
-	beq _08091C3E
-	b _08091C80
-	.align 2, 0
-_08091C30: .4byte gPlayerEntity
-_08091C34:
-	cmp r0, #0x69
-	beq _08091C4E
-	cmp r0, #0x6a
-	beq _08091C66
-	b _08091C80
-_08091C3E:
-	ldrb r0, [r4, #0x15]
-	cmp r0, #0x18
-	beq _08091C54
-	b _08091C76
-_08091C46:
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	beq _08091C6C
-	b _08091C5C
-_08091C4E:
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	bne _08091C5C
-_08091C54:
-	movs r0, #0
-	strb r0, [r4, #0x15]
-	strb r0, [r4, #0x14]
-	b _08091C86
-_08091C5C:
-	movs r0, #0x18
-	strb r0, [r4, #0x15]
-	movs r0, #3
-	strb r0, [r4, #0x14]
-	b _08091C86
-_08091C66:
-	ldrb r0, [r4, #0x15]
-	cmp r0, #0x18
-	bne _08091C76
-_08091C6C:
-	movs r0, #0x10
-	strb r0, [r4, #0x15]
-	movs r0, #2
-	strb r0, [r4, #0x14]
-	b _08091C86
-_08091C76:
-	movs r0, #8
-	strb r0, [r4, #0x15]
-	movs r0, #1
-	strb r0, [r4, #0x14]
-	b _08091C86
-_08091C80:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	b _08091C92
-_08091C86:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	ldr r1, _08091C94 @ =gPlayerEntity
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #1
-	strb r0, [r1, #0x14]
-_08091C92:
-	pop {r4, pc}
-	.align 2, 0
-_08091C94: .4byte gPlayerEntity
-
-	thumb_func_start sub_08091C98
-sub_08091C98: @ 0x08091C98
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl LinearMoveUpdate
-	ldr r5, _08091CC0 @ =gPlayerEntity
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl CopyPosition
-	ldr r1, _08091CC4 @ =gRoomControls
-	ldrh r0, [r1]
-	cmp r0, #0
-	bne _08091CBE
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0xe0
-	lsls r0, r0, #3
-	strh r0, [r4, #0x24]
-	str r5, [r1, #0x30]
-_08091CBE:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08091CC0: .4byte gPlayerEntity
-_08091CC4: .4byte gRoomControls
-
-	thumb_func_start sub_08091CC8
-sub_08091CC8: @ 0x08091CC8
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	ldr r2, _08091D58 @ =gPlayerState
-	ldrb r0, [r2, #2]
-	cmp r0, #0
-	bne _08091D64
-	movs r0, #1
-	strb r0, [r6, #0xc]
-	ldrb r0, [r6, #0x15]
-	movs r1, #0x10
-	eors r0, r1
-	strb r0, [r6, #0x15]
-	ldrb r0, [r6, #0x14]
-	movs r1, #2
-	eors r0, r1
-	strb r0, [r6, #0x14]
-	ldr r0, [r2, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #0x13
-	eors r0, r1
-	str r0, [r2, #0x30]
-	adds r0, r6, #0
-	adds r0, #0x84
-	ldr r4, [r0]
-	movs r0, #0x2e
-	ldrsh r1, [r6, r0]
-	ldr r5, _08091D5C @ =gRoomControls
-	ldrh r0, [r5, #6]
-	subs r1, r1, r0
-	asrs r1, r1, #4
-	movs r3, #0x3f
-	ands r1, r3
-	movs r2, #0x32
-	ldrsh r0, [r6, r2]
-	ldrh r2, [r5, #8]
-	subs r0, r0, r2
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	strh r1, [r4]
-	ldrb r0, [r5, #5]
-	strb r0, [r4, #4]
-	ldrb r0, [r6, #0x14]
-	strb r0, [r4, #5]
-	ldrb r1, [r6, #0x14]
-	adds r1, #0x10
-	adds r0, r6, #0
-	bl InitAnimationForceUpdate
-	ldr r0, _08091D60 @ =0x00004022
-	movs r3, #0x2e
-	ldrsh r1, [r6, r3]
-	ldrh r2, [r5, #6]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	movs r4, #0x3f
-	ands r1, r4
-	movs r3, #0x32
-	ldrsh r2, [r6, r3]
-	ldrh r3, [r5, #8]
-	subs r2, r2, r3
-	asrs r2, r2, #4
-	ands r2, r4
-	lsls r2, r2, #6
-	orrs r1, r2
-	adds r2, r6, #0
-	adds r2, #0x38
-	ldrb r2, [r2]
-	bl SetTile
-	b _08091D8A
-	.align 2, 0
-_08091D58: .4byte gPlayerState
-_08091D5C: .4byte gRoomControls
-_08091D60: .4byte 0x00004022
-_08091D64:
-	adds r0, r6, #0
-	bl UpdateAnimationSingleFrame
-	ldr r3, _08091D8C @ =gPlayerEntity
-	adds r0, r6, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	lsrs r1, r1, #0x1d
-	subs r1, #1
-	adds r3, #0x29
-	movs r0, #7
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-_08091D8A:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08091D8C: .4byte gPlayerEntity
-
-	thumb_func_start sub_08091D90
-sub_08091D90: @ 0x08091D90
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x20]
-	cmp r0, #0
-	bge _08091DA0
-	adds r0, r4, #0
-	bl UpdateAnimationSingleFrame
-_08091DA0:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	bne _08091DD8
-	movs r1, #0x80
-	lsls r1, r1, #6
-	adds r0, r4, #0
-	bl GravityUpdate
-	cmp r0, #0
-	bne _08091DD8
-	ldrb r1, [r4, #0xb]
-	movs r0, #4
-	eors r1, r0
-	strb r1, [r4, #0xb]
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r0, [r0]
-	strb r1, [r0, #6]
-	movs r0, #0x9e
-	lsls r0, r0, #1
-	bl SoundReq
-_08091DD8:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08091DDC
-sub_08091DDC: @ 0x08091DDC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r2, _08091E30 @ =gUnk_081223D0
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #1
-	adds r1, r0, r2
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	adds r0, #1
-	adds r0, r0, r2
-	movs r2, #0
-	ldrsb r2, [r0, r2]
-	adds r0, r4, #0
-	bl sub_080B1AF0
-	cmp r0, #0xff
-	bne _08091E5C
-	ldr r0, _08091E34 @ =gPlayerEntity
-	ldrb r1, [r4, #0x14]
-	bl sub_0807BD14
-	cmp r0, #0
-	beq _08091E5C
-	ldrb r1, [r4, #0x11]
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	beq _08091E40
-	cmp r0, #8
-	bgt _08091E38
-	cmp r0, #0
-	beq _08091E40
-	b _08091E44
-	.align 2, 0
-_08091E30: .4byte gUnk_081223D0
-_08091E34: .4byte gPlayerEntity
-_08091E38:
-	cmp r0, #0x10
-	beq _08091E40
-	cmp r0, #0x18
-	bne _08091E44
-_08091E40:
-	movs r0, #0xa0
-	strh r0, [r4, #0x24]
-_08091E44:
-	ldr r0, _08091E54 @ =gPlayerEntity
-	ldrb r1, [r4, #0x15]
-	strb r1, [r0, #0x15]
-	ldr r0, _08091E58 @ =gRoomControls
-	str r4, [r0, #0x30]
-	movs r0, #1
-	b _08091E5E
-	.align 2, 0
-_08091E54: .4byte gPlayerEntity
-_08091E58: .4byte gRoomControls
-_08091E5C:
-	movs r0, #0
-_08091E5E:
-	pop {r4, pc}

asm/object/object96.s

@@ -1,288 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object96
-Object96: @ 0x0809D784
-	push {lr}
-	ldr r1, _0809D7A0 @ =gUnk_081240B0
-	ldrb r3, [r0, #0xc]
-	lsls r3, r3, #2
-	adds r3, r3, r1
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #5
-	ldr r2, _0809D7A4 @ =gUnk_08123FB0
-	adds r1, r1, r2
-	ldr r2, [r3]
-	bl _call_via_r2
-	pop {pc}
-	.align 2, 0
-_0809D7A0: .4byte gUnk_081240B0
-_0809D7A4: .4byte gUnk_08123FB0
-
-	thumb_func_start sub_0809D7A8
-sub_0809D7A8: @ 0x0809D7A8
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xc]
-	adds r0, #1
-	movs r4, #0
-	strb r0, [r5, #0xc]
-	adds r2, r5, #0
-	adds r2, #0x38
-	movs r0, #2
-	strb r0, [r2]
-	ldrb r2, [r5, #0x19]
-	movs r0, #0x3f
-	ands r0, r2
-	movs r2, #0x40
-	orrs r0, r2
-	strb r0, [r5, #0x19]
-	ldr r0, [r1, #0x10]
-	str r0, [r5, #0x20]
-	ldrb r3, [r1, #0xf]
-	strb r3, [r5, #0x15]
-	ldrh r0, [r1, #0x18]
-	strh r0, [r5, #0x24]
-	ldrh r0, [r5, #0x32]
-	ldrh r2, [r1, #0x1a]
-	subs r0, r0, r2
-	strh r0, [r5, #0x32]
-	str r4, [r5, #0x34]
-	ldrb r0, [r1, #0x1e]
-	strb r0, [r5, #0xe]
-	movs r0, #0x80
-	ands r0, r3
-	cmp r0, #0
-	beq _0809D80C
-	ldrb r0, [r5, #0x15]
-	cmp r0, #0x81
-	bne _0809D80C
-	bl Random
-	ldr r1, _0809D820 @ =gPlayerEntity
-	ldrb r1, [r1, #0x14]
-	lsls r1, r1, #2
-	movs r2, #3
-	ands r0, r2
-	adds r1, r1, r0
-	subs r1, #2
-	movs r0, #0x1f
-	ands r1, r0
-	movs r0, #0x10
-	eors r1, r0
-	strb r1, [r5, #0x15]
-_0809D80C:
-	adds r0, r5, #0
-	bl UpdateSpriteForCollisionLayer
-	ldrb r4, [r5, #0xa]
-	adds r0, r5, #0
-	bl sub_08080CB4
-	strb r4, [r5, #0xa]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0809D820: .4byte gPlayerEntity
-
-	thumb_func_start sub_0809D824
-sub_0809D824: @ 0x0809D824
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r6, r1, #0
-	movs r0, #1
-	ldr r2, [r6, #4]
-	cmp r2, #0
-	beq _0809D838
-	adds r0, r5, #0
-	bl _call_via_r2
-_0809D838:
-	cmp r0, #0
-	beq _0809D850
-	ldrb r0, [r5, #0xc]
-	adds r0, #1
-	strb r0, [r5, #0xc]
-	ldrh r1, [r6, #0x1a]
-	ldrh r2, [r5, #0x32]
-	adds r0, r1, r2
-	strh r0, [r5, #0x32]
-	ldrh r0, [r5, #0x36]
-	subs r0, r0, r1
-	strh r0, [r5, #0x36]
-_0809D850:
-	ldrb r4, [r5, #0xa]
-	ldrb r0, [r6, #0xd]
-	strb r0, [r5, #0xa]
-	adds r0, r5, #0
-	bl sub_08080CB4
-	strb r4, [r5, #0xa]
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_0809D860
-sub_0809D860: @ 0x0809D860
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r6, r1, #0
-	bl LinearMoveUpdate
-	ldr r1, [r6, #0x14]
-	adds r0, r5, #0
-	bl sub_080044EC
-	cmp r0, #1
-	bhi _0809D8B2
-	ldrb r0, [r5, #0xe]
-	cmp r0, #0
-	beq _0809D888
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	ldr r0, [r6, #0x14]
-	lsls r0, r0, #3
-	str r0, [r5, #0x20]
-	b _0809D8AC
-_0809D888:
-	ldrb r0, [r5, #0xc]
-	adds r0, #1
-	strb r0, [r5, #0xc]
-	ldr r0, _0809D8C4 @ =gPlayerEntity
-	adds r0, #0x38
-	ldrb r1, [r0]
-	adds r0, r5, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	adds r0, r5, #0
-	bl UpdateSpriteForCollisionLayer
-	ldr r1, [r6]
-	cmp r1, #0
-	beq _0809D8AC
-	adds r0, r5, #0
-	bl _call_via_r1
-_0809D8AC:
-	movs r0, #0x6e
-	bl SoundReq
-_0809D8B2:
-	ldrb r4, [r5, #0xa]
-	ldrb r0, [r6, #0xd]
-	strb r0, [r5, #0xa]
-	adds r0, r5, #0
-	bl sub_08080CB4
-	strb r4, [r5, #0xa]
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0809D8C4: .4byte gPlayerEntity
-
-	thumb_func_start sub_0809D8C8
-sub_0809D8C8: @ 0x0809D8C8
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r6, r1, #0
-	ldr r0, _0809D8E4 @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0809D8E8
-	adds r0, r5, #0
-	bl sub_0800445C
-	b _0809D90A
-	.align 2, 0
-_0809D8E4: .4byte gPlayerState
-_0809D8E8:
-	adds r0, r5, #0
-	bl IsCollidingPlayer
-	cmp r0, #0
-	beq _0809D90A
-	ldrb r0, [r6, #0xd]
-	ldrb r1, [r5, #0xb]
-	movs r2, #0
-	bl CreateItemEntity
-	ldrh r0, [r6, #0x1c]
-	cmp r0, #0
-	beq _0809D906
-	bl SetFlag
-_0809D906:
-	bl DeleteThisEntity
-_0809D90A:
-	ldrb r4, [r5, #0xa]
-	ldrb r0, [r6, #0xd]
-	strb r0, [r5, #0xa]
-	adds r0, r5, #0
-	bl sub_08080CB4
-	strb r4, [r5, #0xa]
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809D91C
-sub_0809D91C: @ 0x0809D91C
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0x11
-	movs r2, #0
-	bl CreateFx
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0809D934
-	adds r0, r4, #0
-	bl SortEntityBelow
-_0809D934:
-	movs r0, #0x72
-	bl SoundReq
-	pop {r4, pc}
-
-	thumb_func_start sub_0809D93C
-sub_0809D93C: @ 0x0809D93C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r3, r1, #0
-	ldr r2, _0809D9A0 @ =gPlayerEntity
-	ldrb r0, [r2, #0xc]
-	cmp r0, #6
-	bne _0809D9A4
-	ldrb r0, [r3, #0xc]
-	ldrb r1, [r2, #0x14]
-	asrs r0, r1
-	movs r1, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _0809D9A4
-	movs r5, #0x2e
-	ldrsh r0, [r2, r5]
-	movs r5, #0x2e
-	ldrsh r1, [r4, r5]
-	subs r0, r0, r1
-	movs r1, #8
-	ldrsb r1, [r3, r1]
-	adds r0, r0, r1
-	ldrb r1, [r3, #0xa]
-	adds r0, r0, r1
-	lsls r1, r1, #1
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r1, r0
-	ble _0809D9A4
-	movs r0, #0x32
-	ldrsh r2, [r2, r0]
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	movs r4, #0x1a
-	ldrsh r1, [r3, r4]
-	adds r0, r0, r1
-	subs r2, r2, r0
-	movs r0, #9
-	ldrsb r0, [r3, r0]
-	adds r2, r2, r0
-	ldrb r1, [r3, #0xb]
-	adds r0, r2, r1
-	lsls r1, r1, #1
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r1, r0
-	ble _0809D9A4
-	movs r0, #1
-	b _0809D9A6
-	.align 2, 0
-_0809D9A0: .4byte gPlayerEntity
-_0809D9A4:
-	movs r0, #0
-_0809D9A6:
-	pop {r4, r5, pc}

asm/object/object98.s

@@ -1,128 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object98
-Object98: @ 0x0809E348
-	push {lr}
-	ldr r2, _0809E35C @ =gUnk_0812418C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809E35C: .4byte gUnk_0812418C
-
-	thumb_func_start sub_0809E360
-sub_0809E360: @ 0x0809E360
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	cmp r0, #8
-	bls _0809E372
-	movs r0, #8
-	strb r0, [r4, #0xe]
-_0809E372:
-	ldrb r2, [r4, #0xe]
-	movs r0, #0x48
-	subs r0, r0, r2
-	ldr r1, _0809E3E0 @ =gEntCount
-	ldrb r1, [r1]
-	cmp r0, r1
-	ble _0809E3D8
-	movs r5, #0
-	adds r7, r4, #0
-	adds r7, #0x7e
-	movs r0, #0x76
-	adds r0, r0, r4
-	mov r8, r0
-	cmp r5, r2
-	bhs _0809E3A6
-	movs r6, #0xe
-_0809E392:
-	movs r0, #0x17
-	bl CreateProjectile
-	strb r6, [r0, #0xe]
-	str r4, [r0, #0x50]
-	adds r6, #0xc
-	adds r5, #1
-	ldrb r2, [r4, #0xe]
-	cmp r5, r2
-	blo _0809E392
-_0809E3A6:
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r0, [r7]
-	lsls r1, r0, #8
-	mov r2, r8
-	strh r1, [r2]
-	lsls r0, r0, #6
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	movs r1, #0
-	bl SetDefaultPriority
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _0809E3D8
-	bl GetCurrentRoomProperty
-	str r0, [r4, #0x54]
-	adds r1, r4, #0
-	adds r1, #0x54
-	adds r2, r4, #0
-	adds r2, #0x74
-	adds r0, r4, #0
-	bl sub_080A2CC0
-_0809E3D8:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0809E3E0: .4byte gEntCount
-
-	thumb_func_start sub_0809E3E4
-sub_0809E3E4: @ 0x0809E3E4
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r2, r4, #0
-	adds r2, #0x76
-	ldrb r0, [r4, #0xb]
-	ldrh r1, [r2]
-	adds r1, r1, r0
-	strh r1, [r2]
-	lsrs r1, r1, #2
-	strb r1, [r4, #0x14]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _0809E428
-	ldrb r1, [r4, #0x15]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	bne _0809E40E
-	adds r0, r4, #0
-	bl LinearMoveUpdate
-_0809E40E:
-	adds r2, r4, #0
-	adds r2, #0x74
-	ldrh r0, [r2]
-	subs r0, #1
-	strh r0, [r2]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _0809E428
-	adds r1, r4, #0
-	adds r1, #0x54
-	adds r0, r4, #0
-	bl sub_080A2CC0
-_0809E428:
-	pop {r4, pc}
-	.align 2, 0

asm/object/object99.s

@@ -1,117 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object99
-Object99: @ 0x0809E42C
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	adds r4, r0, #0
-	ldr r6, [r4, #0x50]
-	ldr r0, [r6, #4]
-	cmp r0, #0
-	bne _0809E444
-	bl DeleteThisEntity
-_0809E444:
-	ldrb r0, [r4, #0xc]
-	movs r1, #0x76
-	adds r1, r1, r4
-	mov r8, r1
-	adds r7, r4, #0
-	adds r7, #0x62
-	movs r2, #0x74
-	adds r2, r2, r4
-	mov sb, r2
-	adds r5, r4, #0
-	adds r5, #0x63
-	movs r1, #0x75
-	adds r1, r1, r4
-	mov sl, r1
-	cmp r0, #0
-	bne _0809E482
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r0, [r6, #0x14]
-	mov r2, r8
-	strb r0, [r2]
-	ldrb r0, [r7]
-	mov r1, sb
-	strb r0, [r1]
-	ldrb r0, [r5]
-	mov r2, sl
-	strb r0, [r2]
-	ldrb r1, [r4, #0x14]
-	adds r0, r4, #0
-	bl InitializeAnimation
-_0809E482:
-	ldrb r0, [r6, #0x14]
-	mov r1, r8
-	ldrb r1, [r1]
-	cmp r0, r1
-	beq _0809E490
-	bl DeleteThisEntity
-_0809E490:
-	ldrb r1, [r6, #0x18]
-	lsls r1, r1, #0x1e
-	lsrs r1, r1, #0x1e
-	ldrb r2, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r6, #0
-	adds r1, r4, #0
-	bl CopyPositionAndSpriteOffset
-	mov r2, sb
-	ldrb r0, [r2]
-	ldrb r1, [r7]
-	adds r0, r0, r1
-	strb r0, [r7]
-	mov r2, sl
-	ldrb r0, [r2]
-	ldrb r1, [r5]
-	adds r0, r0, r1
-	strb r0, [r5]
-	ldrb r0, [r4, #0x14]
-	cmp r0, #2
-	beq _0809E4D0
-	ldrh r0, [r4, #0x32]
-	adds r0, #1
-	strh r0, [r4, #0x32]
-	ldrb r0, [r5]
-	subs r0, #1
-	b _0809E4DA
-_0809E4D0:
-	ldrh r0, [r4, #0x32]
-	subs r0, #1
-	strh r0, [r4, #0x32]
-	ldrb r0, [r5]
-	adds r0, #1
-_0809E4DA:
-	strb r0, [r5]
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0809E4F4
-	bl DeleteThisEntity
-_0809E4F4:
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0

asm/object/objectA6.s

@@ -1,95 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectA6
-ObjectA6: @ 0x0809F908
-	push {lr}
-	ldr r2, _0809F91C @ =gUnk_08124800
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809F91C: .4byte gUnk_08124800
-
-	thumb_func_start sub_0809F920
-sub_0809F920: @ 0x0809F920
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl CheckFlags
-	cmp r0, #0
-	beq _0809F934
-	bl DeleteThisEntity
-_0809F934:
-	movs r2, #1
-	strb r2, [r4, #0xc]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	adds r1, r4, #0
-	adds r1, #0x3c
-	movs r0, #7
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #0x48
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x3f
-	strb r2, [r0]
-	subs r1, #5
-	movs r0, #2
-	strb r0, [r1]
-	ldr r0, _0809F960 @ =gHitbox_0
-	str r0, [r4, #0x48]
-	pop {r4, pc}
-	.align 2, 0
-_0809F960: .4byte gHitbox_0
-
-	thumb_func_start sub_0809F964
-sub_0809F964: @ 0x0809F964
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0xa1
-	bne _0809F9A8
-	adds r0, r4, #0
-	movs r1, #0x4e
-	movs r2, #0
-	bl CreateFx
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _0809F99A
-	adds r3, r2, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r3]
-	adds r1, r2, #0
-	adds r1, #0x63
-	movs r0, #0xfb
-	strb r0, [r1]
-_0809F99A:
-	adds r0, r4, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl SetFlag
-	bl DeleteThisEntity
-_0809F9A8:
-	pop {r4, pc}
-	.align 2, 0

asm/object/objectA9.s

@@ -1,79 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectA9
-ObjectA9: @ 0x0809FEE0
-	push {lr}
-	ldr r2, _0809FEF4 @ =gUnk_08124850
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809FEF4: .4byte gUnk_08124850
-
-	thumb_func_start sub_0809FEF8
-sub_0809FEF8: @ 0x0809FEF8
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldr r1, _0809FF20 @ =gUnk_0812485C
-	ldrb r0, [r4, #0xa]
-	adds r0, r0, r1
-	ldrb r1, [r0]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	ldr r1, _0809FF24 @ =gUnk_08124860
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrh r0, [r0]
-	bl SoundReq
-	pop {r4, pc}
-	.align 2, 0
-_0809FF20: .4byte gUnk_0812485C
-_0809FF24: .4byte gUnk_08124860
-
-	thumb_func_start sub_0809FF28
-sub_0809FF28: @ 0x0809FF28
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0809FF64
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldr r1, [r4, #0x50]
-	ldrb r0, [r4, #0xe]
-	strb r0, [r1, #0x10]
-	ldrb r2, [r4, #0xf]
-	movs r0, #3
-	ands r2, r0
-	ldrb r3, [r1, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1, #0x18]
-	adds r1, #0x6d
-	ldrb r2, [r1]
-	movs r0, #0xef
-	ands r0, r2
-	strb r0, [r1]
-_0809FF64:
-	pop {r4, pc}
-	.align 2, 0

asm/object/objectAB.s

@@ -1,124 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectAB
-ObjectAB: @ 0x080A00E0
-	push {lr}
-	ldr r2, _080A00F4 @ =gUnk_0812486C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080A00F4: .4byte gUnk_0812486C
-
-	thumb_func_start sub_080A00F8
-sub_080A00F8: @ 0x080A00F8
-	push {lr}
-	ldrb r1, [r0, #0xc]
-	adds r1, #1
-	movs r3, #0
-	strb r1, [r0, #0xc]
-	adds r2, r0, #0
-	adds r2, #0x38
-	movs r1, #1
-	strb r1, [r2]
-	ldrb r1, [r0, #0x19]
-	movs r2, #0xc0
-	orrs r1, r2
-	strb r1, [r0, #0x19]
-	movs r1, #0x29
-	adds r1, r1, r0
-	mov ip, r1
-	ldrb r1, [r1]
-	movs r2, #7
-	orrs r1, r2
-	mov r2, ip
-	strb r1, [r2]
-	strb r3, [r0, #0xd]
-	movs r1, #0
-	bl InitializeAnimation
-	pop {pc}
-
-	thumb_func_start sub_080A012C
-sub_080A012C: @ 0x080A012C
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #0
-	bl CheckRoomFlag
-	cmp r0, #0
-	beq _080A0154
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080A0154
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-_080A0154:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A0158
-sub_080A0158: @ 0x080A0158
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	bl CheckRoomFlag
-	cmp r0, #0
-	beq _080A018A
-	adds r0, r4, #0
-	bl sub_080A0190
-	adds r0, r4, #0
-	movs r1, #0x1e
-	bl RequestPriorityDuration
-	ldr r1, _080A018C @ =gPlayerEntity
-	adds r0, r4, #0
-	movs r2, #0x10
-	movs r3, #0x10
-	bl EntityInRectRadius
-	cmp r0, #0
-	beq _080A018A
-	movs r0, #0x37
-	bl sub_0805B390
-_080A018A:
-	pop {r4, pc}
-	.align 2, 0
-_080A018C: .4byte gPlayerEntity
-
-	thumb_func_start sub_080A0190
-sub_080A0190: @ 0x080A0190
-	push {r4, lr}
-	movs r4, #0
-	movs r1, #1
-	strb r1, [r0, #0xd]
-	ldr r1, _080A01B8 @ =gPlayerEntity
-	bl CopyPosition
-	ldr r2, _080A01BC @ =gPlayerState
-	movs r0, #3
-	strb r0, [r2, #0xc]
-	adds r0, r2, #0
-	adds r0, #0x38
-	strb r4, [r0]
-	ldr r0, [r2, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #8
-	orrs r0, r1
-	str r0, [r2, #0x30]
-	pop {r4, pc}
-	.align 2, 0
-_080A01B8: .4byte gPlayerEntity
-_080A01BC: .4byte gPlayerState

asm/object/objectAD.s

@@ -1,117 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectAD
-ObjectAD: @ 0x080A048C
-	push {lr}
-	ldr r2, _080A04A0 @ =gUnk_081248BC
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080A04A0: .4byte gUnk_081248BC
-
-	thumb_func_start sub_080A04A4
-sub_080A04A4: @ 0x080A04A4
-	push {r4, lr}
-	movs r3, #0
-	movs r1, #1
-	strb r1, [r0, #0xc]
-	movs r4, #4
-	movs r1, #4
-	strb r1, [r0, #0x1e]
-	strb r3, [r0, #0xe]
-	ldrb r1, [r0, #0x19]
-	movs r2, #0xc0
-	orrs r1, r2
-	strb r1, [r0, #0x19]
-	movs r1, #0x29
-	adds r1, r1, r0
-	mov ip, r1
-	ldrb r1, [r1]
-	movs r2, #7
-	orrs r1, r2
-	mov r2, ip
-	strb r1, [r2]
-	str r3, [r0, #0x34]
-	ldrb r2, [r0, #0x19]
-	movs r1, #0xd
-	rsbs r1, r1, #0
-	ands r1, r2
-	orrs r1, r4
-	strb r1, [r0, #0x19]
-	bl sub_080A04E8
-	pop {r4, pc}
-
-	thumb_func_start sub_080A04E0
-sub_080A04E0: @ 0x080A04E0
-	push {lr}
-	bl sub_080A04E8
-	pop {pc}
-
-	thumb_func_start sub_080A04E8
-sub_080A04E8: @ 0x080A04E8
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldr r0, [r5, #0x50]
-	movs r1, #0x36
-	ldrsh r0, [r0, r1]
-	cmp r0, #0
-	bge _080A04F8
-	rsbs r0, r0, #0
-_080A04F8:
-	movs r1, #0x80
-	lsls r1, r1, #1
-	adds r4, r0, r1
-	adds r0, r5, #0
-	adds r1, r4, #0
-	adds r2, r4, #0
-	movs r3, #0
-	bl SetAffineInfo
-	movs r1, #0xe0
-	lsls r1, r1, #1
-	subs r1, r1, r4
-	lsls r0, r1, #2
-	adds r0, r0, r1
-	lsls r0, r0, #1
-	adds r1, r4, #0
-	bl __divsi3
-	adds r4, r0, #0
-	ldr r0, [r5, #0x50]
-	ldrb r0, [r0, #0xa]
-	cmp r0, #0x41
-	bne _080A0538
-	lsls r3, r4, #1
-	cmp r3, #0xc
-	bls _080A052E
-	movs r3, #0xc
-_080A052E:
-	movs r0, #0x10
-	subs r0, r0, r4
-	lsls r4, r0, #8
-	orrs r4, r3
-	b _080A0540
-_080A0538:
-	movs r0, #0x10
-	subs r0, r0, r4
-	lsls r0, r0, #8
-	orrs r4, r0
-_080A0540:
-	ldr r0, _080A054C @ =0x0000FFFF
-	ands r4, r0
-	ldr r0, _080A0550 @ =gScreen
-	adds r0, #0x68
-	strh r4, [r0]
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A054C: .4byte 0x0000FFFF
-_080A0550: .4byte gScreen

asm/object/objectB4.s

@@ -1,352 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectB4
-ObjectB4: @ 0x080A0B90
-	push {lr}
-	ldr r2, _080A0BA4 @ =gUnk_08124B20
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080A0BA4: .4byte gUnk_08124B20
-
-	thumb_func_start sub_080A0BA8
-sub_080A0BA8: @ 0x080A0BA8
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r2, [r5, #0xc]
-	cmp r2, #0
-	beq _080A0BB8
-	cmp r2, #1
-	beq _080A0C08
-	b _080A0CE0
-_080A0BB8:
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	subs r0, #5
-	ands r0, r1
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	movs r0, #9
-	strb r0, [r5, #0x1e]
-	movs r0, #8
-	strb r0, [r5, #0xe]
-	strb r2, [r5, #0xf]
-	ldrb r1, [r5, #0x19]
-	movs r2, #0x3f
-	adds r0, r2, #0
-	ands r0, r1
-	movs r3, #0x40
-	orrs r0, r3
-	strb r0, [r5, #0x19]
-	adds r4, r5, #0
-	adds r4, #0x29
-	ldrb r1, [r4]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	strb r0, [r4]
-	ldrb r0, [r5, #0x1b]
-	ands r2, r0
-	orrs r2, r3
-	strb r2, [r5, #0x1b]
-	adds r0, r5, #0
-	movs r1, #0xbf
-	movs r2, #0x48
-	movs r3, #0x1e
-	bl sub_0806FB00
-	b _080A0CE0
-_080A0C08:
-	ldrb r0, [r5, #0xf]
-	cmp r0, #6
-	bhi _080A0C46
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080A0C46
-	strb r2, [r5, #0xe]
-	ldrb r2, [r5, #0xf]
-	movs r0, #0xb4
-	movs r1, #1
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A0C40
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	movs r0, #0x68
-	strh r0, [r4, #0x32]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl SortEntityBelow
-_080A0C40:
-	ldrb r0, [r5, #0xf]
-	adds r0, #1
-	strb r0, [r5, #0xf]
-_080A0C46:
-	adds r0, r5, #0
-	bl sub_0806FB38
-	cmp r0, #0
-	bne _080A0C58
-	ldr r0, _080A0CE4 @ =gMenu
-	ldrb r0, [r0, #5]
-	cmp r0, #1
-	bls _080A0CE0
-_080A0C58:
-	movs r0, #0xbf
-	strh r0, [r5, #0x2e]
-	movs r0, #0x48
-	strh r0, [r5, #0x32]
-	movs r0, #0xa
-	strb r0, [r5, #0x1e]
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	ldrb r0, [r5, #0xf]
-	cmp r0, #6
-	bhi _080A0CA0
-_080A0C6E:
-	ldrb r2, [r5, #0xf]
-	movs r0, #0xb4
-	movs r1, #1
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A0C92
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	movs r0, #0x68
-	strh r0, [r4, #0x32]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl SortEntityBelow
-_080A0C92:
-	ldrb r0, [r5, #0xf]
-	adds r0, #1
-	strb r0, [r5, #0xf]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #6
-	bls _080A0C6E
-_080A0CA0:
-	movs r0, #0xb4
-	movs r1, #2
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A0CC0
-	movs r0, #0xc4
-	strh r0, [r4, #0x2e]
-	movs r0, #0x2c
-	strh r0, [r4, #0x32]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl SortEntityAbove
-_080A0CC0:
-	movs r0, #0xb4
-	movs r1, #3
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A0CE0
-	movs r0, #0xb4
-	strh r0, [r4, #0x2e]
-	movs r0, #0x19
-	strh r0, [r4, #0x32]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl SortEntityAbove
-_080A0CE0:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A0CE4: .4byte gMenu
-
-	thumb_func_start sub_080A0CE8
-sub_080A0CE8: @ 0x080A0CE8
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	beq _080A0CF8
-	cmp r0, #1
-	beq _080A0D28
-	b _080A0D66
-_080A0CF8:
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	ldrb r0, [r4, #0xb]
-	adds r0, #2
-	strb r0, [r4, #0x1e]
-	ldr r1, _080A0D24 @ =gUnk_08124B10
-	ldrb r0, [r4, #0xb]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrh r1, [r0]
-	adds r0, r4, #0
-	movs r2, #0x68
-	movs r3, #0x14
-	bl sub_0806FB00
-	b _080A0D66
-	.align 2, 0
-_080A0D24: .4byte gUnk_08124B10
-_080A0D28:
-	adds r0, r4, #0
-	bl sub_0806FB38
-	cmp r0, #0
-	bne _080A0D3A
-	ldr r0, _080A0D68 @ =gMenu
-	ldrb r0, [r0, #5]
-	cmp r0, #1
-	bls _080A0D66
-_080A0D3A:
-	ldr r1, _080A0D6C @ =gUnk_08124B10
-	ldrb r0, [r4, #0xb]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrh r0, [r0]
-	strh r0, [r4, #0x2e]
-	movs r0, #0x68
-	strh r0, [r4, #0x32]
-	ldrb r1, [r4, #0xb]
-	movs r0, #7
-	subs r1, r0, r1
-	adds r3, r4, #0
-	adds r3, #0x29
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	movs r0, #2
-	strb r0, [r4, #0xc]
-_080A0D66:
-	pop {r4, pc}
-	.align 2, 0
-_080A0D68: .4byte gMenu
-_080A0D6C: .4byte gUnk_08124B10
-
-	thumb_func_start sub_080A0D70
-sub_080A0D70: @ 0x080A0D70
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldrb r6, [r5, #0xc]
-	cmp r6, #0
-	bne _080A0DC4
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	subs r0, #5
-	ands r0, r1
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	ldrb r2, [r5, #0x19]
-	movs r4, #0x3f
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	movs r3, #0x40
-	orrs r0, r3
-	strb r0, [r5, #0x19]
-	movs r0, #0x29
-	adds r0, r0, r5
-	mov ip, r0
-	ldrb r2, [r0]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	mov r2, ip
-	strb r0, [r2]
-	ldrb r0, [r5, #0x1b]
-	ands r1, r0
-	orrs r1, r3
-	strb r1, [r5, #0x1b]
-	movs r0, #0xb
-	strb r0, [r5, #0x1e]
-	bl Random
-	ands r0, r4
-	adds r0, #0x40
-	strb r0, [r5, #0xe]
-	strb r6, [r5, #0xf]
-_080A0DC4:
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r4, r0, #0x18
-	cmp r4, #0
-	bne _080A0E02
-	movs r0, #4
-	strb r0, [r5, #0xe]
-	ldr r2, _080A0E04 @ =gUnk_08124B30
-	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]
-	adds r0, #2
-	strb r0, [r5, #0x1e]
-	ldrb r0, [r5, #0xf]
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	cmp r0, #0xff
-	bne _080A0E02
-	bl Random
-	movs r1, #0x3f
-	ands r0, r1
-	adds r0, #0x40
-	strb r0, [r5, #0xe]
-	strb r4, [r5, #0xf]
-_080A0E02:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A0E04: .4byte gUnk_08124B30
-
-	thumb_func_start sub_080A0E08
-sub_080A0E08: @ 0x080A0E08
-	push {lr}
-	adds r2, r0, #0
-	ldrb r0, [r2, #0xc]
-	cmp r0, #0
-	bne _080A0E26
-	movs r0, #1
-	strb r0, [r2, #0xc]
-	ldrb r1, [r2, #0x18]
-	subs r0, #5
-	ands r0, r1
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r2, #0x18]
-	movs r0, #0xf
-	strb r0, [r2, #0x1e]
-_080A0E26:
-	pop {pc}

asm/object/objectB9.s

@@ -1,638 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectB9
-ObjectB9: @ 0x080A1204
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	adds r5, r0, #0
-	cmp r5, #0
-	bne _080A1260
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	bl sub_080A1514
-	lsls r0, r0, #2
-	ldr r1, _080A126C @ =gUnk_08124C20
-	adds r0, r0, r1
-	ldrh r2, [r0]
-	lsls r1, r2, #4
-	subs r1, r1, r2
-	lsls r1, r1, #2
-	adds r2, r4, #0
-	adds r2, #0x68
-	strh r1, [r2]
-	adds r1, r4, #0
-	adds r1, #0x6a
-	strh r5, [r1]
-	ldrh r1, [r0, #2]
-	adds r0, r4, #0
-	adds r0, #0x6c
-	strh r1, [r0]
-	adds r1, r4, #0
-	adds r1, #0x6e
-	movs r0, #1
-	strh r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x70
-	movs r2, #0
-	movs r1, #9
-_080A124A:
-	strb r2, [r0]
-	adds r0, #1
-	subs r1, #1
-	cmp r1, #0
-	bge _080A124A
-	adds r0, r4, #0
-	bl sub_0807DD64
-	adds r0, r4, #0
-	bl sub_0806EC20
-_080A1260:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DD94
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A126C: .4byte gUnk_08124C20
-
-	thumb_func_start sub_080A1270
-sub_080A1270: @ 0x080A1270
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	sub sp, #8
-	mov sb, r0
-	movs r6, #0
-	ldr r0, [r0, #0x64]
-	str r0, [sp, #4]
-	mov r4, sb
-	adds r4, #0x70
-	ldr r0, _080A12F8 @ =gRoomControls
-	movs r2, #0xd8
-	lsls r2, r2, #2
-	adds r1, r2, #0
-	ldrh r3, [r0, #6]
-	adds r1, r1, r3
-	movs r7, #0xd4
-	lsls r7, r7, #2
-	adds r2, r7, #0
-	ldrh r0, [r0, #8]
-	adds r2, r2, r0
-	lsls r1, r1, #0x10
-	asrs r1, r1, #0x10
-	mov r8, r1
-	lsls r2, r2, #0x10
-	asrs r3, r2, #0x10
-	movs r0, #9
-	mov sl, r0
-	movs r1, #1
-	rsbs r1, r1, #0
-	adds r5, r1, #0
-_080A12B2:
-	ldr r7, [sp, #4]
-	ldr r2, [r7]
-	movs r0, #0
-	ldrsb r0, [r4, r0]
-	cmp r0, #0
-	bne _080A1300
-	ldr r0, [r2, #4]
-	cmp r0, #0
-	beq _080A132C
-	cmp r2, #0
-	beq _080A132C
-	movs r1, #0x2e
-	ldrsh r0, [r2, r1]
-	cmp r8, r0
-	bgt _080A132E
-	movs r7, #0x32
-	ldrsh r0, [r2, r7]
-	cmp r3, r0
-	bgt _080A132E
-	ldrb r0, [r2, #0xa]
-	adds r0, #1
-	strb r0, [r4]
-	movs r0, #1
-	strb r0, [r2, #0xb]
-	adds r6, #1
-	ldr r1, _080A12FC @ =gUnk_08124EC8
-	ldrb r0, [r2, #0xa]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrh r0, [r0]
-	str r3, [sp]
-	bl SoundReq
-	ldr r3, [sp]
-	b _080A132E
-	.align 2, 0
-_080A12F8: .4byte gRoomControls
-_080A12FC: .4byte gUnk_08124EC8
-_080A1300:
-	cmp r0, #0
-	ble _080A132E
-	adds r6, #1
-	ldr r0, [r2, #4]
-	cmp r0, #0
-	beq _080A132C
-	cmp r2, #0
-	beq _080A132C
-	mov r1, r8
-	adds r1, #4
-	movs r7, #0x2e
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	ble _080A131E
-	strh r1, [r2, #0x2e]
-_080A131E:
-	adds r1, r3, #4
-	movs r7, #0x32
-	ldrsh r0, [r2, r7]
-	cmp r1, r0
-	ble _080A132E
-	strh r1, [r2, #0x32]
-	b _080A132E
-_080A132C:
-	strb r5, [r4]
-_080A132E:
-	movs r0, #1
-	rsbs r0, r0, #0
-	add sl, r0
-	adds r4, #1
-	ldr r1, [sp, #4]
-	adds r1, #4
-	str r1, [sp, #4]
-	mov r2, sl
-	cmp r2, #0
-	bge _080A12B2
-	mov r0, sb
-	adds r0, #0x6a
-	strh r6, [r0]
-	ldr r0, _080A136C @ =gPlayerState
-	adds r0, #0x27
-	movs r1, #0xff
-	strb r1, [r0]
-	mov r1, sb
-	adds r1, #0x68
-	ldrh r0, [r1]
-	subs r0, #1
-	strh r0, [r1]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bgt _080A1370
-	movs r0, #0xe2
-	bl SoundReq
-	bl sub_08050384
-	b _080A1376
-	.align 2, 0
-_080A136C: .4byte gPlayerState
-_080A1370:
-	ldr r1, _080A1384 @ =gActiveScriptInfo
-	movs r0, #0
-	strb r0, [r1, #6]
-_080A1376:
-	add sp, #8
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080A1384: .4byte gActiveScriptInfo
-
-	thumb_func_start sub_080A1388
-sub_080A1388: @ 0x080A1388
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r5, #0x70
-	ldr r4, [r0, #0x64]
-	movs r6, #9
-_080A1392:
-	ldr r1, [r4]
-	movs r0, #0
-	ldrsb r0, [r5, r0]
-	cmp r0, #0
-	blt _080A13A6
-	cmp r1, #0
-	beq _080A13A6
-	adds r0, r1, #0
-	bl DeleteEntityAny
-_080A13A6:
-	subs r6, #1
-	adds r5, #1
-	adds r4, #4
-	cmp r6, #0
-	bge _080A1392
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A13B4
-sub_080A13B4: @ 0x080A13B4
-	push {r4, lr}
-	adds r4, r1, #0
-	adds r1, r0, #0
-	adds r1, #0x6a
-	adds r0, #0x6c
-	movs r2, #0
-	ldrsh r1, [r1, r2]
-	movs r2, #0
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	blt _080A13D8
-	ldr r0, _080A13D4 @ =0x0000300C
-	bl MessageFromTarget
-	movs r0, #1
-	b _080A13E0
-	.align 2, 0
-_080A13D4: .4byte 0x0000300C
-_080A13D8:
-	ldr r0, _080A13E4 @ =0x00003005
-	bl MessageFromTarget
-	movs r0, #0
-_080A13E0:
-	str r0, [r4, #0x14]
-	pop {r4, pc}
-	.align 2, 0
-_080A13E4: .4byte 0x00003005
-
-	thumb_func_start sub_080A13E8
-sub_080A13E8: @ 0x080A13E8
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl sub_080A1514
-	lsls r0, r0, #2
-	ldr r1, _080A1408 @ =gUnk_08124EA0
-	adds r4, r0, r1
-	movs r6, #0
-	ldrb r0, [r4]
-	cmp r0, #0x5c
-	beq _080A141C
-	cmp r0, #0x5c
-	bgt _080A140C
-	cmp r0, #0x3f
-	beq _080A1412
-	b _080A1444
-	.align 2, 0
-_080A1408: .4byte gUnk_08124EA0
-_080A140C:
-	cmp r0, #0x63
-	beq _080A1430
-	b _080A1444
-_080A1412:
-	ldr r0, _080A1418 @ =gSave
-	adds r0, #0xbb
-	b _080A1424
-	.align 2, 0
-_080A1418: .4byte gSave
-_080A141C:
-	ldr r0, _080A142C @ =gSave
-	movs r1, #0x8b
-	lsls r1, r1, #1
-	adds r0, r0, r1
-_080A1424:
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _080A1444
-	b _080A1454
-	.align 2, 0
-_080A142C: .4byte gSave
-_080A1430:
-	movs r0, #0x4f
-	bl CheckGlobalFlag
-	cmp r0, #0
-	bne _080A1442
-	movs r0, #0x4f
-	bl SetGlobalFlag
-	b _080A1444
-_080A1442:
-	movs r6, #1
-_080A1444:
-	cmp r6, #0
-	bne _080A1454
-	ldrb r0, [r4]
-	ldrb r1, [r4, #1]
-	movs r2, #0
-	bl sub_080A7C18
-	b _080A145C
-_080A1454:
-	adds r1, r5, #0
-	adds r1, #0x6e
-	movs r0, #2
-	strh r0, [r1]
-_080A145C:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A1460
-sub_080A1460: @ 0x080A1460
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_080A1514
-	adds r1, r5, #0
-	adds r1, #0x70
-	movs r4, #0
-	ldr r3, _080A149C @ =gUnk_08124ECC
-	movs r2, #9
-_080A1472:
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	adds r0, r0, r3
-	ldrb r0, [r0]
-	adds r4, r4, r0
-	adds r1, #1
-	subs r2, #1
-	cmp r2, #0
-	bge _080A1472
-	adds r0, r4, #0
-	bl ModRupees
-	ldr r0, _080A14A0 @ =0x00003007
-	adds r1, r5, #0
-	bl MessageNoOverlap
-	ldr r1, _080A14A4 @ =gMessage
-	lsls r0, r4, #0x10
-	lsrs r0, r0, #0x10
-	str r0, [r1, #0x10]
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A149C: .4byte gUnk_08124ECC
-_080A14A0: .4byte 0x00003007
-_080A14A4: .4byte gMessage
-
-	thumb_func_start sub_080A14A8
-sub_080A14A8: @ 0x080A14A8
-	push {r4, lr}
-	bl sub_080A1514
-	adds r4, r0, #0
-	adds r4, #1
-	cmp r4, #9
-	ble _080A14B8
-	movs r4, #9
-_080A14B8:
-	movs r0, #1
-	ands r0, r4
-	cmp r0, #0
-	beq _080A14C8
-	movs r0, #0x4b
-	bl SetGlobalFlag
-	b _080A14CE
-_080A14C8:
-	movs r0, #0x4b
-	bl ClearGlobalFlag
-_080A14CE:
-	movs r0, #2
-	ands r0, r4
-	cmp r0, #0
-	beq _080A14DE
-	movs r0, #0x4c
-	bl SetGlobalFlag
-	b _080A14E4
-_080A14DE:
-	movs r0, #0x4c
-	bl ClearGlobalFlag
-_080A14E4:
-	movs r0, #4
-	ands r0, r4
-	cmp r0, #0
-	beq _080A14F4
-	movs r0, #0x4d
-	bl SetGlobalFlag
-	b _080A14FA
-_080A14F4:
-	movs r0, #0x4d
-	bl ClearGlobalFlag
-_080A14FA:
-	movs r0, #8
-	ands r0, r4
-	cmp r0, #0
-	beq _080A150A
-	movs r0, #0x4e
-	bl SetGlobalFlag
-	b _080A1510
-_080A150A:
-	movs r0, #0x4e
-	bl ClearGlobalFlag
-_080A1510:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A1514
-sub_080A1514: @ 0x080A1514
-	push {r4, lr}
-	movs r0, #0x4b
-	bl CheckGlobalFlag
-	rsbs r1, r0, #0
-	orrs r1, r0
-	lsrs r4, r1, #0x1f
-	movs r0, #0x4c
-	bl CheckGlobalFlag
-	cmp r0, #0
-	beq _080A1530
-	movs r0, #2
-	orrs r4, r0
-_080A1530:
-	movs r0, #0x4d
-	bl CheckGlobalFlag
-	cmp r0, #0
-	beq _080A153E
-	movs r0, #4
-	orrs r4, r0
-_080A153E:
-	movs r0, #0x4e
-	bl CheckGlobalFlag
-	cmp r0, #0
-	beq _080A154C
-	movs r0, #8
-	orrs r4, r0
-_080A154C:
-	adds r0, r4, #0
-	pop {r4, pc}
-
-	thumb_func_start sub_080A1550
-sub_080A1550: @ 0x080A1550
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	mov r8, r1
-	movs r0, #0
-	str r0, [r1, #0x14]
-	movs r0, #0xb9
-	movs r1, #0
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A15FE
-	movs r0, #0x28
-	bl zMalloc
-	str r0, [r4, #0x64]
-	cmp r0, #0
-	bne _080A1582
-	adds r0, r4, #0
-	bl DeleteEntityAny
-	b _080A15FE
-_080A1582:
-	mov r0, r8
-	ldr r1, [r0, #4]
-	adds r0, r4, #0
-	bl StartCutscene
-	adds r1, r4, #0
-	adds r1, #0x84
-	str r0, [r1]
-	bl sub_080A1514
-	lsls r1, r0, #4
-	subs r1, r1, r0
-	lsls r1, r1, #2
-	ldr r0, _080A15B4 @ =gUnk_08124C48
-	adds r5, r1, r0
-	ldr r4, [r4, #0x64]
-	mov sb, r4
-	ldr r7, _080A15B8 @ =gRoomControls
-	movs r6, #9
-_080A15A8:
-	movs r1, #0
-	ldrsh r0, [r5, r1]
-	cmp r0, #0
-	bgt _080A15BC
-	movs r4, #0
-	b _080A15E6
-	.align 2, 0
-_080A15B4: .4byte gUnk_08124C48
-_080A15B8: .4byte gRoomControls
-_080A15BC:
-	movs r0, #0
-	ldrsh r1, [r5, r0]
-	subs r1, #1
-	movs r0, #0x41
-	bl CreateEnemy
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080A15E6
-	ldrh r0, [r5, #2]
-	ldrh r1, [r7, #6]
-	adds r0, r0, r1
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r5, #4]
-	ldrh r1, [r7, #8]
-	adds r0, r0, r1
-	strh r0, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x38
-	movs r0, #1
-	strb r0, [r1]
-_080A15E6:
-	mov r0, sb
-	adds r0, #4
-	mov sb, r0
-	subs r0, #4
-	stm r0!, {r4}
-	subs r6, #1
-	adds r5, #6
-	cmp r6, #0
-	bge _080A15A8
-	movs r0, #1
-	mov r1, r8
-	str r0, [r1, #0x14]
-_080A15FE:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A1608
-sub_080A1608: @ 0x080A1608
-	push {r4, lr}
-	ldr r4, _080A163C @ =0x00003002
-	movs r0, #1
-	bl CheckRoomFlag
-	cmp r0, #0
-	beq _080A1618
-	adds r4, #4
-_080A1618:
-	adds r0, r4, #0
-	bl MessageFromTarget
-	ldr r4, _080A1640 @ =gMessage
-	movs r1, #0
-	movs r0, #1
-	strb r0, [r4, #6]
-	strb r1, [r4, #7]
-	bl sub_080A1514
-	lsls r0, r0, #2
-	ldr r1, _080A1644 @ =gUnk_08124C20
-	adds r0, r0, r1
-	ldrh r1, [r0]
-	str r1, [r4, #0x10]
-	ldrh r0, [r0, #2]
-	str r0, [r4, #0x14]
-	pop {r4, pc}
-	.align 2, 0
-_080A163C: .4byte 0x00003002
-_080A1640: .4byte gMessage
-_080A1644: .4byte gUnk_08124C20
-
-	thumb_func_start sub_080A1648
-sub_080A1648: @ 0x080A1648
-	push {r4, lr}
-	ldr r4, _080A1684 @ =0x0000407F
-	ldr r1, _080A1688 @ =0x00000D36
-	adds r0, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r1, _080A168C @ =0x00000D37
-	adds r0, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r1, _080A1690 @ =0x00000D38
-	adds r0, r4, #0
-	movs r2, #1
-	bl SetTileType
-	subs r4, #1
-	ldr r1, _080A1694 @ =0x00000D75
-	adds r0, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r1, _080A1698 @ =0x00000E75
-	adds r0, r4, #0
-	movs r2, #1
-	bl SetTileType
-	pop {r4, pc}
-	.align 2, 0
-_080A1684: .4byte 0x0000407F
-_080A1688: .4byte 0x00000D36
-_080A168C: .4byte 0x00000D37
-_080A1690: .4byte 0x00000D38
-_080A1694: .4byte 0x00000D75
-_080A1698: .4byte 0x00000E75
-
-	thumb_func_start sub_080A169C
-sub_080A169C: @ 0x080A169C
-	push {lr}
-	ldr r0, _080A16C8 @ =0x00000D36
-	movs r1, #1
-	bl RestorePrevTileEntity
-	ldr r0, _080A16CC @ =0x00000D37
-	movs r1, #1
-	bl RestorePrevTileEntity
-	ldr r0, _080A16D0 @ =0x00000D38
-	movs r1, #1
-	bl RestorePrevTileEntity
-	ldr r0, _080A16D4 @ =0x00000D75
-	movs r1, #1
-	bl RestorePrevTileEntity
-	ldr r0, _080A16D8 @ =0x00000E75
-	movs r1, #1
-	bl RestorePrevTileEntity
-	pop {pc}
-	.align 2, 0
-_080A16C8: .4byte 0x00000D36
-_080A16CC: .4byte 0x00000D37
-_080A16D0: .4byte 0x00000D38
-_080A16D4: .4byte 0x00000D75
-_080A16D8: .4byte 0x00000E75

asm/object/objectBlockingStairs.s

@@ -1,677 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectBlockingStairs
-ObjectBlockingStairs: @ 0x08092ED4
-	push {lr}
-	ldr r2, _08092EE8 @ =gUnk_0812283C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08092EE8: .4byte gUnk_0812283C
-
-	thumb_func_start sub_08092EEC
-sub_08092EEC: @ 0x08092EEC
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	bl sub_080932D8
-	cmp r0, #1
-	beq _08092F2C
-	cmp r0, #2
-	beq _08092F3A
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r1, #0
-	movs r2, #0x80
-	strh r2, [r4, #0x24]
-	strb r0, [r4, #0x16]
-	strb r1, [r4, #0xe]
-	strb r1, [r4, #0xf]
-	adds r1, r4, #0
-	adds r1, #0x7a
-	movs r0, #0x20
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x7b
-	strb r2, [r0]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _08092F48
-	ldr r0, _08092F28 @ =gUnk_080FD288
-	str r0, [r4, #0x48]
-	b _08092F48
-	.align 2, 0
-_08092F28: .4byte gUnk_080FD288
-_08092F2C:
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	ldrh r0, [r4, #0x2e]
-	subs r0, #0x20
-	strh r0, [r4, #0x2e]
-	movs r5, #2
-	b _08092F5E
-_08092F3A:
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	ldrh r0, [r4, #0x2e]
-	adds r0, #0x20
-	strh r0, [r4, #0x2e]
-	movs r5, #3
-	b _08092F5E
-_08092F48:
-	movs r5, #0
-	adds r1, r4, #0
-	adds r1, #0x86
-	ldrh r0, [r1]
-	cmp r0, #0
-	beq _08092F5E
-	bl CheckFlags
-	cmp r0, #0
-	bne _08092F5E
-	movs r5, #1
-_08092F5E:
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_080931A4
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08092F68
-sub_08092F68: @ 0x08092F68
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, #0
-	ldr r0, _08092FA4 @ =gPlayerEntity
-	movs r2, #0x2e
-	ldrsh r1, [r0, r2]
-	movs r2, #0x2e
-	ldrsh r0, [r6, r2]
-	subs r1, r1, r0
-	mov r8, r1
-	adds r1, r6, #0
-	adds r1, #0x86
-	ldrh r0, [r1]
-	cmp r0, #0
-	beq _08092FA8
-	bl CheckFlags
-	cmp r0, #0
-	bne _08092F92
-	b _080930E6
-_08092F92:
-	adds r0, r6, #0
-	adds r0, #0x7a
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _08092FA8
-	adds r0, r6, #0
-	bl sub_080932A8
-	b _080930E6
-	.align 2, 0
-_08092FA4: .4byte gPlayerEntity
-_08092FA8:
-	adds r1, r6, #0
-	adds r1, #0x7b
-	ldrb r2, [r1]
-	movs r0, #0x3f
-	ands r0, r2
-	adds r7, r1, #0
-	cmp r0, #0
-	bne _08092FD6
-	movs r0, #0xf
-	movs r4, #0
-	orrs r0, r2
-	strb r0, [r7]
-	adds r0, r6, #0
-	movs r1, #0
-	bl sub_080931A4
-	mov r0, r8
-	cmp r0, #0
-	bge _08092FD6
-	ldrb r0, [r7]
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r7]
-_08092FD6:
-	ldrb r1, [r7]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _08092FEA
-	adds r5, r6, #0
-	adds r5, #0x78
-	ldrh r0, [r5]
-	subs r0, #1
-	b _08092FF2
-_08092FEA:
-	adds r5, r6, #0
-	adds r5, #0x78
-	ldrh r0, [r5]
-	adds r0, #1
-_08092FF2:
-	adds r4, r6, #0
-	adds r4, #0x38
-	ldrb r1, [r4]
-	bl GetTileType
-	adds r1, r0, #0
-	ldr r0, _08093034 @ =0x00004031
-	cmp r1, r0
-	bhi _08093040
-	subs r0, #1
-	cmp r1, r0
-	blo _08093040
-	movs r0, #3
-	strb r0, [r6, #0xc]
-	ldr r0, _08093038 @ =gPlayerEntity
-	ldrb r0, [r0, #0x14]
-	lsls r0, r0, #2
-	strb r0, [r6, #0x15]
-	movs r0, #0x80
-	strh r0, [r6, #0x24]
-	movs r0, #0x40
-	strb r0, [r6, #0xe]
-	adds r0, r6, #0
-	movs r1, #0x50
-	bl RequestPriorityDuration
-	ldr r0, _0809303C @ =0x0000010F
-	bl EnqueueSFX
-	adds r0, r6, #0
-	bl sub_08093248
-	b _080930E6
-	.align 2, 0
-_08093034: .4byte 0x00004031
-_08093038: .4byte gPlayerEntity
-_0809303C: .4byte 0x0000010F
-_08093040:
-	ldr r0, _0809307C @ =gPlayerEntity
-	ldrb r1, [r0, #0x14]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _080930E6
-	adds r0, r6, #0
-	bl RegisterCarryEntity
-	adds r3, r7, #0
-	ldrb r2, [r3]
-	movs r0, #0x80
-	ands r0, r2
-	cmp r0, #0
-	beq _08093088
-	movs r1, #0x7f
-	ands r1, r2
-	strb r1, [r3]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _0809309C
-	ldr r0, _08093080 @ =0x0000402C
-	ldrh r1, [r5]
-	subs r1, #1
-	ldrb r2, [r4]
-	bl SetTile
-	ldr r0, _08093084 @ =0x0000403D
-	b _080930AA
-	.align 2, 0
-_0809307C: .4byte gPlayerEntity
-_08093080: .4byte 0x0000402C
-_08093084: .4byte 0x0000403D
-_08093088:
-	movs r0, #0x40
-	ands r0, r2
-	cmp r0, #0
-	beq _080930C0
-	mov r1, r8
-	cmp r1, #4
-	ble _080930E6
-	movs r0, #0x3f
-	ands r0, r2
-	strb r0, [r3]
-_0809309C:
-	ldr r0, _080930B8 @ =0x0000403D
-	ldrh r1, [r5]
-	subs r1, #1
-	ldrb r2, [r4]
-	bl SetTile
-	ldr r0, _080930BC @ =0x0000402D
-_080930AA:
-	ldrh r1, [r5]
-	adds r1, #1
-	ldrb r2, [r4]
-	bl SetTile
-	b _080930E6
-	.align 2, 0
-_080930B8: .4byte 0x0000403D
-_080930BC: .4byte 0x0000402D
-_080930C0:
-	mov r1, r8
-	rsbs r0, r1, #0
-	cmp r0, #4
-	ble _080930E6
-	movs r0, #0x40
-	orrs r0, r2
-	strb r0, [r7]
-	ldr r0, _080930EC @ =0x0000402C
-	ldrh r1, [r5]
-	subs r1, #1
-	ldrb r2, [r4]
-	bl SetTile
-	ldr r0, _080930F0 @ =0x0000403D
-	ldrh r1, [r5]
-	adds r1, #1
-	ldrb r2, [r4]
-	bl SetTile
-_080930E6:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080930EC: .4byte 0x0000402C
-_080930F0: .4byte 0x0000403D
-
-	thumb_func_start sub_080930F4
-sub_080930F4: @ 0x080930F4
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrb r3, [r4, #0xe]
-	cmp r3, #0
-	beq _08093104
-	bl sub_08093280
-	b _08093174
-_08093104:
-	ldr r5, _0809315C @ =gPlayerState
-	ldrb r0, [r5, #5]
-	cmp r0, #0x12
-	bne _08093168
-	ldr r6, _08093160 @ =gPlayerEntity
-	adds r0, r6, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _08093174
-	ldrb r0, [r4, #0xf]
-	adds r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #8
-	bls _08093174
-	movs r0, #0x10
-	strb r0, [r5, #0xc]
-	adds r0, r5, #0
-	adds r0, #0x38
-	movs r2, #0x40
-	strb r2, [r0]
-	ldr r0, [r5, #0x30]
-	movs r1, #1
-	orrs r0, r1
-	str r0, [r5, #0x30]
-	strh r3, [r6, #0x2c]
-	strh r3, [r6, #0x30]
-	ldrb r0, [r6, #0x14]
-	movs r1, #4
-	eors r0, r1
-	lsls r0, r0, #2
-	strb r0, [r4, #0x15]
-	strb r2, [r4, #0xe]
-	ldr r0, _08093164 @ =0x0000010F
-	bl EnqueueSFX
-	adds r0, r4, #0
-	bl sub_08093248
-	b _08093174
-	.align 2, 0
-_0809315C: .4byte gPlayerState
-_08093160: .4byte gPlayerEntity
-_08093164: .4byte 0x0000010F
-_08093168:
-	ldrb r0, [r4, #0xd]
-	cmp r0, #6
-	bne _08093174
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	strb r3, [r4, #0xf]
-_08093174:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08093178
-sub_08093178: @ 0x08093178
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0800445C
-	adds r0, r4, #0
-	bl LinearMoveUpdate
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08093198
-	adds r0, r4, #0
-	bl sub_08093334
-_08093198:
-	adds r0, r4, #0
-	bl sub_08093364
-	pop {r4, pc}
-
-	thumb_func_start nullsub_120
-nullsub_120: @ 0x080931A0
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080931A4
-sub_080931A4: @ 0x080931A4
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r1, #0
-	movs r1, #0x2e
-	ldrsh r2, [r0, r1]
-	ldr r3, _080931F0 @ =gRoomControls
-	ldrh r1, [r3, #6]
-	subs r2, r2, r1
-	asrs r2, r2, #4
-	movs r4, #0x3f
-	ands r2, r4
-	movs r6, #0x32
-	ldrsh r1, [r0, r6]
-	ldrh r3, [r3, #8]
-	subs r1, r1, r3
-	asrs r1, r1, #4
-	ands r1, r4
-	lsls r1, r1, #6
-	orrs r2, r1
-	adds r1, r0, #0
-	adds r1, #0x78
-	strh r2, [r1]
-	ldrh r1, [r1]
-	subs r1, #0x40
-	mov r8, r1
-	adds r0, #0x38
-	ldrb r7, [r0]
-	cmp r5, #1
-	beq _080931F4
-	cmp r5, #1
-	blo _0809320C
-	cmp r5, #2
-	beq _080931FC
-	cmp r5, #3
-	beq _08093204
-	b _0809320C
-	.align 2, 0
-_080931F0: .4byte gRoomControls
-_080931F4:
-	ldr r0, _080931F8 @ =gUnk_08122862
-	b _0809320E
-	.align 2, 0
-_080931F8: .4byte gUnk_08122862
-_080931FC:
-	ldr r0, _08093200 @ =gUnk_08122874
-	b _0809320E
-	.align 2, 0
-_08093200: .4byte gUnk_08122874
-_08093204:
-	ldr r0, _08093208 @ =gUnk_08122886
-	b _0809320E
-	.align 2, 0
-_08093208: .4byte gUnk_08122886
-_0809320C:
-	ldr r0, _08093230 @ =gUnk_08122850
-_0809320E:
-	movs r4, #0
-	movs r6, #0
-	adds r5, r0, #0
-_08093214:
-	mov r0, r8
-	adds r1, r0, r6
-	adds r1, r1, r4
-	subs r1, #1
-	ldrh r0, [r5]
-	adds r2, r7, #0
-	bl SetTile
-	cmp r4, #2
-	beq _08093234
-	cmp r4, #5
-	beq _08093238
-	b _0809323A
-	.align 2, 0
-_08093230: .4byte gUnk_08122850
-_08093234:
-	movs r6, #0x3d
-	b _0809323A
-_08093238:
-	movs r6, #0x7a
-_0809323A:
-	adds r5, #2
-	adds r4, #1
-	cmp r4, #8
-	bls _08093214
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-
-	thumb_func_start sub_08093248
-sub_08093248: @ 0x08093248
-	push {r4, r5, r6, r7, lr}
-	adds r1, r0, #0
-	adds r1, #0x78
-	ldrh r1, [r1]
-	adds r7, r1, #0
-	subs r7, #0x40
-	adds r0, #0x38
-	ldrb r6, [r0]
-	movs r4, #0
-	movs r5, #0
-_0809325C:
-	adds r0, r7, r5
-	adds r0, r0, r4
-	subs r0, #1
-	adds r1, r6, #0
-	bl RestorePrevTileEntity
-	cmp r4, #2
-	beq _08093272
-	cmp r4, #5
-	beq _08093276
-	b _08093278
-_08093272:
-	movs r5, #0x3d
-	b _08093278
-_08093276:
-	movs r5, #0x7a
-_08093278:
-	adds r4, #1
-	cmp r4, #8
-	bls _0809325C
-	pop {r4, r5, r6, r7, pc}
-
-	thumb_func_start sub_08093280
-sub_08093280: @ 0x08093280
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0800445C
-	adds r0, r4, #0
-	bl LinearMoveUpdate
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080932A0
-	adds r0, r4, #0
-	bl sub_08093334
-_080932A0:
-	adds r0, r4, #0
-	bl sub_08093364
-	pop {r4, pc}
-
-	thumb_func_start sub_080932A8
-sub_080932A8: @ 0x080932A8
-	push {lr}
-	adds r1, r0, #0
-	adds r2, r1, #0
-	adds r2, #0x7a
-	ldrb r0, [r2]
-	subs r0, #1
-	strb r0, [r2]
-	movs r2, #3
-	ands r2, r0
-	cmp r2, #1
-	beq _080932C8
-	cmp r2, #3
-	beq _080932D0
-	adds r1, #0x62
-	movs r0, #0
-	b _080932D4
-_080932C8:
-	adds r0, r1, #0
-	adds r0, #0x62
-	strb r2, [r0]
-	b _080932D6
-_080932D0:
-	adds r1, #0x62
-	movs r0, #0xff
-_080932D4:
-	strb r0, [r1]
-_080932D6:
-	pop {pc}
-
-	thumb_func_start sub_080932D8
-sub_080932D8: @ 0x080932D8
-	push {r4, lr}
-	lsls r0, r0, #3
-	ldr r1, _080932F0 @ =gUnk_08122898
-	adds r4, r0, r1
-	ldr r0, [r4]
-	ldrh r1, [r4, #4]
-	bl CheckLocalFlagByBank
-	cmp r0, #0
-	beq _080932F4
-	movs r0, #1
-	b _08093306
-	.align 2, 0
-_080932F0: .4byte gUnk_08122898
-_080932F4:
-	ldr r0, [r4]
-	ldrh r1, [r4, #6]
-	bl CheckLocalFlagByBank
-	cmp r0, #0
-	bne _08093304
-	movs r0, #0
-	b _08093306
-_08093304:
-	movs r0, #2
-_08093306:
-	pop {r4, pc}
-
-	thumb_func_start sub_08093308
-sub_08093308: @ 0x08093308
-	push {lr}
-	adds r2, r1, #0
-	lsls r0, r0, #3
-	ldr r1, _08093320 @ =gUnk_08122898
-	adds r1, r0, r1
-	cmp r2, #1
-	bne _08093324
-	ldr r0, [r1]
-	ldrh r1, [r1, #4]
-	bl SetLocalFlagByBank
-	b _08093330
-	.align 2, 0
-_08093320: .4byte gUnk_08122898
-_08093324:
-	cmp r2, #2
-	bne _08093330
-	ldr r0, [r1]
-	ldrh r1, [r1, #6]
-	bl SetLocalFlagByBank
-_08093330:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08093334
-sub_08093334: @ 0x08093334
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x15]
-	movs r0, #0x10
-	ands r0, r1
-	movs r5, #2
-	cmp r0, #0
-	beq _0809334A
-	movs r5, #1
-_0809334A:
-	adds r1, r5, #1
-	adds r0, r4, #0
-	bl sub_080931A4
-	ldrb r0, [r4, #0xa]
-	adds r1, r5, #0
-	bl sub_08093308
-	movs r0, #0x72
-	bl EnqueueSFX
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08093364
-sub_08093364: @ 0x08093364
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r1, [r5, #0xe]
-	movs r0, #3
-	ands r0, r1
-	cmp r0, #0
-	bne _080933BC
-	movs r0, #0xf
-	movs r1, #0x11
-	movs r2, #0
-	bl CreateObject
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _080933BC
-	str r5, [r4, #0x50]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	ldrb r1, [r5, #0x15]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0809339C
-	ldrh r0, [r4, #0x2e]
-	adds r0, #0x12
-	b _080933A0
-_0809339C:
-	ldrh r0, [r4, #0x2e]
-	subs r0, #0x12
-_080933A0:
-	strh r0, [r4, #0x2e]
-	movs r0, #0x32
-	ldrsh r2, [r4, r0]
-	ldrb r1, [r5, #0xe]
-	movs r0, #8
-	ands r0, r1
-	cmp r0, #0
-	beq _080933B6
-	adds r0, r2, #0
-	adds r0, #8
-	b _080933BA
-_080933B6:
-	adds r0, r2, #0
-	subs r0, #8
-_080933BA:
-	strh r0, [r4, #0x32]
-_080933BC:
-	pop {r4, r5, pc}
-	.align 2, 0

asm/object/picoBloom.s

@@ -1,91 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start PicoBloom
-PicoBloom: @ 0x08098A78
-	push {lr}
-	ldr r2, _08098A8C @ =gUnk_08123568
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08098A8C: .4byte gUnk_08123568
-
-	thumb_func_start sub_08098A90
-sub_08098A90: @ 0x08098A90
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xb]
-	cmp r0, #1
-	beq _08098A9C
-	movs r0, #2
-_08098A9C:
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0x7f
-	ands r0, r1
-	adds r0, #0x7f
-	strb r0, [r4, #0xe]
-	adds r1, r4, #0
-	adds r1, #0x38
-	movs r0, #1
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	ldr r1, _08098ACC @ =gUnk_08123574
-	ldrb r0, [r4, #0xa]
-	adds r0, r0, r1
-	ldrb r1, [r0]
-	ldrb r0, [r4, #0xb]
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl InitializeAnimation
-	pop {r4, pc}
-	.align 2, 0
-_08098ACC: .4byte gUnk_08123574
-
-	thumb_func_start sub_08098AD0
-sub_08098AD0: @ 0x08098AD0
-	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 _08098AE6
-	ldrb r0, [r1, #0xc]
-	adds r0, #1
-	strb r0, [r1, #0xc]
-_08098AE6:
-	pop {pc}
-
-	thumb_func_start sub_08098AE8
-sub_08098AE8: @ 0x08098AE8
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r4, #0x5a
-	ldrb r1, [r4]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08098B08
-	movs r0, #0xfe
-	ands r0, r1
-	strb r0, [r4]
-	ldr r0, _08098B0C @ =0x0000021B
-	bl EnqueueSFX
-_08098B08:
-	pop {r4, pc}
-	.align 2, 0
-_08098B0C: .4byte 0x0000021B

asm/staffroll.s

@@ -1,716 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start StaffrollTask
-StaffrollTask: @ 0x080A35E0
-	push {lr}
-	ldr r1, _080A35FC @ =gRoomTransition
-	ldr r0, [r1]
-	adds r0, #1
-	str r0, [r1]
-	ldr r1, _080A3600 @ =gUnk_08127D00
-	ldr r0, _080A3604 @ =gMain
-	ldrb r0, [r0, #3]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {pc}
-	.align 2, 0
-_080A35FC: .4byte gRoomTransition
-_080A3600: .4byte gUnk_08127D00
-_080A3604: .4byte gMain
-
-	thumb_func_start sub_080A3608
-sub_080A3608: @ 0x080A3608
-	push {r4, r5, lr}
-	ldr r0, _080A3640 @ =gSave
-	movs r5, #0
-	movs r4, #1
-	strb r4, [r0, #6]
-	movs r0, #0x55
-	bl SetGlobalFlag
-	ldr r0, _080A3644 @ =gMain
-	strb r4, [r0, #3]
-	ldr r2, _080A3648 @ =gMenu
-	strb r5, [r2, #5]
-	movs r1, #0
-	movs r0, #0xb4
-	strh r0, [r2, #8]
-	movs r0, #5
-	strb r0, [r2, #0x16]
-	movs r0, #4
-	strb r0, [r2, #0x17]
-	strb r1, [r2, #0x1a]
-	movs r0, #0x80
-	lsls r0, r0, #0x12
-	ldrb r0, [r0, #7]
-	cmp r0, #1
-	bls _080A3650
-	ldr r0, _080A364C @ =gUnk_08127998
-	b _080A365E
-	.align 2, 0
-_080A3640: .4byte gSave
-_080A3644: .4byte gMain
-_080A3648: .4byte gMenu
-_080A364C: .4byte gUnk_08127998
-_080A3650:
-	cmp r0, #1
-	bne _080A365C
-	ldr r0, _080A3658 @ =gUnk_08127644
-	b _080A365E
-	.align 2, 0
-_080A3658: .4byte gUnk_08127644
-_080A365C:
-	ldr r0, _080A36B0 @ =gUnk_081272F0
-_080A365E:
-	str r0, [r2, #0xc]
-	movs r0, #0
-	bl DispReset
-	movs r0, #0xb
-	bl LoadPaletteGroup
-	movs r0, #0xc
-	bl LoadPaletteGroup
-	movs r0, #0
-	movs r1, #0
-	bl SetColor
-	ldr r2, _080A36B4 @ =gScreen
-	movs r0, #0xc8
-	lsls r0, r0, #3
-	strh r0, [r2]
-	adds r1, r2, #0
-	adds r1, #0x66
-	ldr r0, _080A36B8 @ =0x00002442
-	strh r0, [r1]
-	adds r1, #2
-	movs r0, #0x80
-	lsls r0, r0, #5
-	strh r0, [r1]
-	ldr r0, _080A36BC @ =0x00001E4D
-	strh r0, [r2, #0x14]
-	subs r0, #0x8a
-	strh r0, [r2, #0x20]
-	bl InitSoundPlayingInfo
-	bl ResetSystemPriority
-	movs r1, #0x80
-	lsls r1, r1, #1
-	movs r0, #5
-	bl SetFade
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A36B0: .4byte gUnk_081272F0
-_080A36B4: .4byte gScreen
-_080A36B8: .4byte 0x00002442
-_080A36BC: .4byte 0x00001E4D
-
-	thumb_func_start sub_080A36C0
-sub_080A36C0: @ 0x080A36C0
-	push {lr}
-	ldr r1, _080A36D4 @ =gUnk_08127D10
-	ldr r0, _080A36D8 @ =gMenu
-	ldrb r0, [r0, #5]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {pc}
-	.align 2, 0
-_080A36D4: .4byte gUnk_08127D10
-_080A36D8: .4byte gMenu
-
-	thumb_func_start sub_080A36DC
-sub_080A36DC: @ 0x080A36DC
-	push {lr}
-	ldr r1, _080A36F4 @ =gMenu
-	ldrh r0, [r1, #8]
-	subs r0, #1
-	strh r0, [r1, #8]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _080A36F0
-	bl sub_080A3954
-_080A36F0:
-	pop {pc}
-	.align 2, 0
-_080A36F4: .4byte gMenu
-
-	thumb_func_start sub_080A36F8
-sub_080A36F8: @ 0x080A36F8
-	push {r4, r5, lr}
-	ldr r0, _080A3754 @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A3752
-	ldr r5, _080A3758 @ =gMenu
-	movs r0, #0x10
-	ldrsh r4, [r5, r0]
-	lsls r4, r4, #1
-	ldr r0, _080A375C @ =gUnk_08127CEC
-	adds r4, r4, r0
-	ldrb r0, [r4]
-	bl LoadPaletteGroup
-	ldrb r0, [r4, #1]
-	bl LoadGfxGroup
-	ldr r0, _080A3760 @ =gBG1Buffer
-	movs r1, #0x80
-	lsls r1, r1, #4
-	bl MemClear
-	ldr r1, _080A3764 @ =gScreen
-	movs r2, #0
-	movs r0, #1
-	strh r0, [r1, #0x1a]
-	ldrh r0, [r5, #0x12]
-	strh r0, [r1, #0x22]
-	adds r1, #0x68
-	movs r0, #0x80
-	lsls r0, r0, #5
-	strh r0, [r1]
-	strb r2, [r5, #5]
-	ldrb r0, [r5, #0x1a]
-	cmp r0, #0
-	bne _080A374A
-	movs r0, #1
-	strb r0, [r5, #0x1a]
-	movs r0, #9
-	bl SoundReq
-_080A374A:
-	movs r0, #4
-	movs r1, #8
-	bl SetFade
-_080A3752:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A3754: .4byte gFadeControl
-_080A3758: .4byte gMenu
-_080A375C: .4byte gUnk_08127CEC
-_080A3760: .4byte gBG1Buffer
-_080A3764: .4byte gScreen
-
-	thumb_func_start sub_080A3768
-sub_080A3768: @ 0x080A3768
-	push {r4, lr}
-	ldr r4, _080A377C @ =gMenu
-	ldrb r1, [r4, #6]
-	cmp r1, #1
-	beq _080A37C4
-	cmp r1, #1
-	bgt _080A3780
-	cmp r1, #0
-	beq _080A378A
-	b _080A384C
-	.align 2, 0
-_080A377C: .4byte gMenu
-_080A3780:
-	cmp r1, #2
-	beq _080A3804
-	cmp r1, #3
-	beq _080A3812
-	b _080A384C
-_080A378A:
-	ldr r0, _080A37B8 @ =gBG1Buffer
-	movs r1, #0x80
-	lsls r1, r1, #4
-	bl MemClear
-	movs r1, #0x10
-	ldrsh r0, [r4, r1]
-	ldr r2, _080A37BC @ =gUnk_081272E0
-	ldrb r1, [r4, #0x19]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl sub_0805F46C
-	ldr r1, _080A37C0 @ =gScreen
-	movs r2, #0
-	movs r0, #1
-	strh r0, [r1, #0x1a]
-	ldrb r0, [r4, #6]
-	adds r0, #1
-	strb r0, [r4, #6]
-	strb r2, [r4, #0x18]
-	b _080A385E
-	.align 2, 0
-_080A37B8: .4byte gBG1Buffer
-_080A37BC: .4byte gUnk_081272E0
-_080A37C0: .4byte gScreen
-_080A37C4:
-	ldr r0, _080A37F8 @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A385E
-	ldr r0, _080A37FC @ =gRoomTransition
-	ldr r0, [r0]
-	ands r0, r1
-	cmp r0, #0
-	bne _080A385E
-	ldrb r1, [r4, #0x18]
-	adds r1, #1
-	strb r1, [r4, #0x18]
-	lsls r0, r1, #0x18
-	lsrs r3, r0, #0x18
-	ldr r2, _080A3800 @ =gScreen
-	movs r0, #0x10
-	subs r0, r0, r3
-	lsls r0, r0, #8
-	orrs r0, r3
-	adds r2, #0x68
-	strh r0, [r2]
-	lsls r1, r1, #0x18
-	lsrs r1, r1, #0x18
-	cmp r1, #0xf
-	bls _080A385E
-	b _080A383C
-	.align 2, 0
-_080A37F8: .4byte gFadeControl
-_080A37FC: .4byte gRoomTransition
-_080A3800: .4byte gScreen
-_080A3804:
-	ldrh r0, [r4, #8]
-	subs r0, #1
-	strh r0, [r4, #8]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _080A385E
-	b _080A383C
-_080A3812:
-	ldr r0, _080A3844 @ =gRoomTransition
-	ldr r0, [r0]
-	movs r1, #1
-	ands r0, r1
-	cmp r0, #0
-	bne _080A385E
-	ldrb r1, [r4, #0x18]
-	subs r1, #1
-	strb r1, [r4, #0x18]
-	lsls r0, r1, #0x18
-	lsrs r3, r0, #0x18
-	ldr r2, _080A3848 @ =gScreen
-	movs r0, #0x10
-	subs r0, r0, r3
-	lsls r0, r0, #8
-	orrs r0, r3
-	adds r2, #0x68
-	strh r0, [r2]
-	lsls r1, r1, #0x18
-	cmp r1, #0
-	bne _080A385E
-_080A383C:
-	ldrb r0, [r4, #6]
-	adds r0, #1
-	strb r0, [r4, #6]
-	b _080A385E
-	.align 2, 0
-_080A3844: .4byte gRoomTransition
-_080A3848: .4byte gScreen
-_080A384C:
-	ldr r1, _080A3860 @ =gFadeControl
-	ldrb r0, [r1]
-	cmp r0, #0
-	bne _080A385E
-	movs r0, #1
-	rsbs r0, r0, #0
-	str r0, [r1, #4]
-	bl sub_080A3954
-_080A385E:
-	pop {r4, pc}
-	.align 2, 0
-_080A3860: .4byte gFadeControl
-
-	thumb_func_start sub_080A3864
-sub_080A3864: @ 0x080A3864
-	push {lr}
-	ldr r1, _080A3884 @ =gMenu
-	ldrh r0, [r1, #8]
-	subs r0, #1
-	strh r0, [r1, #8]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _080A3880
-	bl sub_080A3954
-	movs r0, #5
-	movs r1, #8
-	bl SetFade
-_080A3880:
-	pop {pc}
-	.align 2, 0
-_080A3884: .4byte gMenu
-
-	thumb_func_start sub_080A3888
-sub_080A3888: @ 0x080A3888
-	push {lr}
-	ldr r1, _080A38A8 @ =gFadeControl
-	ldr r0, _080A38AC @ =0xFFFF7FFF
-	str r0, [r1, #4]
-	movs r0, #5
-	movs r1, #4
-	bl SetFade
-	ldr r0, _080A38B0 @ =gMenu
-	ldrh r0, [r0, #8]
-	bl SetFadeProgress
-	bl sub_080A3954
-	pop {pc}
-	.align 2, 0
-_080A38A8: .4byte gFadeControl
-_080A38AC: .4byte 0xFFFF7FFF
-_080A38B0: .4byte gMenu
-
-	thumb_func_start sub_080A38B4
-sub_080A38B4: @ 0x080A38B4
-	push {lr}
-	movs r0, #4
-	movs r1, #4
-	bl SetFade
-	ldr r0, _080A38CC @ =gMenu
-	ldrh r0, [r0, #8]
-	bl SetFadeProgress
-	bl sub_080A3954
-	pop {pc}
-	.align 2, 0
-_080A38CC: .4byte gMenu
-
-	thumb_func_start sub_080A38D0
-sub_080A38D0: @ 0x080A38D0
-	push {r4, r5, r6, lr}
-	mov r6, r8
-	push {r6}
-	ldr r0, _080A391C @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A3914
-	ldr r0, _080A3920 @ =gBG1Buffer
-	movs r6, #0x80
-	lsls r6, r6, #4
-	adds r1, r6, #0
-	bl MemClear
-	ldr r4, _080A3924 @ =gScreen
-	movs r0, #0
-	mov r8, r0
-	movs r5, #1
-	strh r5, [r4, #0x1a]
-	ldr r0, _080A3928 @ =gBG2Buffer
-	adds r1, r6, #0
-	bl MemClear
-	strh r5, [r4, #0x26]
-	adds r4, #0x68
-	movs r0, #0x80
-	lsls r0, r0, #5
-	strh r0, [r4]
-	ldr r0, _080A392C @ =gMenu
-	mov r1, r8
-	strb r1, [r0, #5]
-	movs r0, #4
-	movs r1, #8
-	bl SetFade
-_080A3914:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A391C: .4byte gFadeControl
-_080A3920: .4byte gBG1Buffer
-_080A3924: .4byte gScreen
-_080A3928: .4byte gBG2Buffer
-_080A392C: .4byte gMenu
-
-	thumb_func_start sub_080A3930
-sub_080A3930: @ 0x080A3930
-	push {lr}
-	ldr r0, _080A394C @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A3948
-	movs r0, #7
-	movs r1, #8
-	bl SetFade
-	ldr r1, _080A3950 @ =gMain
-	movs r0, #2
-	strb r0, [r1, #3]
-_080A3948:
-	pop {pc}
-	.align 2, 0
-_080A394C: .4byte gFadeControl
-_080A3950: .4byte gMain
-
-	thumb_func_start sub_080A3954
-sub_080A3954: @ 0x080A3954
-	ldr r2, _080A397C @ =gMenu
-	ldr r1, [r2, #0xc]
-	ldrb r0, [r1]
-	movs r3, #0
-	strb r0, [r2, #5]
-	strb r3, [r2, #6]
-	ldrh r0, [r1, #6]
-	strh r0, [r2, #0x10]
-	ldrh r0, [r1, #4]
-	strh r0, [r2, #8]
-	ldrh r0, [r1, #8]
-	strh r0, [r2, #0x12]
-	ldrh r0, [r1, #0xa]
-	strh r0, [r2, #0x14]
-	ldrb r0, [r1, #1]
-	strb r0, [r2, #0x19]
-	adds r1, #0xc
-	str r1, [r2, #0xc]
-	bx lr
-	.align 2, 0
-_080A397C: .4byte gMenu
-
-	thumb_func_start sub_080A3980
-sub_080A3980: @ 0x080A3980
-	push {lr}
-	ldr r0, _080A3990 @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A398E
-	bl DoSoftReset
-_080A398E:
-	pop {pc}
-	.align 2, 0
-_080A3990: .4byte gFadeControl
-
-	thumb_func_start sub_080A3994
-sub_080A3994: @ 0x080A3994
-	push {r4, r5, lr}
-	ldr r0, _080A39AC @ =gMenu
-	ldrb r1, [r0, #6]
-	adds r2, r0, #0
-	cmp r1, #4
-	bls _080A39A2
-	b _080A3B14
-_080A39A2:
-	lsls r0, r1, #2
-	ldr r1, _080A39B0 @ =_080A39B4
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080A39AC: .4byte gMenu
-_080A39B0: .4byte _080A39B4
-_080A39B4: @ jump table
-	.4byte _080A39C8 @ case 0
-	.4byte _080A3A38 @ case 1
-	.4byte _080A3AB8 @ case 2
-	.4byte _080A3AEE @ case 3
-	.4byte _080A3B14 @ case 4
-_080A39C8:
-	movs r5, #1
-	strb r5, [r2, #6]
-	movs r4, #0
-	movs r0, #0x1e
-	strh r0, [r2, #8]
-	strb r4, [r2, #3]
-	movs r0, #1
-	bl DispReset
-	bl InitSoundPlayingInfo
-	bl sub_080A4D34
-	movs r0, #0xa
-	bl LoadPaletteGroup
-	movs r0, #0
-	movs r1, #0
-	bl SetColor
-	movs r0, #4
-	bl LoadGfxGroup
-	movs r0, #0xc0
-	lsls r0, r0, #0x13
-	movs r1, #0x20
-	bl MemClear
-	movs r0, #0
-	movs r1, #0
-	bl SetPopupState
-	ldr r2, _080A3A2C @ =gScreen
-	ldrh r0, [r2]
-	movs r3, #0xc0
-	lsls r3, r3, #3
-	adds r1, r3, #0
-	orrs r0, r1
-	strh r0, [r2]
-	ldr r0, _080A3A30 @ =0x00001C01
-	strh r0, [r2, #0x14]
-	ldr r0, _080A3A34 @ =0x00001D05
-	strh r0, [r2, #0x20]
-	strh r5, [r2, #0x26]
-	movs r0, #4
-	movs r1, #8
-	bl SetFade
-	b _080A3B36
-	.align 2, 0
-_080A3A2C: .4byte gScreen
-_080A3A30: .4byte 0x00001C01
-_080A3A34: .4byte 0x00001D05
-_080A3A38:
-	ldr r0, _080A3A50 @ =gFadeControl
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _080A3A42
-	b _080A3B36
-_080A3A42:
-	ldrh r0, [r2, #8]
-	cmp r0, #0
-	beq _080A3A54
-	subs r0, #1
-	strh r0, [r2, #8]
-	b _080A3B36
-	.align 2, 0
-_080A3A50: .4byte gFadeControl
-_080A3A54:
-	ldrb r4, [r2, #3]
-	ldr r0, _080A3A68 @ =gInput
-	ldrh r0, [r0, #2]
-	cmp r0, #0x40
-	beq _080A3A72
-	cmp r0, #0x40
-	bgt _080A3A6C
-	cmp r0, #1
-	beq _080A3A7A
-	b _080A3A9A
-	.align 2, 0
-_080A3A68: .4byte gInput
-_080A3A6C:
-	cmp r0, #0x80
-	beq _080A3A76
-	b _080A3A9A
-_080A3A72:
-	movs r4, #0
-	b _080A3A9A
-_080A3A76:
-	movs r4, #1
-	b _080A3A9A
-_080A3A7A:
-	cmp r4, #0
-	beq _080A3A82
-	movs r0, #4
-	b _080A3A8C
-_080A3A82:
-	movs r0, #8
-	movs r1, #0
-	bl CreateDialogBox
-	movs r0, #2
-_080A3A8C:
-	ldr r1, _080A3AB4 @ =gMenu
-	strb r0, [r1, #6]
-	movs r0, #0x3c
-	strh r0, [r1, #8]
-	movs r0, #0x6a
-	bl SoundReq
-_080A3A9A:
-	ldr r1, _080A3AB4 @ =gMenu
-	ldrb r0, [r1, #3]
-	cmp r0, r4
-	beq _080A3B36
-	strb r4, [r1, #3]
-	movs r0, #0
-	adds r1, r4, #0
-	bl SetPopupState
-	movs r0, #0x69
-	bl SoundReq
-	b _080A3B36
-	.align 2, 0
-_080A3AB4: .4byte gMenu
-_080A3AB8:
-	movs r0, #0
-	bl HandleSave
-	adds r1, r0, #0
-	ldr r4, _080A3AD8 @ =gMenu
-	strb r1, [r4]
-	movs r0, #1
-	rsbs r0, r0, #0
-	cmp r1, r0
-	beq _080A3ADC
-	cmp r1, #1
-	bne _080A3B36
-	movs r0, #4
-	strb r0, [r4, #6]
-	b _080A3B36
-	.align 2, 0
-_080A3AD8: .4byte gMenu
-_080A3ADC:
-	movs r0, #0x3c
-	strh r0, [r4, #8]
-	movs r0, #9
-	movs r1, #0
-	bl CreateDialogBox
-	movs r0, #3
-	strb r0, [r4, #6]
-	b _080A3B36
-_080A3AEE:
-	adds r1, r2, #0
-	ldrh r0, [r1, #8]
-	cmp r0, #0
-	beq _080A3AFC
-	subs r0, #1
-	strh r0, [r1, #8]
-	b _080A3B36
-_080A3AFC:
-	ldr r0, _080A3B10 @ =gInput
-	ldrh r1, [r0, #2]
-	movs r0, #0xb
-	ands r0, r1
-	cmp r0, #0
-	beq _080A3B36
-	movs r0, #1
-	strb r0, [r2, #6]
-	b _080A3B36
-	.align 2, 0
-_080A3B10: .4byte gInput
-_080A3B14:
-	ldr r2, _080A3B38 @ =gScreen
-	ldrh r1, [r2]
-	ldr r0, _080A3B3C @ =0x0000FDFF
-	ands r0, r1
-	movs r4, #0
-	strh r0, [r2]
-	bl sub_08050384
-	movs r0, #7
-	movs r1, #8
-	bl SetFade
-	ldr r1, _080A3B40 @ =gMain
-	movs r0, #3
-	strb r0, [r1, #3]
-	ldr r0, _080A3B44 @ =gMenu
-	strb r4, [r0, #6]
-_080A3B36:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A3B38: .4byte gScreen
-_080A3B3C: .4byte 0x0000FDFF
-_080A3B40: .4byte gMain
-_080A3B44: .4byte gMenu
-
-	thumb_func_start sub_080A3B48
-sub_080A3B48: @ 0x080A3B48
-	push {lr}
-	movs r1, #0
-	ldr r0, _080A3B6C @ =gSave
-	ldr r3, _080A3B70 @ =0x0000012B
-	adds r2, r0, r3
-	ldrb r0, [r2]
-	cmp r0, #0
-	beq _080A3B66
-_080A3B58:
-	adds r1, #1
-	cmp r1, #0x12
-	bhi _080A3B66
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _080A3B58
-_080A3B66:
-	adds r0, r1, #0
-	pop {pc}
-	.align 2, 0
-_080A3B6C: .4byte gSave
-_080A3B70: .4byte 0x0000012B
-
-	thumb_func_start sub_080A3B74
-sub_080A3B74: @ 0x080A3B74
-	ldr r0, _080A3B80 @ =gMenu
-	adds r0, #0x2f
-	movs r1, #0
-	strb r1, [r0]
-	bx lr
-	.align 2, 0
-_080A3B80: .4byte gMenu

data/const/enemy/acroBandits.s

@@ -1,55 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-AcroBandit_Functions:: @ 080CE56C
-	.4byte AcroBandit_OnTick
-	.4byte AcroBandit_OnCollision
-	.4byte AcroBandit_OnKnockback
-	.4byte GenericDeath
-	.4byte GenericConfused
-	.4byte AcroBandit_OnGrabbed
-
-gUnk_080CE584:: @ 080CE584
-	.4byte sub_08031A88
-	.4byte sub_08031E90
-
-gUnk_080CE58C:: @ 080CE58C
-	.4byte sub_08031AA0
-	.4byte sub_08031AC8
-	.4byte sub_08031B48
-	.4byte sub_08031B98
-	.4byte sub_08031C1C
-	.4byte sub_08031C58
-	.4byte sub_08031D70
-	.4byte sub_08031DA0
-	.4byte sub_08031DC4
-
-gUnk_080CE5B0:: @ 080CE5B0
-	.incbin "acroBandits/gUnk_080CE5B0.bin"
-
-gUnk_080CE5B8:: @ 080CE5B8
-	.incbin "acroBandits/gUnk_080CE5B8.bin"
-
-gUnk_080CE5C0:: @ 080CE5C0
-	.incbin "acroBandits/gUnk_080CE5C0.bin"
-
-gUnk_080CE5C8:: @ 080CE5C8
-	.4byte sub_08031EA8
-	.4byte sub_08031EE8
-	.4byte sub_08031F54
-	.4byte sub_08031FB0
-	.4byte sub_08032008
-	.4byte sub_08032148
-	.4byte sub_08032160
-	.4byte sub_080321E8
-	.4byte sub_08032204
-	.4byte sub_08032248
-
-gUnk_080CE5F0:: @ 080CE5F0
-	.incbin "acroBandits/gUnk_080CE5F0.bin"
-
-gUnk_080CE5FA:: @ 080CE5FA
-	.incbin "acroBandits/gUnk_080CE5FA.bin"

data/const/enemy/flyingPot.s

@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-
-gUnk_080CF244:: @ 080CF244
-	.4byte sub_0803708C
-	.4byte sub_080370A4
-	.4byte GenericKnockback
-	.4byte GenericDeath
-	.4byte GenericConfused
-	.4byte sub_0803712C
-
-gUnk_080CF25C:: @ 080CF25C
-	.4byte sub_08037220
-	.4byte sub_08037280
-	.4byte sub_080372E8
-	.4byte sub_0803737C
-	.4byte sub_080373B0
-	.4byte sub_080373C8
-	.4byte sub_080373E0
-
-gUnk_080CF278:: @ 080CF278
-	.4byte sub_08037144
-	.4byte sub_0803715C
-	.4byte sub_0803718C
-	.4byte sub_080371F8
-	.4byte nullsub_161
-	.4byte sub_08037218
-
-gUnk_080CF290:: @ 080CF290
-	.incbin "flyingPot/gUnk_080CF290.bin"

data/const/object/bird.s

@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123EC0:: @ 08123EC0
-	.4byte sub_0809CF3C
-	.4byte sub_0809D030
-	.4byte sub_0809D0F4
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D1F0
-	.4byte sub_0809D498
-	.4byte sub_0809D66C
-
-gUnk_08123EEC:: @ 08123EEC
-	.4byte sub_0809CF54
-	.4byte sub_0809CFEC
-
-gUnk_08123EF4:: @ 08123EF4
-	.4byte sub_0809D048
-	.4byte sub_0809D06C
-
-gUnk_08123EFC:: @ 08123EFC
-	.4byte sub_0809D084
-	.4byte sub_0809D0AC
-
-gUnk_08123F04:: @ 08123F04
-	.4byte sub_0809D10C
-	.4byte sub_0809D130

data/const/object/mazaalBossObject.s

@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123D28:: @ 08123D28
-	.4byte sub_0809AB04
-	.4byte sub_0809ABA4
-	.4byte sub_0809ABB0
-	.4byte sub_0809ABD4
-	.4byte sub_0809ABF4
-	.4byte sub_0809AC3C
-	.4byte sub_0809ACA0
-	.4byte sub_0809ACCC
-	.4byte sub_0809ACE8

data/const/object/minecart.s

@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081223A8:: @ 081223A8
-	.4byte sub_080916EC
-	.4byte sub_080917DC
-	.4byte sub_080918A4
-	.4byte sub_080919AC
-	.4byte sub_08091C0C
-	.4byte sub_08091C98
-	.4byte sub_08091CC8
-	.4byte sub_08091D90
-
-gUnk_081223C8:: @ 081223C8
-	.incbin "minecart/gUnk_081223C8.bin"
-
-gUnk_081223D0:: @ 081223D0
-	.incbin "minecart/gUnk_081223D0.bin"

data/const/object/object96.s

@@ -1,83 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123FB0:: @ 08123FB0
-	.4byte sub_0809D91C
-	.4byte sub_0809D93C
-	.4byte 0x30300000
-	.4byte 0x133c3c01
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x10636300
-	.4byte 00000000
-	.4byte 0x00001800
-	.4byte 0x00180000
-.ifdef JP
-	.4byte 0x000000CD
-.else
-.ifdef DEMO_JP
-	.4byte 0x000000CD
-.else
-.ifdef EU
-	.4byte 0x000000CD  @ TODO deduplicate
-.else
-	.4byte 0x000000d0
-.endif
-.endif
-.endif
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x0f3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x023c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400140
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x0d3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x1a3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400100
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x133c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-
-	.incbin "object96/gUnk_08123FB0.bin"
-
-gUnk_081240B0:: @ 081240B0
-	.4byte sub_0809D7A8
-	.4byte sub_0809D824
-	.4byte sub_0809D860
-	.4byte sub_0809D8C8
-

data/const/object/object98.s

@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812418C:: @ 0812418C
-	.4byte sub_0809E360
-	.4byte sub_0809E3E4

data/const/object/objectA6.s

@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124800:: @ 08124800
-	.4byte sub_0809F920
-	.4byte sub_0809F964

data/const/object/objectA9.s

@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124850:: @ 08124850
-	.4byte sub_0809FEF8
-	.4byte sub_0809FF28
-	.4byte DeleteEntity
-
-gUnk_0812485C:: @ 0812485C
-	.incbin "objectA9/gUnk_0812485C.bin"
-
-gUnk_08124860:: @ 08124860
-	.incbin "objectA9/gUnk_08124860.bin"

data/const/object/objectAB.s

@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812486C:: @ 0812486C
-	.4byte sub_080A00F8
-	.4byte sub_080A012C
-	.4byte sub_080A0158

data/const/object/objectAD.s

@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081248BC:: @ 081248BC
-	.4byte sub_080A04A4
-	.4byte sub_080A04E0

data/const/object/objectB4.s

@@ -1,17 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124B10:: @ 08124B10
-	.incbin "objectB4/gUnk_08124B10.bin"
-
-gUnk_08124B20:: @ 08124B20
-	.4byte sub_080A0BA8
-	.4byte sub_080A0CE8
-	.4byte sub_080A0D70
-	.4byte sub_080A0E08
-
-gUnk_08124B30:: @ 08124B30
-	.incbin "objectB4/gUnk_08124B30.bin"

data/const/object/objectB9.s

@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124C20:: @ 08124C20
-	.incbin "objectB9/gUnk_08124C20.bin"
-
-gUnk_08124C48:: @ 08124C48
-	.incbin "objectB9/gUnk_08124C48.bin"
-
-gUnk_08124EA0:: @ 08124EA0
-	.incbin "objectB9/gUnk_08124EA0.bin"
-
-gUnk_08124EC8:: @ 08124EC8
-	.incbin "objectB9/gUnk_08124EC8.bin"
-
-gUnk_08124ECC:: @ 08124ECC
-	.incbin "objectB9/gUnk_08124ECC.bin"
-

data/const/object/objectBlockingStairs.s

@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812283C:: @ 0812283C
-	.4byte sub_08092EEC
-	.4byte sub_08092F68
-	.4byte sub_080930F4
-	.4byte sub_08093178
-	.4byte nullsub_120
-
-gUnk_08122850:: @ 08122850
-	.incbin "objectBlockingStairs/gUnk_08122850.bin"
-
-gUnk_08122862:: @ 08122862
-	.incbin "objectBlockingStairs/gUnk_08122862.bin"
-
-gUnk_08122874:: @ 08122874
-	.incbin "objectBlockingStairs/gUnk_08122874.bin"
-
-gUnk_08122886:: @ 08122886
-	.incbin "objectBlockingStairs/gUnk_08122886.bin"
-
-gUnk_08122898:: @ 08122898
-	.incbin "objectBlockingStairs/gUnk_08122898.bin"

data/const/object/picoBloom.s

@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123568:: @ 08123568
-	.4byte sub_08098A90
-	.4byte sub_08098AD0
-	.4byte sub_08098AE8
-
-gUnk_08123574:: @ 08123574
-	.incbin "picoBloom/gUnk_08123574.bin"

data/data_08108E6C.s

@@ -390,7 +390,7 @@ gUnk_081091F8:: @ 081091F8
 gUnk_08109202:: @ 08109202
 	.incbin "data_08108E6C/gUnk_08109202.bin"
 
-gUnk_08109214:: @ 08109214
+gTranslations:: @ 08109214
 	.4byte translation
 	.4byte translation
 	.4byte translation

data/data_0811E750.s

@@ -4,30 +4,10 @@
 	.section .rodata
 	.align 2
 
-gUnk_0811E768:: @ 0811E768
-	.4byte sub_0807FC64
-	.4byte sub_0807FC7C
-	.4byte sub_0807FDB0
-	.4byte 00000000
-	.4byte sub_0807FEF0
-	.4byte sub_0807FF54
 
-gUnk_0811E780:: @ 0811E780
-	.4byte sub_0807FDC8
-	.4byte sub_0807FDE4
-	.4byte sub_0807FDF8
 
-gUnk_0811E78C:: @ 0811E78C
-	.4byte sub_0807FF08
-	.4byte sub_0807FF1C
 
-gUnk_0811E794:: @ 0811E794
-	.4byte sub_0807FF6C
-	.4byte sub_0807FFE4
-	.4byte sub_08080040
-	.4byte sub_08080108
-	.4byte sub_08080198
-	.4byte sub_080801BC
+
 
 gUnk_0811E7AC:: @ 0811E7AC
 	.4byte sub_08080794

data/data_08127280.s

@@ -4,23 +4,7 @@
 	.section .rodata
     .align 2
 
-gUnk_08127280:: @ 08127280
-	.incbin "data_08127280/gUnk_08127280.bin"
-
-gUnk_08127298:: @ 08127298
-	.incbin "data_08127280/gUnk_08127298.bin"
-
-gUnk_081272B0:: @ 081272B0
-	.incbin "data_08127280/gUnk_081272B0.bin"
-
-gUnk_081272C8:: @ 081272C8
-	.incbin "data_08127280/gUnk_081272C8.bin"
-
-gUnk_081272E0:: @ 081272E0
-	.4byte gUnk_08127280
-	.4byte gUnk_08127298
-	.4byte gUnk_081272B0
-	.4byte gUnk_081272C8
+@ staffroll rodata
 
 gUnk_081272F0:: @ 081272F0
 	.incbin "data_08127280/gUnk_081272F0.bin"
@@ -35,20 +19,23 @@ gUnk_08127CEC:: @ 08127CEC
 	.incbin "data_08127280/gUnk_08127CEC.bin"
 
 gUnk_08127D00:: @ 08127D00
-	.4byte sub_080A3608
-	.4byte sub_080A36C0
-	.4byte sub_080A3994
-	.4byte sub_080A3980
+	.4byte StaffrollTask_State0
+	.4byte StaffrollTask_State1
+	.4byte StaffrollTask_State2
+	.4byte StaffrollTask_State3
 
 gUnk_08127D10:: @ 08127D10
-	.4byte sub_080A36DC
-	.4byte sub_080A36F8
-	.4byte sub_080A3768
-	.4byte sub_080A3864
-	.4byte sub_080A3888
-	.4byte sub_080A38B4
-	.4byte sub_080A38D0
-	.4byte sub_080A3930
+	.4byte StaffrollTask_State1MenuType0
+	.4byte StaffrollTask_State1MenuType1
+	.4byte StaffrollTask_State1MenuType2
+	.4byte StaffrollTask_State1MenuType3
+	.4byte StaffrollTask_State1MenuType4
+	.4byte StaffrollTask_State1MenuType5
+	.4byte StaffrollTask_State1MenuType6
+	.4byte StaffrollTask_State1MenuType7
+
+@ End of staffroll
+
 
 gAreaMetadata:: @ 08127D30
 .ifdef EU

data/map/metatile_headers.s

@@ -265,10 +265,10 @@ gAreaMetatiles_RoyalCrypt:: @ 08102E74
 	metatile_types_top offset_gAreaMetatiles_RoyalCrypt_3, 0xD84, 1, 1
 
 gAreaMetatiles_PalaceOfWinds:: @ 08102EA4
-	metatiles_bottom offset_gAreaMetatiles_PalaceOfWinds_0, 0x3620, 1
-	metatiles_top offset_gAreaMetatiles_PalaceOfWinds_1, 0x3620, 1
-	metatile_types_bottom offset_gAreaMetatiles_PalaceOfWinds_2, 0xD88, 1
-	metatile_types_top offset_gAreaMetatiles_PalaceOfWinds_3, 0xD88, 1, 1
+	metatiles_bottom offset_gAreaMetatiles_PalaceOfWinds_GyorgTornado, 0x3620, 1
+	metatiles_top offset_gAreaMetatiles_PalaceOfWinds_BossKey, 0x3620, 1
+	metatile_types_bottom offset_gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers, 0xD88, 1
+	metatile_types_top offset_gAreaMetatiles_PalaceOfWinds_GyorgBossDoor, 0xD88, 1, 1
 
 gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
 	metatiles_top offset_gAreaMetatiles_PalaceOfWindsBoss_0, 0x108, 1
@@ -293,10 +293,10 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
 	metatile_types_top offset_gAreaMetatiles_SanctuaryEntrance_3, 0x3FC, 1, 1
 
 gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
-	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_0, 0x3FD8, 1
-	metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_1, 0x37C0, 1
-	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_2, 0xFF6, 1
-	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3, 0xDF0, 1, 1
+	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_1FEntrance, 0x3FD8, 1
+	metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower, 0x37C0, 1
+	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_3FTopRightTower, 0xFF6, 1
+	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower, 0xDF0, 1, 1
 
 gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
 	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_0, 0x3340, 1

data/map/room_headers.s

@@ -119,7 +119,7 @@ gAreaRoomHeaders_MelarisMine:: @ 0811C6F6
 	room_header 0x00, 0x00, 0x2d0, 0x270, 0
 	.2byte 0xFFFF
 
-gAreaRoomHeaders_MinishPaths1:: @ 0811C702
+gAreaRoomHeaders_MinishPaths:: @ 0811C702
 	room_header 0x02, 0x04, 0xf0, 0x320, 0
 	room_header 0x16, 0x04, 0xf0, 0x320, 1
 	room_header 0x2a, 0x04, 0xf0, 0x320, 2
@@ -1040,7 +1040,7 @@ gAreaRoomHeaders:: @ 0811E214
 	.4byte gAreaRoomHeaders_Empty                   @ 0xE
 	.4byte gAreaRoomHeaders_HyruleDigCaves          @ 0xF
 	.4byte gAreaRoomHeaders_MelarisMine             @ 0x10
-	.4byte gAreaRoomHeaders_MinishPaths1            @ 0x11
+	.4byte gAreaRoomHeaders_MinishPaths            @ 0x11
 	.4byte gAreaRoomHeaders_CrenelMinishPaths       @ 0x12
 	.4byte gAreaRoomHeaders_DigCaves1               @ 0x13
 	.4byte gAreaRoomHeaders_CrenelDigCave           @ 0x14

data/map/tileset_headers.s

@@ -311,25 +311,25 @@ gAreaTileset_MelarisMine_0:: @ 08101430
 gAreaTilesets_MelarisMine:: @ 08101460
 	.4byte gAreaTileset_MelarisMine_0
 
-gAreaTileset_MinishPaths1_0:: @ 08101464
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_1, 0x6004000, 0x4000, 1
+gAreaTileset_MinishPaths_0:: @ 08101464
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 18, 1
 
-gAreaTileset_MinishPaths1_1:: @ 08101488
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_1, 0x6004000, 0x4000, 1
+gAreaTileset_MinishPaths_1:: @ 08101488
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 63, 1
 
-gAreaTileset_MinishPaths1_2:: @ 081014AC
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths1_2_1, 0x6004000, 0x4000, 1
+gAreaTileset_MinishPaths_2:: @ 081014AC
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 64, 1
 
-gAreaTilesets_MinishPaths1:: @ 081014D0
-	.4byte gAreaTileset_MinishPaths1_0
-	.4byte gAreaTileset_MinishPaths1_1
-	.4byte gAreaTileset_MinishPaths1_2
+gAreaTilesets_MinishPaths:: @ 081014D0
+	.4byte gAreaTileset_MinishPaths_0
+	.4byte gAreaTileset_MinishPaths_1
+	.4byte gAreaTileset_MinishPaths_2
 
 gAreaTileset_CrenelMinishPaths_0:: @ 081014DC
 	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_0_0, 0x6000000, 0x4000, 1
@@ -857,15 +857,15 @@ gAreaTileset_RoyalCrypt_0:: @ 081020E0
 gAreaTilesets_RoyalCrypt:: @ 08102110
 	.4byte gAreaTileset_RoyalCrypt_0
 
-gAreaTileset_PalaceOfWinds_0:: @ 08102114
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_3, 0x600F000, 0x800, 1
+gAreaTileset_PalaceOfWinds_GyorgTornado:: @ 08102114
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_3, 0x600F000, 0x800, 1
 	tileset_palette_set 56, 1
 
 gAreaTilesets_PalaceOfWinds:: @ 08102150
-	.4byte gAreaTileset_PalaceOfWinds_0
+	.4byte gAreaTileset_PalaceOfWinds_GyorgTornado
 
 gAreaTileset_PalaceOfWindsBoss_0:: @ 08102154
 	tileset_tiles offset_gAreaTileset_PalaceOfWindsBoss_0_0, 0x6000000, 0x4000, 1
@@ -903,14 +903,14 @@ gAreaTileset_SanctuaryEntrance_0:: @ 081021F0
 gAreaTilesets_SanctuaryEntrance:: @ 08102220
 	.4byte gAreaTileset_SanctuaryEntrance_0
 
-gAreaTileset_DarkHyruleCastle_0:: @ 08102224
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_2, 0x6008000, 0x4000, 1
+gAreaTileset_DarkHyruleCastle_1FEntrance:: @ 08102224
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 59, 1
 
 gAreaTilesets_DarkHyruleCastle:: @ 08102254
-	.4byte gAreaTileset_DarkHyruleCastle_0
+	.4byte gAreaTileset_DarkHyruleCastle_1FEntrance
 
 gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258
 	tileset_tiles offset_gAreaTileset_DarkHyruleCastleOutside_0_0, 0x6000000, 0x4000, 1
@@ -1021,7 +1021,7 @@ gAreaTilesets:: @ 0810246C
 	.4byte gAreaTilesets_MinishWoods             @ 0xE
 	.4byte gAreaTilesets_HyruleDigCaves          @ 0xF
 	.4byte gAreaTilesets_MelarisMine             @ 0x10
-	.4byte gAreaTilesets_MinishPaths1            @ 0x11
+	.4byte gAreaTilesets_MinishPaths            @ 0x11
 	.4byte gAreaTilesets_CrenelMinishPaths       @ 0x12
 	.4byte gAreaTilesets_DigCaves1               @ 0x13
 	.4byte gAreaTilesets_CrenelDigCave           @ 0x14

data/scripts/hyruleTown/script_Anju.inc

@@ -19,7 +19,7 @@ script_0801015A:
 	Call sub_080A1608
 	WaitUntilTextboxCloses
 	EnablePlayerControl
-	CallWithArg sub_080A1550, script_080101AC
+	CallWithArg CuccoMinigame_Init, script_080101AC
 	JumpIfNot script_0801015A
 	PlayBgm BGM_CUCCO_MINIGAME
 	SetRoomFlag 0x0001
@@ -49,7 +49,7 @@ script_080101AC:
 	Call sub_0807FB74
 	_0807E8E4_1
 	Call SetPlayerCollisionLayer1
-	Call sub_080A1388
+	Call CuccoMinigame_Cleanup
 	Call sub_0806EC38
 	BeginBlock
 	MoveEntityToPlayer

include/area.h

@@ -2,6 +2,7 @@
 #define AREA_H
 
 #include "global.h"
+#include "transitions.h"
 
 #define MAX_ROOMS 64
 
@@ -14,7 +15,7 @@ typedef struct {
     void* map;
     void* metatiles;
     void* bg_anim;
-    void* exits;
+    const Transition* exits;
     void** properties;
 } RoomResInfo;
 static_assert(sizeof(RoomResInfo) == 0x20);
@@ -93,9 +94,9 @@ typedef enum {
     AREA_EMPTY,
     AREA_HYRULE_DIG_CAVES,
     AREA_MELARIS_MINE,
-    AREA_MINISH_PATHS_1,
+    AREA_MINISH_PATHS,
     AREA_CRENEL_MINISH_PATHS,
-    AREA_DIG_CAVES_1,
+    AREA_DIG_CAVES,
     AREA_CRENEL_DIG_CAVE,
     AREA_FESTIVAL_TOWN,
     AREA_VEIL_FALLS_DIG_CAVE,
@@ -220,6 +221,15 @@ typedef enum {
     AREA_DARK_HYRULE_CASTLE_BRIDGE,
     AREA_NULL_8E,
     AREA_8F,
+    AREA_90,
+    AREA_91,
+    AREA_92,
+    AREA_93,
+    AREA_94,
+    AREA_95,
+    AREA_96,
+    AREA_97,
+    AREA_98,
 } AreaID;
 
 #endif

include/collision.h

@@ -0,0 +1,33 @@
+
+#ifndef COLLISION_H
+#define COLLISION_H
+
+#include "global.h"
+#include "entity.h"
+
+/** Collisions. */
+typedef enum {
+    COL_NONE = 0x0,
+    COL_NORTH_WEST = 0x2,
+    COL_NORTH_EAST = 0x4,
+    COL_NORTH_FULL = 0x6,
+    COL_NORTH_ANY = 0xe,
+    COL_SOUTH_WEST = 0x20,
+    COL_SOUTH_EAST = 0x40,
+    COL_SOUTH_FULL = 0x60,
+    COL_SOUTH_ANY = 0xe0,
+    COL_WEST_SOUTH = 0x200,
+    COL_WEST_NORTH = 0x400,
+    COL_WEST_FULL = 0x600,
+    COL_WEST_ANY = 0xe00,
+    COL_EAST_SOUTH = 0x2000,
+    COL_EAST_NORTH = 0x4000,
+    COL_EAST_FULL = 0x6000,
+    COL_EAST_ANY = 0xe000,
+} Collisions;
+
+bool32 IsTileCollision(const u8*, s32, s32, u32);
+void CalculateEntityTileCollisions(Entity*, u32, u32);
+bool32 ProcessMovementInternal(Entity*, s32, s32, u32);
+
+#endif

include/fileselect.h

@@ -23,21 +23,16 @@ static_assert(sizeof(ChooseFileState) == 0x30);
 // TODO: This occupies the same memory region as gMenu
 extern ChooseFileState gChooseFileState;
 
-typedef struct {
-    u8 filler0[0x1];
-    u8 unk1;
-    u8 charColor;
-    u8 bgColor;
-    u16 unk4;
-    u16 unk6;
-    u8* unk8;
-} struct_02036540;
-
-typedef struct {
-    u8 filler0[0x10];
-    u16 unk10;
-    u8 filler12[0x6];
-} struct_080FC844;
+// typedef struct {
+//     u8 unk00 : 4;
+//     u8 unk04 : 4;
+//     u8 unk1;
+//     u8 charColor;
+//     u8 bgColor;
+//     u16 unk4;
+//     u16 unk6;
+//     u8* unk8;
+// } struct_02036540;
 
 extern struct_020227E8 gUnk_020227E8[];
 
@@ -57,18 +52,19 @@ extern struct_02019EE0 gMapDataBottomSpecial;
 // TODO size: 0x8000 from ClearTilemaps?
 
 extern void sub_08056FEC(u32, struct_020227E8*);
-extern void sub_0805F46C(u32, void*);
+extern u32 sub_0805F46C(u32, Font*);
 extern void RecoverUI(u32 bottomPt, u32 topPt);
 extern void ClearTilemaps(void);
 extern void sub_0805194C(u32);
-extern struct_02036540* sub_0805F2C8(void);
-extern void sub_0805F7DC(u32, struct_02036540*);
-extern void sub_0805F300(struct_02036540*);
+extern WStruct* sub_0805F2C8(void);
+extern u32 sub_0805F7DC(u32, WStruct*);
+extern void sub_0805F300(WStruct*);
 extern void sub_08050A64(u32);
 extern void sub_08050AFC(u32);
 extern void sub_08050384();
+extern void CreateDialogBox(u32, u32);
 
-extern const struct_080FC844 gUnk_080FC844;
+extern const Font gUnk_080FC844;
 extern const u16 gUnk_080FC85C[][3];
 extern void (*const gUnk_080FC908[])(void);
 extern const u8 gGlobalGfxAndPalettes[];

include/functions.h

@@ -52,7 +52,7 @@ extern void LoadResources(void);
 extern bool32 LoadSwapGFX(Entity*, u16, u32);
 extern void MenuFadeIn(u32, u32);
 extern void ModBombs(s32);
-extern u32 PlayerInRange(Entity*, u32, u32);
+extern bool32 PlayerInRange(Entity*, u32, s32);
 extern bool32 ProcessMovement1(Entity*);
 extern bool32 ProcessMovement12(Entity*);
 extern bool32 ProcessMovement2(Entity*);
@@ -130,15 +130,16 @@ extern void sub_0803C0AC(Entity*);
 extern void sub_08049CF4(Entity*);
 extern Entity* sub_08049DF4(u32);
 extern u32 sub_08049EE4(Entity*);
-extern u32 sub_08049F1C(Entity*, Entity*, u32);
-extern u32 sub_08049F84(Entity*, u32);
-extern u32 sub_08049FA0(Entity*);
-extern u32 sub_08049FDC(Entity*, u32);
+extern bool32 sub_08049F1C(Entity*, Entity*, s32);
+extern bool32 sub_08049F84(Entity*, s32);
+extern bool32 sub_08049FA0(Entity*);
+extern bool32 sub_08049FDC(Entity*, u32);
 extern u32 sub_0804A024(Entity*, u32, u32);
 extern u32 sub_0804A044(Entity*, Entity*, u32);
+extern void sub_0804A4E4(Entity*, Entity*);
 extern void sub_0804A720(Entity*);
 extern void sub_0804AA1C(Entity*);
-extern void sub_0804C128();
+extern void sub_0804C128(void);
 extern u32 sub_080542AC(u32);
 extern void sub_08054564();
 extern void sub_08054570(void);
@@ -163,7 +164,7 @@ extern void sub_08060158(Entity*);
 extern void sub_0806D02C(Entity*);
 extern void sub_0806D0B0(Entity*);
 extern void sub_0806F4E8(Entity*);
-extern u32 sub_0806F520();
+extern bool32 sub_0806F520(Entity*);
 extern u32 sub_0806F5B0(u32);
 extern u32 sub_0806F824(Entity*, Entity*, s32, s32);
 extern u32 sub_0806F948(Entity*);
@@ -214,7 +215,7 @@ extern u32 sub_08079B24(void);
 extern void sub_08079BD8(Entity*);
 extern u32 sub_08079D48();
 extern void sub_08079D84(void);
-extern u32 sub_08079F8C(void);
+extern bool32 sub_08079F8C(void);
 extern u32 sub_08079FC4(u32);
 extern void sub_0807A050(void);
 extern void sub_0807A5B8(u32);

include/manager.h

@@ -141,7 +141,7 @@ typedef struct {
     DiggingCaveEntrance* unk_00;
     u16 unk_04;
     u16 unk_06;
-    u8 unk_08;
+    u8 isDiggingCave;
     u8 unk_09;
     u8 unk_0a;
     u8 unk_0b;

include/message.h

@@ -17,7 +17,7 @@ typedef struct {
     u16 textIndex;
     u16 unk2; // HI?
     u32 field_0xc;
-    u32 field_0x10;
+    u32 rupees;
     u32 field_0x14;
     u32 field_0x18;
     u32 field_0x1c;
@@ -25,14 +25,17 @@ typedef struct {
 extern Message gMessage;
 
 typedef struct {
-    u8 flags;
+    u8 unk00 : 1;
+    u8 unk01 : 4;
+    u8 unk05 : 2;
+    u8 unk06 : 1;
     u8 code;      // first byte read
     u16 param;    // second byte read
     u16 extended; // ascii adjusted for jp chars
     u16 _6;
     u16 textIndex;
     void* _c;
-    u8 buf[32];
+    const u8* buf[8];
 } Token;
 
 typedef struct {

include/object.h

@@ -20,7 +20,7 @@ extern void sub_080787B4(Entity*);
 extern void sub_0808C650(Entity*, u32);
 extern u32 sub_0808C67C(void);
 extern void sub_0808C688(void);
-extern void sub_080A2BE4(Entity*, u32);
+extern void sub_080A2BE4(Entity*, bool32);
 
 void CreateDust(Entity* parent);
 void CreateDustAt(s32, s32, u32);
@@ -215,7 +215,7 @@ typedef enum {
     OBJECT_B6,
     WELL,
     WIND_TRIBE_TELEPORTER,
-    OBJECT_B9,
+    CUCCO_MINIGAME,
     GYORG_BOSS_OBJECT,
     WINDCREST,
     LIT_AREA,

include/projectile/winder.h

@@ -0,0 +1,12 @@
+#ifndef PROJECTILE_WINDER_H
+#define PROJECTILE_WINDER_H
+#include "enemy.h"
+
+#define WINDER_NUM_SEGMENTS 8
+
+typedef struct {
+    Entity base;
+    s16 positions[2 * WINDER_NUM_SEGMENTS];
+} WinderEntity;
+
+#endif

include/room.h

@@ -83,6 +83,16 @@ typedef struct {
 static_assert(sizeof(RoomVars) == 0xCC);
 extern RoomVars gRoomVars;
 
+typedef struct {
+    u8 area;
+    u8 room;
+    u16 unk_02;
+    u32 unk_04;
+} RoomMemory;
+
+extern RoomMemory* gUnk_020354B0;
+extern RoomMemory gRoomMemory[];
+
 // Packets used to store which entities to load in a room
 typedef struct {
     u8 kind;
@@ -96,10 +106,10 @@ typedef struct {
 } EntityData;
 
 typedef struct {
-    u16 field_0x0;
+    u16 tilePos;
     u16 field_0x2;
-    u8 field_0x4;
-    u8 field_0x5;
+    u8 room;
+    u8 animationState;
     u8 field_0x6;
     u8 field_0x7;
 } struct_030010EC;

include/roomid.h

@@ -0,0 +1,993 @@
+#ifndef TMC_ROOMID_H
+#define TMC_ROOMID_H
+
+typedef enum {
+    // AREA_MINISH_WOODS
+    ROOM_MINISH_WOODS_MAIN = 0,
+    // AREA_MINISH_VILLAGE
+    ROOM_MINISH_VILLAGE_MAIN = 0,
+    ROOM_MINISH_VILLAGE_SIDE_HOUSE_AREA,
+    ROOM_MINISH_VILLAGE_2,
+    ROOM_MINISH_VILLAGE_3,
+    // AREA_HYRULE_TOWN
+    ROOM_HYRULE_TOWN_MAIN = 0,
+    // AREA_HYRULE_FIELD
+    ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH = 0,
+    ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD,
+    ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH,
+    ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER,
+    ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH,
+    ROOM_HYRULE_FIELD_LON_LON_RANCH,
+    ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD,
+    ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS,
+    ROOM_HYRULE_FIELD_WESTERN_WOODS_NORTH,
+    ROOM_HYRULE_FIELD_WESTERN_WOODS_CENTER,
+    // AREA_CASTOR_WILDS
+    ROOM_CASTOR_WILDS_MAIN = 0,
+    // AREA_RUINS
+    ROOM_RUINS_ENTRANCE = 0,
+    ROOM_RUINS_BEANSTALK,
+    ROOM_RUINS_TEKTITES,
+    ROOM_RUINS_LADDER_TO_TEKTITES,
+    ROOM_RUINS_FORTRESS_ENTRANCE,
+    ROOM_RUINS_BELOW_FORTRESS_ENTRANCE,
+    // AREA_MT_CRENEL
+    ROOM_MT_CRENEL_TOP = 0,
+    ROOM_MT_CRENEL_WALL_CLIMB,
+    ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE,
+    ROOM_MT_CRENEL_CENTER,
+    ROOM_MT_CRENEL_ENTRANCE,
+    // AREA_CASTLE_GARDEN
+    ROOM_CASTLE_GARDEN_MAIN = 0,
+    // AREA_CLOUD_TOPS
+    ROOM_CLOUD_TOPS_CLOUD_TOPS = 0,
+    ROOM_CLOUD_TOPS_CLOUD_MIDDLES,
+    ROOM_CLOUD_TOPS_CLOUD_BOTTOMS,
+    // AREA_ROYAL_VALLEY
+    ROOM_ROYAL_VALLEY_MAIN = 0,
+    ROOM_ROYAL_VALLEY_FOREST_MAZE,
+    // AREA_VEIL_FALLS
+    ROOM_VEIL_FALLS_MAIN = 0,
+    // AREA_LAKE_HYLIA
+    ROOM_LAKE_HYLIA_MAIN = 0,
+    ROOM_LAKE_HYLIA_BEANSTALK,
+    // AREA_LAKE_WOODS_CAVE
+    ROOM_LAKE_WOODS_CAVE_MAIN = 0,
+    // AREA_BEANSTALKS
+    ROOM_BEANSTALKS_CRENEL = 0,
+    ROOM_BEANSTALKS_LAKE_HYLIA,
+    ROOM_BEANSTALKS_RUINS,
+    ROOM_BEANSTALKS_EASTERN_HILLS,
+    ROOM_BEANSTALKS_WESTERN_WOODS,
+    ROOM_BEANSTALKS_5,
+    ROOM_BEANSTALKS_6,
+    ROOM_BEANSTALKS_7,
+    ROOM_BEANSTALKS_8,
+    ROOM_BEANSTALKS_9,
+    ROOM_BEANSTALKS_a,
+    ROOM_BEANSTALKS_b,
+    ROOM_BEANSTALKS_c,
+    ROOM_BEANSTALKS_d,
+    ROOM_BEANSTALKS_e,
+    ROOM_BEANSTALKS_f,
+    ROOM_BEANSTALKS_CRENEL_CLIMB,
+    ROOM_BEANSTALKS_LAKE_HYLIA_CLIMB,
+    ROOM_BEANSTALKS_RUINS_CLIMB,
+    ROOM_BEANSTALKS_EASTERN_HILLS_CLIMB,
+    ROOM_BEANSTALKS_WESTERN_WOODS_CLIMB,
+    // AREA_EMPTY
+    ROOM_EMPTY_0 = 0,
+    // AREA_HYRULE_DIG_CAVES
+    ROOM_HYRULE_DIG_CAVES_TOWN = 0,
+    // AREA_MELARIS_MINE
+    ROOM_MELARIS_MINE_MAIN = 0,
+    // AREA_MINISH_PATHS
+    ROOM_MINISH_PATHS_MINISH_VILLAGE = 0,
+    ROOM_MINISH_PATHS_BOW,
+    ROOM_MINISH_PATHS_SCHOOLYARD,
+    ROOM_MINISH_PATHS_LON_LON_RANCH,
+    ROOM_MINISH_PATHS_LAKE_HYLIA,
+    // AREA_CRENEL_MINISH_PATHS
+    ROOM_CRENEL_MINISH_PATHS_BEAN = 0,
+    ROOM_CRENEL_MINISH_PATHS_SPRING_WATER,
+    ROOM_CRENEL_MINISH_PATHS_RAIN,
+    ROOM_CRENEL_MINISH_PATHS_MELARI,
+    // AREA_DIG_CAVES
+    ROOM_DIG_CAVES_EASTERN_HILLS = 0,
+    ROOM_DIG_CAVES_1,
+    ROOM_DIG_CAVES_2,
+    ROOM_DIG_CAVES_TRILBY_HIGHLANDS,
+    // AREA_CRENEL_DIG_CAVE
+    ROOM_CRENEL_DIG_CAVE_0 = 0,
+    // AREA_FESTIVAL_TOWN
+    ROOM_FESTIVAL_TOWN_MAIN = 0,
+    // AREA_VEIL_FALLS_DIG_CAVE
+    ROOM_VEIL_FALLS_DIG_CAVE_0 = 0,
+    // AREA_CASTOR_WILDS_DIG_CAVE
+    ROOM_CASTOR_WILDS_DIG_CAVE_0 = 0,
+    // AREA_OUTER_FORTRESS_OF_WINDS
+    ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL = 0,
+    ROOM_OUTER_FORTRESS_OF_WINDS_2F,
+    ROOM_OUTER_FORTRESS_OF_WINDS_3F,
+    ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS,
+    ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY,
+    // AREA_HYLIA_DIG_CAVES
+    ROOM_HYLIA_DIG_CAVES_0 = 0,
+    ROOM_HYLIA_DIG_CAVES_1,
+    // AREA_VEIL_FALLS_TOP
+    ROOM_VEIL_FALLS_TOP_0 = 0,
+    // AREA_NULL_1B
+    ROOM_NULL_1B_0 = 0,
+    // AREA_NULL_1C
+    ROOM_NULL_1C_0 = 0,
+    // AREA_NULL_1D
+    ROOM_NULL_1D_0 = 0,
+    // AREA_NULL_1E
+    ROOM_NULL_1E_0 = 0,
+    // AREA_NULL_1F
+    ROOM_NULL_1F_0 = 0,
+    // AREA_MINISH_HOUSE_INTERIORS
+    ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN = 0,
+    ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT,
+    ROOM_MINISH_HOUSE_INTERIORS_FESTARI,
+    ROOM_MINISH_HOUSE_INTERIORS_RED,
+    ROOM_MINISH_HOUSE_INTERIORS_GREEN,
+    ROOM_MINISH_HOUSE_INTERIORS_BLUE,
+    ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA,
+    ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_NULL1,
+    ROOM_MINISH_HOUSE_INTERIORS_NULL2,
+    ROOM_MINISH_HOUSE_INTERIORS_c,
+    ROOM_MINISH_HOUSE_INTERIORS_d,
+    ROOM_MINISH_HOUSE_INTERIORS_e,
+    ROOM_MINISH_HOUSE_INTERIORS_f,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST,
+    ROOM_MINISH_HOUSE_INTERIORS_13,
+    ROOM_MINISH_HOUSE_INTERIORS_14,
+    ROOM_MINISH_HOUSE_INTERIORS_15,
+    ROOM_MINISH_HOUSE_INTERIORS_16,
+    ROOM_MINISH_HOUSE_INTERIORS_17,
+    ROOM_MINISH_HOUSE_INTERIORS_18,
+    ROOM_MINISH_HOUSE_INTERIORS_19,
+    ROOM_MINISH_HOUSE_INTERIORS_1a,
+    ROOM_MINISH_HOUSE_INTERIORS_1b,
+    ROOM_MINISH_HOUSE_INTERIORS_1c,
+    ROOM_MINISH_HOUSE_INTERIORS_1d,
+    ROOM_MINISH_HOUSE_INTERIORS_1e,
+    ROOM_MINISH_HOUSE_INTERIORS_1f,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST,
+    ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD,
+    ROOM_MINISH_HOUSE_INTERIORS_NEXT_TO_KNUCKLE,
+    ROOM_MINISH_HOUSE_INTERIORS_LIBRARI,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN,
+    ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB,
+    ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA,
+    // AREA_HOUSE_INTERIORS_1
+    ROOM_HOUSE_INTERIORS_1_MAYOR = 0,
+    ROOM_HOUSE_INTERIORS_1_POST_OFFICE,
+    ROOM_HOUSE_INTERIORS_1_LIBRARY_2F,
+    ROOM_HOUSE_INTERIORS_1_LIBRARY_1F,
+    ROOM_HOUSE_INTERIORS_1_INN_1F,
+    ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_WEST_2F,
+    ROOM_HOUSE_INTERIORS_1_INN_EAST_2F,
+    ROOM_HOUSE_INTERIORS_1_INN_MINISH_HEART_PIECE,
+    ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST,
+    ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST,
+    ROOM_HOUSE_INTERIORS_1_d,
+    ROOM_HOUSE_INTERIORS_1_e,
+    ROOM_HOUSE_INTERIORS_1_f,
+    ROOM_HOUSE_INTERIORS_1_10,
+    ROOM_HOUSE_INTERIORS_1_11,
+    ROOM_HOUSE_INTERIORS_1_12,
+    ROOM_HOUSE_INTERIORS_1_13,
+    ROOM_HOUSE_INTERIORS_1_14,
+    ROOM_HOUSE_INTERIORS_1_15,
+    ROOM_HOUSE_INTERIORS_1_16,
+    ROOM_HOUSE_INTERIORS_1_17,
+    ROOM_HOUSE_INTERIORS_1_18,
+    ROOM_HOUSE_INTERIORS_1_19,
+    ROOM_HOUSE_INTERIORS_1_1a,
+    ROOM_HOUSE_INTERIORS_1_1b,
+    ROOM_HOUSE_INTERIORS_1_1c,
+    ROOM_HOUSE_INTERIORS_1_1d,
+    ROOM_HOUSE_INTERIORS_1_1e,
+    ROOM_HOUSE_INTERIORS_1_1f,
+    // AREA_HOUSE_INTERIORS_2
+    ROOM_HOUSE_INTERIORS_2_STRANGER = 0,
+    ROOM_HOUSE_INTERIORS_2_WEST_ORACLE,
+    ROOM_HOUSE_INTERIORS_2_2,
+    ROOM_HOUSE_INTERIORS_2_3,
+    ROOM_HOUSE_INTERIORS_2_DR_LEFT,
+    ROOM_HOUSE_INTERIORS_2_5,
+    ROOM_HOUSE_INTERIORS_2_ROMIO,
+    ROOM_HOUSE_INTERIORS_2_JULIETTA,
+    ROOM_HOUSE_INTERIORS_2_PERCY,
+    ROOM_HOUSE_INTERIORS_2_EAST_ORACLE,
+    ROOM_HOUSE_INTERIORS_2_a,
+    ROOM_HOUSE_INTERIORS_2_b,
+    ROOM_HOUSE_INTERIORS_2_CUCCO,
+    ROOM_HOUSE_INTERIORS_2_d,
+    ROOM_HOUSE_INTERIORS_2_e,
+    ROOM_HOUSE_INTERIORS_2_f,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_SMITH,
+    ROOM_HOUSE_INTERIORS_2_DAMPE,
+    ROOM_HOUSE_INTERIORS_2_13,
+    ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM,
+    ROOM_HOUSE_INTERIORS_2_16,
+    ROOM_HOUSE_INTERIORS_2_17,
+    ROOM_HOUSE_INTERIORS_2_18,
+    ROOM_HOUSE_INTERIORS_2_19,
+    ROOM_HOUSE_INTERIORS_2_1a,
+    ROOM_HOUSE_INTERIORS_2_1b,
+    ROOM_HOUSE_INTERIORS_2_1c,
+    ROOM_HOUSE_INTERIORS_2_1d,
+    ROOM_HOUSE_INTERIORS_2_1e,
+    ROOM_HOUSE_INTERIORS_2_1f,
+    ROOM_HOUSE_INTERIORS_2_20,
+    ROOM_HOUSE_INTERIORS_2_21,
+    ROOM_HOUSE_INTERIORS_2_22,
+    ROOM_HOUSE_INTERIORS_2_23,
+    ROOM_HOUSE_INTERIORS_2_24,
+    ROOM_HOUSE_INTERIORS_2_25,
+    ROOM_HOUSE_INTERIORS_2_26,
+    ROOM_HOUSE_INTERIORS_2_27,
+    ROOM_HOUSE_INTERIORS_2_28,
+    ROOM_HOUSE_INTERIORS_2_29,
+    ROOM_HOUSE_INTERIORS_2_2a,
+    ROOM_HOUSE_INTERIORS_2_2b,
+    ROOM_HOUSE_INTERIORS_2_2c,
+    ROOM_HOUSE_INTERIORS_2_2d,
+    ROOM_HOUSE_INTERIORS_2_2e,
+    ROOM_HOUSE_INTERIORS_2_2f,
+    // AREA_HOUSE_INTERIORS_3
+    ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP = 0,
+    ROOM_HOUSE_INTERIORS_3_CAFE,
+    ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP,
+    ROOM_HOUSE_INTERIORS_3_BAKERY,
+    ROOM_HOUSE_INTERIORS_3_SIMON,
+    ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE,
+    ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE,
+    ROOM_HOUSE_INTERIORS_3_CARLOV,
+    ROOM_HOUSE_INTERIORS_3_BORLOV,
+    ROOM_HOUSE_INTERIORS_3_9,
+    ROOM_HOUSE_INTERIORS_3_a,
+    ROOM_HOUSE_INTERIORS_3_b,
+    ROOM_HOUSE_INTERIORS_3_c,
+    ROOM_HOUSE_INTERIORS_3_d,
+    ROOM_HOUSE_INTERIORS_3_e,
+    ROOM_HOUSE_INTERIORS_3_f,
+    // AREA_TREE_INTERIORS
+    ROOM_TREE_INTERIORS_WITCH_HUT = 0,
+    ROOM_TREE_INTERIORS_1,
+    ROOM_TREE_INTERIORS_2,
+    ROOM_TREE_INTERIORS_3,
+    ROOM_TREE_INTERIORS_4,
+    ROOM_TREE_INTERIORS_5,
+    ROOM_TREE_INTERIORS_6,
+    ROOM_TREE_INTERIORS_7,
+    ROOM_TREE_INTERIORS_8,
+    ROOM_TREE_INTERIORS_9,
+    ROOM_TREE_INTERIORS_a,
+    ROOM_TREE_INTERIORS_b,
+    ROOM_TREE_INTERIORS_c,
+    ROOM_TREE_INTERIORS_d,
+    ROOM_TREE_INTERIORS_e,
+    ROOM_TREE_INTERIORS_f,
+    ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV,
+    ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE,
+    ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE,
+    ROOM_TREE_INTERIORS_WAVEBLADE,
+    ROOM_TREE_INTERIORS_14,
+    ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST,
+    ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST,
+    ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST,
+    ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST,
+    ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE,
+    ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
+    ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY,
+    ROOM_TREE_INTERIORS_1c,
+    ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB,
+    ROOM_TREE_INTERIORS_1e,
+    ROOM_TREE_INTERIORS_UNUSED_HEART_CONTAINER,
+    // AREA_DOJOS
+    ROOM_DOJOS_GRAYBLADE = 0,
+    ROOM_DOJOS_SPLITBLADE,
+    ROOM_DOJOS_GREATBLADE,
+    ROOM_DOJOS_SCARBLADE,
+    ROOM_DOJOS_SWIFTBLADE_I,
+    ROOM_DOJOS_GRIMBLADE,
+    ROOM_DOJOS_WAVEBLADE,
+    ROOM_DOJOS_7,
+    ROOM_DOJOS_8,
+    ROOM_DOJOS_9,
+    ROOM_DOJOS_TO_GRIMBLADE,
+    ROOM_DOJOS_TO_SPLITBLADE,
+    ROOM_DOJOS_TO_GREATBLADE,
+    ROOM_DOJOS_TO_SCARBLADE,
+    ROOM_DOJOS_e,
+    ROOM_DOJOS_f,
+    // AREA_CRENEL_CAVES
+    ROOM_CRENEL_CAVES_BLOCK_PUSHING = 0,
+    ROOM_CRENEL_CAVES_PILLAR_CAVE,
+    ROOM_CRENEL_CAVES_BRIDGE_SWITCH,
+    ROOM_CRENEL_CAVES_EXIT_TO_MINES,
+    ROOM_CRENEL_CAVES_GRIP_RING,
+    ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN,
+    ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE,
+    ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST,
+    ROOM_CRENEL_CAVES_WATER_HEART_PIECE,
+    ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN,
+    ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY,
+    ROOM_CRENEL_CAVES_MUSHROOM_KEESE,
+    ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER,
+    ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB,
+    ROOM_CRENEL_CAVES_HERMIT,
+    ROOM_CRENEL_CAVES_HINT_SCRUB,
+    ROOM_CRENEL_CAVES_TO_GRAYBLADE,
+    // AREA_MINISH_CRACKS
+    ROOM_MINISH_CRACKS_LON_LON_RANCH_NORTH = 0,
+    ROOM_MINISH_CRACKS_LAKE_HYLIA_EAST,
+    ROOM_MINISH_CRACKS_HYRULE_CASTLE_GARDEN,
+    ROOM_MINISH_CRACKS_MT_CRENEL,
+    ROOM_MINISH_CRACKS_EAST_HYRULE_CASTLE,
+    ROOM_MINISH_CRACKS_5,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_BOW,
+    ROOM_MINISH_CRACKS_RUINS_ENTRANCE,
+    ROOM_MINISH_CRACKS_MINISH_WOODS_SOUTH,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_NORTH,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_WEST,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_MIDDLE,
+    ROOM_MINISH_CRACKS_RUINS_TEKTITE,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_NEXT_TO_BOW,
+    ROOM_MINISH_CRACKS_e,
+    ROOM_MINISH_CRACKS_f,
+    ROOM_MINISH_CRACKS_10,
+    ROOM_MINISH_CRACKS_11,
+    ROOM_MINISH_CRACKS_12,
+    ROOM_MINISH_CRACKS_13,
+    ROOM_MINISH_CRACKS_14,
+    ROOM_MINISH_CRACKS_15,
+    ROOM_MINISH_CRACKS_16,
+    ROOM_MINISH_CRACKS_17,
+    // AREA_HOUSE_INTERIORS_4
+    ROOM_HOUSE_INTERIORS_4_CARPENTER = 0,
+    ROOM_HOUSE_INTERIORS_4_SWIFTBLADE,
+    ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST,
+    ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST,
+    ROOM_HOUSE_INTERIORS_4_FARM_HOUSE,
+    ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN,
+    ROOM_HOUSE_INTERIORS_4_6,
+    ROOM_HOUSE_INTERIORS_4_7,
+    ROOM_HOUSE_INTERIORS_4_8,
+    ROOM_HOUSE_INTERIORS_4_9,
+    ROOM_HOUSE_INTERIORS_4_a,
+    ROOM_HOUSE_INTERIORS_4_b,
+    ROOM_HOUSE_INTERIORS_4_c,
+    ROOM_HOUSE_INTERIORS_4_d,
+    ROOM_HOUSE_INTERIORS_4_e,
+    ROOM_HOUSE_INTERIORS_4_f,
+    // AREA_GREAT_FAIRIES
+    ROOM_GREAT_FAIRIES_GRAVEYARD = 0,
+    ROOM_GREAT_FAIRIES_MINISH_WOODS,
+    ROOM_GREAT_FAIRIES_CRENEL,
+    ROOM_GREAT_FAIRIES_NOT_IMPLEMENTED,
+    // AREA_CASTOR_CAVES
+    ROOM_CASTOR_CAVES_SOUTH = 0,
+    ROOM_CASTOR_CAVES_NORTH,
+    ROOM_CASTOR_CAVES_WIND_RUINS,
+    ROOM_CASTOR_CAVES_DARKNUT,
+    ROOM_CASTOR_CAVES_HEART_PIECE,
+    ROOM_CASTOR_CAVES_5,
+    ROOM_CASTOR_CAVES_6,
+    ROOM_CASTOR_CAVES_7,
+    // AREA_CASTOR_DARKNUT
+    ROOM_CASTOR_DARKNUT_MAIN = 0,
+    ROOM_CASTOR_DARKNUT_HALL,
+    // AREA_ARMOS_INTERIORS
+    ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_NORTH = 0,
+    ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_SOUTH,
+    ROOM_ARMOS_INTERIORS_RUINS_LEFT,
+    ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_LEFT,
+    ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_RIGHT,
+    ROOM_ARMOS_INTERIORS_RUINS_RIGHT,
+    ROOM_ARMOS_INTERIORS_6,
+    ROOM_ARMOS_INTERIORS_RUINS_GRASS_PATH,
+    ROOM_ARMOS_INTERIORS_8,
+    ROOM_ARMOS_INTERIORS_FORTRESS_LEFT,
+    ROOM_ARMOS_INTERIORS_FORTRESS_RIGHT,
+    // AREA_TOWN_MINISH_HOLES
+    ROOM_TOWN_MINISH_HOLES_MAYORS_HOUSE = 0,
+    ROOM_TOWN_MINISH_HOLES_WEST_ORACLE,
+    ROOM_TOWN_MINISH_HOLES_DR_LEFT,
+    ROOM_TOWN_MINISH_HOLES_CARPENTER,
+    ROOM_TOWN_MINISH_HOLES_CAFE,
+    ROOM_TOWN_MINISH_HOLES_5,
+    ROOM_TOWN_MINISH_HOLES_6,
+    ROOM_TOWN_MINISH_HOLES_7,
+    ROOM_TOWN_MINISH_HOLES_8,
+    ROOM_TOWN_MINISH_HOLES_9,
+    ROOM_TOWN_MINISH_HOLES_a,
+    ROOM_TOWN_MINISH_HOLES_b,
+    ROOM_TOWN_MINISH_HOLES_c,
+    ROOM_TOWN_MINISH_HOLES_d,
+    ROOM_TOWN_MINISH_HOLES_e,
+    ROOM_TOWN_MINISH_HOLES_f,
+    ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF,
+    ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE,
+    ROOM_TOWN_MINISH_HOLES_REM_SHOE_SHOP,
+    ROOM_TOWN_MINISH_HOLES_13,
+    // AREA_MINISH_RAFTERS
+    ROOM_MINISH_RAFTERS_CAFE = 0,
+    ROOM_MINISH_RAFTERS_STOCKWELL,
+    ROOM_MINISH_RAFTERS_DR_LEFT,
+    ROOM_MINISH_RAFTERS_BAKERY,
+    // AREA_GORON_CAVE
+    ROOM_GORON_CAVE_STAIRS = 0,
+    ROOM_GORON_CAVE_MAIN,
+    // AREA_WIND_TRIBE_TOWER
+    ROOM_WIND_TRIBE_TOWER_ENTRANCE = 0,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_1,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_2,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_3,
+    // AREA_WIND_TRIBE_TOWER_ROOF
+    ROOM_WIND_TRIBE_TOWER_ROOF_0 = 0,
+    // AREA_CAVES
+    ROOM_CAVES_BOOMERANG = 0,
+    ROOM_CAVES_TO_GRAVEYARD,
+    ROOM_CAVES_2,
+    ROOM_CAVES_3,
+    ROOM_CAVES_4,
+    ROOM_CAVES_5,
+    ROOM_CAVES_6,
+    ROOM_CAVES_TRILBY_KEESE_CHEST,
+    ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN,
+    ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
+    ROOM_CAVES_a,
+    ROOM_CAVES_HYRULE_TOWN_WATERFALL,
+    ROOM_CAVES_LON_LON_RANCH,
+    ROOM_CAVES_LON_LON_RANCH_SECRET,
+    ROOM_CAVES_TRILBY_HIGHLANDS,
+    ROOM_CAVES_LON_LON_RANCH_WALLET,
+    ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE,
+    ROOM_CAVES_TRILBY_RUPEE,
+    ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN,
+    ROOM_CAVES_HILLS_KEESE_CHEST,
+    ROOM_CAVES_BOTTLE_BUSINESS_SCRUB,
+    ROOM_CAVES_HEART_PIECE_HALLWAY,
+    ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
+    ROOM_CAVES_KINSTONE_BUSINESS_SCRUB,
+    // AREA_VEIL_FALLS_CAVES
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_2F = 0,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_1F,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_ROOM,
+    ROOM_VEIL_FALLS_CAVES_ENTRANCE,
+    ROOM_VEIL_FALLS_CAVES_EXIT,
+    ROOM_VEIL_FALLS_CAVES_SECRET_CHEST,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE,
+    ROOM_VEIL_FALLS_CAVES_a,
+    ROOM_VEIL_FALLS_CAVES_b,
+    ROOM_VEIL_FALLS_CAVES_c,
+    ROOM_VEIL_FALLS_CAVES_d,
+    ROOM_VEIL_FALLS_CAVES_e,
+    ROOM_VEIL_FALLS_CAVES_f,
+    // AREA_ROYAL_VALLEY_GRAVES
+    ROOM_ROYAL_VALLEY_GRAVES_HEART_PIECE = 0,
+    ROOM_ROYAL_VALLEY_GRAVES_GINA,
+    // AREA_MINISH_CAVES
+    ROOM_MINISH_CAVES_BEAN_PESTO = 0,
+    ROOM_MINISH_CAVES_SOUTHEAST_WATER_1,
+    ROOM_MINISH_CAVES_2,
+    ROOM_MINISH_CAVES_RUINS,
+    ROOM_MINISH_CAVES_OUTSIDE_LINKS_HOUSE,
+    ROOM_MINISH_CAVES_MINISH_WOODS_NORTH_1,
+    ROOM_MINISH_CAVES_6,
+    ROOM_MINISH_CAVES_LAKE_HYLIA_NORTH,
+    ROOM_MINISH_CAVES_LAKE_HYLIA_LIBRARI,
+    ROOM_MINISH_CAVES_MINISH_WOODS_SOUTHWEST,
+    // AREA_CASTLE_GARDEN_MINISH_HOLES
+    ROOM_CASTLE_GARDEN_MINISH_HOLES_0 = 0,
+    ROOM_CASTLE_GARDEN_MINISH_HOLES_1,
+    // AREA_37
+    ROOM_37_0 = 0,
+    ROOM_37_1,
+    // AREA_EZLO_CUTSCENE
+    ROOM_EZLO_CUTSCENE_0 = 0,
+    // AREA_NULL_39
+    ROOM_NULL_39_0 = 0,
+    // AREA_NULL_3A
+    ROOM_NULL_3A_0 = 0,
+    // AREA_NULL_3B
+    ROOM_NULL_3B_0 = 0,
+    // AREA_NULL_3C
+    ROOM_NULL_3C_0 = 0,
+    // AREA_NULL_3D
+    ROOM_NULL_3D_0 = 0,
+    // AREA_NULL_3E
+    ROOM_NULL_3E_0 = 0,
+    // AREA_NULL_3F
+    ROOM_NULL_3F_0 = 0,
+    // AREA_40
+    ROOM_40_0 = 0,
+    // AREA_HYRULE_TOWN_UNDERGROUND
+    ROOM_HYRULE_TOWN_UNDERGROUND_0 = 0,
+    ROOM_HYRULE_TOWN_UNDERGROUND_1,
+    // AREA_GARDEN_FOUNTAINS
+    ROOM_GARDEN_FOUNTAINS_EAST = 0,
+    ROOM_GARDEN_FOUNTAINS_WEST,
+    // AREA_HYRULE_CASTLE_CELLAR
+    ROOM_HYRULE_CASTLE_CELLAR_0 = 0,
+    ROOM_HYRULE_CASTLE_CELLAR_1,
+    // AREA_SIMONS_SIMULATION
+    ROOM_SIMONS_SIMULATION_0 = 0,
+    // AREA_45
+    ROOM_45_0 = 0,
+    // AREA_NULL_46
+    ROOM_NULL_46_0 = 0,
+    // AREA_47
+    ROOM_47_0 = 0,
+    // AREA_DEEPWOOD_SHRINE
+    ROOM_DEEPWOOD_SHRINE_MADDERPILLAR = 0,
+    ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL,
+    ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1,
+    ROOM_DEEPWOOD_SHRINE_POT_BRIDGE,
+    ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE,
+    ROOM_DEEPWOOD_SHRINE_MAP,
+    ROOM_DEEPWOOD_SHRINE_BARREL,
+    ROOM_DEEPWOOD_SHRINE_BUTTON,
+    ROOM_DEEPWOOD_SHRINE_MULLDOZER,
+    ROOM_DEEPWOOD_SHRINE_PILLARS,
+    ROOM_DEEPWOOD_SHRINE_LEVER,
+    ROOM_DEEPWOOD_SHRINE_ENTRANCE,
+    ROOM_DEEPWOOD_SHRINE_c,
+    ROOM_DEEPWOOD_SHRINE_d,
+    ROOM_DEEPWOOD_SHRINE_e,
+    ROOM_DEEPWOOD_SHRINE_f,
+    ROOM_DEEPWOOD_SHRINE_TORCHES,
+    ROOM_DEEPWOOD_SHRINE_BOSS_KEY,
+    ROOM_DEEPWOOD_SHRINE_COMPASS,
+    ROOM_DEEPWOOD_SHRINE_13,
+    ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST,
+    ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST,
+    ROOM_DEEPWOOD_SHRINE_16,
+    ROOM_DEEPWOOD_SHRINE_BOSS_DOOR,
+    ROOM_DEEPWOOD_SHRINE_18,
+    ROOM_DEEPWOOD_SHRINE_19,
+    ROOM_DEEPWOOD_SHRINE_1a,
+    ROOM_DEEPWOOD_SHRINE_1b,
+    ROOM_DEEPWOOD_SHRINE_1c,
+    ROOM_DEEPWOOD_SHRINE_1d,
+    ROOM_DEEPWOOD_SHRINE_1e,
+    ROOM_DEEPWOOD_SHRINE_1f,
+    ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL,
+    // AREA_DEEPWOOD_SHRINE_BOSS
+    ROOM_DEEPWOOD_SHRINE_BOSS_MAIN = 0,
+    // AREA_DEEPWOOD_SHRINE_ENTRY
+    ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN = 0,
+    // AREA_NULL_4B
+    ROOM_NULL_4B_0 = 0,
+    // AREA_NULL_4C
+    ROOM_NULL_4C_0 = 0,
+    // AREA_4D
+    ROOM_4D_0 = 0,
+    // AREA_NULL_4E
+    ROOM_NULL_4E_0 = 0,
+    // AREA_NULL_4F
+    ROOM_NULL_4F_0 = 0,
+    // AREA_CAVE_OF_FLAMES
+    ROOM_CAVE_OF_FLAMES_AFTER_CANE = 0,
+    ROOM_CAVE_OF_FLAMES_SPINY_CHU,
+    ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU,
+    ROOM_CAVE_OF_FLAMES_ENTRANCE,
+    ROOM_CAVE_OF_FLAMES_MAIN_CART,
+    ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE,
+    ROOM_CAVE_OF_FLAMES_CART_WEST,
+    ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT,
+    ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM,
+    ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM,
+    ROOM_CAVE_OF_FLAMES_a,
+    ROOM_CAVE_OF_FLAMES_b,
+    ROOM_CAVE_OF_FLAMES_c,
+    ROOM_CAVE_OF_FLAMES_d,
+    ROOM_CAVE_OF_FLAMES_e,
+    ROOM_CAVE_OF_FLAMES_f,
+    ROOM_CAVE_OF_FLAMES_MINISH_SPIKES,
+    ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM,
+    ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK,
+    ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1,
+    ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2,
+    ROOM_CAVE_OF_FLAMES_COMPASS,
+    ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL,
+    ROOM_CAVE_OF_FLAMES_BOSS_DOOR,
+    ROOM_CAVE_OF_FLAMES_18,
+    ROOM_CAVE_OF_FLAMES_19,
+    ROOM_CAVE_OF_FLAMES_1a,
+    ROOM_CAVE_OF_FLAMES_1b,
+    ROOM_CAVE_OF_FLAMES_1c,
+    ROOM_CAVE_OF_FLAMES_1d,
+    ROOM_CAVE_OF_FLAMES_1e,
+    ROOM_CAVE_OF_FLAMES_1f,
+    ROOM_CAVE_OF_FLAMES_20,
+    // AREA_CAVE_OF_FLAMES_BOSS
+    ROOM_CAVE_OF_FLAMES_BOSS_0 = 0,
+    // AREA_NULL_52
+    ROOM_NULL_52_0 = 0,
+    // AREA_NULL_53
+    ROOM_NULL_53_0 = 0,
+    // AREA_NULL_54
+    ROOM_NULL_54_0 = 0,
+    // AREA_NULL_55
+    ROOM_NULL_55_0 = 0,
+    // AREA_NULL_56
+    ROOM_NULL_56_0 = 0,
+    // AREA_57
+    ROOM_57_0 = 0,
+    // AREA_FORTRESS_OF_WINDS
+    ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE = 0,
+    ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL,
+    ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER,
+    ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS,
+    ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER,
+    ROOM_FORTRESS_OF_WINDS_5,
+    ROOM_FORTRESS_OF_WINDS_6,
+    ROOM_FORTRESS_OF_WINDS_7,
+    ROOM_FORTRESS_OF_WINDS_8,
+    ROOM_FORTRESS_OF_WINDS_9,
+    ROOM_FORTRESS_OF_WINDS_a,
+    ROOM_FORTRESS_OF_WINDS_b,
+    ROOM_FORTRESS_OF_WINDS_c,
+    ROOM_FORTRESS_OF_WINDS_d,
+    ROOM_FORTRESS_OF_WINDS_e,
+    ROOM_FORTRESS_OF_WINDS_f,
+    ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM,
+    ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE,
+    ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT,
+    ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL,
+    ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS,
+    ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS,
+    ROOM_FORTRESS_OF_WINDS_MAZAAL,
+    ROOM_FORTRESS_OF_WINDS_STALFOS,
+    ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS,
+    ROOM_FORTRESS_OF_WINDS_MAIN_2F,
+    ROOM_FORTRESS_OF_WINDS_MINISH_HOLE,
+    ROOM_FORTRESS_OF_WINDS_BOSS_KEY,
+    ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F,
+    ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F,
+    ROOM_FORTRESS_OF_WINDS_1e,
+    ROOM_FORTRESS_OF_WINDS_1f,
+    ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_WIZZROBE,
+    ROOM_FORTRESS_OF_WINDS_HEART_PIECE,
+    ROOM_FORTRESS_OF_WINDS_25,
+    ROOM_FORTRESS_OF_WINDS_26,
+    ROOM_FORTRESS_OF_WINDS_27,
+    // AREA_FORTRESS_OF_WINDS_TOP
+    ROOM_FORTRESS_OF_WINDS_TOP_MAIN = 0,
+    // AREA_INNER_MAZAAL
+    ROOM_INNER_MAZAAL_MAIN = 0,
+    ROOM_INNER_MAZAAL_PHASE_1,
+    // AREA_NULL_5B
+    ROOM_NULL_5B_0 = 0,
+    // AREA_NULL_5C
+    ROOM_NULL_5C_0 = 0,
+    // AREA_NULL_5D
+    ROOM_NULL_5D_0 = 0,
+    // AREA_NULL_5E
+    ROOM_NULL_5E_0 = 0,
+    // AREA_5F
+    ROOM_5F_0 = 0,
+    // AREA_TEMPLE_OF_DROPLETS
+    ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE = 0,
+    ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM,
+    ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE,
+    ROOM_TEMPLE_OF_DROPLETS_ENTRANCE,
+    ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS,
+    ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS,
+    ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST,
+    ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST,
+    ROOM_TEMPLE_OF_DROPLETS_ELEMENT,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE,
+    ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST,
+    ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST,
+    ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO,
+    ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_12,
+    ROOM_TEMPLE_OF_DROPLETS_13,
+    ROOM_TEMPLE_OF_DROPLETS_14,
+    ROOM_TEMPLE_OF_DROPLETS_15,
+    ROOM_TEMPLE_OF_DROPLETS_16,
+    ROOM_TEMPLE_OF_DROPLETS_17,
+    ROOM_TEMPLE_OF_DROPLETS_18,
+    ROOM_TEMPLE_OF_DROPLETS_19,
+    ROOM_TEMPLE_OF_DROPLETS_1a,
+    ROOM_TEMPLE_OF_DROPLETS_1b,
+    ROOM_TEMPLE_OF_DROPLETS_1c,
+    ROOM_TEMPLE_OF_DROPLETS_1d,
+    ROOM_TEMPLE_OF_DROPLETS_1e,
+    ROOM_TEMPLE_OF_DROPLETS_1f,
+    ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE,
+    ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS,
+    ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM,
+    ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS,
+    ROOM_TEMPLE_OF_DROPLETS_29,
+    ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS,
+    ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE,
+    ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER,
+    ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST,
+    ROOM_TEMPLE_OF_DROPLETS_COMPASS,
+    ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR,
+    ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE,
+    ROOM_TEMPLE_OF_DROPLETS_37,
+    ROOM_TEMPLE_OF_DROPLETS_38,
+    ROOM_TEMPLE_OF_DROPLETS_39,
+    ROOM_TEMPLE_OF_DROPLETS_3a,
+    ROOM_TEMPLE_OF_DROPLETS_3b,
+    ROOM_TEMPLE_OF_DROPLETS_3c,
+    ROOM_TEMPLE_OF_DROPLETS_3d,
+    ROOM_TEMPLE_OF_DROPLETS_3e,
+    ROOM_TEMPLE_OF_DROPLETS_3f,
+    // AREA_NULL_61
+    ROOM_NULL_61_0 = 0,
+    // AREA_HYRULE_TOWN_MINISH_CAVES
+    ROOM_HYRULE_TOWN_MINISH_CAVES_0 = 0,
+    // AREA_NULL_63
+    ROOM_NULL_63_0 = 0,
+    // AREA_NULL_64
+    ROOM_NULL_64_0 = 0,
+    // AREA_NULL_65
+    ROOM_NULL_65_0 = 0,
+    // AREA_NULL_66
+    ROOM_NULL_66_0 = 0,
+    // AREA_67
+    ROOM_67_0 = 0,
+    // AREA_ROYAL_CRYPT
+    ROOM_ROYAL_CRYPT_0 = 0,
+    ROOM_ROYAL_CRYPT_WATER_ROPE,
+    ROOM_ROYAL_CRYPT_GIBDO,
+    ROOM_ROYAL_CRYPT_3,
+    ROOM_ROYAL_CRYPT_KEY_BLOCK,
+    ROOM_ROYAL_CRYPT_5,
+    ROOM_ROYAL_CRYPT_6,
+    ROOM_ROYAL_CRYPT_MUSHROOM_PIT,
+    ROOM_ROYAL_CRYPT_ENTRANCE,
+    // AREA_NULL_69
+    ROOM_NULL_69_0 = 0,
+    // AREA_NULL_6A
+    ROOM_NULL_6A_0 = 0,
+    // AREA_NULL_6B
+    ROOM_NULL_6B_0 = 0,
+    // AREA_NULL_6C
+    ROOM_NULL_6C_0 = 0,
+    // AREA_NULL_6D
+    ROOM_NULL_6D_0 = 0,
+    // AREA_NULL_6E
+    ROOM_NULL_6E_0 = 0,
+    // AREA_6F
+    ROOM_6F_0 = 0,
+    // AREA_PALACE_OF_WINDS
+    ROOM_PALACE_OF_WINDS_GYORG_TORNADO = 0,
+    ROOM_PALACE_OF_WINDS_BOSS_KEY,
+    ROOM_PALACE_OF_WINDS_BEFORE_BALL_AND_CHAIN_SOLDIERS,
+    ROOM_PALACE_OF_WINDS_GYORG_BOSS_DOOR,
+    ROOM_PALACE_OF_WINDS_EAST_CHEST_FROM_GYORG_BOSS_DOOR,
+    ROOM_PALACE_OF_WINDS_MOBLIN_AND_WIZZROBE_FIGHT,
+    ROOM_PALACE_OF_WINDS_FOUR_BUTTON_STALFOS,
+    ROOM_PALACE_OF_WINDS_FAN_AND_KEY_TO_BOSS_KEY,
+    ROOM_PALACE_OF_WINDS_BALL_AND_CHAIN_SOLDIERS,
+    ROOM_PALACE_OF_WINDS_BOMBAROSSA_PATH,
+    ROOM_PALACE_OF_WINDS_HOLE_TO_DARKNUT,
+    ROOM_PALACE_OF_WINDS_TO_BOMBAROSSA_PATH,
+    ROOM_PALACE_OF_WINDS_DARKNUT_MINIBOSS,
+    ROOM_PALACE_OF_WINDS_BOMB_WALL_INSIDE,
+    ROOM_PALACE_OF_WINDS_BOMB_WALL_OUTSIDE,
+    ROOM_PALACE_OF_WINDS_CLOUD_JUMPS,
+    ROOM_PALACE_OF_WINDS_BLOCK_MAZE_TO_BOSS_DOOR,
+    ROOM_PALACE_OF_WINDS_CRACKED_FLOOR_LAKITU,
+    ROOM_PALACE_OF_WINDS_HEART_PIECE_BRIDGE,
+    ROOM_PALACE_OF_WINDS_FAN_BRIDGE,
+    ROOM_PALACE_OF_WINDS_TO_FAN_BRIDGE,
+    ROOM_PALACE_OF_WINDS_RED_WARP_HALL,
+    ROOM_PALACE_OF_WINDS_PLATFORM_CLONE_RIDE,
+    ROOM_PALACE_OF_WINDS_PIT_CORNER_AFTER_KEY,
+    ROOM_PALACE_OF_WINDS_PLATFORM_CROW_RIDE,
+    ROOM_PALACE_OF_WINDS_GRATE_PLATFORM_RIDE,
+    ROOM_PALACE_OF_WINDS_POT_PUSH,
+    ROOM_PALACE_OF_WINDS_FLOORMASTER_LEVER,
+    ROOM_PALACE_OF_WINDS_MAP,
+    ROOM_PALACE_OF_WINDS_CORNER_TO_MAP,
+    ROOM_PALACE_OF_WINDS_STAIRS_AFTER_FLOORMASTER,
+    ROOM_PALACE_OF_WINDS_HOLE_TO_KINSTONE_WIZZROBE,
+    ROOM_PALACE_OF_WINDS_KEY_ARROW_BUTTON,
+    ROOM_PALACE_OF_WINDS_GRATES_TO_3F,
+    ROOM_PALACE_OF_WINDS_SPINY_FIGHT,
+    ROOM_PALACE_OF_WINDS_PEAHAT_SWITCH,
+    ROOM_PALACE_OF_WINDS_WHIRLWIND_BOMBAROSSA,
+    ROOM_PALACE_OF_WINDS_DOOR_TO_STALFOS_FIREBAR,
+    ROOM_PALACE_OF_WINDS_STALFOS_FIREBAR_HOLE,
+    ROOM_PALACE_OF_WINDS_SHORTCUT_DOOR_BUTTONS,
+    ROOM_PALACE_OF_WINDS_TO_PEAHAT_SWITCH,
+    ROOM_PALACE_OF_WINDS_KINSTONE_WIZZROBE_FIGHT,
+    ROOM_PALACE_OF_WINDS_GIBDO_STAIRS,
+    ROOM_PALACE_OF_WINDS_SPIKE_BAR_SMALL_KEY,
+    ROOM_PALACE_OF_WINDS_ROC_CAPE,
+    ROOM_PALACE_OF_WINDS_FIRE_BAR_GRATES,
+    ROOM_PALACE_OF_WINDS_PLATFORM_RIDE_BOMBAROSSAS,
+    ROOM_PALACE_OF_WINDS_BRIDGE_AFTER_DARKNUT,
+    ROOM_PALACE_OF_WINDS_BRIDGE_SWITCHES_CLONE_BLOCK,
+    ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM,
+    ROOM_PALACE_OF_WINDS_DARK_COMPASS_HALL,
+    ROOM_PALACE_OF_WINDS_33,
+    // AREA_PALACE_OF_WINDS_BOSS
+    ROOM_PALACE_OF_WINDS_BOSS_0 = 0,
+    // AREA_NULL_72
+    ROOM_NULL_72_0 = 0,
+    // AREA_NULL_73
+    ROOM_NULL_73_0 = 0,
+    // AREA_NULL_74
+    ROOM_NULL_74_0 = 0,
+    // AREA_NULL_75
+    ROOM_NULL_75_0 = 0,
+    // AREA_NULL_76
+    ROOM_NULL_76_0 = 0,
+    // AREA_77
+    ROOM_77_0 = 0,
+    // AREA_SANCTUARY
+    ROOM_SANCTUARY_HALL = 0,
+    ROOM_SANCTUARY_MAIN,
+    ROOM_SANCTUARY_STAINED_GLASS,
+    // AREA_NULL_79
+    ROOM_NULL_79_0 = 0,
+    // AREA_NULL_7A
+    ROOM_NULL_7A_0 = 0,
+    // AREA_NULL_7B
+    ROOM_NULL_7B_0 = 0,
+    // AREA_NULL_7C
+    ROOM_NULL_7C_0 = 0,
+    // AREA_NULL_7D
+    ROOM_NULL_7D_0 = 0,
+    // AREA_NULL_7E
+    ROOM_NULL_7E_0 = 0,
+    // AREA_7F
+    ROOM_7F_0 = 0,
+    // AREA_HYRULE_CASTLE
+    ROOM_HYRULE_CASTLE_0 = 0,
+    ROOM_HYRULE_CASTLE_1,
+    ROOM_HYRULE_CASTLE_2,
+    ROOM_HYRULE_CASTLE_3,
+    ROOM_HYRULE_CASTLE_4,
+    ROOM_HYRULE_CASTLE_5,
+    ROOM_HYRULE_CASTLE_6,
+    ROOM_HYRULE_CASTLE_7,
+    // AREA_SANCTUARY_ENTRANCE
+    ROOM_SANCTUARY_ENTRANCE_MAIN = 0,
+    // AREA_NULL_82
+    ROOM_NULL_82_0 = 0,
+    // AREA_NULL_83
+    ROOM_NULL_83_0 = 0,
+    // AREA_NULL_84
+    ROOM_NULL_84_0 = 0,
+    // AREA_NULL_85
+    ROOM_NULL_85_0 = 0,
+    // AREA_NULL_86
+    ROOM_NULL_86_0 = 0,
+    // AREA_87
+    ROOM_87_0 = 0,
+    // AREA_DARK_HYRULE_CASTLE
+    ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE = 0,
+    ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI,
+    ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY,
+    ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_SPARKS,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS,
+    ROOM_DARK_HYRULE_CASTLE_2F_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_2F_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE,
+    ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI,
+    ROOM_DARK_HYRULE_CASTLE_1b,
+    ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM,
+    ROOM_DARK_HYRULE_CASTLE_1F_COMPASS,
+    ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS,
+    ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL,
+    ROOM_DARK_HYRULE_CASTLE_B1_KEATONS,
+    ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR,
+    ROOM_DARK_HYRULE_CASTLE_B1_CANNONS,
+    ROOM_DARK_HYRULE_CASTLE_B1_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_B1_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_B1_MAP,
+    ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B2_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN,
+    ROOM_DARK_HYRULE_CASTLE_3b,
+    ROOM_DARK_HYRULE_CASTLE_3c,
+    ROOM_DARK_HYRULE_CASTLE_3d,
+    ROOM_DARK_HYRULE_CASTLE_3e,
+    ROOM_DARK_HYRULE_CASTLE_3f,
+    // AREA_DARK_HYRULE_CASTLE_OUTSIDE
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM = 0,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST,
+    // AREA_VAATIS_ARMS
+    ROOM_VAATIS_ARMS_FIRST = 0,
+    ROOM_VAATIS_ARMS_SECOND,
+    // AREA_VAATI_3
+    ROOM_VAATI_3_0 = 0,
+    // AREA_VAATI_2
+    ROOM_VAATI_2_0 = 0,
+    // AREA_DARK_HYRULE_CASTLE_BRIDGE
+    ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN = 0,
+    // AREA_NULL_8E
+    ROOM_NULL_8E_0 = 0,
+    // AREA_8F
+    ROOM_8F_0 = 0,
+} RoomID;
+
+#endif // TMC_ROOMID_H

include/structures.h

@@ -222,15 +222,19 @@ extern struct {
 static_assert(sizeof(gUnk_02034490) == 0x18);
 
 typedef struct {
-    u8 unk0;
+    u8 unk00 : 1;
+    u8 unk01 : 3;
+    u8 unk04 : 4;
     u8 unk1;
-    u8 unk2;
-    u8 unk3;
+    u8 charColor;
+    u8 bgColor;
     u16 unk4;
     u16 unk6;
     void* unk8;
 } WStruct;
 
+static_assert(sizeof(WStruct) == 12);
+
 typedef struct {
     u8 unk0;
     u8 unk1;
@@ -296,4 +300,22 @@ typedef struct {
 
 extern SpritePtr gSpritePtrs[];
 
+typedef struct {
+    u16* dest;
+    void* gfx_dest;
+    void* buffer_loc;
+    u32 _c;
+    u16 gfx_src;
+    u8 width;
+    u8 right_align : 1;
+    u8 sm_border : 1;
+    u8 unused : 1;
+    u8 draw_border : 1;
+    u8 border_type : 4;
+    u8 fill_type;
+    u8 _15;
+    u8 _16;
+    u8 stylized;
+} Font;
+
 #endif

include/transitions.h

@@ -0,0 +1,54 @@
+#ifndef TMC_TRANSITIONS_H
+#define TMC_TRANSITIONS_H
+#include "global.h"
+#include "roomid.h"
+
+typedef enum {
+    WARP_TYPE_BORDER,
+    WARP_TYPE_AREA,
+    WARP_TYPE_END_OF_LIST = -1,
+} WarpType;
+
+typedef enum {
+    TRANSITION_TYPE_NORMAL,
+    TRANSITION_TYPE_INSTANT_MINISH,
+    TRANSITION_TYPE_DROP_IN,
+    TRANSITION_TYPE_INSTANT,
+    TRANSITION_TYPE_STEP_FORWARD,
+    TRANSITION_TYPE_5,
+    TRANSITION_TYPE_DROP_IN_MINISH,
+    TRANSITION_TYPE_STAIR_EXIT,
+    TRANSITION_TYPE_8,
+    TRANSITION_TYPE_9,
+    TRANSITION_TYPE_HOP_IN_FORWARD,
+    TRANSITION_TYPE_HOP_IN,
+    TRANSITION_TYPE_FLY_IN,
+} TransitionType;
+
+typedef struct Transition {
+    WarpType warp_type : 8;
+    u8 subtype;
+    u16 startX;
+    u16 startY;
+    u16 endX;
+    u16 endY;
+    u8 shape;
+    u8 area;
+    RoomID room : 8;
+    u8 height;
+    TransitionType transition_type : 8;
+    u8 facing_direction; // 0-4
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+} Transition;
+
+extern const Transition gExitList_RoyalValley_ForestMaze[];
+extern const Transition gUnk_08134FBC[];
+extern const Transition gUnk_08135048[];
+extern const Transition gUnk_08135190[];
+extern const Transition gUnk_0813A76C[];
+extern const Transition* const* const gExitLists[];
+
+#endif // TMC_TRANSITIONS_H

linker.ld

@@ -381,7 +381,7 @@ SECTIONS {
         src/enemy/mazaalMacro.o(.text);
         src/enemy/mazaalHand.o(.text);
         src/enemy/octorokBoss.o(.text);
-        asm/enemy/flyingPot.o(.text);
+        src/enemy/flyingPot.o(.text);
         src/enemy/gibdo.o(.text);
         src/enemy/octorokGolden.o(.text);
         src/enemy/tektiteGolden.o(.text);
@@ -428,7 +428,7 @@ SECTIONS {
         src/enemy/enemy66.o(.text);
         /* END enemies */
         src/code_08049CD4.o(.text); /* enemyUtils.c */
-        asm/code_08049D30.o(.text);
+        src/code_08049DF4.o(.text);
         src/enemyUtils.o(.text);
         src/createEnemy.o(.text);
         src/enterPortalSubtask.o(.text);
@@ -501,7 +501,6 @@ SECTIONS {
         src/manager/manager39.o(.text);
         src/entity.o(.text);
         src/code_0805EC04.o(.text); /* objaffine? */
-        asm/text.o(.text);
         src/text.o(.text);
         src/debug.o(.text);
         src/playerItem/playerItem14.o(.text);
@@ -711,7 +710,6 @@ SECTIONS {
         src/object/object53.o(.text);
         src/object/pullableLever.o(.text);
         src/object/minecart.o(.text);
-        asm/object/minecart.o(.text);
         src/object/thoughtBubble.o(.text);
         src/object/hiddenLadderDown.o(.text);
         src/object/gentariCurtains.o(.text);
@@ -721,7 +719,7 @@ SECTIONS {
         src/object/mask.o(.text);
         src/object/houseDoorInterior.o(.text);
         src/object/whirlwind.o(.text);
-        asm/object/objectBlockingStairs.o(.text);
+        src/object/objectBlockingStairs.o(.text);
         src/object/swordsmanNewsletter.o(.text);
         src/object/object61.o(.text);
         src/object/giantTwig.o(.text);
@@ -751,7 +749,7 @@ SECTIONS {
         src/object/macroShoes.o(.text);
         src/object/objectOnSpinyBeetle.o(.text);
         src/object/object7E.o(.text);
-        asm/object/picoBloom.o(.text);
+        src/object/picoBloom.o(.text);
         src/object/board.o(.text);
         src/object/object81.o(.text);
         src/object/bigVortex.o(.text);
@@ -761,7 +759,7 @@ SECTIONS {
         src/object/object86.o(.text);
         src/object/octorokBossObject.o(.text);
         src/object/macroBook.o(.text);
-        asm/object/mazaalBossObject.o(.text);
+        src/object/mazaalBossObject.o(.text);
         src/object/cabinFurniture.o(.text);
         src/object/doubleBookshelf.o(.text);
         src/object/book.o(.text);
@@ -774,11 +772,10 @@ SECTIONS {
         src/object/lamp.o(.text);
         src/object/windTribeFlag.o(.text);
         src/object/bird.o(.text);
-        asm/object/bird.o(.text);
-        asm/object/object96.o(.text);
+        src/object/object96.o(.text);
         src/object/keyStealingTakkuri.o(.text);
-        asm/object/object98.o(.text);
-        asm/object/object99.o(.text);
+        src/object/object98.o(.text);
+        src/object/object99.o(.text);
         src/object/macroAcorn.o(.text);
         src/object/object9B.o(.text);
         src/object/treeHidingPortal.o(.text);
@@ -790,27 +787,27 @@ SECTIONS {
         src/object/objectA2.o(.text);
         src/object/cloud.o(.text);
         src/object/minishLight.o(.text);
-        asm/object/fireballChain.o(.text);
-        asm/object/objectA6.o(.text);
+        src/object/fireballChain.o(.text);
+        src/object/objectA6.o(.text);
         src/object/objectA7.o(.text);
         src/object/objectA8.o(.text);
-        asm/object/objectA9.o(.text);
+        src/object/objectA9.o(.text);
         src/object/waterfallOpening.o(.text);
-        asm/object/objectAB.o(.text);
+        src/object/objectAB.o(.text);
         src/object/fourElements.o(.text);
-        asm/object/objectAD.o(.text);
+        src/object/objectAD.o(.text);
         src/object/floatingBlock.o(.text);
         src/object/objectAF.o(.text);
         src/object/metalDoor.o(.text);
         src/object/jailBars.o(.text);
         src/object/objectB2.o(.text);
         src/object/objectB3.o(.text);
-        asm/object/objectB4.o(.text);
+        src/object/objectB4.o(.text);
         src/object/objectB5.o(.text);
         src/object/objectB6.o(.text);
         src/object/well.o(.text);
         src/object/windTribeTeleporter.o(.text);
-        asm/object/objectB9.o(.text);
+        src/object/cuccoMinigame.o(.text);
         src/object/gyorgBossObject.o(.text);
         src/object/windcrest.o(.text);
         src/object/litArea.o(.text);
@@ -827,7 +824,7 @@ SECTIONS {
         src/demo.o(.text);
 #endif
         src/sound.o(.text);
-        asm/staffroll.o(.text);
+        src/staffroll.o(.text);
         src/menu/kinstone_menu.o(.text);
         src/menu/figurine_menu.o(.text);
         src/menu/pause_menu.o(.text);
@@ -998,7 +995,7 @@ SECTIONS {
         data/const/enemy/rope.o(.rodata);
         data/animations/enemy/rope.o(.rodata);
         data/const/enemy/smallPesto.o(.rodata);
-        data/const/enemy/acroBandits.o(.rodata);
+        src/enemy/acroBandits.o(.rodata);
         data/animations/enemy/acroBandits.o(.rodata);
         data/const/enemy/keaton.o(.rodata);
         data/animations/enemy/keaton.o(.rodata);
@@ -1020,7 +1017,7 @@ SECTIONS {
         data/animations/enemy/mazaalHand.o(.rodata);
         src/enemy/octorokBoss.o(.rodata);
         data/animations/enemy/octorokBoss.o(.rodata);
-        data/const/enemy/flyingPot.o(.rodata);
+        src/enemy/flyingPot.o(.rodata);
         src/enemy/gibdo.o(.rodata);
         data/animations/enemy/gibdo.o(.rodata);
         src/enemy/octorokGolden.o(.rodata);
@@ -1332,6 +1329,7 @@ SECTIONS {
         src/flags.o(.rodata);
         src/save.o(.rodata);
         src/script.o(.rodata);
+        src/scroll.o(.rodata);
         data/data_0811E750.o(.rodata);
         data/const/object/itemOnGround.o(.rodata);
         src/object/deathFx.o(.rodata);
@@ -1446,7 +1444,7 @@ SECTIONS {
         src/object/object53.o(.rodata);
         src/object/pullableLever.o(.rodata);
         data/animations/object/pullableLever.o(.rodata);
-        data/const/object/minecart.o(.rodata);
+        src/object/minecart.o(.rodata);
         data/animations/object/minecart.o(.rodata);
         data/const/object/thoughtBubble.o(.rodata);
         data/animations/object/thoughtBubble.o(.rodata);
@@ -1461,7 +1459,7 @@ SECTIONS {
         src/object/houseDoorInterior.o(.rodata);
         src/object/whirlwind.o(.rodata);
         data/animations/object/whirlwind.o(.rodata);
-        data/const/object/objectBlockingStairs.o(.rodata);
+        src/object/objectBlockingStairs.o(.rodata);
         data/const/object/swordsmanNewsletter.o(.rodata);
         src/object/object61.o(.rodata);
         src/object/giantTwig.o(.rodata);
@@ -1494,7 +1492,7 @@ SECTIONS {
         data/animations/object/pushableLever.o(.rodata);
         src/object/macroShoes.o(.rodata);
         src/object/objectOnSpinyBeetle.o(.rodata);
-        data/const/object/picoBloom.o(.rodata);
+        src/object/picoBloom.o(.rodata);
         data/animations/object/picoBloom.o(.rodata);
         src/object/board.o(.rodata);
         src/object/object81.o(.rodata);
@@ -1511,7 +1509,7 @@ SECTIONS {
         src/object/octorokBossObject.o(.rodata);
         src/object/macroBook.o(.rodata);
         data/animations/object/macroBook.o(.rodata);
-        data/const/object/mazaalBossObject.o(.rodata);
+        src/object/mazaalBossObject.o(.rodata);
         src/object/cabinFurniture.o(.rodata);
         src/object/doubleBookshelf.o(.rodata);
         src/object/book.o(.rodata);
@@ -1524,11 +1522,11 @@ SECTIONS {
         data/animations/object/bakerOven.o(.rodata);
         src/object/lamp.o(.rodata);
         data/animations/object/lamp.o(.rodata);
-        data/const/object/bird.o(.rodata);
+        src/object/bird.o(.rodata);
         data/animations/object/bird.o(.rodata);
-        data/const/object/object96.o(.rodata);
+        src/object/object96.o(.rodata);
         src/object/keyStealingTakkuri.o(.rodata);
-        data/const/object/object98.o(.rodata);
+        src/object/object98.o(.rodata);
         data/animations/object/object98.o(.rodata);
         src/object/macroAcorn.o(.rodata);
         src/object/object9B.o(.rodata);
@@ -1544,15 +1542,15 @@ SECTIONS {
         data/animations/object/objectA2.o(.rodata);
         data/const/object/cloud.o(.rodata);
         data/const/object/minishLight.o(.rodata);
-        data/const/object/objectA6.o(.rodata);
+        src/object/objectA6.o(.rodata);
         data/animations/object/objectA6.o(.rodata);
         src/object/objectA8.o(.rodata);
-        data/const/object/objectA9.o(.rodata);
+        src/object/objectA9.o(.rodata);
         src/object/waterfallOpening.o(.rodata);
-        data/const/object/objectAB.o(.rodata);
+        src/object/objectAB.o(.rodata);
         data/animations/object/objectAB.o(.rodata);
         src/object/fourElements.o(.rodata);
-        data/const/object/objectAD.o(.rodata);
+        src/object/objectAD.o(.rodata);
         data/const/object/objectAF.o(.rodata);
         data/animations/object/objectAF.o(.rodata);
         data/const/object/metalDoor.o(.rodata);
@@ -1561,11 +1559,11 @@ SECTIONS {
         data/animations/object/objectB2.o(.rodata);
         src/object/objectB3.o(.rodata);
         data/animations/object/objectB3.o(.rodata);
-        data/const/object/objectB4.o(.rodata);
+        src/object/objectB4.o(.rodata);
         data/animations/object/objectB4.o(.rodata);
         data/const/object/well.o(.rodata);
         src/object/windTribeTeleporter.o(.rodata);
-        data/const/object/objectB9.o(.rodata);
+        src/object/cuccoMinigame.o(.rodata);
         src/object/gyorgBossObject.o(.rodata);
         data/const/object/windcrest.o(.rodata);
         src/object/objectBD.o(.rodata);
@@ -1580,6 +1578,7 @@ SECTIONS {
 #ifdef DEMO_USA
         data/const/demo.o(.rodata);
 #endif
+        src/staffroll.o(.rodata);
         data/data_08127280.o(.rodata);
         src/menu/kinstone_menu.o(.rodata);
         src/menu/figurine_menu.o(.rodata);
@@ -1656,7 +1655,7 @@ SECTIONS {
         data/gfx/fixed_type_gfx.o(.rodata);
         data/const/movement.o(.rodata);
         src/movement.o(.rodata);
-        data/map/exit_lists.o(.rodata);
+        src/data/transitions.o(.rodata);
         data/gfx_0813AA54.o(.rodata);
         data/gfx/sprite_gfx.o(.rodata);
         data/gfx/frame_obj_lists.o(.rodata);

src/code_08049CD4.c

@@ -1,25 +1,76 @@
+#define NENT_DEPRECATED
 #include "global.h"
-
-extern u32* gUnk_020354B0;
-extern u32 gRoomMemory;
+#include "room.h"
 
 extern void MemFill32(u32, void*, u32);
 
+void sub_08049DCC(RoomMemory*);
+RoomMemory* sub_08049D88(void);
+
 void ClearRoomMemory(void) {
-    MemFill32(0xFFFFFFFF, &gRoomMemory, 0x40);
-    gUnk_020354B0 = &gRoomMemory;
+    MemFill32(0xFFFFFFFF, gRoomMemory, 0x40);
+    gUnk_020354B0 = gRoomMemory;
 }
 
-void sub_08049CF4(u8* arg0) {
-    u8 field_0x6c = *(arg0 + 0x6c);
+void sub_08049CF4(GenericEntity* ent) {
+    u8 field_0x6c = ent->field_0x6c.HALF.LO;
     if (field_0x6c & 0x80) {
-        *(gUnk_020354B0 + 1) |= 1 << (field_0x6c & 0x1f);
+        gUnk_020354B0->unk_04 |= 1 << (field_0x6c & 0x1f);
     }
 }
 
 u32 sub_08049D1C(u32 arg0) {
-    u32 bitmask = *(gUnk_020354B0 + 1) >> arg0;
+    u32 bitmask = gUnk_020354B0->unk_04 >> arg0;
     u32 output = 1;
     output &= ~bitmask;
     return output;
 }
+
+void UpdateRoomTracker(void) {
+    gUnk_020354B0 = gRoomMemory;
+
+    do {
+        if (gUnk_020354B0->area == gRoomControls.area && gUnk_020354B0->room == gRoomControls.room) {
+            sub_08049DCC(gUnk_020354B0);
+            return;
+        }
+        gUnk_020354B0++;
+
+    } while (gUnk_020354B0 < gRoomMemory + 8);
+    gUnk_020354B0 = sub_08049D88();
+}
+
+RoomMemory* sub_08049D88(void) {
+    RoomMemory* rm = gRoomMemory;
+    RoomMemory* r1 = rm + 1;
+
+    do {
+        if (r1->unk_02 > rm->unk_02) {
+            rm = r1;
+        }
+        r1++;
+    } while (r1 < gRoomMemory + 8);
+
+    rm->area = gRoomControls.area;
+    rm->room = gRoomControls.room;
+
+    rm->unk_02 = 0xFFFF;
+    rm->unk_04 = 0;
+
+    sub_08049DCC(rm);
+
+    return rm;
+}
+
+void sub_08049DCC(RoomMemory* rm) {
+    RoomMemory* r1 = gRoomMemory;
+
+    do {
+        if (r1->unk_02 < rm->unk_02) {
+            r1->unk_02++;
+        }
+        r1++;
+    } while (r1 < gRoomMemory + 8);
+
+    rm->unk_02 = 0;
+}

src/code_08049DF4.c

@@ -0,0 +1,324 @@
+#define NENT_DEPRECATED
+#include "asm.h"
+#include "global.h"
+#include "entity.h"
+#include "functions.h"
+#include "map.h"
+#include "player.h"
+#include "room.h"
+
+extern Entity* gUnk_020000B0;
+extern Entity* (*const gUnk_080D3BE8[])(void);
+
+extern void ReplaceMonitoredEntity(Entity*, Entity*);
+
+Entity* sub_08049DF4(u32 arg0) {
+    if (gUnk_020000B0 != NULL) {
+        return gUnk_020000B0;
+    }
+    return gUnk_080D3BE8[arg0]();
+}
+
+Entity* sub_08049E18(void) {
+    if ((gPlayerState.field_0x3c[0] == 0) && !(gPlayerState.flags & 0x22189b75)) {
+        gUnk_020000B0 = &gPlayerEntity;
+        return &gPlayerEntity;
+    }
+    return NULL;
+}
+
+Entity* sub_08049E4C(void) {
+    if ((gPlayerState.field_0x3c[0] == 0) && !(gPlayerState.flags & 0x22189bf5)) {
+        gUnk_020000B0 = &gPlayerEntity;
+        return &gPlayerEntity;
+    }
+    return NULL;
+}
+
+Entity* sub_08049E80(void) {
+    if ((gPlayerState.field_0x3c[0] != 0) || !(gPlayerState.flags & 0x80)) {
+        return NULL;
+    }
+    gUnk_020000B0 = &gPlayerEntity;
+    return &gPlayerEntity;
+}
+
+Entity* sub_08049EB0(void) {
+    if ((gPlayerState.field_0x3c[0] == 0) && !(gPlayerState.flags & 0x80190)) {
+        gUnk_020000B0 = &gPlayerEntity;
+        return &gPlayerEntity;
+    }
+    return NULL;
+}
+
+u32 sub_08049EE4(Entity* ent) {
+    GenericEntity* genEnt = (GenericEntity*)ent;
+    u16 tempLO = genEnt->field_0x70.HALF.LO + 4 * genEnt->field_0x6e.HALF.LO;
+    u16 tempHI = genEnt->field_0x70.HALF.HI + 4 * genEnt->field_0x6e.HALF.HI;
+
+    return CalculateDirectionTo(genEnt->base.x.HALF.HI, genEnt->base.y.HALF.HI, tempLO, tempHI);
+}
+
+bool32 sub_08049F1C(Entity* entA, Entity* entB, s32 maxDist) {
+    if ((entA->collisionLayer & entB->collisionLayer) != 0) {
+        s32 xDiff = entB->x.HALF.HI - entA->x.HALF.HI;
+        s32 yDiff = entB->y.HALF.HI - entA->y.HALF.HI;
+        s32 maxDistSq = maxDist * maxDist;
+        s32 distSq = xDiff * xDiff + yDiff * yDiff;
+
+        if (maxDistSq >= distSq) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool32 PlayerInRange(Entity* ent, u32 arg1, s32 maxDist) {
+    Entity* tempEnt = sub_08049DF4(arg1);
+    if (tempEnt == NULL) {
+        return FALSE;
+    } else {
+        return sub_08049F1C(ent, tempEnt, maxDist);
+    }
+}
+
+u32 sub_08049F84(Entity* ent, s32 arg2) {
+    Entity* target = sub_08049DF4(arg2);
+
+    if (target == NULL) {
+        return 0xFF;
+    } else {
+        return GetFacingDirection(ent, target);
+    }
+}
+
+bool32 sub_08049FA0(Entity* ent) {
+    GenericEntity* genEnt = (GenericEntity*)ent;
+    u32 temp = 8 * genEnt->field_0x6e.HALF.LO;
+
+    if (temp >= genEnt->base.x.HALF.HI - genEnt->field_0x70.HALF_U.LO) {
+        temp = 8 * genEnt->field_0x6e.HALF.HI;
+        if (temp >= genEnt->base.y.HALF.HI - genEnt->field_0x70.HALF_U.HI) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool32 sub_08049FDC(Entity* ent, u32 arg1) {
+    u32 temp;
+    GenericEntity* genEnt = (GenericEntity*)ent;
+    GenericEntity* tempEnt = (GenericEntity*)sub_08049DF4(arg1);
+
+    if (tempEnt != NULL) {
+        temp = 8 * genEnt->field_0x6e.HALF.LO;
+        if (temp >= tempEnt->base.x.HALF.HI - genEnt->field_0x70.HALF_U.LO) {
+            temp = 8 * genEnt->field_0x6e.HALF.HI;
+            if (temp >= tempEnt->base.y.HALF.HI - genEnt->field_0x70.HALF_U.HI) {
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+u32 sub_0804A024(Entity* ent, u32 arg1, u32 arg2) {
+    Entity* tempEnt = sub_08049DF4(arg1);
+    if (tempEnt == NULL) {
+        return 0xFF;
+    } else {
+        return sub_0804A044(ent, tempEnt, arg2);
+    }
+}
+
+u32 sub_0804A168(Entity*, Entity*, LayerStruct*);
+u32 sub_0804A318(Entity*, Entity*, LayerStruct*);
+
+u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) {
+    LayerStruct* layer;
+    s32 ret;
+    s32 yDiff;
+    s32 xDiff;
+    s32 flags;
+
+    if ((entB->collisionLayer & entA->collisionLayer) != 0) {
+        flags = 0;
+        xDiff = entB->x.HALF.HI + entB->hitbox->offset_x - entA->x.HALF.HI - entA->hitbox->offset_x;
+
+        if (arg2 >= xDiff + (arg2 >> 1)) {
+            flags |= 1;
+        }
+        if (arg2 << 1 >= xDiff + arg2) {
+            flags |= 2;
+        }
+
+        yDiff = entB->y.HALF.HI + entB->hitbox->offset_y - entA->y.HALF.HI - entA->hitbox->offset_y;
+        if (arg2 >= yDiff + (arg2 >> 1)) {
+            flags |= 4;
+        }
+        if (arg2 << 1 >= yDiff + arg2) {
+            flags |= 8;
+        }
+
+        //! @bug flags & 5 can never equal 0xA
+        if (flags && ((flags & 5) != 0xA)) {
+            layer = GetLayerByIndex(entA->collisionLayer);
+            if (xDiff < 0) {
+                xDiff = -xDiff;
+            }
+            if (yDiff < 0) {
+                yDiff = -yDiff;
+            }
+            if (xDiff < yDiff) {
+                if (flags & 1) {
+                    ret = sub_0804A168(entA, entB, layer);
+                    if (ret != 0xFF) {
+                        return ret;
+                    }
+                }
+                if (!(flags & 4)) {
+                    return 0xFF;
+                }
+                ret = sub_0804A318(entA, entB, layer);
+            } else {
+                if (flags & 4) {
+                    ret = sub_0804A318(entA, entB, layer);
+                    if (ret != 0xFF) {
+                        return ret;
+                    }
+                }
+                if (!(flags & 1)) {
+                    return 0xFF;
+                }
+                ret = sub_0804A168(entA, entB, layer);
+            }
+            if (ret != 0xFF) {
+                return ret;
+            }
+        }
+    }
+    return 0xFF;
+}
+
+bool32 sub_0804A4BC(u8* arg0, u8* arg1, s32 arg2, u32 arg3);
+
+u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) {
+    u32 uVar2;
+    u32 uVar3;
+    u32 tile1;
+    u32 tile2;
+
+    if (entB->y.HALF.HI > entA->y.HALF.HI) {
+        uVar2 = entA->x.HALF.HI - 4;
+        uVar3 = ((uVar2 & 0xF) < 8) ? 10 : 5;
+        tile1 = TILE(uVar2, entA->y.HALF.HI + 10);
+        tile2 = TILE(uVar2, entB->y.HALF.HI);
+
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) {
+            uVar2 = entA->x.HALF.HI + 4;
+            uVar3 ^= 0xF;
+            tile1 = TILE(uVar2, entA->y.HALF.HI + 10);
+            tile2 = TILE(uVar2, entB->y.HALF.HI);
+
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) {
+                return 0x10;
+            }
+        }
+    } else {
+        uVar2 = entA->x.HALF.HI - 4;
+        uVar3 = ((uVar2 & 0xF) < 8) ? 10 : 5;
+        tile1 = TILE(uVar2, entA->y.HALF.HI - 10);
+        tile2 = TILE(uVar2, entB->y.HALF.HI);
+
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) {
+            uVar2 = entA->x.HALF.HI + 4;
+            uVar3 ^= 0xF;
+            tile1 = TILE(uVar2, entA->y.HALF.HI - 10);
+            tile2 = TILE(uVar2, entB->y.HALF.HI);
+
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) {
+                return 0;
+            }
+        }
+    }
+    return 0xFF;
+}
+
+u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) {
+    u32 uVar2;
+    u32 uVar3;
+    u32 tile1;
+    u32 tile2;
+
+    if (entB->x.HALF.HI > entA->x.HALF.HI) {
+        uVar2 = entA->y.HALF.HI - 4;
+        uVar3 = ((uVar2 & 0xF) < 8) ? 0xC : 3;
+        tile1 = TILE(entA->x.HALF.HI + 10, uVar2);
+        tile2 = TILE(entB->x.HALF.HI, uVar2);
+
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) {
+            uVar2 = entA->y.HALF.HI + 4;
+            uVar3 ^= 0xF;
+            tile1 = TILE(entA->x.HALF.HI + 10, uVar2);
+            tile2 = TILE(entB->x.HALF.HI, uVar2);
+
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) {
+                return 8;
+            }
+        }
+    } else {
+        uVar2 = entA->y.HALF.HI - 4;
+        uVar3 = ((uVar2 & 0xF) < 8) ? 0xC : 3;
+        tile1 = TILE(entA->x.HALF.HI - 10, uVar2);
+        tile2 = TILE(entB->x.HALF.HI, uVar2);
+
+        if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) {
+            uVar2 = entA->y.HALF.HI + 4;
+            uVar3 ^= 0xF;
+            tile1 = TILE(entA->x.HALF.HI - 10, uVar2);
+            tile2 = TILE(entB->x.HALF.HI, uVar2);
+            if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) {
+                return 0x18;
+            }
+        }
+    }
+    return 0xFF;
+}
+
+bool32 sub_0804A4BC(u8* arg0, u8* arg1, s32 arg2, u32 arg3) {
+    while (arg0 != arg1) {
+        u8 r0 = *arg0;
+
+        if (r0 != 0) {
+            if (r0 > 0xF) {
+                return FALSE;
+            }
+
+            r0 &= arg3;
+            if (r0 != 0) {
+                return FALSE;
+            }
+        }
+        arg0 += arg2;
+    }
+
+    return TRUE;
+}
+
+void sub_0804A4E4(Entity* entA, Entity* entB) {
+    GenericEntity* r5 = (GenericEntity*)entA;
+    GenericEntity* r6 = (GenericEntity*)entB;
+
+    r6->field_0x6c.HALF.HI = (r5->field_0x6c.HALF.HI & 0x40) | 4;
+    r6->field_0x6c.HALF.LO = r5->field_0x6c.HALF.LO;
+    r6->field_0x70.HALF.LO = r5->field_0x70.HALF.LO;
+    r6->field_0x70.HALF.HI = r5->field_0x70.HALF.HI;
+    r6->field_0x6e.HALF.LO = r5->field_0x6e.HALF.LO;
+    r6->field_0x6e.HALF.HI = r5->field_0x6e.HALF.HI;
+
+    CopyPositionAndSpriteOffset(&r5->base, &r6->base);
+
+    if (r5->field_0x6c.HALF.HI & 0x40) {
+        ReplaceMonitoredEntity(&r5->base, &r6->base);
+    }
+}

src/collision.c

@@ -61,7 +61,7 @@ void CollisionMain(void) {
         prio = gPriorityHandler.ent_priority;
 
     // if any priority is set, dont do collision
-    if (prio)
+    if (prio != 0)
         return;
 
     doCollision = &ram_CollideAll;

src/coord.c

@@ -1,6 +1,8 @@
+#define NENT_DEPRECATED
 #include "asm.h"
 #include "area.h"
 #include "player.h"
+#include "new_player.h"
 #include "coord.h"
 #include "common.h"
 #include "sound.h"
@@ -38,7 +40,7 @@ void sub_0806F38C(void) {
 u32 sub_0806F39C(Entity* ent) {
     s32 dist;
 
-    if (gPlayerEntity.animationState & 2) {
+    if (gNewPlayerEntity.base.animationState & 2) {
         dist = ent->x.HALF.HI - gPlayerEntity.x.HALF.HI;
     } else {
         dist = ent->y.HALF.HI - gPlayerEntity.y.HALF.HI;
@@ -55,7 +57,7 @@ u32 sub_0806F39C(Entity* ent) {
 }
 
 bool32 sub_0806F3E4(Entity* ent) {
-    Entity tmp_ent;
+    GenericEntity tmp_ent;
     s8* p;
 
     if ((gPlayerState.field_0x1c & 0x7F) != 1)
@@ -74,15 +76,15 @@ bool32 sub_0806F3E4(Entity* ent) {
     if (ent->knockbackSpeed > 0x500)
         ent->knockbackSpeed = 0x500;
     p = &gUnk_08126EE4[gPlayerEntity.animationState & 0xE];
-    tmp_ent.x.HALF.HI = p[0] + gPlayerEntity.x.HALF.HI;
-    tmp_ent.y.HALF.HI = p[1] + gPlayerEntity.y.HALF.HI;
-    LinearMoveDirection(ent, ent->knockbackSpeed, GetFacingDirection(ent, &tmp_ent));
-    if (sub_0800419C(&tmp_ent, ent, 4, 4)) {
+    tmp_ent.base.x.HALF.HI = p[0] + gPlayerEntity.x.HALF.HI;
+    tmp_ent.base.y.HALF.HI = p[1] + gPlayerEntity.y.HALF.HI;
+    LinearMoveDirection(ent, ent->knockbackSpeed, GetFacingDirection(ent, &tmp_ent.base));
+    if (sub_0800419C(&tmp_ent.base, ent, 4, 4)) {
         u32 state = ent->field_0x1c & 0xF;
         if (state == 2) {
             Entity* item;
             ent->subAction = 3;
-            (Entity*)gPlayerEntity.field_0x70.WORD = ent;
+            gNewPlayerEntity.unk_70 = ent;
             gPlayerState.field_0x1c = 7;
             item = CreatePlayerItem(0x11, 0, 0, 0);
             if (item != NULL) {
@@ -116,7 +118,7 @@ void sub_0806F4E8(Entity* ent) {
     }
 }
 
-u32 sub_0806F520(Entity* ent) {
+bool32 sub_0806F520(Entity* ent) {
     if (ent->bitfield == 0x93)
         return 1;
     ent->field_0x3a &= ~4;
@@ -336,38 +338,38 @@ void SortEntityBelow(Entity* above_ent, Entity* below_ent) {
     below_ent->spritePriority.b0 = gSpriteSortBelowTable[above_ent->spritePriority.b0];
 }
 
-void sub_0806FB00(Entity* ent, u32 param_1, u32 param_2, u32 param_3) {
+void sub_0806FB00(GenericEntity* ent, u32 param_1, u32 param_2, u32 param_3) {
     if (param_3 == 0) {
         param_3 = 1;
     }
 
     ent->field_0x7c.BYTES.byte2 = 0;
     ent->field_0x7c.BYTES.byte3 = param_3;
-    ent->field_0x80.HWORD = ent->x.HALF.HI;
-    ent->field_0x82.HWORD = ent->y.HALF.HI;
+    ent->field_0x80.HWORD = ent->base.x.HALF.HI;
+    ent->field_0x82.HWORD = ent->base.y.HALF.HI;
     ent->cutsceneBeh.HWORD = param_1;
     ent->field_0x86.HWORD = param_2;
 }
 
-bool32 sub_0806FB38(Entity* ent) {
+bool32 sub_0806FB38(GenericEntity* ent) {
     s32 val;
     u32 rv;
     if (ent->field_0x7c.BYTES.byte2 < ent->field_0x7c.BYTES.byte3) {
         ent->field_0x7c.BYTES.byte2++;
-        ent->x.HALF.HI =
+        ent->base.x.HALF.HI =
             ((((((s16)ent->cutsceneBeh.HWORD - (s16)ent->field_0x80.HWORD) * ent->field_0x7c.BYTES.byte2) << 8) /
               ent->field_0x7c.BYTES.byte3) >>
              8) +
             ent->field_0x80.HWORD;
-        ent->y.HALF.HI =
+        ent->base.y.HALF.HI =
             (((((((s16)ent->field_0x86.HWORD - (s16)ent->field_0x82.HWORD) * ent->field_0x7c.BYTES.byte2) << 8) /
                ent->field_0x7c.BYTES.byte3) >>
               8)) +
             ent->field_0x82.HWORD;
         rv = 0;
     } else {
-        ent->x.HALF.HI = ent->cutsceneBeh.HWORD;
-        ent->y.HALF.HI = ent->field_0x86.HWORD;
+        ent->base.x.HALF.HI = ent->cutsceneBeh.HWORD;
+        ent->base.y.HALF.HI = ent->field_0x86.HWORD;
         rv = 1;
     }
     return rv;

src/demo.c

@@ -216,7 +216,7 @@ void sub_080A3198(u32 param_1, u32 param_2) {
         MemClear(gUnk_08127C98 - 0x1e, 0x180);
 
         if (r4 != 0) {
-            sub_0805F46C(r4, &gUnk_08127C98);
+            sub_0805F46C(r4, (Font*)&gUnk_08127C98); // TODO
         }
 
         gScreen.bg0.updated = 1;

src/enemy/acroBandits.c

@@ -10,15 +10,39 @@
 
 extern Entity* gUnk_020000B0;
 extern void (*const gUnk_080012C8[])(Entity*);
-extern void (*const AcroBandit_Functions[])(Entity*);
-extern void (*const gUnk_080CE584[])(Entity*);
-extern void (*const gUnk_080CE58C[])(Entity*);
-extern void (*const gUnk_080CE5C8[])(Entity*);
-extern u8 gUnk_080CE5B0[8];
-extern u8 gUnk_080CE5B8[8];
-extern s8 gUnk_080CE5C0[8];
-extern u16 gUnk_080CE5F0[5];
-extern u8 gUnk_080CE5FA[20]; // Directions
+
+void AcroBandit_OnTick(Entity* this);
+void AcroBandit_OnCollision(Entity* this);
+void AcroBandit_OnKnockback(Entity* this);
+void GenericDeath(Entity* this);
+void GenericConfused(Entity* this);
+void AcroBandit_OnGrabbed(Entity* this);
+void AcroBandit_Type0(Entity* this);
+void AcroBandit_Type1(Entity* this);
+void AcroBandit_Type0Action0(Entity* this);
+void AcroBandit_Type0Action1(Entity* this);
+void AcroBandit_Type0Action2(Entity* this);
+void AcroBandit_Type0Action3(Entity* this);
+void AcroBandit_Type0Action4(Entity* this);
+void AcroBandit_Type0Action5(Entity* this);
+void AcroBandit_Type0Action6(Entity* this);
+void AcroBandit_Type0Action7(Entity* this);
+void AcroBandit_Type0Action8(Entity* this);
+void AcroBandit_Type1Init(Entity* this);
+void AcroBandit_Type1Action1(Entity* this);
+void AcroBandit_Type1Action2(Entity* this);
+void AcroBandit_Type1Action3(Entity* this);
+void AcroBandit_Type1Action4(Entity* this);
+void AcroBandit_Type1Action5(Entity* this);
+void AcroBandit_Type1Action6(Entity* this);
+void AcroBandit_Type1Action7(Entity* this);
+void AcroBandit_Type1Action8(Entity* this);
+void AcroBandit_Type1Action9(Entity* this);
+
+static void (*const AcroBandit_Functions[])(Entity*) = {
+    AcroBandit_OnTick, AcroBandit_OnCollision, AcroBandit_OnKnockback,
+    GenericDeath,      GenericConfused,        AcroBandit_OnGrabbed,
+};
 
 void AcroBandit(Entity* this) {
     s32 index;
@@ -37,7 +61,11 @@ void AcroBandit(Entity* this) {
 }
 
 void AcroBandit_OnTick(Entity* this) {
-    gUnk_080CE584[this->type](this);
+    static void (*const typeFuncs[])(Entity*) = {
+        AcroBandit_Type0,
+        AcroBandit_Type1,
+    };
+    typeFuncs[this->type](this);
 }
 
 void AcroBandit_OnCollision(Entity* this) {
@@ -47,7 +75,7 @@ void AcroBandit_OnCollision(Entity* this) {
         if (this->type == 1) {
             if (this->action < 7 && this->knockbackDuration != 0) {
                 brother = this->child;
-                if (brother) {
+                if (brother != NULL) {
                     brother->parent = this->parent;
                     do {
                         brother->action = 5;
@@ -56,10 +84,10 @@ void AcroBandit_OnCollision(Entity* this) {
                             brother->iframes = -12;
                     } while (brother = brother->child, brother != NULL);
                 }
-                if (this->parent) {
+                if (this->parent != NULL) {
                     this->parent->child = this->child;
                 } else {
-                    if (this->child)
+                    if (this->child != NULL)
                         this->parent = this;
                 }
 
@@ -109,25 +137,27 @@ void AcroBandit_OnKnockback(Entity* this) {
     GenericKnockback(this);
 }
 
-void AcroBandit_OnGrabbed(void) {
-    /* ... */
+void AcroBandit_OnGrabbed(Entity* this) {
 }
 
-void sub_08031A88(Entity* this) {
-    gUnk_080CE58C[this->action](this);
+void AcroBandit_Type0(Entity* this) {
+    static void (*const actionFuncs[])(Entity*) = {
+        AcroBandit_Type0Action0, AcroBandit_Type0Action1, AcroBandit_Type0Action2,
+        AcroBandit_Type0Action3, AcroBandit_Type0Action4, AcroBandit_Type0Action5,
+        AcroBandit_Type0Action6, AcroBandit_Type0Action7, AcroBandit_Type0Action8,
+    };
+    actionFuncs[this->action](this);
 }
 
-void sub_08031AA0(Entity* this) {
+void AcroBandit_Type0Action0(Entity* this) {
     sub_0804A720(this);
-    this->action = '\x01';
+    this->action = 1;
     this->field_0x74.HWORD = this->x.HALF.HI;
     this->field_0x76.HWORD = this->y.HALF.HI;
     this->field_0x78.HALF.HI = Random();
 }
 
-void sub_08031AC8(Entity* this)
-
-{
+void AcroBandit_Type0Action1(Entity* this) {
     u32 rand;
     s32 x, y;
 
@@ -149,7 +179,9 @@ void sub_08031AC8(Entity* this)
     }
 }
 
-void sub_08031B48(Entity* this) {
+void AcroBandit_Type0Action2(Entity* this) {
+    static const u8 actionDelays[] = { 2, 2, 2, 3, 3, 3, 3, 4 };
+
     GetNextFrame(this);
     if (this->frame & 1) {
         this->frame = 0;
@@ -157,13 +189,13 @@ void sub_08031B48(Entity* this) {
     } else {
         if (this->frame & ANIM_DONE) {
             this->action = 0x3;
-            this->actionDelay = gUnk_080CE5B0[Random() & 7];
+            this->actionDelay = actionDelays[Random() & 7];
             InitializeAnimation(this, 1);
         }
     }
 }
 
-void sub_08031B98(Entity* this) {
+void AcroBandit_Type0Action3(Entity* this) {
     if (sub_08031E04(this)) {
         this->action = 5;
         if (this->x.HALF.HI > gUnk_020000B0->x.HALF.HI) {
@@ -186,21 +218,22 @@ void sub_08031B98(Entity* this) {
     }
 }
 
-void sub_08031C1C(Entity* this) {
+void AcroBandit_Type0Action4(Entity* this) {
+    static const u8 actionDelays[] = { 60, 60, 90, 120, 120, 120, 120, 150 };
     GetNextFrame(this);
     if (this->frame & ANIM_DONE) {
-        this->action = '\x01';
-        this->actionDelay = gUnk_080CE5B8[Random() & 7];
+        this->action = 1;
+        this->actionDelay = actionDelays[Random() & 7];
         this->spriteSettings.draw = 0;
     }
 }
 
-void sub_08031C58(Entity* this) {
+void AcroBandit_Type0Action5(Entity* this) {
     Entity *a, *b;
 
     GetNextFrame(this);
     if (this->frame & ANIM_DONE) {
-        if (gEntCount < 0x43) {
+        if (gEntCount < MAX_ENTITIES - 4) {
             u32 tmp = Random();
             tmp &= 3;
 
@@ -252,7 +285,7 @@ void sub_08031C58(Entity* this) {
     }
 }
 
-void sub_08031D70(Entity* this) {
+void AcroBandit_Type0Action6(Entity* this) {
     GetNextFrame(this);
     if (--this->actionDelay == 0) {
         this->action = 7;
@@ -262,7 +295,7 @@ void sub_08031D70(Entity* this) {
     }
 }
 
-void sub_08031DA0(Entity* this) {
+void AcroBandit_Type0Action7(Entity* this) {
     if ((this->actionDelay & 0xf) == 0) {
         if (this->actionDelay == 0x50) {
             DeleteEntity(this);
@@ -273,7 +306,7 @@ void sub_08031DA0(Entity* this) {
     }
 }
 
-void sub_08031DC4(Entity* this) {
+void AcroBandit_Type0Action8(Entity* this) {
     if (this->frame & ANIM_DONE) {
         this->action = 1;
         this->actionDelay = 0xb4;
@@ -286,13 +319,14 @@ void sub_08031DC4(Entity* this) {
     }
 }
 
-u32 sub_08031E04(Entity* this) {
+bool32 sub_08031E04(Entity* this) {
+    static const s8 gUnk_080CE5C0[] = { -32, 0, 0, 32, 32, 0, 0, 0 };
     Entity* ent;
-    s8* tmp;
+    const s8* tmp;
 
     ent = sub_08049DF4(1);
     if (ent == NULL)
-        return 0;
+        return FALSE;
 
     tmp = &gUnk_080CE5C0[this->frame & 6];
     return EntityWithinDistance(this, ent->x.HALF.HI + tmp[0], ent->y.HALF.HI + tmp[1], 0x50);
@@ -308,11 +342,16 @@ void sub_08031E48(Entity* this, Entity* child) {
     child->field_0x7c.WORD = (s32)this;
 }
 
-void sub_08031E90(Entity* this) {
-    gUnk_080CE5C8[this->action](this);
+void AcroBandit_Type1(Entity* this) {
+    static void (*const actionFuncs[])(Entity*) = {
+        AcroBandit_Type1Init,    AcroBandit_Type1Action1, AcroBandit_Type1Action2, AcroBandit_Type1Action3,
+        AcroBandit_Type1Action4, AcroBandit_Type1Action5, AcroBandit_Type1Action6, AcroBandit_Type1Action7,
+        AcroBandit_Type1Action8, AcroBandit_Type1Action9,
+    };
+    actionFuncs[this->action](this);
 }
 
-void sub_08031EA8(Entity* this) {
+void AcroBandit_Type1Init(Entity* this) {
     this->action = 1;
     this->spritePriority.b1 = 1;
     this->zVelocity = Q_16_16(4.0);
@@ -321,7 +360,7 @@ void sub_08031EA8(Entity* this) {
     InitializeAnimation(this, 4);
 }
 
-void sub_08031EE8(Entity* this) {
+void AcroBandit_Type1Action1(Entity* this) {
     int draw;
 
     this->z.WORD -= this->zVelocity;
@@ -346,8 +385,10 @@ void sub_08031EE8(Entity* this) {
     }
 }
 
-void sub_08031F54(Entity* this) {
-    GravityUpdate(this, gUnk_080CE5F0[this->type2]);
+void AcroBandit_Type1Action2(Entity* this) {
+    static const u16 banditGravity[] = { 0x1600, 0x1300, 0x1000, 0xD00, 0xB00 };
+
+    GravityUpdate(this, banditGravity[this->type2]);
     if (this->type2 * -0xe <= this->z.HALF.HI) {
         this->action = 3;
         this->actionDelay = 20;
@@ -358,13 +399,13 @@ void sub_08031F54(Entity* this) {
     }
 }
 
-void sub_08031FB0(Entity* this) {
+void AcroBandit_Type1Action3(Entity* this) {
     GetNextFrame(this);
-    if ((this->frame & ANIM_DONE) && (this->parent || --this->actionDelay == 0)) {
+    if ((this->frame & ANIM_DONE) && ((this->parent != NULL) || (--this->actionDelay == 0))) {
         this->action = 4;
         this->direction = sub_08049F84(this, 1);
         *(u8*)&this->field_0x76 = 0;
-        if (this->child) {
+        if (this->child != NULL) {
             InitializeAnimation(this, 9);
         } else {
             InitializeAnimation(this, 8);
@@ -372,12 +413,12 @@ void sub_08031FB0(Entity* this) {
     }
 }
 
-void sub_08032008(Entity* this) {
+void AcroBandit_Type1Action4(Entity* this) {
     Entity* parent;
 
-    if (sub_080322A4(this) == 0) {
+    if (!sub_080322A4(this)) {
         parent = this->parent;
-        if (parent == 0) {
+        if (parent == NULL) {
             if (sub_08049FDC(this, 1)) {
                 if ((++this->field_0x78.HALF.HI & 7) == 0) {
                     sub_08004596(this, GetFacingDirection(this, gUnk_020000B0));
@@ -421,20 +462,22 @@ void sub_08032008(Entity* this) {
     }
 }
 
-void sub_08032148(Entity* this) {
+void AcroBandit_Type1Action5(Entity* this) {
     if (GravityUpdate(this, 0x2000))
         return;
 
     sub_08032290(this);
 }
 
-void sub_08032160(Entity* this) {
+void AcroBandit_Type1Action6(Entity* this) {
+    static const u8 fallDirections[] = { 0x8,  0x1c, 0x11, 0x2, 0x15, 0xc,  0x0, 0x15, 0x6, 0x19,
+                                         0x10, 0x4,  0x19, 0xa, 0x1d, 0x14, 0x8, 0x1d, 0xe, 0x1 };
     Entity* tmp;
     u32 dir;
 
     if (this->actionDelay == 0) {
         this->action = 7;
-        dir = gUnk_080CE5FA[this->field_0x74.HALF.LO * 5 + this->type2];
+        dir = fallDirections[this->field_0x74.HALF.LO * 5 + this->type2];
         this->direction = dir;
         if (dir >= 0x10) {
             this->spriteSettings.flipX = 1;
@@ -456,14 +499,14 @@ void sub_08032160(Entity* this) {
     }
 }
 
-void sub_080321E8(Entity* this) {
+void AcroBandit_Type1Action7(Entity* this) {
     ProcessMovement2(this);
 
     if (sub_080044EC(this, 0x2000) == 0)
         this->action = 8;
 }
 
-void sub_08032204(Entity* this) {
+void AcroBandit_Type1Action8(Entity* this) {
     GetNextFrame(this);
     if (this->frame & 1) {
         this->frame = 0;
@@ -476,7 +519,7 @@ void sub_08032204(Entity* this) {
     }
 }
 
-void sub_08032248(Entity* this) {
+void AcroBandit_Type1Action9(Entity* this) {
     if (GravityUpdate(this, Q_8_8(24.0)) == 0) {
         if (this->frame & ANIM_DONE) {
             ((Entity*)this->field_0x7c.WORD)->actionDelay--;
@@ -497,30 +540,29 @@ void sub_08032290(Entity* this) {
     InitializeAnimation(this, 11);
 }
 
-u32 sub_080322A4(Entity* this) {
+bool32 sub_080322A4(Entity* this) {
     if (this->child != NULL && (this->child->z.HALF.HI + 8) >= this->z.HALF.HI) {
         if (this->z.HALF.HI) {
             this->action = 5;
             this->z.HALF.HI = this->child->z.HALF.HI + 8;
             InitializeAnimation(this, 11);
-            return 1;
+            return TRUE;
         } else {
             sub_08032290(this);
-            return 1;
+            return TRUE;
         }
     }
-    return 0;
+    return FALSE;
 }
 
 void sub_080322E8(Entity* this) {
-    u8 tmp;
     if (this->field_0x78.HALF.LO) {
         if (--this->field_0x78.HALF.LO == 0) {
             u32 flipX = this->spriteSettings.flipX;
             this->spriteSettings.flipX = flipX ^ 1;
         }
     } else {
-        tmp = this->direction;
+        u8 tmp = this->direction;
         if (tmp & 0xF) {
             tmp >>= 4;
             tmp ^= 1;

src/enemy/armos.c

@@ -306,12 +306,12 @@ bool32 sub_08030650(ArmosEntity* this) {
             return 1;
         }
     } else if (this->unk_80 != 2) {
-        if ((sub_08049FDC(super, 1) == 0) || (0x20 < (gUnk_020000B0->x.HALF.HI - super->x.HALF.HI) + 0x10U)) {
+        if (!sub_08049FDC(super, 1) || (0x20 < (gUnk_020000B0->x.HALF.HI - super->x.HALF.HI) + 0x10U)) {
             return FALSE;
         }
         return TRUE;
     } else {
-        if (sub_08049FDC(super, 1) == 0) {
+        if (!sub_08049FDC(super, 1)) {
             return FALSE;
         }
         if (gUnk_020000B0->x.HALF.HI >= (s32)(gRoomControls.origin_x + 0xa8)) {

src/enemy/beetle.c

@@ -60,7 +60,7 @@ void Beetle_OnDeath(Entity* this) {
         GenericDeath(this);
     } else {
         Entity* ent = this->parent;
-        if (ent) {
+        if (ent != NULL) {
             ent->field_0xf--;
             this->parent = NULL;
         }

src/enemy/bobomb.c

@@ -6,6 +6,7 @@
  */
 
 #include "asm.h"
+#include "collision.h"
 #include "sound.h"
 #include "enemy.h"
 #include "object.h"
@@ -160,7 +161,7 @@ void sub_0802C91C(Entity* this) {
     GetNextFrame(this);
     ProcessMovement0(this);
     if (this->field_0x82.HALF.LO) {
-        if (this->collisions) {
+        if (this->collisions != COL_NONE) {
             sub_0800417E(this, this->collisions);
             InitializeAnimation(this, (this->direction >> 4) | 2);
         }
@@ -173,7 +174,7 @@ void sub_0802C91C(Entity* this) {
             sub_0802CC18(this);
         }
     } else {
-        if (this->collisions) {
+        if (this->collisions != COL_NONE) {
             sub_0800417E(this, this->collisions);
             InitializeAnimation(this, this->direction >> 4);
         }
@@ -289,7 +290,7 @@ void sub_0802CBC4(Entity* this) {
     FreeCarryEntity(this);
 
     ent = CreateObjectWithParent(this, OBJECT_20, 0, 0);
-    if (ent) {
+    if (ent != NULL) {
         ent->collisionLayer = this->collisionLayer;
     }
 }

src/enemy/bombPeahat.c

@@ -92,7 +92,6 @@ void sub_0802A8FC(Entity* this) {
 }
 
 void nullsub_143(Entity* this) {
-    /* ... */
 }
 
 void sub_0802A91C(Entity* this) {
@@ -167,7 +166,7 @@ void sub_0802AA40(Entity* this) {
         this->actionDelay--;
     } else {
         Entity* ent = this->child;
-        if (ent) {
+        if (ent != NULL) {
             if (ent->next == NULL) {
                 this->child = NULL;
             } else {
@@ -212,7 +211,7 @@ void sub_0802AAC0(Entity* this) {
             }
         }
 #else
-        } else if (ent->actionDelay == 0 && ent->field_0xf < 0x51) {
+        } else if ((ent->actionDelay == 0) && (ent->field_0xf <= 0x50)) {
             this->field_0x80.HALF.HI = 0;
         }
 #endif
@@ -304,7 +303,7 @@ void sub_0802AC40(Entity* this) {
     GetNextFrame(this);
     LinearMoveUpdate(this);
     if (this->field_0x7a.HALF.LO) {
-        if (sub_0802B234(this) == 0) {
+        if (!sub_0802B234(this)) {
             this->field_0x7a.HALF.LO = 0;
             this->spritePriority.b1 = 0;
 #ifndef EU
@@ -349,7 +348,7 @@ void sub_0802ACDC(Entity* this, u32 param_2) {
 
 void sub_0802AD1C(Entity* this, u32 param_2) {
     Entity* ent = sub_08049DF4(1);
-    if (ent) {
+    if (ent != NULL) {
         u32 y = ent->y.HALF.HI - 0x18;
         u32 x = ent->x.HALF.HI;
         sub_08004596(this, sub_080045B4(this, x, y));
@@ -416,7 +415,7 @@ void sub_0802AE24(Entity* this) {
 #ifdef EU
 void sub_0802AE68(Entity* this) {
     Entity* ent = this->parent;
-    if (ent == 0) {
+    if (ent == NULL) {
         this->action = 3;
         this->spriteSettings.draw = 1;
         this->field_0x80.HALF.LO = 1;
@@ -441,7 +440,7 @@ void sub_0802AE68(Entity* this) {
 #else
 void sub_0802AE68(Entity* this) {
     Entity* ent = sub_0802B250(this);
-    if (ent == 0) {
+    if (ent == NULL) {
         this->action = 3;
         this->field_0x80.HALF.LO = 1;
         sub_0802B264(this);
@@ -559,7 +558,7 @@ void sub_0802B048(Entity* this) {
     }
 
     ent = this->parent;
-    if (ent && this->action == 1) {
+    if ((ent != NULL) && this->action == 1) {
         this->spriteRendering.b3 = ent->spriteRendering.b3;
         this->spritePriority.b0 = ent->spritePriority.b0;
         this->spriteOrientation.flipY = ent->spriteOrientation.flipY;
@@ -588,7 +587,7 @@ void sub_0802B048(Entity* this) {
                     COLLISION_ON(this);
                     this->field_0x7a.HALF.HI = 0;
                     FreeCarryEntity(this);
-                    if (this->parent->next) {
+                    if (this->parent->next != NULL) {
                         this->parent->field_0x80.HALF.HI = 0;
                     }
                     ent = CreateObjectWithParent(this, OBJECT_20, 0, 0);
@@ -622,7 +621,7 @@ void sub_0802B1BC(Entity* this) {
     }
 
     ent = this->parent;
-    if (ent == 0) {
+    if (ent == NULL) {
         this->action = 2;
         this->spriteSettings.draw = 1;
     }
@@ -651,7 +650,7 @@ void sub_0802B1BC(Entity* this) {
     }
 
     ent = sub_0802B250(this);
-    if (ent == 0) {
+    if (ent == NULL) {
         this->action = 2;
         sub_0802B264(this);
     } else {
@@ -668,7 +667,7 @@ void sub_0802B1BC(Entity* this) {
 void sub_0802B204(Entity* this) {
     if (sub_080044EC(this, 0x2800) == 1) {
         Entity* ent = CreateEnemy(BOBOMB, 1);
-        if (ent) {
+        if (ent != NULL) {
             CopyPosition(this, ent);
             ent->parent = this->parent;
         }
@@ -686,7 +685,7 @@ bool32 sub_0802B234(Entity* this) {
 #ifndef EU
 Entity* sub_0802B250(Entity* this) {
     Entity* parent = this->parent;
-    if (parent && parent->next == NULL) {
+    if ((parent != NULL) && (parent->next == NULL)) {
         parent = NULL;
     }
     return parent;

src/enemy/bombarossa.c

@@ -44,7 +44,7 @@ void Bombarossa_OnCollision(BombarossaEntity* this) {
     switch (super->bitfield & 0x7f) {
         default:
             ent = CreateObject(OBJECT_20, 0, 0);
-            if (ent) {
+            if (ent != NULL) {
                 CopyPosition(super, ent);
             }
             DeleteThisEntity();

src/enemy/bowMoblin.c

@@ -230,7 +230,7 @@ void sub_0803C400(BowMoblinEntity* this) {
         }
 
         sub_0803C6DC(this);
-        if (super->child) {
+        if (super->child != NULL) {
             sub_0803C714(this);
         }
     }
@@ -271,7 +271,7 @@ void sub_0803C4B0(BowMoblinEntity* this) {
 u32 sub_0803C568(BowMoblinEntity* this) {
     if (this->unk_0x81 == 0) {
         Entity* ent = sub_08049DF4(1);
-        if (ent) {
+        if (ent != NULL) {
             if (this->unk_0x82 == 2) {
                 if (sub_0806FC80(super, ent, 0x30)) {
                     return 1;

src/enemy/businessScrub.c

@@ -384,7 +384,7 @@ void sub_08028F0C(Entity* this) {
             SetPlayerControl(1);
         }
         MessageFromTarget(dialog);
-        gMessage.field_0x10 = offer->price;
+        gMessage.rupees = offer->price;
     }
 }
 

src/enemy/businessScrubPrologue.c

@@ -48,7 +48,7 @@ void BusinessScrubPrologue_OnCollision(BusinessScrubPrologueEntity* this) {
             super->flags &= ~ENT_COLLIDE;
             sub_08046030(this, 4);
             ent = CreateFx(super, FX_BUSH, 0);
-            if (ent) {
+            if (ent != NULL) {
                 ent->z.HALF.HI -= 8;
             }
 
@@ -123,7 +123,7 @@ void sub_08045CE0(BusinessScrubPrologueEntity* this) {
             sub_0804604C(this);
             if (super->frame & 1) {
                 ent = CreateProjectileWithParent(super, DEKU_SEED_PROJECTILE, 0);
-                if (ent) {
+                if (ent != NULL) {
                     ent->parent = super;
                     ent->direction = super->direction;
                     super->frame &= 0xfe;
@@ -186,7 +186,7 @@ void sub_08045E14(BusinessScrubPrologueEntity* this) {
                 super->subAction = 0;
                 sub_08046030(this, 0);
                 ent = Create0x68FX(super, FX_STARS);
-                if (ent) {
+                if (ent != NULL) {
                     ent->spritePriority.b0 = 3;
                     ent->z.HALF.HI -= 0xc;
                     SetDefaultPriority(ent, PRIO_MESSAGE);
@@ -299,7 +299,7 @@ void sub_08046078(BusinessScrubPrologueEntity* this) {
     for (index = 0; index <= 4; index++) {
         ent = CreateFx(super, FX_DEATH, 0x40);
 
-        if (ent) {
+        if (ent != NULL) {
             ent->x.HALF.HI = gRoomControls.origin_x + *ptr;
             ptr++;
             ent->y.HALF.HI = gRoomControls.origin_y + *ptr;
@@ -315,12 +315,12 @@ void sub_08046078(BusinessScrubPrologueEntity* this) {
     RestorePrevTileEntity(0x7a7, 1);
 
     ent = CreateFx(super, FX_BIG_EXPLOSION2, 0x40);
-    if (ent) {
+    if (ent != NULL) {
         CopyPosition(super, ent);
         EnqueueSFX(SFX_184);
     }
 
-    if (super->child) {
+    if (super->child != NULL) {
         super->child->action = 0xff;
     }
 

src/enemy/chuchu.c

@@ -123,7 +123,7 @@ void Chuchu_OnCollision(Entity* this) {
 }
 
 void Chuchu_OnGrabbed(Entity* this) {
-    if (sub_0806F520(this) == 0 && this->confusedTime) {
+    if (!sub_0806F520(this) && this->confusedTime) {
         Create0x68FX(this, FX_STARS);
         InitializeAnimation(this, 6);
     } else {
@@ -552,7 +552,7 @@ void sub_0801F884(Entity* this) {
         this->field_0xf--;
     } else {
         Entity* ent = Create0x68FX(this, FX_LIGHTNING_STRIKE);
-        if (ent) {
+        if (ent != NULL) {
             ent->type2 = 64;
             this->action = 4;
             this->hitType = 165;

src/enemy/cloudPiranha.c

@@ -7,6 +7,7 @@
 
 #define NENT_DEPRECATED
 #include "global.h"
+#include "collision.h"
 #include "enemy.h"
 #include "functions.h"
 #include "coord.h"
@@ -259,7 +260,7 @@ void sub_080387F0(CloudPiranhaEntity* this) {
         if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
             super->direction = (super->direction + 0x10) & 0x1f;
         } else {
-            if (super->collisions != 0) {
+            if (super->collisions != COL_NONE) {
                 sub_0800417E(super, super->collisions);
             }
         }

src/enemy/cuccoAggr.c

@@ -295,7 +295,7 @@ void sub_080391B4(CuccoAggrEntity* this) {
     if (this->unk_7a) {
         if ((this->unk_7b++ & 0x1f) == 0) {
             Entity* ent = CreateEnemy(CUCCO_AGGR, 2);
-            if (ent) {
+            if (ent != NULL) {
                 u32 rand = (Random() & 0x17);
                 const PosOffset* ptr = &gCuccoAggrSpawnPoints[rand];
                 ent->x.HALF.HI = gRoomControls.scroll_x + ptr->x;
@@ -321,7 +321,7 @@ void sub_08039218(CuccoAggrEntity* this) {
 void CuccoAggr_CreateFx(CuccoAggrEntity* this) {
     Entity* ent = CreateFx(super, gCuccoAggrFx[super->type], 0);
 
-    if (ent) {
+    if (ent != NULL) {
         ent->x.HALF.HI += gCuccoAggrFxHorizontalOffsets[super->spriteSettings.flipX];
     }
 }

src/enemy/darkNut.c

@@ -312,7 +312,7 @@ void sub_080210E4(Entity* this) {
 
         this->frame &= ~1;
         ent = CreateProjectileWithParent(this, DARK_NUT_SWORD_SLASH, 2);
-        if (ent) {
+        if (ent != NULL) {
             ent->parent = this;
             this->child = ent;
         }
@@ -558,7 +558,7 @@ void sub_08021540(Entity* this) {
 }
 
 void sub_08021588(Entity* this) {
-    if (this->child) {
+    if (this->child != NULL) {
         this->child->parent = NULL;
         this->child = NULL;
     }
@@ -571,7 +571,7 @@ void sub_0802159C(Entity* this) {
         this->frame = 0;
         this->hitType = 0x51;
         ent = CreateProjectileWithParent(this, DARK_NUT_SWORD_SLASH, 3);
-        if (ent) {
+        if (ent != NULL) {
             ent->parent = this;
             this->child = ent;
         }
@@ -592,7 +592,7 @@ void sub_08021600(Entity* this) {
         this->frame = 0;
         this->hitType = 0x51;
         ent = CreateProjectileWithParent(this, DARK_NUT_SWORD_SLASH, 4);
-        if (ent) {
+        if (ent != NULL) {
             ent->parent = this;
             this->child = ent;
         }
@@ -610,8 +610,6 @@ void sub_08021644(Entity* this) {
     }
 }
 
-extern u32 sub_08049F1C(Entity*, Entity*, u32);
-
 u32 sub_08021664(Entity* this, Entity* ent) {
     switch (this->animationState) {
         case 0:

src/enemy/enemy50.c

@@ -154,7 +154,7 @@ void sub_08040D30(Enemy50Entity* this) {
 }
 
 void sub_08040D90(Enemy50Entity* this) {
-    if (sub_0806F520()) {
+    if (sub_0806F520(super)) {
         Enemy50_SubActions[super->subAction](this);
     } else {
         sub_08041128(this);

src/enemy/fallingBoulder.c

@@ -97,7 +97,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E
                         s32 i;
                         for (i = 1; i > -1; i--) {
                             Entity* ent = CreateFx(this, FX_ROCK2, 0);
-                            if (ent) {
+                            if (ent != NULL) {
                                 ent->x.HALF.HI += 12;
                                 ent->x.HALF.HI -= diff;
                             }

src/enemy/fireballGuy.c

@@ -91,7 +91,7 @@ void sub_08045454(Entity* this) {
     }
 
     ent = CreateFx(this, FX_DEATH, 0);
-    if (ent)
+    if (ent != NULL)
         CopyPosition(this, ent);
 
     DeleteEntity(this);

src/enemy/flyingPot.c

@@ -0,0 +1,265 @@
+/**
+ * @file flyingPot.c
+ * @ingroup Enemies
+ *
+ * @brief Flying pot enemy
+ */
+#define NENT_DEPRECATED
+#include "collision.h"
+#include "functions.h"
+#include "enemy.h"
+#include "player.h"
+#include "room.h"
+
+extern void (*const gUnk_080012C8[])(Entity*);
+extern Hitbox gUnk_080FD34C;
+
+typedef struct {
+    /* 0x00 */ Entity base;
+    /* 0x68 */ u8 filler[0xC];
+    /* 0x74 */ u16 tileIndex;
+} FlyingPotEntity;
+
+enum FlyingPotActions {
+    /* 0 */ FLYING_POT_ACTION_0,
+    /* 1 */ FLYING_POT_ACTION_1,
+    /* 2 */ FLYING_POT_ACTION_2,
+    /* 3 */ FLYING_POT_ACTION_3,
+    /* 4 */ FLYING_POT_ACTION_4,
+    /* 5 */ FLYING_POT_ACTION_5,
+    /* 6 */ FLYING_POT_ACTION_6,
+};
+
+enum FlyingPotSubActions {
+    /* 0 */ FLYING_POT_SUBACTION_0,
+    /* 1 */ FLYING_POT_SUBACTION_1,
+    /* 2 */ FLYING_POT_SUBACTION_2,
+    /* 3 */ FLYING_POT_SUBACTION_3,
+    /* 4 */ FLYING_POT_SUBACTION_DO_NOTHING,
+    /* 5 */ FLYING_POT_SUBACTION_5,
+};
+
+// Functions
+void FlyingPot_OnTick(FlyingPotEntity*);      // 0803708C
+void FlyingPot_OnCollision(FlyingPotEntity*); // 080370A4
+void FlyingPot_OnGrabbed(FlyingPotEntity*);   // 0803712C
+
+// Subactions
+void FlyingPot_SubAction0(FlyingPotEntity*); // 08037144
+void FlyingPot_SubAction1(FlyingPotEntity*); // 0803715C
+void FlyingPot_SubAction2(FlyingPotEntity*); // 0803718C
+void FlyingPot_SubAction3(FlyingPotEntity*); // 080371F8
+void FlyingPot_SubActionDoNothing(FlyingPotEntity*);
+void FlyingPot_SubAction5(FlyingPotEntity*); // 08037218
+
+// Actions
+void FlyingPot_Init(FlyingPotEntity*);    // ? // 08037220
+void FlyingPot_Action1(FlyingPotEntity*); // 08037280
+void FlyingPot_Action2(FlyingPotEntity*); // 080372E8
+void FlyingPot_Action3(FlyingPotEntity*); // 0803737C
+void FlyingPot_Action4(FlyingPotEntity*); // 080373B0
+void FlyingPot_Action5(FlyingPotEntity*); // 080373C8
+void FlyingPot_Action6(FlyingPotEntity*); // 080373E0
+
+void sub_08037408(FlyingPotEntity*);
+void sub_08037418(FlyingPotEntity*);
+
+void (*const FlyingPot_Functions[])(Entity*) = {
+    (EntityActionPtr)FlyingPot_OnTick,
+    (EntityActionPtr)FlyingPot_OnCollision,
+    GenericKnockback,
+    GenericDeath,
+    GenericConfused,
+    (EntityActionPtr)FlyingPot_OnGrabbed,
+};
+
+void FlyingPot(Entity* thisx) {
+    s32 index = sub_080012DC(thisx);
+
+    if (index != 0) {
+        gUnk_080012C8[index](thisx);
+    } else {
+        FlyingPot_Functions[GetNextFunction(thisx)](thisx);
+    }
+}
+
+void FlyingPot_OnTick(FlyingPotEntity* this) {
+    static void (*const FlyingPot_Actions[])(FlyingPotEntity*) = {
+        FlyingPot_Init,    FlyingPot_Action1, FlyingPot_Action2, FlyingPot_Action3,
+        FlyingPot_Action4, FlyingPot_Action5, FlyingPot_Action6,
+    };
+
+    FlyingPot_Actions[super->action](this);
+}
+
+void FlyingPot_OnCollision(FlyingPotEntity* this) {
+    sub_08037418(this);
+
+    if (super->bitfield == 0x9D) {
+        super->action = FLYING_POT_ACTION_6;
+        COLLISION_OFF(super);
+        super->zVelocity = 0x2A000;
+        super->spritePriority.b1 = 1;
+
+        SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
+    } else if (super->z.HALF.HI != 0) {
+        sub_08037408(this);
+    }
+
+    EnemyFunctionHandlerAfterCollision(super, FlyingPot_Functions);
+}
+
+void FlyingPot_OnGrabbed(FlyingPotEntity* this) {
+    static void (*const FlyingPot_SubActions[])(FlyingPotEntity*) = {
+        FlyingPot_SubAction0, FlyingPot_SubAction1,         FlyingPot_SubAction2,
+        FlyingPot_SubAction3, FlyingPot_SubActionDoNothing, FlyingPot_SubAction5,
+    };
+
+    FlyingPot_SubActions[super->subAction](this);
+}
+
+void FlyingPot_SubAction0(FlyingPotEntity* this) {
+    sub_08037418(this);
+
+    super->subAction = FLYING_POT_SUBACTION_1;
+    super->actionDelay = 0;
+    super->field_0x1d = 0x30;
+}
+
+void FlyingPot_SubAction1(FlyingPotEntity* this) {
+    sub_08037418(this);
+
+    if (sub_0806F520(super)) {
+        sub_0806F4E8(super);
+    } else {
+        super->spriteOffsetX = 0;
+
+        if (super->z.HALF.HI != 0) {
+            sub_08037408(this);
+        }
+    }
+}
+
+void FlyingPot_SubAction2(FlyingPotEntity* this) {
+    if (super->actionDelay == 0) {
+        sub_08037418(this);
+        super->actionDelay = 1;
+        COLLISION_OFF(super);
+        super->spriteOffsetX = 0;
+
+        SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
+    }
+
+    if (sub_0806F520(super)) {
+        sub_0806F3E4(super);
+    } else {
+        sub_08037408(this);
+    }
+}
+
+void FlyingPot_SubAction3(FlyingPotEntity* this) {
+    if (!(gPlayerState.field_0x1c & 0xF)) {
+        sub_08037408(this);
+    }
+}
+
+void FlyingPot_SubActionDoNothing(FlyingPotEntity* this) {
+}
+
+void FlyingPot_SubAction5(FlyingPotEntity* this) {
+    sub_08037408(this);
+}
+
+void FlyingPot_Init(FlyingPotEntity* this) {
+    u32 tile;
+
+    super->action = FLYING_POT_ACTION_1;
+    super->field_0x1c = 2;
+    super->y.HALF.HI += 3;
+
+    tile = TILE(super->x.HALF.HI, super->y.HALF.HI);
+    this->tileIndex = GetTileIndex(tile, super->collisionLayer);
+    SetTile(0x4000, tile, super->collisionLayer);
+    InitializeAnimation(super, 5);
+}
+
+void FlyingPot_Action1(FlyingPotEntity* this) {
+    sub_08037418(this);
+
+    if (GetTileTypeByEntity(super) != 0x4000) {
+        SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
+        sub_08037408(this);
+    }
+
+    if (PlayerInRange(super, 1, 0x40)) {
+        super->action = FLYING_POT_ACTION_2;
+        super->actionDelay = 30;
+    }
+}
+
+void FlyingPot_Action2(FlyingPotEntity* this) {
+    static const u8 offsets[] = { -1, 1, 1, -1 };
+
+    sub_08037418(this);
+
+    super->spriteOffsetX += offsets[super->actionDelay & 3];
+
+    if (--super->actionDelay == 0) {
+        super->action = FLYING_POT_ACTION_3;
+        super->spritePriority.b1 = 1;
+        super->spriteOffsetX = 0;
+        super->hitType = 0xA0;
+        super->flags2 = 0xF;
+        super->hitbox = &gUnk_080FD34C;
+
+        SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
+    }
+}
+
+void FlyingPot_Action3(FlyingPotEntity* this) {
+    super->z.WORD -= 0x10000;
+
+    if (super->z.HALF.HI <= -6) {
+        super->action = FLYING_POT_ACTION_4;
+        super->actionDelay = 10;
+        super->direction = GetFacingDirection(super, &gPlayerEntity);
+    }
+}
+
+void FlyingPot_Action4(FlyingPotEntity* this) {
+    if (--super->actionDelay == 0) {
+        super->action = FLYING_POT_ACTION_5;
+    }
+}
+
+void FlyingPot_Action5(FlyingPotEntity* this) {
+    ProcessMovement2(super);
+
+    if (super->collisions != COL_NONE) {
+        sub_08037408(this);
+    }
+}
+
+void FlyingPot_Action6(FlyingPotEntity* this) {
+    if (super->zVelocity < 0) {
+        super->spriteSettings.flipY = 1;
+    }
+
+    if (!GravityUpdate(super, 0x2000)) {
+        sub_08037408(this);
+    }
+}
+
+void sub_08037408(FlyingPotEntity* this) {
+    CreateFx(super, FX_POT_SHATTER, 0);
+    DeleteThisEntity();
+}
+
+void sub_08037418(FlyingPotEntity* this) {
+    u32 tile = COORD_TO_TILE(super);
+
+    if (GetTileIndex(tile, super->collisionLayer) == 0x4067) {
+        SetTile(this->tileIndex, tile, super->collisionLayer);
+        DeleteThisEntity();
+    }
+}

src/enemy/flyingSkull.c

@@ -1,4 +1,5 @@
 #define NENT_DEPRECATED
+#include "collision.h"
 #include "entity.h"
 #include "enemy.h"
 #include "functions.h"
@@ -140,7 +141,7 @@ void sub_08039DD8(FlyingSkullEntity* this) {
                     super->actionDelay = 0x1e;
                 } else {
                     ent = CreateEnemy(STALFOS, super->type - 2);
-                    if (ent) {
+                    if (ent != NULL) {
                         ent->type2 = 1;
                         CopyPosition(super, ent);
                         SetTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer);
@@ -159,7 +160,7 @@ void sub_08039ECC(FlyingSkullEntity* this) {
 void sub_08039EE4(FlyingSkullEntity* this) {
     super->subAction = 1;
     COLLISION_OFF(super);
-    super->collisions = 0;
+    super->collisions = COL_NONE;
     super->hitbox = (Hitbox*)&gUnk_080FD340;
     gPlayerEntity.animationState;
     this->unk_0x76 = gPlayerEntity.animationState;
@@ -175,7 +176,7 @@ void sub_08039F4C(FlyingSkullEntity* this) {
 
 void sub_08039F78(FlyingSkullEntity* this) {
     super->spritePriority.b1 = 1;
-    if (super->z.HALF.HI == 0 || super->collisions) {
+    if (super->z.HALF.HI == 0 || (super->collisions != COL_NONE)) {
         sub_0803A0E0(this);
     }
 }
@@ -222,7 +223,7 @@ void sub_0803A09C(FlyingSkullEntity* this) {
     GetNextFrame(super);
     ProcessMovement2(super);
 
-    if (super->collisions) {
+    if (super->collisions != COL_NONE) {
         sub_0803A0E0(this);
     }
 }

src/enemy/ghini.c

@@ -113,7 +113,7 @@ void Ghini_OnConfused(GhiniEntity* this) {
 }
 
 void Ghini_OnGrabbed(GhiniEntity* this) {
-    if (sub_0806F520()) {
+    if (sub_0806F520(super)) {
         Ghini_SubActions[super->subAction](this);
     } else {
         sub_0803F51C(this);

src/enemy/gibdo.c

@@ -42,9 +42,6 @@ void sub_08037ACC(GibdoEntity*);
 void Gibdo_CreateObjects(GibdoEntity*);
 void sub_08037A14(GibdoEntity*);
 
-extern void sub_0804A4E4(Entity*, Entity*);
-u32 sub_0804A044(Entity*, Entity*, u32);
-
 void (*const Gibdo_Functions[6])(Entity*);
 void (*const gUnk_080CF2AC[9])(GibdoEntity*);
 extern Entity* gUnk_020000B0;