Merge branch 'master' into demo-jp

asm/ballChainSoldier.s

@@ -71,7 +71,7 @@ sub_0803E580: @ 0x0803E580
 	adds r0, r5, #0
 	movs r1, #0x19
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	cmp r0, #0
 	beq _0803E5E4
 	str r5, [r0, #0x50]

asm/bowMoblin.s

@@ -344,7 +344,7 @@ _0803C46C:
 	lsrs r2, r2, #0x19
 	adds r0, r4, #0
 	movs r1, #0xd
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0803C49A

asm/businessScrubPrologue.s

@@ -261,7 +261,7 @@ _08045D60:
 	adds r0, r4, #0
 	movs r1, #4
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _08045DF8

asm/code_08049D30.s

@@ -1682,13 +1682,13 @@ _0804A982:
 	mov sl, r5
 	pop {r4, r5, r6, r7, pc}
 
-	thumb_func_start sub_0804A98C
-sub_0804A98C: @ 0x0804A98C
+	thumb_func_start CreateProjectileWithParent
+CreateProjectileWithParent: @ 0x0804A98C
 	push {r4, r5, r6, lr}
 	adds r6, r0, #0
 	adds r0, r1, #0
 	adds r5, r2, #0
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r4, r0, #0
 	cmp r4, #0
 	beq _0804A9A8

asm/code_0805E3B0.s

@@ -333,7 +333,7 @@ sub_0805E5C0: @ 0x0805E5C0
 	bl sub_0805E428
 	bl ClearHitboxList
 	bl sub_0806F0A4
-	ldr r1, _0805E5F4 @ =gUnk_03005F40
+	ldr r1, _0805E5F4 @ =_UpdateEntities
 	movs r0, #0
 	bl _call_via_r1
 	bl ClearAllDeletedEntities
@@ -341,18 +341,18 @@ sub_0805E5C0: @ 0x0805E5C0
 	pop {pc}
 	.align 2, 0
 _0805E5F0: .4byte gRoomVars
-_0805E5F4: .4byte gUnk_03005F40
+_0805E5F4: .4byte _UpdateEntities
 
 	thumb_func_start sub_0805E5F8
 sub_0805E5F8: @ 0x0805E5F8
 	push {lr}
-	ldr r1, _0805E608 @ =gUnk_03005F40
+	ldr r1, _0805E608 @ =_UpdateEntities
 	movs r0, #1
 	bl _call_via_r1
 	bl ClearAllDeletedEntities
 	pop {pc}
 	.align 2, 0
-_0805E608: .4byte gUnk_03005F40
+_0805E608: .4byte _UpdateEntities
 
 	thumb_func_start EraseAllEntities
 EraseAllEntities: @ 0x0805E60C

asm/code_080A7C00.s

@@ -411,8 +411,8 @@ _080A7EDC:
 _080A7EDE:
 	pop {pc}
 
-	thumb_func_start sub_080A7EE0
-sub_080A7EE0: @ 0x080A7EE0
+	thumb_func_start CreateProjectile
+CreateProjectile: @ 0x080A7EE0
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	bl GetEmptyEntity

asm/enemy49.s

@@ -262,7 +262,7 @@ sub_0803D058: @ 0x0803D058
 	adds r4, r0, #0
 	movs r1, #0x16
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r5, r0, #0
 	cmp r5, #0
 	beq _0803D0AE

asm/enemy5A.s

@@ -1,652 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Enemy5A
-Enemy5A: @ 0x080456D8
-	push {lr}
-	ldr r1, _080456E4 @ =gUnk_080D1888
-	bl EnemyFunctionHandler
-	pop {pc}
-	.align 2, 0
-_080456E4: .4byte gUnk_080D1888
-
-	thumb_func_start sub_080456E8
-sub_080456E8: @ 0x080456E8
-	push {lr}
-	ldr r2, _080456FC @ =gUnk_080D18A0
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080456FC: .4byte gUnk_080D18A0
-
-	thumb_func_start sub_08045700
-sub_08045700: @ 0x08045700
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xa]
-	cmp r0, #0
-	beq _080457D0
-	ldr r0, [r5, #0x50]
-	ldr r3, [r0, #0x50]
-	adds r0, r5, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080457D0
-	movs r0, #0x3f
-	ands r0, r1
-	cmp r0, #0xe
-	beq _08045728
-	cmp r0, #0x15
-	bne _08045778
-_08045728:
-	adds r1, r5, #0
-	adds r1, #0x81
-	ldrb r0, [r1]
-	cmp r0, #0
-	bne _0804575C
-	movs r0, #3
-	strb r0, [r5, #0xc]
-	ldrb r0, [r1]
-	adds r0, #1
-	strb r0, [r1]
-	ldrb r1, [r5, #0xa]
-	lsls r1, r1, #3
-	ldrb r0, [r5, #0xe]
-	adds r0, #2
-	orrs r1, r0
-	adds r0, r5, #0
-	bl InitializeAnimation
-	ldr r0, [r5, #0x50]
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #3
-	ldrb r2, [r5, #0xe]
-	adds r2, #2
-	orrs r1, r2
-	bl InitializeAnimation
-_0804575C:
-	ldrb r0, [r5, #0xe]
-	cmp r0, #0
-	beq _0804576C
-	movs r0, #0xbd
-	lsls r0, r0, #1
-	bl SoundReq
-	b _080457D0
-_0804576C:
-	ldr r0, _08045774 @ =0x00000119
-	bl SoundReq
-	b _080457D0
-	.align 2, 0
-_08045774: .4byte 0x00000119
-_08045778:
-	adds r2, r5, #0
-	adds r2, #0x45
-	ldrb r1, [r2]
-	adds r0, r1, #0
-	cmp r0, #0xff
-	beq _080457D0
-	movs r0, #0xff
-	strb r0, [r2]
-	ldrb r0, [r5, #0xe]
-	cmp r0, #0
-	beq _080457D0
-	adds r0, r3, #0
-	adds r0, #0x81
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _080457D0
-	adds r0, r3, #0
-	adds r0, #0x76
-	movs r1, #1
-	ldrb r2, [r5, #0xb]
-	lsls r1, r2
-	ldrb r2, [r0]
-	orrs r1, r2
-	strb r1, [r0]
-	adds r1, r5, #0
-	adds r1, #0x85
-	ldrb r0, [r1]
-	cmp r0, #0
-	bne _080457D0
-	adds r0, #1
-	strb r0, [r1]
-	ldrb r1, [r5, #0xa]
-	lsls r1, r1, #3
-	movs r4, #6
-	orrs r1, r4
-	adds r0, r5, #0
-	bl InitializeAnimation
-	ldr r0, [r5, #0x50]
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #3
-	orrs r1, r4
-	bl InitializeAnimation
-_080457D0:
-	ldr r1, _080457DC @ =gUnk_080D1888
-	adds r0, r5, #0
-	bl sub_0804AA30
-	pop {r4, r5, pc}
-	.align 2, 0
-_080457DC: .4byte gUnk_080D1888
-
-	thumb_func_start nullsub_173
-nullsub_173: @ 0x080457E0
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080457E4
-sub_080457E4: @ 0x080457E4
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _08045850 @ =gTextBox
-	ldrb r0, [r0]
-	movs r2, #0x7f
-	ands r2, r0
-	cmp r2, #0
-	bne _08045868
-	movs r3, #1
-	strb r3, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x80
-	strb r2, [r0]
-	adds r0, #1
-	strb r2, [r0]
-	adds r0, #4
-	strb r2, [r0]
-	strb r2, [r4, #0xf]
-	adds r1, r4, #0
-	adds r1, #0x82
-	movs r0, #0x30
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x83
-	strb r2, [r0]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _08045854
-	adds r0, r4, #0
-	bl sub_08045A00
-	movs r0, #0x5a
-	movs r1, #1
-	bl CreateEnemy
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0804585A
-	str r4, [r1, #0x50]
-	str r1, [r4, #0x54]
-	ldrb r0, [r4, #0xe]
-	strb r0, [r1, #0xe]
-	ldrb r0, [r4, #0xb]
-	strb r0, [r1, #0xb]
-	adds r0, r4, #0
-	bl CopyPosition
-	b _0804585A
-	.align 2, 0
-_08045850: .4byte gTextBox
-_08045854:
-	adds r0, r4, #0
-	adds r0, #0x63
-	strb r3, [r0]
-_0804585A:
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #3
-	movs r0, #1
-	orrs r1, r0
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08045868:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804586C
-sub_0804586C: @ 0x0804586C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08045A28
-	adds r1, r4, #0
-	adds r1, #0x82
-	ldrb r0, [r1]
-	cmp r0, #0
-	bne _080458AA
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080458C2
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _0804589A
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-_0804589A:
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #3
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _080458C2
-_080458AA:
-	subs r0, #1
-	strb r0, [r1]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080458C2
-	ldrb r0, [r4, #0x18]
-	movs r1, #4
-	rsbs r1, r1, #0
-	ands r1, r0
-	movs r0, #1
-	orrs r1, r0
-	strb r1, [r4, #0x18]
-_080458C2:
-	pop {r4, pc}
-
-	thumb_func_start sub_080458C4
-sub_080458C4: @ 0x080458C4
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_08045A28
-	ldr r1, [r5, #0x50]
-	ldrb r2, [r5, #0xa]
-	cmp r2, #0
-	beq _080458D6
-	ldr r1, [r1, #0x50]
-_080458D6:
-	ldrb r0, [r1, #0xc]
-	cmp r0, #3
-	bne _08045934
-	adds r0, r1, #0
-	adds r0, #0x80
-	ldrb r0, [r0]
-	cmp r0, #1
-	bne _08045934
-	movs r0, #0
-	movs r4, #4
-	strb r4, [r5, #0xc]
-	strb r0, [r5, #0xf]
-	cmp r2, #0
-	beq _08045934
-	ldrb r0, [r5, #0x10]
-	movs r1, #0x7f
-	ands r1, r0
-	strb r1, [r5, #0x10]
-	ldrb r0, [r5, #0xe]
-	cmp r0, #0
-	beq _0804591C
-	ldrb r1, [r5, #0xa]
-	lsls r1, r1, #3
-	movs r4, #5
-	orrs r1, r4
-	adds r0, r5, #0
-	bl InitializeAnimation
-	ldr r0, [r5, #0x50]
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #3
-	orrs r1, r4
-	bl InitializeAnimation
-	b _08045934
-_0804591C:
-	ldrb r1, [r5, #0xa]
-	lsls r1, r1, #3
-	orrs r1, r4
-	adds r0, r5, #0
-	bl InitializeAnimation
-	ldr r0, [r5, #0x50]
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #3
-	orrs r1, r4
-	bl InitializeAnimation
-_08045934:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08045938
-sub_08045938: @ 0x08045938
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08045A28
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08045980
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _08045980
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	bne _08045966
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x32
-	b _0804597E
-_08045966:
-	ldr r0, [r4, #0x50]
-	ldr r2, [r0, #0x50]
-	adds r2, #0x76
-	movs r0, #1
-	ldrb r1, [r4, #0xb]
-	lsls r0, r1
-	ldrb r1, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x31
-_0804597E:
-	strb r0, [r1]
-_08045980:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08045984
-sub_08045984: @ 0x08045984
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08045A28
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	bne _080459A6
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080459FE
-	movs r0, #0x20
-	strb r0, [r4, #0xf]
-	b _080459FE
-_080459A6:
-	ldr r2, [r4, #0x50]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _080459B0
-	ldr r2, [r2, #0x50]
-_080459B0:
-	ldrb r0, [r2, #0x14]
-	cmp r0, #2
-	bhi _080459FE
-	ldrb r0, [r2, #0xc]
-	cmp r0, #3
-	beq _080459FE
-	movs r0, #0
-	movs r3, #1
-	strb r3, [r4, #0xc]
-	strb r0, [r4, #0xf]
-	adds r1, r4, #0
-	adds r1, #0x81
-	strb r0, [r1]
-	adds r1, #4
-	strb r0, [r1]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _080459DA
-	subs r1, #0x46
-	movs r0, #0x33
-	strb r0, [r1]
-_080459DA:
-	adds r0, r2, #0
-	adds r0, #0x75
-	ldrb r0, [r0]
-	ldrb r1, [r4, #0xb]
-	asrs r0, r1
-	ands r0, r3
-	cmp r0, #0
-	beq _080459EE
-	strb r3, [r4, #0xe]
-	b _080459F0
-_080459EE:
-	strb r0, [r4, #0xe]
-_080459F0:
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #3
-	movs r0, #1
-	orrs r1, r0
-	adds r0, r4, #0
-	bl InitializeAnimation
-_080459FE:
-	pop {r4, pc}
-
-	thumb_func_start sub_08045A00
-sub_08045A00: @ 0x08045A00
-	push {lr}
-	adds r1, r0, #0
-	ldrb r3, [r1, #0xb]
-	lsls r3, r3, #1
-	ldr r0, _08045A24 @ =gUnk_080D18B4
-	adds r3, r3, r0
-	ldr r0, [r1, #0x50]
-	movs r2, #0
-	ldrsb r2, [r3, r2]
-	lsls r2, r2, #0x10
-	ldrb r3, [r3, #1]
-	lsls r3, r3, #0x18
-	asrs r3, r3, #0x18
-	adds r3, #3
-	lsls r3, r3, #0x10
-	bl PositionRelative
-	pop {pc}
-	.align 2, 0
-_08045A24: .4byte gUnk_080D18B4
-
-	thumb_func_start sub_08045A28
-sub_08045A28: @ 0x08045A28
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, #0
-	adds r0, #0x82
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _08045A3E
-	adds r0, r5, #0
-	bl GetNextFrame
-_08045A3E:
-	adds r6, r5, #0
-	adds r6, #0x5a
-	ldrb r0, [r6]
-	movs r1, #0x70
-	mov r8, r1
-	mov r4, r8
-	ands r4, r0
-	ldrb r7, [r5, #0xa]
-	cmp r7, #0
-	bne _08045AF8
-	adds r0, r5, #0
-	bl sub_08045A00
-	adds r1, r5, #0
-	adds r1, #0x83
-	ldrb r0, [r1]
-	adds r2, r1, #0
-	cmp r0, #1
-	beq _08045AA4
-	cmp r0, #1
-	bgt _08045A6E
-	cmp r0, #0
-	beq _08045A78
-	b _08045B7C
-_08045A6E:
-	cmp r0, #2
-	beq _08045ABC
-	cmp r0, #3
-	beq _08045AE8
-	b _08045B7C
-_08045A78:
-	cmp r4, #0x20
-	beq _08045A8C
-	cmp r4, #0x20
-	bhi _08045A86
-	cmp r4, #0
-	beq _08045A96
-	b _08045B7C
-_08045A86:
-	cmp r4, #0x40
-	beq _08045A96
-	b _08045B7C
-_08045A8C:
-	movs r0, #1
-	strb r0, [r1]
-	movs r1, #0x9f
-	lsls r1, r1, #1
-	b _08045B5A
-_08045A96:
-	movs r0, #2
-	strb r0, [r2]
-	ldr r1, _08045AA0 @ =0x0000013F
-	b _08045B5A
-	.align 2, 0
-_08045AA0: .4byte 0x0000013F
-_08045AA4:
-	cmp r4, #0
-	beq _08045AB0
-	cmp r4, #0x10
-	bne _08045B7C
-	strb r7, [r1]
-	b _08045B58
-_08045AB0:
-	movs r0, #2
-	strb r0, [r1]
-	ldr r1, _08045AB8 @ =0x0000013F
-	b _08045B5A
-	.align 2, 0
-_08045AB8: .4byte 0x0000013F
-_08045ABC:
-	cmp r4, #0x20
-	beq _08045AD0
-	cmp r4, #0x20
-	bhi _08045ACA
-	cmp r4, #0x10
-	beq _08045ADA
-	b _08045B7C
-_08045ACA:
-	cmp r4, #0x40
-	beq _08045ADE
-	b _08045B7C
-_08045AD0:
-	movs r0, #1
-	strb r0, [r1]
-	movs r1, #0x9f
-	lsls r1, r1, #1
-	b _08045B5A
-_08045ADA:
-	strb r7, [r1]
-	b _08045B58
-_08045ADE:
-	strb r0, [r1]
-	ldr r1, _08045AE4 @ =0x0000013F
-	b _08045B5A
-	.align 2, 0
-_08045AE4: .4byte 0x0000013F
-_08045AE8:
-	cmp r4, #0
-	bne _08045B7C
-	movs r0, #2
-	strb r0, [r1]
-	ldr r1, _08045AF4 @ =0x0000013F
-	b _08045B5A
-	.align 2, 0
-_08045AF4: .4byte 0x0000013F
-_08045AF8:
-	ldr r0, [r5, #0x50]
-	ldr r3, _08045B18 @ =0xFFFF0000
-	adds r1, r5, #0
-	movs r2, #0
-	bl PositionRelative
-	adds r2, r5, #0
-	adds r2, #0x83
-	ldrb r0, [r2]
-	cmp r0, #1
-	beq _08045B3A
-	cmp r0, #1
-	bgt _08045B1C
-	cmp r0, #0
-	beq _08045B22
-	b _08045B7C
-	.align 2, 0
-_08045B18: .4byte 0xFFFF0000
-_08045B1C:
-	cmp r0, #2
-	beq _08045B68
-	b _08045B7C
-_08045B22:
-	ldrb r0, [r6]
-	mov r1, r8
-	ands r1, r0
-	cmp r1, #0x10
-	beq _08045B54
-	cmp r1, #0x20
-	bne _08045B7C
-	movs r0, #1
-	strb r0, [r2]
-	movs r1, #0x9f
-	lsls r1, r1, #1
-	b _08045B5A
-_08045B3A:
-	ldrb r0, [r6]
-	mov r1, r8
-	ands r1, r0
-	cmp r1, #0
-	beq _08045B4A
-	cmp r1, #0x10
-	beq _08045B54
-	b _08045B7C
-_08045B4A:
-	strb r1, [r2]
-	ldr r1, _08045B50 @ =0x0000013F
-	b _08045B5A
-	.align 2, 0
-_08045B50: .4byte 0x0000013F
-_08045B54:
-	movs r0, #2
-	strb r0, [r2]
-_08045B58:
-	ldr r1, _08045B64 @ =0x0000013B
-_08045B5A:
-	adds r0, r5, #0
-	bl sub_0801D2B4
-	b _08045B7C
-	.align 2, 0
-_08045B64: .4byte 0x0000013B
-_08045B68:
-	ldrb r0, [r6]
-	mov r1, r8
-	ands r1, r0
-	cmp r1, #0
-	bne _08045B7C
-	strb r1, [r2]
-	ldr r1, _08045B84 @ =0x0000013F
-	adds r0, r5, #0
-	bl sub_0801D2B4
-_08045B7C:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08045B84: .4byte 0x0000013F

asm/enemy5F.s

@@ -1,474 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Enemy5F
-Enemy5F: @ 0x080482C4
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _080482D4
-	bl DeleteThisEntity
-_080482D4:
-	ldr r0, _080482E8 @ =gUnk_080D1D48
-	ldrb r1, [r4, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-	pop {r4, pc}
-	.align 2, 0
-_080482E8: .4byte gUnk_080D1D48
-
-	thumb_func_start sub_080482EC
-sub_080482EC: @ 0x080482EC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _08048310 @ =gScreenTransition
-	adds r0, #0x38
-	ldrb r1, [r0]
-	movs r2, #1
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _08048314
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	b _08048326
-	.align 2, 0
-_08048310: .4byte gScreenTransition
-_08048314:
-	strb r2, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	movs r0, #0xb3
-	lsls r0, r0, #1
-	bl SoundReq
-_08048326:
-	adds r0, r4, #0
-	bl sub_080485D8
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08048330
-sub_08048330: @ 0x08048330
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_080485D8
-	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 _08048358
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-_08048358:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804835C
-sub_0804835C: @ 0x0804835C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_080485D8
-	ldr r0, _08048384 @ =gScreenTransition
-	adds r0, #0x39
-	ldrb r1, [r0]
-	movs r2, #3
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _08048382
-	strb r2, [r4, #0xc]
-	ldrb r0, [r4, #0x10]
-	movs r1, #0x80
-	orrs r1, r0
-	strb r1, [r4, #0x10]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-_08048382:
-	pop {r4, pc}
-	.align 2, 0
-_08048384: .4byte gScreenTransition
-
-	thumb_func_start sub_08048388
-sub_08048388: @ 0x08048388
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldr r2, [r5, #0x50]
-	adds r0, r2, #0
-	adds r0, #0x79
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _080483A0
-	adds r0, r5, #0
-	bl sub_080485D8
-	b _080483F2
-_080483A0:
-	ldrb r1, [r5, #0xa]
-	lsls r1, r1, #1
-	ldr r0, _080483F4 @ =gUnk_080D1D98
-	adds r1, r1, r0
-	movs r0, #0x2e
-	ldrsh r4, [r2, r0]
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	adds r4, r4, r0
-	movs r0, #0x32
-	ldrsh r2, [r2, r0]
-	movs r0, #1
-	ldrsb r0, [r1, r0]
-	adds r6, r2, r0
-	movs r1, #0x2e
-	ldrsh r0, [r5, r1]
-	movs r2, #0x32
-	ldrsh r1, [r5, r2]
-	adds r2, r4, #0
-	adds r3, r6, #0
-	bl sub_080045D4
-	strb r0, [r5, #0x15]
-	adds r0, r5, #0
-	bl sub_0806F69C
-	ldr r0, [r5, #0x50]
-	ldrh r0, [r0, #0x36]
-	strh r0, [r5, #0x36]
-	movs r1, #0x2e
-	ldrsh r0, [r5, r1]
-	cmp r0, r4
-	bne _080483F2
-	movs r2, #0x32
-	ldrsh r0, [r5, r2]
-	cmp r0, r6
-	bne _080483F2
-	movs r0, #4
-	strb r0, [r5, #0xc]
-	movs r0, #0x3c
-	strb r0, [r5, #0xe]
-_080483F2:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080483F4: .4byte gUnk_080D1D98
-
-	thumb_func_start sub_080483F8
-sub_080483F8: @ 0x080483F8
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_080485FC
-	ldrb r0, [r4, #0xe]
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _0804841C
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08048436
-	adds r0, r4, #0
-	movs r1, #3
-	bl InitializeAnimation
-	b _08048436
-_0804841C:
-	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 _08048436
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	strb r5, [r4, #0xe]
-_08048436:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08048438
-sub_08048438: @ 0x08048438
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	beq _0804846A
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	ldr r0, [r4, #0x50]
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0x14
-	bls _08048454
-	movs r0, #0x78
-	b _08048456
-_08048454:
-	movs r0, #0x3c
-_08048456:
-	strb r0, [r4, #0xe]
-	movs r0, #0
-	str r0, [r4, #0x54]
-	adds r0, r4, #0
-	movs r1, #5
-	bl InitializeAnimation
-	ldr r0, _08048474 @ =0x0000019B
-	bl SoundReq
-_0804846A:
-	adds r0, r4, #0
-	bl sub_080485FC
-	pop {r4, pc}
-	.align 2, 0
-_08048474: .4byte 0x0000019B
-
-	thumb_func_start sub_08048478
-sub_08048478: @ 0x08048478
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_080485FC
-	adds r0, r4, #0
-	bl GetNextFrame
-	ldrb r0, [r4, #0xe]
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _080484A2
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080484E6
-	adds r0, r4, #0
-	movs r1, #6
-	bl InitializeAnimation
-	b _080484E6
-_080484A2:
-	adds r3, r4, #0
-	adds r3, #0x5a
-	ldrb r1, [r3]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080484BC
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	movs r0, #0x78
-	strb r0, [r4, #0xe]
-	strb r2, [r4, #0xf]
-	b _080484E6
-_080484BC:
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080484E6
-	movs r0, #0xfe
-	ands r0, r1
-	strb r0, [r3]
-	movs r0, #0x24
-	bl sub_080A7EE0
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _080484E6
-	str r4, [r1, #0x50]
-	str r1, [r4, #0x54]
-	movs r3, #0xc0
-	lsls r3, r3, #0xc
-	adds r0, r4, #0
-	movs r2, #0
-	bl PositionRelative
-_080484E6:
-	pop {r4, pc}
-
-	thumb_func_start sub_080484E8
-sub_080484E8: @ 0x080484E8
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_080485FC
-	adds r0, r4, #0
-	bl GetNextFrame
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _08048528
-	movs r0, #8
-	strb r0, [r4, #0xc]
-	movs r0, #0x3c
-	strb r0, [r4, #0xe]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	movs r1, #0x1f
-	movs r2, #0x40
-	bl CreateFx
-	ldr r2, [r4, #0x50]
-	adds r2, #0x7b
-	movs r0, #0x10
-	b _08048542
-_08048528:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	bne _0804854C
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	strb r1, [r4, #0xe]
-	ldr r2, [r4, #0x50]
-	adds r2, #0x7b
-	movs r0, #1
-_08048542:
-	ldrb r4, [r4, #0xa]
-	lsls r0, r4
-	ldrb r1, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-_0804854C:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08048550
-sub_08048550: @ 0x08048550
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldrb r0, [r0, #0xc]
-	cmp r0, #0xb
-	bne _08048562
-	movs r0, #0x3c
-	strb r0, [r4, #0xe]
-	b _0804859E
-_08048562:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0804859E
-	movs r0, #9
-	strb r0, [r4, #0xc]
-	ldrb r0, [r4, #0x10]
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_080485FC
-	movs r0, #0xb3
-	lsls r0, r0, #1
-	bl SoundReq
-_0804859E:
-	pop {r4, pc}
-
-	thumb_func_start sub_080485A0
-sub_080485A0: @ 0x080485A0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_080485FC
-	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 _080485D6
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r1, #1
-	strb r1, [r4, #0xe]
-	ldr r2, [r4, #0x50]
-	adds r2, #0x7b
-	ldrb r3, [r2]
-	movs r0, #0xf
-	ands r0, r3
-	ldrb r4, [r4, #0xa]
-	lsls r1, r4
-	orrs r0, r1
-	strb r0, [r2]
-_080485D6:
-	pop {r4, pc}
-
-	thumb_func_start sub_080485D8
-sub_080485D8: @ 0x080485D8
-	push {lr}
-	adds r1, r0, #0
-	ldrb r3, [r1, #0xa]
-	lsls r3, r3, #1
-	ldr r0, _080485F8 @ =gUnk_080D1D70
-	adds r3, r3, r0
-	ldr r0, [r1, #0x50]
-	movs r2, #0
-	ldrsb r2, [r3, r2]
-	ldrb r3, [r3, #1]
-	lsls r3, r3, #0x18
-	asrs r3, r3, #0x18
-	bl sub_0806FA90
-	pop {pc}
-	.align 2, 0
-_080485F8: .4byte gUnk_080D1D70
-
-	thumb_func_start sub_080485FC
-sub_080485FC: @ 0x080485FC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #1
-	ldr r0, _08048638 @ =gUnk_080D1D98
-	adds r1, r1, r0
-	ldr r0, [r4, #0x50]
-	movs r2, #0
-	ldrsb r2, [r1, r2]
-	movs r3, #1
-	ldrsb r3, [r1, r3]
-	adds r1, r4, #0
-	bl sub_0806FA90
-	ldr r3, _0804863C @ =gUnk_080D1D78
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #3
-	ldr r0, [r4, #0x50]
-	adds r0, #0x78
-	ldrb r0, [r0]
-	lsrs r0, r0, #4
-	movs r2, #7
-	ands r0, r2
-	adds r1, r1, r0
-	adds r1, r1, r3
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	strh r0, [r4, #0x36]
-	pop {r4, pc}
-	.align 2, 0
-_08048638: .4byte gUnk_080D1D98
-_0804863C: .4byte gUnk_080D1D78

asm/enemy64.s

@@ -139,7 +139,7 @@ _08049144:
 	bl sub_0807B7D8
 _0804916E:
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _080491E4
@@ -560,7 +560,7 @@ _0804948C:
 	cmp r0, #0
 	beq _080494B2
 	movs r0, #0x23
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _080494B2

asm/gleerok.s

@@ -1838,7 +1838,7 @@ _0802DD74:
 	adds r0, r4, #0
 	movs r1, #0xa
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	str r1, [r4, #0x54]
 	cmp r1, #0
@@ -1985,7 +1985,7 @@ _0802DE7E:
 	bne _0802DEC4
 	adds r0, r5, #0
 	movs r1, #0xa
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	str r1, [r5, #0x54]
 	cmp r1, #0
@@ -2711,7 +2711,7 @@ _0802E40C:
 	adds r0, r4, #0
 	movs r1, #0xa
 	movs r2, #3
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _0802E422:
 	adds r0, r4, #0
 	bl sub_0802E518

asm/gyorgFemale.s

@@ -29,7 +29,7 @@ sub_0804614C: @ 0x0804614C
 	cmp r0, #0x3d
 	bhi _08046244
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r1, r0, #0
 	movs r4, #0
 	strb r4, [r1, #0xa]

asm/intr.s

@@ -659,6 +659,7 @@ UpdateEntities: @ 0x080B21B0
 	ldr r8, [fp, #4]
 	ldr r0, [fp, #8]
 	add pc, pc, #0x60 @ =_080B2230
+@ UpdateEntities starts here
 	ldr r1, _080B2274 @ =gUnk_080026A4
 	add r1, r1, r0, lsl #4
 	push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
@@ -682,12 +683,12 @@ _080B21FC:
 	ldr r1, [sl, r1, lsl #2]
 	mov r0, r4
 	mov lr, pc
-	bx r1
+	bx r1					@ Jump to address stored in r1
 _080B2224:
 	ldr r0, [fp, #8]
 	cmp r0, r4
 	bleq sub_080B1C54
-_080B2230:
+_080B2230: @ jumped here if ClearAndUpdateEntities
 	ldr r4, [r0, #4]
 	b _080B21FC
 _080B2238:
@@ -695,7 +696,7 @@ _080B2238:
 	str r0, [fp, #8]
 	pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	bx lr
-_080B2248: .4byte DeleteThisEntity
+_080B2248: .4byte DeleteThisEntity @ 0x3005fbc
 _080B224C: .4byte PlayerUpdate
 _080B2250: .4byte DeleteThisEntity
 _080B2254: .4byte EnemyUpdate

asm/non_matching/gyorgMaleEnergyProjectile/sub_080AC8DC.inc

@@ -35,6 +35,6 @@ _080AC8FE:
 	bl InitializeAnimation
 _080AC920:
 	adds r0, r4, #0
-	bl sub_080AC8C4
+	bl GyorgMaleEnergyProjectile_OnTick
 	pop {r4, pc}
 	.syntax divided

asm/non_matching/gyorgTail/sub_080AC5E4.inc

@@ -16,7 +16,7 @@
 	movs r0, #0x11
 	strb r0, [r1]
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r6, r0, #0
 	ldrb r0, [r5, #0xa]
 	strb r0, [r6, #0xa]
@@ -30,7 +30,7 @@
 	strb r0, [r1]
 	str r6, [r5, #0x54]
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r7, r0, #0
 	ldrb r0, [r5, #0xa]
 	strb r0, [r7, #0xa]
@@ -46,7 +46,7 @@
 	strb r1, [r0]
 	str r7, [r6, #0x54]
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	ldrb r1, [r5, #0xa]
 	strb r1, [r0, #0xa]
 	movs r1, #3
@@ -79,7 +79,7 @@ _080AC678:
 	movs r0, #0xf
 	strb r0, [r1]
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r6, r0, #0
 	ldrb r0, [r5, #0xa]
 	strb r0, [r6, #0xa]
@@ -95,7 +95,7 @@ _080AC678:
 	strb r1, [r0]
 	str r6, [r5, #0x54]
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r7, r0, #0
 	ldrb r0, [r5, #0xa]
 	strb r0, [r7, #0xa]
@@ -112,7 +112,7 @@ _080AC678:
 	str r7, [r6, #0x54]
 _080AC6C8:
 	movs r0, #0x22
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r6, r0, #0
 	ldrb r0, [r5, #0xa]
 	strb r0, [r6, #0xa]

asm/non_matching/mazaal/sub_08034B38.inc

@@ -17,7 +17,7 @@
 	b _08034B9A
 _08034B58:
 	movs r0, #0xe
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r5, r0, #0
 	cmp r5, #0
 	beq _08034B9A

asm/non_matching/projectile14/sub_080AA544.inc

@@ -1,134 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	adds r6, r0, #0
-	ldrb r0, [r6, #0xb]
-	cmp r0, #8
-	bhi _080AA618
-	ldr r0, _080AA5E8 @ =gUnk_08129FF8
-	mov sb, r0
-	movs r1, #0x2e
-	ldrsh r2, [r6, r1]
-	ldr r1, _080AA5EC @ =gRoomControls
-	ldrh r0, [r1, #6]
-	subs r2, r2, r0
-	asrs r2, r2, #4
-	movs r3, #0x3f
-	ands r2, r3
-	movs r4, #0x32
-	ldrsh r0, [r6, r4]
-	ldrh r1, [r1, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r2, r0
-	ldrb r0, [r6, #0xb]
-	add r0, sb
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r7, r2, r0
-	movs r4, #0
-	movs r5, #0
-	movs r0, #0x38
-	adds r0, r0, r6
-	mov r8, r0
-_080AA58E:
-	mov r1, sb
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	subs r0, r7, r0
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	mov r2, r8
-	ldrb r1, [r2]
-	bl sub_080002C8
-	cmp r0, #0x3e
-	bne _080AA5AC
-	adds r5, #1
-_080AA5AC:
-	adds r4, #1
-	cmp r4, #8
-	bls _080AA58E
-	cmp r5, #8
-	bne _080AA5F4
-	movs r4, #0
-	ldr r5, _080AA5F0 @ =gUnk_08129FD0
-_080AA5BA:
-	ldrh r0, [r5]
-	mov r3, sb
-	adds r1, r3, r4
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	subs r1, r7, r1
-	mov r3, r8
-	ldrb r2, [r3]
-	bl sub_0807B7D8
-	adds r5, #2
-	adds r4, #1
-	cmp r4, #8
-	bls _080AA5BA
-	adds r0, r6, #0
-	adds r1, r7, #0
-	bl sub_080AA654
-	ldrh r0, [r6, #0x24]
-	bl SetFlag
-	b _080AA648
-	.align 2, 0
-_080AA5E8: .4byte gUnk_08129FF8
-_080AA5EC: .4byte gRoomControls
-_080AA5F0: .4byte gUnk_08129FD0
-_080AA5F4:
-	ldr r2, _080AA614 @ =gUnk_08129FE4
-	ldrb r1, [r6, #0xb]
-	lsls r0, r1, #1
-	adds r0, r0, r2
-	ldrh r0, [r0]
-	add r1, sb
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	subs r1, r7, r1
-	mov r4, r8
-	ldrb r2, [r4]
-	bl sub_0807B7D8
-	b _080AA648
-	.align 2, 0
-_080AA614: .4byte gUnk_08129FE4
-_080AA618:
-	movs r1, #0x2e
-	ldrsh r0, [r6, r1]
-	ldr r2, _080AA650 @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	movs r3, #0x3f
-	ands r0, r3
-	movs r4, #0x32
-	ldrsh r1, [r6, r4]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r0, r1
-	adds r1, r6, #0
-	adds r1, #0x38
-	ldrb r1, [r1]
-	bl sub_0807BA8C
-	ldrh r0, [r6, #0x24]
-	bl SetFlag
-_080AA648:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080AA650: .4byte gRoomControls
-	.syntax divided

asm/non_matching/projectile1B/sub_080AB634.inc

@@ -1,49 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	ldr r0, [r6, #0x50]
-	movs r5, #0
-	adds r4, r0, #0
-	adds r4, #0x20
-_080AB640:
-	ldr r1, [r4]
-	cmp r1, #0
-	beq _080AB684
-	adds r0, r6, #0
-	bl sub_080177A0
-	cmp r0, #0
-	beq _080AB684
-	ldr r1, [r4]
-	ldrb r0, [r1, #0xc]
-	cmp r0, #2
-	bhi _080AB67A
-	movs r0, #3
-	strb r0, [r1, #0xc]
-	ldr r1, [r4]
-	movs r0, #0x1e
-	strb r0, [r1, #0xe]
-	ldr r2, [r4]
-	ldrb r0, [r2, #0x18]
-	movs r3, #4
-	rsbs r3, r3, #0
-	adds r1, r3, #0
-	ands r0, r1
-	strb r0, [r2, #0x18]
-	ldr r0, [r4]
-	movs r1, #0x45
-	movs r2, #0
-	bl CreateFx
-_080AB67A:
-	adds r0, r6, #0
-	bl DeleteEntity
-	movs r0, #1
-	b _080AB68E
-_080AB684:
-	adds r4, #4
-	adds r5, #1
-	cmp r5, #3
-	bls _080AB640
-	movs r0, #0
-_080AB68E:
-	pop {r4, r5, r6, pc}
-	.syntax divided

asm/non_matching/v3ElectricProjectile/sub_080AC200.inc

@@ -12,7 +12,7 @@
 	movs r0, #0x10
 	strb r0, [r4, #0xe]
 	movs r0, #0x21
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _080AC23C

asm/non_matching/vaati/sub_080432A8.inc

@@ -0,0 +1,89 @@
+
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	adds r4, r0, #0
+	movs r3, #3
+	movs r2, #0
+	ldr r0, [r4, #0x64]
+	adds r1, r0, #0
+	adds r1, #0x48
+	ldrb r0, [r1, #0xc]
+	cmp r0, #2
+	bls _080432C2
+	subs r0, #1
+	strb r0, [r1, #0xc]
+	movs r2, #1
+_080432C2:
+	subs r3, #1
+	cmp r3, #0
+	blt _080432E0
+	lsls r0, r3, #4
+	adds r0, #0x18
+	ldr r1, [r4, #0x64]
+	adds r1, r1, r0
+	ldrb r0, [r1, #0xc]
+	cmp r0, #2
+	bls _080432C2
+	subs r0, #1
+	strb r0, [r1, #0xc]
+	adds r2, #1
+	cmp r2, #1
+	ble _080432C2
+_080432E0:
+	ldr r0, [r4, #0x64]
+	adds r1, r0, #0
+	adds r1, #0x18
+	ldrb r0, [r1, #5]
+	subs r0, #2
+	strb r0, [r1, #5]
+	movs r3, #0
+	movs r6, #0x80
+	movs r7, #4
+	rsbs r7, r7, #0
+	movs r5, #1
+_080432F6:
+	ldr r0, [r4, #0x64]
+	lsls r1, r3, #2
+	adds r0, r0, r1
+	ldr r2, [r0]
+	movs r1, #0x36
+	ldrsh r0, [r2, r1]
+	cmp r0, #3
+	bgt _08043316
+	ldrb r0, [r2, #0x10]
+	orrs r0, r6
+	strb r0, [r2, #0x10]
+	ldrb r1, [r2, #0x18]
+	adds r0, r7, #0
+	ands r0, r1
+	orrs r0, r5
+	strb r0, [r2, #0x18]
+_08043316:
+	adds r3, #1
+	cmp r3, #3
+	ble _080432F6
+	ldr r1, [r4, #0x64]
+	ldr r0, [r1]
+	ldrb r0, [r0, #0x18]
+	lsls r0, r0, #0x1e
+	lsrs r2, r0, #0x1e
+	cmp r2, #1
+	bne _08043348
+	adds r0, r1, #0
+	adds r0, #0x34
+	ldrb r0, [r0]
+	cmp r0, #2
+	bhi _08043348
+	strb r2, [r4, #0xd]
+	movs r0, #0x1e
+	strb r0, [r4, #0xe]
+	movs r0, #0x80
+	lsls r0, r0, #7
+	strh r0, [r1, #0x1c]
+	ldr r0, [r4, #0x64]
+	ldr r0, [r0, #0x10]
+	bl sub_0804AA1C
+_08043348:
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+    .syntax divided

asm/non_matching/vaati/sub_0804334C.inc

@@ -0,0 +1,111 @@
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	adds r4, r0, #0
+	ldrb r0, [r4, #0xe]
+	cmp r0, #0
+	beq _08043388
+	subs r0, #1
+	strb r0, [r4, #0xe]
+	lsls r0, r0, #0x18
+	cmp r0, #0
+	bne _0804341C
+	movs r5, #0
+	movs r7, #0x80
+	movs r6, #4
+	rsbs r6, r6, #0
+	movs r3, #1
+_0804336A:
+	ldr r0, [r4, #0x64]
+	lsls r1, r5, #2
+	adds r0, r0, r1
+	ldr r2, [r0]
+	ldrb r0, [r2, #0x10]
+	orrs r0, r7
+	strb r0, [r2, #0x10]
+	ldrb r1, [r2, #0x18]
+	adds r0, r6, #0
+	ands r0, r1
+	orrs r0, r3
+	strb r0, [r2, #0x18]
+	adds r5, #1
+	cmp r5, #4
+	bls _0804336A
+_08043388:
+	ldr r3, [r4, #0x64]
+	adds r2, r3, #0
+	adds r2, #0x18
+	ldr r1, _080433AC @ =gUnk_080D131C
+	ldrb r0, [r4, #0xb]
+	adds r0, r0, r1
+	ldrb r0, [r0]
+	ldrb r1, [r2, #1]
+	subs r0, r0, r1
+	adds r0, #1
+	cmp r0, #2
+	bls _080433B0
+	ldrh r0, [r2, #8]
+	ldrh r1, [r3, #0x18]
+	adds r0, r0, r1
+	strh r0, [r3, #0x18]
+	movs r7, #0
+	b _080433B2
+	.align 2, 0
+_080433AC: .4byte gUnk_080D131C
+_080433B0:
+	movs r7, #1
+_080433B2:
+	adds r0, r4, #0
+	bl sub_08043B9C
+	movs r5, #0
+	movs r6, #0x18
+_080433BC:
+	ldr r0, [r4, #0x64]
+	adds r2, r0, r6
+	ldr r0, _080433E4 @ =gUnk_080D1414
+	adds r0, r5, r0
+	ldrb r1, [r2, #0xc]
+	ldrb r3, [r0]
+	cmp r3, r1
+	bls _080433E8
+	adds r0, r1, #1
+	strb r0, [r2, #0xc]
+	lsls r0, r0, #0x18
+	lsrs r0, r0, #0x18
+	cmp r3, r0
+	bne _0804341C
+	movs r0, #0xaf
+	lsls r0, r0, #1
+	bl SoundReq
+	b _0804341C
+	.align 2, 0
+_080433E4: .4byte gUnk_080D1414
+_080433E8:
+	cmp r7, #0
+	beq _08043414
+	cmp r5, #4
+	bne _08043414
+	adds r0, r4, #0
+	bl sub_08043BC8
+	adds r0, r4, #0
+	movs r1, #7
+	bl InitAnimationForceUpdate
+	adds r1, r4, #0
+	adds r1, #0x7e
+	ldrb r0, [r1]
+	cmp r0, #0
+	beq _08043414
+	movs r0, #0
+	strb r0, [r1]
+	ldr r0, [r4, #0x64]
+	ldr r1, [r0, #0x14]
+	movs r0, #2
+	strb r0, [r1, #0xd]
+_08043414:
+	adds r6, #0x10
+	adds r5, #1
+	cmp r5, #4
+	bls _080433BC
+_0804341C:
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+    .syntax divided

asm/non_matching/vaati/sub_08043490.inc

@@ -0,0 +1,75 @@
+    .syntax unified
+	push {r4, lr}
+	adds r4, r0, #0
+	ldr r0, [r4, #0x64]
+	ldr r0, [r0, #0x10]
+	mov ip, r0
+	ldrh r1, [r0, #0x36]
+	movs r2, #0x36
+	ldrsh r0, [r0, r2]
+	movs r2, #4
+	rsbs r2, r2, #0
+	cmp r0, r2
+	bge _080434C4
+	movs r0, #0xc0
+	lsls r0, r0, #9
+	mov r3, ip
+	str r0, [r3, #0x20]
+	movs r0, #0
+	movs r1, #2
+	strb r1, [r4, #0xd]
+	adds r2, r4, #0
+	adds r2, #0x7e
+	strb r0, [r2]
+	ldr r0, [r4, #0x64]
+	ldr r0, [r0, #0x14]
+	strb r1, [r0, #0xd]
+	b _08043514
+_080434C4:
+	subs r0, r1, #2
+	mov r1, ip
+	strh r0, [r1, #0x36]
+	lsls r0, r0, #0x10
+	cmp r0, #0
+	bge _08043514
+	ldrb r0, [r1, #0x10]
+	movs r3, #0x80
+	orrs r0, r3
+	strb r0, [r1, #0x10]
+	ldrb r1, [r1, #0x18]
+	adds r0, r2, #0
+	ands r0, r1
+	movs r1, #1
+	orrs r0, r1
+	mov r2, ip
+	strb r0, [r2, #0x18]
+	adds r2, #0x3c
+	ldrb r1, [r2]
+	movs r0, #0xef
+	ands r0, r1
+	strb r0, [r2]
+	mov r1, ip
+	adds r1, #0x3f
+	movs r0, #0x3a
+	strb r0, [r1]
+	ldr r0, _0804351C @ =gUnk_080FD450
+	mov r1, ip
+	str r0, [r1, #0x48]
+	ldr r0, [r4, #0x64]
+	ldr r1, [r0, #8]
+	ldrb r0, [r1, #0x10]
+	orrs r3, r0
+	strb r3, [r1, #0x10]
+	ldr r0, [r4, #0x64]
+	ldr r2, [r0, #0xc]
+	ldrb r1, [r2, #0x10]
+	movs r0, #0x7f
+	ands r0, r1
+	strb r0, [r2, #0x10]
+_08043514:
+	adds r0, r4, #0
+	bl UpdateAnimationSingleFrame
+	pop {r4, pc}
+	.align 2, 0
+_0804351C: .4byte gUnk_080FD450
+    .syntax divided

asm/non_matching/vaati/sub_08043770.inc

@@ -0,0 +1,58 @@
+    .syntax unified
+	push {r4, r5, lr}
+	adds r2, r0, #0
+	ldrb r0, [r2, #0xe]
+	subs r0, #1
+	strb r0, [r2, #0xe]
+	lsls r0, r0, #0x18
+	lsrs r4, r0, #0x18
+	cmp r4, #0
+	bne _080437D8
+	ldr r0, [r2, #0x64]
+	ldr r3, [r0, #0x14]
+	ldr r0, _080437AC @ =gScreenTransition
+	adds r5, r0, #0
+	adds r5, #0x39
+	ldrb r1, [r5]
+	movs r0, #0xc
+	ands r0, r1
+	cmp r0, #0
+	bne _0804379A
+	movs r0, #2
+	strb r0, [r3, #0xd]
+_0804379A:
+	ldrb r0, [r2, #0xb]
+	cmp r0, #0
+	bne _080437B0
+	ldr r0, [r3, #0x64]
+	str r4, [r0, #0x14]
+	ldrb r1, [r5]
+	movs r0, #0xfe
+	b _080437B8
+	.align 2, 0
+_080437AC: .4byte gScreenTransition
+_080437B0:
+	ldr r0, [r3, #0x64]
+	str r4, [r0, #0x18]
+	ldrb r1, [r5]
+	movs r0, #0xfd
+_080437B8:
+	ands r0, r1
+	strb r0, [r5]
+	ldr r0, [r2, #0x64]
+	ldr r0, [r0, #0x10]
+	movs r1, #0
+	str r1, [r0, #0x64]
+	ldr r0, [r2, #0x64]
+	ldr r0, [r0, #0x10]
+	adds r0, #0x45
+	strb r1, [r0]
+	ldr r1, [r2, #0x68]
+	ldr r0, [r2, #0x64]
+	ldr r0, [r0, #0x10]
+	str r0, [r1, #0x50]
+	bl DeleteThisEntity
+_080437D8:
+	pop {r4, r5, pc}
+	.align 2, 0
+    .syntax divided

asm/non_matching/vaati/sub_0804393C.inc

@@ -0,0 +1,109 @@
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	mov r7, r8
+	push {r7}
+	adds r5, r0, #0
+	ldr r0, [r5, #0x64]
+	ldr r1, [r0]
+	adds r0, r1, #0
+	adds r0, #0x7c
+	ldrb r0, [r0]
+	lsls r2, r0, #0x18
+	cmp r2, #0
+	beq _0804397C
+	adds r0, r1, #0
+	adds r0, #0x7d
+	ldrb r0, [r0]
+	ldrb r1, [r5, #0xa]
+	cmp r0, r1
+	bhi _0804397C
+	ldr r4, _08043978 @ =gUnk_080D1362
+	ldrb r3, [r5, #0xa]
+	lsls r1, r3, #4
+	lsrs r0, r2, #0x1b
+	movs r2, #0xf
+	ands r0, r2
+	adds r1, r1, r0
+	adds r1, r1, r4
+	ldrb r4, [r1]
+	adds r6, r3, #0
+	b _08043980
+	.align 2, 0
+_08043978: .4byte gUnk_080D1362
+_0804397C:
+	movs r4, #0
+	ldrb r6, [r5, #0xa]
+_08043980:
+	lsls r0, r6, #4
+	adds r0, #0x18
+	ldr r2, [r5, #0x64]
+	mov ip, r2
+	adds r2, r2, r0
+	ldrb r0, [r2, #0xc]
+	adds r0, r4, r0
+	lsls r4, r0, #8
+	ldr r3, _08043A0C @ =gSineTable
+	ldrb r1, [r2, #5]
+	adds r0, r1, #0
+	adds r0, #0x40
+	lsls r0, r0, #1
+	adds r0, r0, r3
+	movs r7, #0
+	ldrsh r0, [r0, r7]
+	rsbs r0, r0, #0
+	adds r7, r0, #0
+	muls r7, r4, r7
+	mov r8, r7
+	movs r0, #0x7f
+	ands r1, r0
+	lsls r1, r1, #1
+	adds r1, r1, r3
+	movs r7, #0
+	ldrsh r0, [r1, r7]
+	muls r0, r4, r0
+	cmp r0, #0
+	bge _080439BC
+	adds r0, #0xff
+_080439BC:
+	asrs r4, r0, #8
+	ldrb r1, [r2, #1]
+	lsls r0, r1, #1
+	adds r0, r0, r3
+	movs r2, #0
+	ldrsh r0, [r0, r2]
+	adds r2, r0, #0
+	muls r2, r4, r2
+	adds r1, #0x40
+	lsls r1, r1, #1
+	adds r1, r1, r3
+	movs r3, #0
+	ldrsh r0, [r1, r3]
+	rsbs r0, r0, #0
+	adds r3, r0, #0
+	muls r3, r4, r3
+	adds r0, r6, #1
+	lsls r0, r0, #2
+	add r0, ip
+	ldr r0, [r0]
+	adds r1, r5, #0
+	bl PositionRelative
+	ldr r0, [r5, #0x34]
+	add r0, r8
+	str r0, [r5, #0x34]
+	ldr r1, [r5, #0x64]
+	ldrb r0, [r5, #0xa]
+	adds r0, #1
+	lsls r0, r0, #2
+	adds r1, r1, r0
+	ldr r0, [r1]
+	adds r0, #0x63
+	ldrb r1, [r0]
+	adds r0, r5, #0
+	adds r0, #0x63
+	strb r1, [r0]
+	pop {r3}
+	mov r8, r3
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_08043A0C: .4byte gSineTable
+    .syntax divided

asm/non_matching/vaati/sub_08043B08.inc

@@ -0,0 +1,67 @@
+    .syntax unified
+	push {r4, r5, r6, lr}
+	ldrb r3, [r0, #0xa]
+	lsls r1, r3, #4
+	adds r4, r1, #0
+	adds r4, #8
+	ldr r2, [r0, #0x64]
+	adds r6, r2, r4
+	adds r1, #0x18
+	adds r4, r2, r1
+	ldr r0, _08043B40 @ =gUnk_080D13B2
+	adds r3, r3, r0
+	ldrb r5, [r3]
+	ldr r0, [r2]
+	ldrb r0, [r0, #0xb]
+	cmp r0, #0
+	bne _08043B44
+	ldrb r1, [r6, #1]
+	ldrb r0, [r4, #1]
+	subs r0, r1, r0
+	lsls r0, r0, #0x18
+	asrs r3, r0, #0x18
+	cmp r5, r3
+	bhs _08043B5E
+	cmp r3, #0
+	ble _08043B56
+	subs r0, r1, r5
+	b _08043B5C
+	.align 2, 0
+_08043B40: .4byte gUnk_080D13B2
+_08043B44:
+	ldrb r0, [r4, #1]
+	ldrb r1, [r6, #1]
+	subs r0, r0, r1
+	lsls r0, r0, #0x18
+	asrs r3, r0, #0x18
+	cmp r5, r3
+	bhs _08043B5E
+	cmp r3, #0
+	bge _08043B5A
+_08043B56:
+	strb r1, [r4, #1]
+	b _08043B5E
+_08043B5A:
+	adds r0, r1, r5
+_08043B5C:
+	strb r0, [r4, #1]
+_08043B5E:
+	ldrb r2, [r6, #5]
+	ldrb r0, [r4, #5]
+	subs r3, r2, r0
+	lsls r1, r5, #1
+	adds r0, r3, r5
+	cmp r1, r0
+	bhs _08043B78
+	cmp r3, #0
+	ble _08043B74
+	subs r0, r2, r5
+	b _08043B76
+_08043B74:
+	adds r0, r2, r5
+_08043B76:
+	strb r0, [r4, #5]
+_08043B78:
+	pop {r4, r5, r6, pc}
+	.align 2, 0
+    .syntax divided

asm/non_matching/vaati/sub_08044000.inc

@@ -0,0 +1,59 @@
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	adds r4, r0, #0
+	ldrb r0, [r4, #0xb]
+	lsls r1, r0, #2
+	adds r1, r1, r0
+	lsls r1, r1, #1
+	ldr r0, _08044070 @ =gUnk_080D1400
+	movs r3, #0
+	ldr r2, _08044074 @ =gUnk_080D1414
+	mov ip, r2
+	movs r7, #8
+	rsbs r7, r7, #0
+	adds r5, r1, r0
+	movs r6, #0x18
+_0804401C:
+	ldr r0, [r4, #0x64]
+	lsls r1, r3, #2
+	adds r0, r0, r1
+	ldr r2, [r0]
+	ldrb r1, [r2, #0x10]
+	movs r0, #0x80
+	orrs r0, r1
+	strb r0, [r2, #0x10]
+	adds r2, #0x29
+	ldrb r1, [r2]
+	adds r0, r7, #0
+	ands r0, r1
+	movs r1, #4
+	orrs r0, r1
+	strb r0, [r2]
+	ldr r1, [r4, #0x64]
+	adds r1, r1, r6
+	ldrh r0, [r5]
+	strh r0, [r1]
+	movs r0, #0x80
+	lsls r0, r0, #7
+	strh r0, [r1, #4]
+	mov r2, ip
+	adds r0, r3, r2
+	ldrb r0, [r0]
+	strb r0, [r1, #0xc]
+	adds r5, #2
+	adds r6, #0x10
+	adds r3, #1
+	cmp r3, #4
+	bls _0804401C
+	adds r0, r4, #0
+	movs r1, #7
+	bl InitAnimationForceUpdate
+	ldr r1, [r4, #0x64]
+	ldr r0, [r1, #0x14]
+	ldr r1, [r1, #0x10]
+	bl CopyPosition
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_08044070: .4byte gUnk_080D1400
+_08044074: .4byte gUnk_080D1414
+    .syntax divided

asm/object98.s

@@ -50,7 +50,7 @@ _0809E372:
 	movs r6, #0xe
 _0809E392:
 	movs r0, #0x17
-	bl sub_080A7EE0
+	bl CreateProjectile
 	strb r6, [r0, #0xe]
 	str r4, [r0, #0x50]
 	adds r6, #0xc

asm/objectA0.s

@@ -92,7 +92,7 @@ sub_0809F1B0: @ 0x0809F1B0
 	ands r0, r1
 	strb r0, [r2]
 	movs r0, #0x1b
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r5, r0, #0
 	cmp r5, #0
 	beq _0809F21E

asm/objectA5.s

@@ -20,7 +20,7 @@ ObjectA5: @ 0x0809F8A4
 	movs r5, #0
 _0809F8B6:
 	movs r0, #0x1d
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r4, r0, #0
 	cmp r5, #0
 	bne _0809F8C6

asm/objectB5.s

@@ -1,33 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ObjectB5
-ObjectB5: @ 0x080A0E28
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xc]
-	cmp r0, #0
-	bne _080A0E36
-	movs r0, #1
-	strb r0, [r1, #0xc]
-_080A0E36:
-.ifndef EU
-	ldr r0, _080A0E48 @ =gRoomControls
-	str r1, [r0, #0x30]
-.endif
-	ldr r0, _080A0E4C @ =gPlayerEntity
-	ldr r3, _080A0E50 @ =0xFFD80000
-	movs r2, #0
-	bl PositionRelative
-	pop {pc}
-	.align 2, 0
-.ifndef EU
-_080A0E48: .4byte gRoomControls
-.endif
-_080A0E4C: .4byte gPlayerEntity
-_080A0E50: .4byte 0xFFD80000

asm/octorokBoss.s

@@ -2505,7 +2505,7 @@ _08035F16:
 	adds r0, r5, #0
 	movs r1, #0xf
 	movs r2, #3
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _08035F48:
 	ldr r1, _08035F78 @ =gUnk_080CF0C4
 	ldrb r0, [r5, #0xd]
@@ -3096,7 +3096,7 @@ sub_08036390: @ 0x08036390
 	adds r4, r0, #0
 	movs r1, #0xf
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	str r0, [r4, #0x54]
 	cmp r0, #0
 	beq _080363B4
@@ -3526,7 +3526,7 @@ _080366D4:
 	adds r0, r4, #0
 	movs r1, #0xf
 	movs r2, #2
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	str r0, [r4, #0x54]
 	cmp r0, #0
 	beq _08036706
@@ -3572,7 +3572,7 @@ sub_0803670C: @ 0x0803670C
 	adds r0, r4, #0
 	movs r1, #0xf
 	movs r2, #3
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _08036746:
 	adds r0, r4, #0
 	adds r0, #0x76

asm/octorokGolden.s

@@ -177,7 +177,7 @@ sub_08037D54: @ 0x08037D54
 	adds r0, r4, #0
 	movs r1, #1
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _08037E0C

asm/scissorsBeetle.s

@@ -122,7 +122,7 @@ sub_08038984: @ 0x08038984
 	push {r4, r5, r6, lr}
 	adds r5, r0, #0
 	movs r0, #0x13
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r6, r0, #0
 	cmp r6, #0
 	beq _080389E6

asm/stalfos.s

@@ -142,7 +142,7 @@ _08039390:
 	adds r0, r5, #0
 	movs r1, #0x10
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _080393DC
@@ -258,7 +258,7 @@ sub_08039470: @ 0x08039470
 	bne _08039494
 	movs r1, #0x10
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0803949C
@@ -1007,7 +1007,7 @@ sub_08039A20: @ 0x08039A20
 	adds r4, r0, #0
 	movs r1, #2
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _08039A44
@@ -1107,7 +1107,7 @@ sub_08039AD4: @ 0x08039AD4
 	ldrb r2, [r4, #0xb]
 	adds r0, r4, #0
 	movs r1, #0x10
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _08039B20

asm/vaati.s

@@ -1,335 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Vaati
-Vaati: @ 0x08066A5C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _08066A90 @ =gUnk_08110734
-	ldrb r0, [r4, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	ldrb r3, [r4, #0x1a]
-	lsrs r1, r3, #4
-	adds r0, r4, #0
-	adds r0, #0x5b
-	ldrb r2, [r0]
-	movs r0, #1
-	ands r0, r2
-	adds r1, r1, r0
-	movs r0, #0xf
-	ands r1, r0
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r4, #0x1a]
-	pop {r4, pc}
-	.align 2, 0
-_08066A90: .4byte gUnk_08110734
-
-	thumb_func_start sub_08066A94
-sub_08066A94: @ 0x08066A94
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r2, #0
-	movs r3, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	strb r2, [r4, #0xd]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x68
-	strb r2, [r0]
-	adds r0, #1
-	strb r2, [r0]
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-	adds r0, r4, #0
-	bl sub_0807DD64
-	adds r0, r4, #0
-	bl sub_08066ACC
-	pop {r4, pc}
-
-	thumb_func_start sub_08066ACC
-sub_08066ACC: @ 0x08066ACC
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r1, _08066B18 @ =sub_08066B74
-	bl sub_0807DD94
-	adds r0, r4, #0
-	adds r0, #0x69
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #0
-	beq _08066AF6
-	ldr r0, _08066B1C @ =gScreenTransition
-	ldr r0, [r0]
-	movs r1, #3
-	ands r0, r1
-	cmp r0, #0
-	bne _08066AF6
-	adds r0, r4, #0
-	bl sub_08095CB0
-_08066AF6:
-	adds r1, r4, #0
-	adds r1, #0x5a
-	ldrb r2, [r1]
-	movs r0, #0x81
-	rsbs r0, r0, #0
-	ands r2, r0
-	adds r5, r1, #0
-	cmp r2, #0
-	beq _08066B6E
-	cmp r2, #2
-	beq _08066B34
-	cmp r2, #2
-	bhi _08066B20
-	cmp r2, #1
-	beq _08066B2A
-	b _08066B66
-	.align 2, 0
-_08066B18: .4byte sub_08066B74
-_08066B1C: .4byte gScreenTransition
-_08066B20:
-	cmp r2, #3
-	beq _08066B40
-	cmp r2, #4
-	beq _08066B52
-	b _08066B66
-_08066B2A:
-	movs r0, #0x87
-	lsls r0, r0, #2
-	bl EnqueueSFX
-	b _08066B66
-_08066B34:
-	ldr r0, _08066B3C @ =0x0000021E
-	bl EnqueueSFX
-	b _08066B66
-	.align 2, 0
-_08066B3C: .4byte 0x0000021E
-_08066B40:
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r1, [r0]
-	movs r0, #4
-	str r0, [r1, #4]
-	adds r0, r4, #0
-	bl CreateManager36
-	b _08066B66
-_08066B52:
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r1, [r0]
-	str r2, [r1, #4]
-	adds r0, r4, #0
-	bl DeleteManager36
-	ldr r0, _08066B70 @ =0x0000021D
-	bl EnqueueSFX
-_08066B66:
-	ldrb r1, [r5]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5]
-_08066B6E:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08066B70: .4byte 0x0000021D
-
-	thumb_func_start sub_08066B74
-sub_08066B74: @ 0x08066B74
-	push {r4, r5, r6, lr}
-	mov ip, r0
-	ldr r0, [r1, #8]
-	ldr r4, _08066BCC @ =0xFFF00000
-	ands r4, r0
-	ldr r2, _08066BD0 @ =0x000FFFFF
-	ands r0, r2
-	str r0, [r1, #8]
-	cmp r4, #0
-	bne _08066B8A
-	b _08066C86
-_08066B8A:
-	mov r3, ip
-	adds r3, #0x80
-	mov r5, ip
-	adds r5, #0x68
-	movs r6, #1
-_08066B94:
-	mvns r0, r4
-	adds r1, r0, #1
-	ands r1, r4
-	eors r4, r1
-	mov r2, ip
-	ldrb r0, [r2, #0x14]
-	lsrs r2, r0, #1
-	movs r0, #0x80
-	lsls r0, r0, #0x12
-	cmp r1, r0
-	beq _08066C4C
-	cmp r1, r0
-	bhi _08066BE6
-	movs r0, #0x80
-	lsls r0, r0, #0xf
-	cmp r1, r0
-	beq _08066C34
-	cmp r1, r0
-	bhi _08066BD4
-	movs r0, #0x80
-	lsls r0, r0, #0xd
-	cmp r1, r0
-	beq _08066C24
-	movs r0, #0x80
-	lsls r0, r0, #0xe
-	cmp r1, r0
-	beq _08066C2C
-	b _08066C82
-	.align 2, 0
-_08066BCC: .4byte 0xFFF00000
-_08066BD0: .4byte 0x000FFFFF
-_08066BD4:
-	movs r0, #0x80
-	lsls r0, r0, #0x10
-	cmp r1, r0
-	beq _08066C3C
-	movs r0, #0x80
-	lsls r0, r0, #0x11
-	cmp r1, r0
-	beq _08066C44
-	b _08066C82
-_08066BE6:
-	movs r0, #0x80
-	lsls r0, r0, #0x15
-	cmp r1, r0
-	beq _08066C64
-	cmp r1, r0
-	bhi _08066C04
-	movs r0, #0x80
-	lsls r0, r0, #0x13
-	cmp r1, r0
-	beq _08066C54
-	movs r0, #0x80
-	lsls r0, r0, #0x14
-	cmp r1, r0
-	beq _08066C5C
-	b _08066C82
-_08066C04:
-	movs r0, #0x80
-	lsls r0, r0, #0x17
-	cmp r1, r0
-	beq _08066C70
-	cmp r1, r0
-	bhi _08066C1A
-	movs r0, #0x80
-	lsls r0, r0, #0x16
-	cmp r1, r0
-	beq _08066C6C
-	b _08066C82
-_08066C1A:
-	movs r0, #0x80
-	lsls r0, r0, #0x18
-	cmp r1, r0
-	beq _08066C76
-	b _08066C82
-_08066C24:
-	adds r0, r2, #0
-	adds r0, #0x10
-	strh r0, [r3]
-	b _08066C82
-_08066C2C:
-	adds r0, r2, #0
-	adds r0, #0x14
-	strh r0, [r3]
-	b _08066C82
-_08066C34:
-	adds r0, r2, #0
-	adds r0, #0x18
-	strh r0, [r3]
-	b _08066C82
-_08066C3C:
-	adds r0, r2, #0
-	adds r0, #0x1c
-	strh r0, [r3]
-	b _08066C82
-_08066C44:
-	adds r0, r2, #0
-	adds r0, #0x20
-	strh r0, [r3]
-	b _08066C82
-_08066C4C:
-	adds r0, r2, #0
-	adds r0, #0x24
-	strh r0, [r3]
-	b _08066C82
-_08066C54:
-	adds r0, r2, #0
-	adds r0, #0x28
-	strh r0, [r3]
-	b _08066C82
-_08066C5C:
-	adds r0, r2, #0
-	adds r0, #0x2c
-	strh r0, [r3]
-	b _08066C82
-_08066C64:
-	adds r0, r2, #0
-	adds r0, #0x30
-	strh r0, [r3]
-	b _08066C82
-_08066C6C:
-	strb r6, [r5]
-	b _08066C82
-_08066C70:
-	movs r0, #0xff
-	strb r0, [r5]
-	b _08066C82
-_08066C76:
-	mov r2, ip
-	adds r2, #0x69
-	ldrb r1, [r2]
-	adds r0, r6, #0
-	eors r0, r1
-	strb r0, [r2]
-_08066C82:
-	cmp r4, #0
-	bne _08066B94
-_08066C86:
-	mov r0, ip
-	adds r0, #0x84
-	ldr r1, [r0]
-	mov r0, ip
-	bl HandlePostScriptActions
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_08066C94
-sub_08066C94: @ 0x08066C94
-	push {lr}
-	movs r1, #0
-	bl sub_0805DA90
-	movs r0, #0xf7
-	bl SoundReq
-	pop {pc}
-
-	thumb_func_start sub_08066CA4
-sub_08066CA4: @ 0x08066CA4
-	push {lr}
-	movs r1, #1
-	bl sub_0805DA90
-	movs r0, #0xf6
-	bl SoundReq
-	pop {pc}

asm/vaatiEyesMacro.s

@@ -1,631 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start VaatiEyesMacro
-VaatiEyesMacro: @ 0x0802EC6C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r5, _0802EC94 @ =gUnk_080CDE34
-	bl GetNextFunction
-	lsls r0, r0, #2
-	adds r0, r0, r5
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	movs r3, #0x10
-	rsbs r3, r3, #0
-	adds r0, r4, #0
-	movs r1, #0
-	movs r2, #1
-	bl SetChildOffset
-	pop {r4, r5, pc}
-	.align 2, 0
-_0802EC94: .4byte gUnk_080CDE34
-
-	thumb_func_start sub_0802EC98
-sub_0802EC98: @ 0x0802EC98
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _0802ECBC @ =gUnk_080CDE4C
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	ldrb r0, [r4, #0xa]
-	cmp r0, #1
-	bhi _0802ECB8
-	adds r0, r4, #0
-	bl sub_0802EF90
-_0802ECB8:
-	pop {r4, pc}
-	.align 2, 0
-_0802ECBC: .4byte gUnk_080CDE4C
-
-	thumb_func_start sub_0802ECC0
-sub_0802ECC0: @ 0x0802ECC0
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0802ED2A
-	adds r0, r4, #0
-	adds r0, #0x45
-	ldrb r1, [r0]
-	adds r5, r0, #0
-	ldr r3, _0802ED00 @ =gScreenTransition
-	cmp r1, #0
-	bne _0802ECEE
-	adds r2, r3, #0
-	adds r2, #0x39
-	adds r0, r3, #0
-	adds r0, #0x3c
-	ldrb r0, [r0]
-	adds r0, #2
-	movs r1, #1
-	lsls r1, r0
-	ldrb r0, [r2]
-	bics r0, r1
-	strb r0, [r2]
-_0802ECEE:
-	ldr r0, _0802ED04 @ =gRoomControls
-	ldrb r0, [r0, #5]
-	cmp r0, #0
-	bne _0802ED08
-	ldrb r1, [r5]
-	adds r0, r3, #0
-	adds r0, #0x3a
-	b _0802ED0E
-	.align 2, 0
-_0802ED00: .4byte gScreenTransition
-_0802ED04: .4byte gRoomControls
-_0802ED08:
-	ldrb r1, [r5]
-	adds r0, r3, #0
-	adds r0, #0x3b
-_0802ED0E:
-	strb r1, [r0]
-	adds r6, r4, #0
-	adds r6, #0x79
-	ldrb r0, [r6]
-	ldrb r1, [r5]
-	cmp r0, r1
-	beq _0802ED24
-	movs r0, #0xbd
-	lsls r0, r0, #1
-	bl EnqueueSFX
-_0802ED24:
-	ldrb r0, [r5]
-	strb r0, [r6]
-	b _0802ED52
-_0802ED2A:
-	cmp r0, #1
-	bne _0802ED52
-	adds r1, r4, #0
-	adds r1, #0x3d
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	cmp r0, #0
-	ble _0802ED3E
-	rsbs r0, r0, #0
-	strb r0, [r1]
-_0802ED3E:
-	adds r5, r4, #0
-	adds r5, #0x45
-	ldrb r0, [r5]
-	cmp r0, #0xff
-	beq _0802ED4E
-	movs r0, #0xe5
-	bl EnqueueSFX
-_0802ED4E:
-	movs r0, #0xff
-	strb r0, [r5]
-_0802ED52:
-	adds r0, r4, #0
-	adds r0, #0x43
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0802ED64
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-_0802ED64:
-	ldr r1, _0802ED70 @ =gUnk_080CDE34
-	adds r0, r4, #0
-	bl sub_0804AA30
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0802ED70: .4byte gUnk_080CDE34
-
-	thumb_func_start sub_0802ED74
-sub_0802ED74: @ 0x0802ED74
-	push {lr}
-	ldr r2, _0802ED88 @ =gUnk_080CDE5C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0802ED88: .4byte gUnk_080CDE5C
-
-	thumb_func_start sub_0802ED8C
-sub_0802ED8C: @ 0x0802ED8C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _0802EDD0 @ =gEntCount
-	ldrb r0, [r0]
-	cmp r0, #0x46
-	bhi _0802EE0A
-	bl GetEmptyManager
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0802EE0A
-	movs r0, #9
-	strb r0, [r1, #8]
-	movs r0, #0x34
-	strb r0, [r1, #9]
-	str r4, [r1, #0x14]
-	adds r0, r1, #0
-	movs r1, #8
-	bl AppendEntityToList
-	movs r0, #0x25
-	movs r1, #2
-	bl CreateEnemy
-	str r4, [r0, #0x50]
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldr r0, _0802EDD4 @ =gRoomControls
-	ldrb r0, [r0, #5]
-	cmp r0, #0
-	bne _0802EDDC
-	ldr r0, _0802EDD8 @ =gScreenTransition
-	adds r0, #0x3a
-	b _0802EDE0
-	.align 2, 0
-_0802EDD0: .4byte gEntCount
-_0802EDD4: .4byte gRoomControls
-_0802EDD8: .4byte gScreenTransition
-_0802EDDC:
-	ldr r0, _0802EE0C @ =gScreenTransition
-	adds r0, #0x3b
-_0802EDE0:
-	ldrb r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x45
-	strb r0, [r1]
-	adds r1, #0x34
-	strb r0, [r1]
-	bl Random
-	adds r1, r4, #0
-	adds r1, #0x78
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl sub_0802EFB8
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_0802EF58
-_0802EE0A:
-	pop {r4, pc}
-	.align 2, 0
-_0802EE0C: .4byte gScreenTransition
-
-	thumb_func_start sub_0802EE10
-sub_0802EE10: @ 0x0802EE10
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0802F04C
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-
-	thumb_func_start sub_0802EE20
-sub_0802EE20: @ 0x0802EE20
-	push {lr}
-	ldr r2, _0802EE34 @ =gUnk_080CDE64
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0802EE34: .4byte gUnk_080CDE64
-
-	thumb_func_start sub_0802EE38
-sub_0802EE38: @ 0x0802EE38
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldr r0, _0802EE84 @ =gEntCount
-	ldrb r0, [r0]
-	cmp r0, #0x46
-	bhi _0802EE82
-	movs r0, #0x25
-	movs r1, #3
-	bl CreateEnemy
-	str r5, [r0, #0x50]
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	bl Random
-	adds r4, r0, #0
-	movs r1, #3
-	ands r0, r1
-	adds r0, #1
-	strb r0, [r5, #0xe]
-	bl Random
-	lsrs r0, r0, #8
-	adds r1, r5, #0
-	adds r1, #0x78
-	strb r0, [r1]
-	ldr r1, _0802EE88 @ =gUnk_080CDE6C
-	lsrs r4, r4, #0x10
-	movs r0, #3
-	ands r4, r0
-	adds r4, r4, r1
-	ldrb r0, [r4]
-	strb r0, [r5, #0x15]
-	adds r0, r5, #0
-	movs r1, #1
-	bl InitializeAnimation
-_0802EE82:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0802EE84: .4byte gEntCount
-_0802EE88: .4byte gUnk_080CDE6C
-
-	thumb_func_start sub_0802EE8C
-sub_0802EE8C: @ 0x0802EE8C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldr r2, [r0, #4]
-	cmp r2, #0
-	bne _0802EEA8
-	ldrb r0, [r4, #0x10]
-	movs r1, #0x7f
-	ands r1, r0
-	strb r1, [r4, #0x10]
-	adds r0, r4, #0
-	adds r0, #0x45
-	strb r2, [r0]
-	b _0802EEB4
-_0802EEA8:
-	adds r0, r4, #0
-	bl sub_0802F04C
-	adds r0, r4, #0
-	bl GetNextFrame
-_0802EEB4:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0802EEB8
-sub_0802EEB8: @ 0x0802EEB8
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _0802EEC8
-	bl DeleteThisEntity
-_0802EEC8:
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _0802EED6
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0xff
-	strb r0, [r4, #0x14]
-_0802EED6:
-	ldr r0, [r4, #0x50]
-	adds r1, r4, #0
-	bl CopyPositionAndSpriteOffset
-	ldr r1, _0802EF14 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl GetFacingDirection
-	adds r0, #1
-	movs r1, #0x1e
-	ands r0, r1
-	ldr r1, _0802EF18 @ =gUnk_080CDE70
-	adds r0, r0, r1
-	ldrb r2, [r0]
-	ldrb r1, [r4, #0x1e]
-	cmp r2, r1
-	beq _0802EF00
-	ldrb r0, [r0, #1]
-	cmp r0, r1
-	beq _0802EF00
-	strb r2, [r4, #0x1e]
-_0802EF00:
-	ldrh r0, [r4, #0x32]
-	adds r0, #1
-	strh r0, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x63
-	ldrb r0, [r1]
-	subs r0, #1
-	strb r0, [r1]
-	pop {r4, pc}
-	.align 2, 0
-_0802EF14: .4byte gPlayerEntity
-_0802EF18: .4byte gUnk_080CDE70
-
-	thumb_func_start sub_0802EF1C
-sub_0802EF1C: @ 0x0802EF1C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _0802EF2C
-	bl DeleteThisEntity
-_0802EF2C:
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _0802EF4A
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x11
-	strb r0, [r4, #0x1e]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	subs r0, #0x19
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r2]
-_0802EF4A:
-	ldr r0, [r4, #0x50]
-	adds r1, r4, #0
-	bl CopyPositionAndSpriteOffset
-	movs r0, #0
-	strh r0, [r4, #0x36]
-	pop {r4, pc}
-
-	thumb_func_start sub_0802EF58
-sub_0802EF58: @ 0x0802EF58
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	movs r5, #0
-_0802EF5E:
-	movs r0, #0x25
-	movs r1, #1
-	bl CreateEnemy
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0802EF86
-	strb r5, [r4, #0xb]
-	adds r1, r4, #0
-	adds r1, #0x38
-	movs r0, #1
-	strb r0, [r1]
-	str r6, [r4, #0x50]
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	adds r0, r6, #0
-	adds r1, r4, #0
-	bl CopyPosition
-_0802EF86:
-	adds r5, #1
-	cmp r5, #6
-	bls _0802EF5E
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0802EF90
-sub_0802EF90: @ 0x0802EF90
-	push {r4, lr}
-	ldr r4, _0802EFB4 @ =gUnk_080CDE90
-	adds r3, r0, #0
-	adds r3, #0x78
-	ldrb r1, [r3]
-	adds r2, r1, #1
-	strb r2, [r3]
-	lsls r1, r1, #0x18
-	lsrs r1, r1, #0x1b
-	movs r2, #7
-	ands r1, r2
-	adds r1, r1, r4
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	strh r1, [r0, #0x36]
-	pop {r4, pc}
-	.align 2, 0
-_0802EFB4: .4byte gUnk_080CDE90
-
-	thumb_func_start sub_0802EFB8
-sub_0802EFB8: @ 0x0802EFB8
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	bl Random
-	adds r6, r0, #0
-	lsrs r0, r6, #0x10
-	movs r1, #3
-	ands r0, r1
-	cmp r0, #0
-	beq _0802EFD2
-	movs r5, #0x18
-	ands r5, r6
-	b _0802EFE0
-_0802EFD2:
-	ldr r0, _0802F01C @ =gPlayerEntity
-	adds r1, r4, #0
-	bl GetFacingDirection
-	adds r5, r0, #4
-	movs r0, #0x18
-	ands r5, r0
-_0802EFE0:
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r2, _0802F020 @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	movs r3, #0x3f
-	ands r0, r3
-	movs r7, #0x32
-	ldrsh r1, [r4, r7]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r0, r1
-	ldr r2, _0802F024 @ =gUnk_080B4488
-	lsrs r1, r5, #2
-	adds r1, r1, r2
-	movs r2, #0
-	ldrsh r1, [r1, r2]
-	adds r0, r0, r1
-	movs r1, #1
-	bl sub_080002E0
-	cmp r0, #0
-	beq _0802F028
-	movs r0, #0xff
-	strb r0, [r4, #0x15]
-	b _0802F044
-	.align 2, 0
-_0802F01C: .4byte gPlayerEntity
-_0802F020: .4byte gRoomControls
-_0802F024: .4byte gUnk_080B4488
-_0802F028:
-	movs r1, #3
-	adds r0, r6, #0
-	ands r0, r1
-	adds r0, #1
-	strb r0, [r4, #0xe]
-	strb r5, [r4, #0x15]
-	ldr r2, _0802F048 @ =gUnk_080CDE98
-	lsrs r0, r6, #0x18
-	movs r1, #3
-	ands r0, r1
-	lsls r0, r0, #1
-	adds r0, r0, r2
-	ldrh r0, [r0]
-	strh r0, [r4, #0x24]
-_0802F044:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0802F048: .4byte gUnk_080CDE98
-
-	thumb_func_start sub_0802F04C
-sub_0802F04C: @ 0x0802F04C
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	movs r0, #0x2e
-	ldrsh r5, [r4, r0]
-	movs r1, #0x32
-	ldrsh r6, [r4, r1]
-	adds r0, r4, #0
-	bl ProcessMovement
-	cmp r0, #0
-	bne _0802F06A
-	adds r0, r4, #0
-	bl sub_0802EFB8
-	b _0802F112
-_0802F06A:
-	ldrb r0, [r4, #0x15]
-	lsrs r0, r0, #3
-	cmp r0, #1
-	beq _0802F098
-	cmp r0, #1
-	bgt _0802F07C
-	cmp r0, #0
-	beq _0802F082
-	b _0802F0DC
-_0802F07C:
-	cmp r0, #2
-	beq _0802F0AE
-	b _0802F0DC
-_0802F082:
-	movs r2, #0xf
-	adds r0, r6, #0
-	ands r0, r2
-	cmp r0, #8
-	ble _0802F102
-	ldrh r1, [r4, #0x32]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #8
-	bgt _0802F102
-	b _0802F0C2
-_0802F098:
-	movs r2, #0xf
-	adds r0, r5, #0
-	ands r0, r2
-	cmp r0, #7
-	bgt _0802F102
-	ldrh r1, [r4, #0x2e]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #7
-	ble _0802F102
-	b _0802F0F0
-_0802F0AE:
-	movs r2, #0xf
-	adds r0, r6, #0
-	ands r0, r2
-	cmp r0, #7
-	bgt _0802F102
-	ldrh r1, [r4, #0x32]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #7
-	ble _0802F102
-_0802F0C2:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	ldr r1, _0802F0D8 @ =0x0000FFF0
-	ands r0, r1
-	adds r6, r0, #0
-	adds r6, #8
-	b _0802F102
-	.align 2, 0
-_0802F0D8: .4byte 0x0000FFF0
-_0802F0DC:
-	movs r2, #0xf
-	adds r0, r5, #0
-	ands r0, r2
-	cmp r0, #8
-	ble _0802F102
-	ldrh r1, [r4, #0x2e]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #8
-	bgt _0802F102
-_0802F0F0:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r1, _0802F114 @ =0x0000FFF0
-	ands r0, r1
-	adds r5, r0, #0
-	adds r5, #8
-_0802F102:
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	bne _0802F112
-	strh r5, [r4, #0x2e]
-	strh r6, [r4, #0x32]
-	adds r0, r4, #0
-	bl sub_0802EFB8
-_0802F112:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0802F114: .4byte 0x0000FFF0

asm/vaatiProjectile.s

@@ -1,713 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start VaatiProjectile
-VaatiProjectile: @ 0x0803E08C
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_0803E4A0
-	cmp r0, #0
-	beq _0803E0AA
-	ldrb r0, [r5, #0x10]
-	movs r1, #0x7f
-	ands r1, r0
-	movs r0, #0
-	strb r1, [r5, #0x10]
-	adds r1, r5, #0
-	adds r1, #0x45
-	strb r0, [r1]
-	str r0, [r5, #0x50]
-_0803E0AA:
-	ldr r4, _0803E0C0 @ =gUnk_080D0648
-	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
-	pop {r4, r5, pc}
-	.align 2, 0
-_0803E0C0: .4byte gUnk_080D0648
-
-	thumb_func_start sub_0803E0C4
-sub_0803E0C4: @ 0x0803E0C4
-	push {lr}
-	ldr r2, _0803E0D8 @ =gUnk_080D0660
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0803E0D8: .4byte gUnk_080D0660
-
-	thumb_func_start sub_0803E0DC
-sub_0803E0DC: @ 0x0803E0DC
-.ifdef EU
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x80
-	bne _0803E08E
-	movs r0, #5
-	strb r0, [r5, #0xc]
-	ldrb r2, [r5, #0x10]
-	movs r1, #0x7f
-	adds r0, r1, #0
-	ands r0, r2
-	strb r0, [r5, #0x10]
-	adds r3, r5, #0
-	adds r3, #0x29
-	ldrb r2, [r3]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r2
-	strb r0, [r3]
-	ldr r3, _0803E098 @ =gPlayerEntity
-	ldrb r0, [r3, #0x10]
-	ands r1, r0
-	strb r1, [r3, #0x10]
-	ldrb r2, [r5, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r4, [r3, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r4
-	orrs r0, r2
-	strb r0, [r3, #0x1b]
-	ldrb r0, [r5, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r3, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r3, #0x19]
-	adds r0, r5, #0
-	bl sub_0803E444
-_0803E08E:
-	ldr r1, _0803E09C @ =gUnk_080D0648
-	adds r0, r5, #0
-	bl sub_0804AA30
-	pop {r4, r5, pc}
-	.align 2, 0
-_0803E098: .4byte gPlayerEntity
-_0803E09C: .4byte gUnk_080D0648
-
-.else
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x80
-	bne _0803E16C
-	adds r0, r5, #0
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0803E158
-	movs r0, #5
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x10]
-	movs r6, #0x7f
-	adds r0, r6, #0
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r3, _0803E154 @ =gPlayerEntity
-	ldrb r1, [r3, #0x10]
-	adds r0, r6, #0
-	ands r0, r1
-	strb r0, [r3, #0x10]
-	ldrb r2, [r5, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r4, [r3, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r4
-	orrs r0, r2
-	strb r0, [r3, #0x1b]
-	ldrb r0, [r5, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r3, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r3, #0x19]
-	adds r0, r5, #0
-	bl sub_0803E444
-	movs r0, #2
-	bl sub_08078A90
-	ldr r2, [r5, #0x50]
-	cmp r2, #0
-	beq _0803E16C
-	ldrb r1, [r2, #0x10]
-	adds r0, r6, #0
-	ands r0, r1
-	b _0803E16A
-	.align 2, 0
-_0803E154: .4byte gPlayerEntity
-_0803E158:
-	ldr r2, _0803E178 @ =gPlayerState
-	ldr r0, [r2, #0x30]
-	ldr r1, _0803E17C @ =0xFFFFFEFF
-	ands r0, r1
-	str r0, [r2, #0x30]
-	ldr r2, _0803E180 @ =gPlayerEntity
-	ldrb r1, [r2, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-_0803E16A:
-	strb r0, [r2, #0x10]
-_0803E16C:
-	ldr r1, _0803E184 @ =gUnk_080D0648
-	adds r0, r5, #0
-	bl sub_0804AA30
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0803E178: .4byte gPlayerState
-_0803E17C: .4byte 0xFFFFFEFF
-_0803E180: .4byte gPlayerEntity
-_0803E184: .4byte gUnk_080D0648
-.endif
-
-	thumb_func_start sub_0803E188
-sub_0803E188: @ 0x0803E188
-	push {lr}
-	adds r3, r0, #0
-	ldr r2, [r3, #0x50]
-	cmp r2, #0
-	beq _0803E19C
-	ldrb r0, [r2, #0xf]
-	subs r0, #1
-	movs r1, #0
-	strb r0, [r2, #0xf]
-	str r1, [r3, #0x50]
-_0803E19C:
-	adds r0, r3, #0
-	bl sub_0804A7D4
-	pop {pc}
-
-	thumb_func_start nullsub_19
-nullsub_19: @ 0x0803E1A4
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_0803E1A8
-sub_0803E1A8: @ 0x0803E1A8
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xa]
-	cmp r0, #0
-	bne _0803E1F8
-	movs r0, #0x4b
-	movs r1, #1
-	bl CreateEnemy
-	cmp r0, #0
-	beq _0803E250
-	str r5, [r0, #0x50]
-	str r0, [r5, #0x54]
-	ldrb r0, [r5, #0xb]
-	cmp r0, #0
-	bne _0803E1D8
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	ldr r0, _0803E1D4 @ =0x0000FFE8
-	strh r0, [r5, #0x36]
-	b _0803E1E8
-	.align 2, 0
-_0803E1D4: .4byte 0x0000FFE8
-_0803E1D8:
-	movs r0, #9
-	strb r0, [r5, #0xc]
-	ldr r0, _0803E1F4 @ =0x0000FF80
-	strh r0, [r5, #0x36]
-	adds r1, r5, #0
-	adds r1, #0x3b
-	movs r0, #1
-	strb r0, [r1]
-_0803E1E8:
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitializeAnimation
-	b _0803E250
-	.align 2, 0
-_0803E1F4: .4byte 0x0000FF80
-_0803E1F8:
-	movs r0, #8
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	adds r1, r5, #0
-	adds r1, #0x63
-	movs r0, #1
-	strb r0, [r1]
-	ldr r4, [r5, #0x50]
-	ldrb r2, [r4, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r3, [r5, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r5, #0x1b]
-	ldrb r0, [r4, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r5, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r5, #0x19]
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, [r5, #0x50]
-	ldr r3, _0803E254 @ =0xFFFF0000
-	adds r1, r5, #0
-	movs r2, #0
-	bl PositionRelative
-	adds r0, r5, #0
-	movs r1, #1
-	bl InitializeAnimation
-_0803E250:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0803E254: .4byte 0xFFFF0000
-
-	thumb_func_start sub_0803E258
-sub_0803E258: @ 0x0803E258
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0803E480
-	adds r0, r4, #0
-	movs r1, #0
-	movs r2, #8
-	bl PlayerInRange
-	cmp r0, #0
-	beq _0803E280
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0xa
-	strb r0, [r4, #0xe]
-	ldr r0, [r4, #0x54]
-	movs r1, #2
-	bl InitializeAnimation
-	b _0803E29C
-_0803E280:
-	ldr r0, _0803E2A4 @ =gUnk_020000B0
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0803E29C
-	adds r0, r4, #0
-	bl GetFacingDirection
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-	adds r0, r4, #0
-	bl sub_0806F69C
-_0803E29C:
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-	.align 2, 0
-_0803E2A4: .4byte gUnk_020000B0
-
-	thumb_func_start sub_0803E2A8
-sub_0803E2A8: @ 0x0803E2A8
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xe]
-	cmp r0, #0
-	beq _0803E2B8
-	subs r0, #1
-	strb r0, [r1, #0xe]
-	b _0803E2C8
-_0803E2B8:
-	ldrh r0, [r1, #0x36]
-	adds r0, #1
-	strh r0, [r1, #0x36]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _0803E2C8
-	movs r0, #3
-	strb r0, [r1, #0xc]
-_0803E2C8:
-	adds r0, r1, #0
-	bl GetNextFrame
-	pop {pc}
-
-	thumb_func_start sub_0803E2D0
-sub_0803E2D0: @ 0x0803E2D0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x54]
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0803E312
-	ldrh r0, [r4, #0x36]
-	subs r0, #1
-	strh r0, [r4, #0x36]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x10
-	movs r1, #0x18
-	rsbs r1, r1, #0
-	cmp r0, r1
-	bgt _0803E30C
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0xf
-	ands r0, r1
-	adds r0, #0xf
-	strb r0, [r4, #0xe]
-	ldr r0, [r4, #0x54]
-	movs r1, #1
-	bl InitializeAnimation
-_0803E30C:
-	adds r0, r4, #0
-	bl GetNextFrame
-_0803E312:
-	pop {r4, pc}
-
-	thumb_func_start sub_0803E314
-sub_0803E314: @ 0x0803E314
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0803E332
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldr r1, _0803E33C @ =gPlayerEntity
-	adds r0, r4, #0
-	bl GetFacingDirection
-	strb r0, [r4, #0x15]
-_0803E332:
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-	.align 2, 0
-_0803E33C: .4byte gPlayerEntity
-
-	thumb_func_start sub_0803E340
-sub_0803E340: @ 0x0803E340
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0803E444
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	beq _0803E352
-	subs r0, #1
-	b _0803E36A
-_0803E352:
-	ldrh r0, [r4, #0x36]
-	subs r0, #1
-	strh r0, [r4, #0x36]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x10
-	movs r1, #0x18
-	rsbs r1, r1, #0
-	cmp r0, r1
-	bgt _0803E36C
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	movs r0, #0x14
-_0803E36A:
-	strb r0, [r4, #0xe]
-_0803E36C:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0803E370
-sub_0803E370: @ 0x0803E370
-	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 _0803E38E
-	movs r0, #7
-	strb r0, [r1, #0xc]
-	movs r0, #0x10
-	strb r0, [r1, #0x15]
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	strh r0, [r1, #0x24]
-_0803E38E:
-	adds r0, r1, #0
-	bl sub_0803E444
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0803E398
-sub_0803E398: @ 0x0803E398
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0803E444
-	adds r0, r4, #0
-	bl sub_0806F69C
-	adds r0, r4, #0
-	bl sub_0803E4D8
-	ldr r1, _0803E3CC @ =gRoomControls
-	ldrh r0, [r1, #8]
-	ldrh r1, [r1, #0x20]
-	adds r0, r0, r1
-	subs r0, #0x10
-	movs r2, #0x32
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bgt _0803E3C8
-	bl sub_0805E5A8
-	ldr r0, _0803E3D0 @ =gUnk_0813AB94
-	bl DoExitTransition
-_0803E3C8:
-	pop {r4, pc}
-	.align 2, 0
-_0803E3CC: .4byte gRoomControls
-_0803E3D0: .4byte gUnk_0813AB94
-
-	thumb_func_start sub_0803E3D4
-sub_0803E3D4: @ 0x0803E3D4
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _0803E3E4
-	bl DeleteThisEntity
-_0803E3E4:
-	ldr r0, [r4, #0x50]
-	ldr r3, _0803E3F8 @ =0xFFFF0000
-	adds r1, r4, #0
-	movs r2, #0
-	bl PositionRelative
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-	.align 2, 0
-_0803E3F8: .4byte 0xFFFF0000
-
-	thumb_func_start sub_0803E3FC
-sub_0803E3FC: @ 0x0803E3FC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _0803E438 @ =gPlayerEntity
-	ldrh r0, [r1, #0x2e]
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r1, #0x32]
-	strh r0, [r4, #0x32]
-	ldrh r2, [r4, #0x36]
-	movs r0, #0x36
-	ldrsh r1, [r4, r0]
-	movs r0, #8
-	rsbs r0, r0, #0
-	cmp r1, r0
-	bge _0803E43C
-	adds r0, r4, #0
-	adds r0, #0x58
-	ldrb r0, [r0]
-	cmp r0, #2
-	beq _0803E42E
-	movs r0, #0
-	strb r0, [r4, #0xe]
-	ldr r0, [r4, #0x54]
-	movs r1, #2
-	bl InitializeAnimation
-_0803E42E:
-	adds r0, r4, #0
-	bl sub_0803E2A8
-	b _0803E442
-	.align 2, 0
-_0803E438: .4byte gPlayerEntity
-_0803E43C:
-	adds r0, r2, #0
-	adds r0, #8
-	strh r0, [r4, #0x36]
-_0803E442:
-	pop {r4, pc}
-
-	thumb_func_start sub_0803E444
-sub_0803E444: @ 0x0803E444
-	push {r4, lr}
-	adds r4, r0, #0
-	bl ResetPlayer
-	ldr r2, _0803E478 @ =gPlayerState
-	ldrb r1, [r2, #0x1a]
-	movs r0, #0x80
-	orrs r1, r0
-	strb r1, [r2, #0x1a]
-	ldrb r1, [r2, #0xa]
-	orrs r0, r1
-	strb r0, [r2, #0xa]
-	ldr r1, [r4, #0x4c]
-	movs r3, #2
-	rsbs r3, r3, #0
-	adds r0, r4, #0
-	movs r2, #0
-	bl sub_0806FA90
-	ldr r1, _0803E47C @ =gPlayerEntity
-	adds r1, #0x63
-	ldrb r0, [r1]
-	adds r0, #0xe
-	strb r0, [r1]
-	pop {r4, pc}
-	.align 2, 0
-_0803E478: .4byte gPlayerState
-_0803E47C: .4byte gPlayerEntity
-
-	thumb_func_start sub_0803E480
-sub_0803E480: @ 0x0803E480
-	push {lr}
-	adds r3, r0, #0
-	adds r2, r3, #0
-	adds r2, #0x78
-	ldrh r1, [r2]
-	movs r0, #0x96
-	lsls r0, r0, #3
-	cmp r1, r0
-	bls _0803E49A
-	movs r0, #0xc0
-	lsls r0, r0, #1
-	strh r0, [r3, #0x24]
-	b _0803E49E
-_0803E49A:
-	adds r0, r1, #1
-	strh r0, [r2]
-_0803E49E:
-	pop {pc}
-
-	thumb_func_start sub_0803E4A0
-sub_0803E4A0: @ 0x0803E4A0
-.ifdef EU
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0803E3CCEU @ =gScreenTransition
-	adds r0, #0x39
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _0803E3D0EU
-	movs r0, #1
-	b _0803E3E6
-	.align 2, 0
-_0803E3CCEU: .4byte gScreenTransition
-_0803E3D0EU:
-	ldr r0, [r1, #0x50]
-	cmp r0, #0
-	bne _0803E3DA
-	movs r0, #0
-	b _0803E3E6
-_0803E3DA:
-	movs r1, #0
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	bne _0803E3E4EU
-	movs r1, #1
-_0803E3E4EU:
-	adds r0, r1, #0
-_0803E3E6:
-	pop {pc}
-.else
-	push {lr}
-	adds r1, r0, #0
-	ldr r0, _0803E4B8 @ =gScreenTransition
-	adds r0, #0x39
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0803E4C6
-	ldr r1, [r1, #0x50]
-	cmp r1, #0
-	bne _0803E4BC
-	movs r0, #0
-	b _0803E4D6
-	.align 2, 0
-_0803E4B8: .4byte gScreenTransition
-_0803E4BC:
-	adds r0, r1, #0
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _0803E4CA
-_0803E4C6:
-	movs r0, #1
-	b _0803E4D6
-_0803E4CA:
-	movs r2, #0
-	ldr r0, [r1, #4]
-	cmp r0, #0
-	bne _0803E4D4
-	movs r2, #1
-_0803E4D4:
-	adds r0, r2, #0
-_0803E4D6:
-	pop {pc}
-.endif
-
-	thumb_func_start sub_0803E4D8
-sub_0803E4D8: @ 0x0803E4D8
-	push {r4, r5, lr}
-	movs r2, #0x2e
-	ldrsh r1, [r0, r2]
-	ldr r3, _0803E51C @ =gRoomControls
-	ldrh r2, [r3, #6]
-	subs r1, r1, r2
-	asrs r4, r1, #4
-	movs r2, #0x3f
-	ands r4, r2
-	movs r1, #0x32
-	ldrsh r0, [r0, r1]
-	ldrh r1, [r3, #8]
-	subs r1, #8
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r4, r0
-	ldr r0, _0803E520 @ =gPlayerEntity
-	adds r5, r0, #0
-	adds r5, #0x38
-	ldrb r1, [r5]
-	adds r0, r4, #0
-	bl sub_080002E0
-	cmp r0, #0xff
-	beq _0803E518
-	ldr r0, _0803E524 @ =0x00004074
-	ldrb r2, [r5]
-	adds r1, r4, #0
-	bl SetTile
-_0803E518:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0803E51C: .4byte gRoomControls
-_0803E520: .4byte gPlayerEntity
-_0803E524: .4byte 0x00004074

asm/vaatiReborn.s

@@ -1,451 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start VaatiReborn
-VaatiReborn: @ 0x0806B664
-	push {lr}
-	ldr r2, _0806B678 @ =gUnk_08112F78
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0806B678: .4byte gUnk_08112F78
-
-	thumb_func_start sub_0806B67C
-sub_0806B67C: @ 0x0806B67C
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	movs r1, #0
-	movs r0, #1
-	strb r0, [r6, #0xc]
-	strb r1, [r6, #0xd]
-	strb r1, [r6, #0xe]
-	ldrb r0, [r6, #0xa]
-	cmp r0, #5
-	bls _0806B692
-	b _0806B7B8
-_0806B692:
-	lsls r0, r0, #2
-	ldr r1, _0806B69C @ =_0806B6A0
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0806B69C: .4byte _0806B6A0
-_0806B6A0: @ jump table
-	.4byte _0806B6B8 @ case 0
-	.4byte _0806B7A6 @ case 1
-	.4byte _0806B70C @ case 2
-	.4byte _0806B726 @ case 3
-	.4byte _0806B7B0 @ case 4
-	.4byte _0806B7A6 @ case 5
-_0806B6B8:
-	ldrh r0, [r6, #0x32]
-	subs r0, #0xa0
-	strh r0, [r6, #0x32]
-	movs r0, #0xa0
-	strb r0, [r6, #0xe]
-	movs r0, #0x20
-	strb r0, [r6, #0xf]
-	adds r1, r6, #0
-	adds r1, #0x63
-	strb r0, [r1]
-	movs r5, #0
-_0806B6CE:
-	movs r0, #0x3b
-	movs r1, #2
-	adds r2, r5, #0
-	bl CreateNPC
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0806B6E0
-	str r6, [r4, #0x50]
-_0806B6E0:
-	adds r5, #1
-	cmp r5, #3
-	bls _0806B6CE
-	movs r0, #0x3b
-	movs r1, #1
-	movs r2, #0
-	bl CreateNPC
-	adds r4, r0, #0
-	str r6, [r4, #0x50]
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #0xff
-	strb r0, [r1]
-	movs r3, #0x80
-	lsls r3, r3, #9
-	adds r0, r6, #0
-	adds r1, r4, #0
-	movs r2, #0
-	bl PositionRelative
-	b _0806B7A6
-_0806B70C:
-	ldrb r1, [r6, #0xb]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _0806B71E
-	ldrb r0, [r6, #0x18]
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r6, #0x18]
-_0806B71E:
-	adds r0, r6, #0
-	bl sub_0806B96C
-	b _0806B7A6
-_0806B726:
-	movs r0, #1
-	strb r0, [r6, #0xe]
-	movs r0, #0x20
-	strb r0, [r6, #0xf]
-	movs r0, #0x3b
-	movs r1, #4
-	movs r2, #0
-	bl CreateNPC
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0806B76C
-	adds r0, r6, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	str r6, [r4, #0x50]
-	adds r0, r6, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	lsrs r1, r1, #0x1d
-	subs r1, #1
-	adds r3, r4, #0
-	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]
-	movs r0, #0
-	strb r0, [r4, #0x1e]
-_0806B76C:
-	movs r0, #0x3b
-	movs r1, #5
-	movs r2, #0
-	bl CreateNPC
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0806B7A6
-	adds r0, r6, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	str r6, [r4, #0x50]
-	adds r0, r6, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	lsrs r1, r1, #0x1d
-	adds r1, #1
-	adds r3, r4, #0
-	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]
-_0806B7A6:
-	adds r0, r6, #0
-	movs r1, #0
-	bl InitAnimationForceUpdate
-	b _0806B7B8
-_0806B7B0:
-	adds r0, r6, #0
-	movs r1, #0
-	bl InitializeAnimation
-_0806B7B8:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0806B7BC
-sub_0806B7BC: @ 0x0806B7BC
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r0, #3
-	bl CheckRoomFlag
-	cmp r0, #0
-	bne _0806B7CC
-	b _0806B968
-_0806B7CC:
-	ldrb r0, [r5, #0xa]
-	cmp r0, #1
-	beq _0806B84C
-	cmp r0, #1
-	bgt _0806B7DC
-	cmp r0, #0
-	beq _0806B7E6
-	b _0806B93C
-_0806B7DC:
-	cmp r0, #2
-	beq _0806B86C
-	cmp r0, #3
-	beq _0806B874
-	b _0806B93C
-_0806B7E6:
-	ldrh r0, [r5, #0x32]
-	adds r0, #1
-	strh r0, [r5, #0x32]
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	movs r1, #0xff
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0806B82C
-	movs r0, #0x3b
-	movs r1, #3
-	movs r2, #0
-	bl CreateNPC
-	adds r4, r0, #0
-	cmp r4, #0
-	bne _0806B80C
-	b _0806B968
-_0806B80C:
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	ldr r0, _0806B828 @ =0x00001634
-	bl TextboxNoOverlapFollow
-	ldrb r0, [r5, #0xd]
-	adds r0, #1
-	strb r0, [r5, #0xd]
-	bl DeleteThisEntity
-	b _0806B968
-	.align 2, 0
-_0806B828: .4byte 0x00001634
-_0806B82C:
-	ldrb r0, [r5, #0xf]
-	subs r0, #1
-	strb r0, [r5, #0xf]
-	ands r0, r1
-	cmp r0, #0
-	beq _0806B83A
-	b _0806B95A
-_0806B83A:
-	movs r0, #0x20
-	strb r0, [r5, #0xf]
-	ldr r0, _0806B848 @ =0x000001A9
-	bl SoundReq
-	b _0806B95A
-	.align 2, 0
-_0806B848: .4byte 0x000001A9
-_0806B84C:
-	adds r0, r5, #0
-	bl sub_0806B9BC
-	adds r4, r0, #0
-	cmp r4, #0
-	bne _0806B85C
-	bl DeleteThisEntity
-_0806B85C:
-	movs r3, #0x84
-	lsls r3, r3, #0xe
-	adds r0, r4, #0
-	adds r1, r5, #0
-	movs r2, #0
-	bl PositionRelative
-	b _0806B95A
-_0806B86C:
-	adds r0, r5, #0
-	bl sub_0806B96C
-	b _0806B95A
-_0806B874:
-	ldrb r0, [r5, #0xd]
-	cmp r0, #1
-	beq _0806B8A2
-	cmp r0, #1
-	bgt _0806B884
-	cmp r0, #0
-	beq _0806B88E
-	b _0806B91E
-_0806B884:
-	cmp r0, #2
-	beq _0806B8C4
-	cmp r0, #3
-	beq _0806B906
-	b _0806B91E
-_0806B88E:
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0806B91E
-	ldrb r0, [r5, #0xd]
-	adds r0, #1
-	strb r0, [r5, #0xd]
-	b _0806B91E
-_0806B8A2:
-	adds r0, r5, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0806B91E
-	movs r0, #2
-	strb r0, [r5, #0xd]
-	ldr r1, _0806B8C0 @ =0x0000013F
-	adds r0, r5, #0
-	bl sub_0801D2B4
-	b _0806B8FA
-	.align 2, 0
-_0806B8C0: .4byte 0x0000013F
-_0806B8C4:
-	adds r2, r5, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0806B91E
-	movs r0, #0xef
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r0, [r5, #0xe]
-	adds r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #1
-	beq _0806B91E
-	cmp r0, #0xa
-	bne _0806B91E
-	ldrb r0, [r5, #0xd]
-	adds r0, #1
-	strb r0, [r5, #0xd]
-	movs r0, #0xf4
-	bl EnqueueSFX
-	movs r0, #0
-	strb r0, [r5, #0xe]
-_0806B8FA:
-	ldrb r1, [r5, #0xd]
-	subs r1, #1
-	adds r0, r5, #0
-	bl InitAnimationForceUpdate
-	b _0806B91E
-_0806B906:
-	adds r0, r5, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0806B91E
-	movs r0, #0
-	bl SetRoomFlag
-	bl DeleteThisEntity
-_0806B91E:
-	ldrb r0, [r5, #0xf]
-	subs r0, #1
-	strb r0, [r5, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0806B95A
-	movs r0, #0x20
-	strb r0, [r5, #0xf]
-	ldr r0, _0806B938 @ =0x000001A9
-	bl SoundReq
-	b _0806B95A
-	.align 2, 0
-_0806B938: .4byte 0x000001A9
-_0806B93C:
-	adds r0, r5, #0
-	bl sub_0806B9BC
-	adds r4, r0, #0
-	cmp r4, #0
-	bne _0806B94E
-	bl DeleteThisEntity
-	b _0806B968
-_0806B94E:
-	ldrb r0, [r4, #0xd]
-	cmp r0, #0
-	beq _0806B968
-	ldrb r0, [r5, #0xa]
-	cmp r0, #4
-	beq _0806B962
-_0806B95A:
-	adds r0, r5, #0
-	bl UpdateAnimationSingleFrame
-	b _0806B968
-_0806B962:
-	adds r0, r5, #0
-	bl GetNextFrame
-_0806B968:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0806B96C
-sub_0806B96C: @ 0x0806B96C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_0806B9BC
-	adds r5, r0, #0
-	cmp r5, #0
-	bne _0806B97E
-	bl DeleteThisEntity
-_0806B97E:
-	ldrb r3, [r4, #0xb]
-	lsls r3, r3, #1
-	ldr r0, _0806B9B8 @ =gUnk_08112F80
-	adds r3, r3, r0
-	ldrb r1, [r5, #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]
-	movs r2, #0
-	ldrsb r2, [r3, r2]
-	lsls r2, r2, #0x10
-	ldrb r3, [r3, #1]
-	lsls r3, r3, #0x18
-	asrs r3, r3, #0x18
-	adds r3, #0x21
-	lsls r3, r3, #0x10
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl PositionRelative
-	adds r0, r4, #0
-	bl UpdateAnimationSingleFrame
-	pop {r4, r5, pc}
-	.align 2, 0
-_0806B9B8: .4byte gUnk_08112F80
-
-	thumb_func_start sub_0806B9BC
-sub_0806B9BC: @ 0x0806B9BC
-	push {lr}
-	ldr r1, [r0, #0x50]
-	cmp r1, #0
-	beq _0806B9CC
-	ldr r0, [r1, #4]
-	cmp r0, #0
-	bne _0806B9CC
-	movs r1, #0
-_0806B9CC:
-	adds r0, r1, #0
-	pop {pc}

asm/wizzrobeFire.s

@@ -98,7 +98,7 @@ sub_0802FBB8: @ 0x0802FBB8
 	adds r0, r4, #0
 	movs r1, #8
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0802FBF6
@@ -248,7 +248,7 @@ _0802FCDE:
 	adds r0, r4, #0
 	movs r1, #8
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0802FDCA

asm/wizzrobeIce.s

@@ -125,7 +125,7 @@ sub_0802FE90: @ 0x0802FE90
 	adds r0, r4, #0
 	movs r1, #9
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0802FECE
@@ -275,7 +275,7 @@ _0802FFB6:
 	adds r0, r4, #0
 	movs r1, #9
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _080300A2

asm/wizzrobeWind.s

@@ -151,7 +151,7 @@ _0802F5B8:
 	adds r0, r4, #0
 	movs r1, #7
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0802F5D0
@@ -300,7 +300,7 @@ _0802F6B6:
 	adds r0, r4, #0
 	movs r1, #7
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0802F7A2
@@ -493,7 +493,7 @@ _0802F84C:
 	adds r0, r4, #0
 	movs r1, #7
 	movs r2, #1
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r5, r0, #0
 	cmp r5, #0
 	beq _0802F884

asmdiff.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-buildname=tmc
-baserom=baserom
+buildname=tmc_eu
+baserom=baserom_eu
 
 OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
 OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"

data/animations/projectile/torchTrapProjectile.s

@@ -4,6 +4,13 @@
 	.section .rodata
     .align 2
 
+gUnk_0812A3E0:: @ 0812A3E0
+	.incbin "baserom.gba", 0x12A3E0, 0x0000014
+
+gUnk_0812A3F4:: @ 0812A3F4
+	.4byte gUnk_0812A3E0
+	.4byte 00000000
+
 gUnk_0812A3FC:: @ 0812A3FC
 	.incbin "baserom.gba", 0x12A3FC, 0x0000014
 

data/const/enemy/enemy5A.s

@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-
-gUnk_080D1888:: @ 080D1888
-	.4byte sub_080456E8
-	.4byte sub_08045700
-	.4byte sub_080456E8
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_173
-
-gUnk_080D18A0:: @ 080D18A0
-	.4byte sub_080457E4
-	.4byte sub_0804586C
-	.4byte sub_080458C4
-	.4byte sub_08045938
-	.4byte sub_08045984
-
-gUnk_080D18B4:: @ 080D18B4
-	.incbin "baserom.gba", 0x0D18B4, 0x0000010

data/const/enemy/enemy5F.s

@@ -1,26 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D1D48:: @ 080D1D48
-	.4byte sub_080482EC
-	.4byte sub_08048330
-	.4byte sub_0804835C
-	.4byte sub_08048388
-	.4byte sub_080483F8
-	.4byte sub_08048438
-	.4byte sub_08048478
-	.4byte sub_080484E8
-	.4byte sub_08048550
-	.4byte sub_080485A0
-
-gUnk_080D1D70:: @ 080D1D70
-	.incbin "baserom.gba", 0x0D1D70, 0x0000008
-
-gUnk_080D1D78:: @ 080D1D78
-	.incbin "baserom.gba", 0x0D1D78, 0x0000020
-
-gUnk_080D1D98:: @ 080D1D98
-	.incbin "baserom.gba", 0x0D1D98, 0x0000008

data/const/enemy/vaatiArm.s

@@ -1,193 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D1230:: @ 080D1230
-	.4byte sub_08042570
-	.4byte sub_08042588
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_170
-
-gUnk_080D1248:: @ 080D1248
-	.4byte sub_0804259C
-	.4byte sub_08044078
-	.4byte sub_08044078
-	.4byte sub_08044078
-	.4byte sub_080440CC
-
-gUnk_080D125C:: @ 080D125C
-	.4byte sub_080425B4
-	.4byte sub_08042654
-	.4byte sub_08042818
-	.4byte sub_08042870
-	.4byte sub_08042A3C
-	.4byte sub_08042C14
-	.4byte sub_0804325C
-	.4byte sub_08043420
-	.4byte sub_08043680
-
-gUnk_080D1280:: @ 080D1280
-	.incbin "baserom.gba", 0x0D1280, 0x0000004
-
-gUnk_080D1284:: @ 080D1284
-	.incbin "baserom.gba", 0x0D1284, 0x0000002
-
-gUnk_080D1286:: @ 080D1286
-	.incbin "baserom.gba", 0x0D1286, 0x000000A
-
-gUnk_080D1290:: @ 080D1290
-	.4byte sub_08042894
-	.4byte sub_080428AC
-	.4byte sub_080428FC
-	.4byte sub_08042944
-	.4byte sub_08042970
-	.4byte sub_080429D4
-	.4byte sub_080429FC
-
-gUnk_080D12AC:: @ 080D12AC
-	.incbin "baserom.gba", 0x0D12AC, 0x0000004
-
-gUnk_080D12B0:: @ 080D12B0
-	.incbin "baserom.gba", 0x0D12B0, 0x0000002
-
-gUnk_080D12B2:: @ 080D12B2
-	.incbin "baserom.gba", 0x0D12B2, 0x0000002
-
-gUnk_080D12B4:: @ 080D12B4
-	.incbin "baserom.gba", 0x0D12B4, 0x0000002
-
-gUnk_080D12B6:: @ 080D12B6
-	.incbin "baserom.gba", 0x0D12B6, 0x0000002
-
-gUnk_080D12B8:: @ 080D12B8
-	.4byte sub_08042A6C
-	.4byte sub_08042A88
-	.4byte sub_08042AEC
-	.4byte sub_08042B20
-
-gUnk_080D12C8:: @ 080D12C8
-	.incbin "baserom.gba", 0x0D12C8, 0x0000002
-
-gUnk_080D12CA:: @ 080D12CA
-	.incbin "baserom.gba", 0x0D12CA, 0x0000006
-
-gUnk_080D12D0:: @ 080D12D0
-	.4byte sub_08042C34
-	.4byte sub_08042D24
-	.4byte sub_08042D6C
-	.4byte sub_08042E30
-	.4byte sub_08042EF4
-	.4byte sub_08042FD8
-	.4byte sub_08043048
-	.4byte sub_080430D0
-	.4byte sub_08043130
-	.4byte sub_080431E8
-
-gUnk_080D12F8:: @ 080D12F8
-	.incbin "baserom.gba", 0x0D12F8, 0x0000006
-
-gUnk_080D12FE:: @ 080D12FE
-	.incbin "baserom.gba", 0x0D12FE, 0x0000002
-
-gUnk_080D1300:: @ 080D1300
-	.incbin "baserom.gba", 0x0D1300, 0x0000004
-
-gUnk_080D1304:: @ 080D1304
-	.incbin "baserom.gba", 0x0D1304, 0x0000008
-
-gUnk_080D130C:: @ 080D130C
-	.incbin "baserom.gba", 0x0D130C, 0x0000001
-
-gUnk_080D130D:: @ 080D130D
-	.incbin "baserom.gba", 0x0D130D, 0x0000003
-
-gUnk_080D1310:: @ 080D1310
-	.incbin "baserom.gba", 0x0D1310, 0x0000004
-
-gUnk_080D1314:: @ 080D1314
-		.4byte sub_080432A8
-
-gUnk_080D1318:: @ 080D1318
-	.4byte sub_0804334C
-
-gUnk_080D131C:: @ 080D131C
-	.incbin "baserom.gba", 0x0D131C, 0x0000004
-
-gUnk_080D1320:: @ 080D1320
-	.4byte sub_08043440
-	.4byte sub_08043490
-	.4byte sub_08043520
-	.4byte sub_0804355C
-	.4byte sub_08043580
-	.4byte sub_080435F4
-
-gUnk_080D1338:: @ 080D1338
-	.incbin "baserom.gba", 0x0D1338, 0x0000004
-
-gUnk_080D133C:: @ 080D133C
-	.incbin "baserom.gba", 0x0D133C, 0x0000004
-
-gUnk_080D1340:: @ 080D1340
-	.incbin "baserom.gba", 0x0D1340, 0x0000008
-
-gUnk_080D1348:: @ 080D1348
-	.4byte sub_08043698
-	.4byte sub_080436C0
-	.4byte sub_08043700
-	.4byte sub_08043738
-	.4byte sub_08043770
-
-gUnk_080D135C:: @ 080D135C
-	.incbin "baserom.gba", 0x0D135C, 0x0000006
-
-gUnk_080D1362:: @ 080D1362
-	.incbin "baserom.gba", 0x0D1362, 0x0000050
-
-gUnk_080D13B2:: @ 080D13B2
-	.incbin "baserom.gba", 0x0D13B2, 0x0000005
-
-gUnk_080D13B7:: @ 080D13B7
-	.incbin "baserom.gba", 0x0D13B7, 0x0000021
-
-gUnk_080D13D8:: @ 080D13D8
-	.incbin "baserom.gba", 0x0D13D8, 0x0000008
-
-gUnk_080D13E0:: @ 080D13E0
-	.incbin "baserom.gba", 0x0D13E0, 0x0000003
-
-gUnk_080D13E3:: @ 080D13E3
-	.incbin "baserom.gba", 0x0D13E3, 0x0000006
-
-gUnk_080D13E9:: @ 080D13E9
-	.incbin "baserom.gba", 0x0D13E9, 0x0000003
-
-gUnk_080D13EC:: @ 080D13EC
-	.incbin "baserom.gba", 0x0D13EC, 0x0000014
-
-gUnk_080D1400:: @ 080D1400
-	.incbin "baserom.gba", 0x0D1400, 0x000000D
-
-gUnk_080D140D:: @ 080D140D
-	.incbin "baserom.gba", 0x0D140D, 0x0000005
-
-gUnk_080D1412:: @ 080D1412
-	.incbin "baserom.gba", 0x0D1412, 0x0000002
-
-gUnk_080D1414:: @ 080D1414
-	.incbin "baserom.gba", 0x0D1414, 0x0000003
-
-gUnk_080D1417:: @ 080D1417
-	.incbin "baserom.gba", 0x0D1417, 0x0000001
-
-gUnk_080D1418:: @ 080D1418
-	.incbin "baserom.gba", 0x0D1418, 0x0000001
-
-gUnk_080D1419:: @ 080D1419
-	.incbin "baserom.gba", 0x0D1419, 0x0000003
-
-gUnk_080D141C:: @ 080D141C
-	.incbin "baserom.gba", 0x0D141C, 0x0000002

data/const/enemy/vaatiEyesMacro.s

@@ -1,39 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080CDE34:: @ 080CDE34
-	.4byte sub_0802EC98
-	.4byte sub_0802ECC0
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte sub_0802EC98
-
-gUnk_080CDE4C:: @ 080CDE4C
-	.4byte sub_0802ED74
-	.4byte sub_0802EE20
-	.4byte sub_0802EEB8
-	.4byte sub_0802EF1C
-
-gUnk_080CDE5C:: @ 080CDE5C
-	.4byte sub_0802ED8C
-	.4byte sub_0802EE10
-
-gUnk_080CDE64:: @ 080CDE64
-	.4byte sub_0802EE38
-	.4byte sub_0802EE8C
-
-gUnk_080CDE6C:: @ 080CDE6C
-	.incbin "baserom.gba", 0x0CDE6C, 0x0000004
-
-gUnk_080CDE70:: @ 080CDE70
-	.incbin "baserom.gba", 0x0CDE70, 0x0000020
-
-gUnk_080CDE90:: @ 080CDE90
-	.incbin "baserom.gba", 0x0CDE90, 0x0000008
-
-gUnk_080CDE98:: @ 080CDE98
-	.incbin "baserom.gba", 0x0CDE98, 0x0000008

data/const/enemy/vaatiProjectile.s

@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D0648:: @ 080D0648
-	.4byte sub_0803E0C4
-	.4byte sub_0803E0DC
-	.4byte sub_08001328
-	.4byte sub_0803E188
-	.4byte sub_08001242
-	.4byte nullsub_19
-
-gUnk_080D0660:: @ 080D0660
-	.4byte sub_0803E1A8
-	.4byte sub_0803E258
-	.4byte sub_0803E2A8
-	.4byte sub_0803E2D0
-	.4byte sub_0803E314
-	.4byte sub_0803E340
-	.4byte sub_0803E370
-	.4byte sub_0803E398
-	.4byte sub_0803E3D4
-	.4byte sub_0803E3FC

data/const/enemy/vaatiRebornEnemy.s

@@ -1,49 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D0470:: @ 080D0470
-	.4byte sub_0803D134
-	.4byte sub_0803D264
-	.4byte sub_0803D408
-	.4byte sub_0803D560
-	.4byte sub_0803D658
-	.4byte sub_0803D700
-	.4byte sub_0803D830
-	.4byte sub_0803D8FC
-
-gUnk_080D0490:: @ 080D0490
-	.4byte sub_0803D974
-	.4byte sub_0803D9BC
-
-gUnk_080D0498:: @ 080D0498
-	.4byte sub_0803DAA8
-	.4byte sub_0803DAE4
-
-gUnk_080D04A0:: @ 080D04A0
-	.4byte sub_0803DB88
-	.4byte sub_0803DBB8
-
-gUnk_080D04A8:: @ 080D04A8
-	.incbin "baserom.gba", 0x0D04A8, 0x0000004
-
-gUnk_080D04AC:: @ 080D04AC
-	.incbin "baserom.gba", 0x0D04AC, 0x0000014
-
-gUnk_080D04C0:: @ 080D04C0
-	.incbin "baserom.gba", 0x0D04C0, 0x0000008
-
-gUnk_080D04C8:: @ 080D04C8
-	.incbin "baserom.gba", 0x0D04C8, 0x0000008
-
-gUnk_080D04D0:: @ 080D04D0
-.ifdef EU
-	.incbin "baserom_eu.gba", 0x0CFBFC, 0x0000003
-.else
-	.incbin "baserom.gba", 0x0D04D0, 0x0000003
-.endif
-
-gUnk_080D04D3:: @ 080D04D3
-	.incbin "baserom.gba", 0x0D04D3, 0x0000004

data/const/enemy/vaatiTransfigured.s

@@ -1,69 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D0ABC:: @ 080D0ABC
-.ifdef EU
-	.incbin "baserom_eu.gba", 0x0D01E8, 0x0000003
-.else
-	.incbin "baserom.gba", 0x0D0ABC, 0x0000003
-.endif
-
-gUnk_080D0ABF:: @ 080D0ABF
-	.incbin "baserom.gba", 0x0D0ABF, 0x0000009
-
-gUnk_080D0AC8:: @ 080D0AC8
-	.4byte sub_0803F818
-	.4byte sub_0803F914
-	.4byte sub_0803FAC8
-	.4byte sub_0803FAD0
-	.4byte sub_0803FD50
-	.4byte sub_0803FE90
-	.4byte sub_0803FF7C
-	.4byte sub_0804006C
-
-gUnk_080D0AE8:: @ 080D0AE8
-	.4byte sub_08040130
-	.4byte sub_0804015C
-
-gUnk_080D0AF0:: @ 080D0AF0
-	.4byte sub_080401E0
-	.4byte sub_08040268
-	.4byte sub_0804038C
-
-gUnk_080D0AFC:: @ 080D0AFC
-	.4byte sub_080403CC
-
-gUnk_080D0B00:: @ 080D0B00
-	.4byte sub_080403EC
-
-gUnk_080D0B04:: @ 080D0B04
-	.4byte sub_0804041C
-	.4byte sub_0804044C
-
-gUnk_080D0B0C:: @ 080D0B0C
-	.4byte sub_080404D0
-
-gUnk_080D0B10:: @ 080D0B10
-	.4byte sub_0804051C
-	.4byte sub_080405D8
-
-gUnk_080D0B18:: @ 080D0B18
-	.incbin "baserom.gba", 0x0D0B18, 0x0000011
-
-gUnk_080D0B29:: @ 080D0B29
-	.incbin "baserom.gba", 0x0D0B29, 0x000002F
-
-gUnk_080D0B58:: @ 080D0B58
-	.incbin "baserom.gba", 0x0D0B58, 0x000000C
-
-gUnk_080D0B64:: @ 080D0B64
-	.incbin "baserom.gba", 0x0D0B64, 0x0000010
-
-gUnk_080D0B74:: @ 080D0B74
-	.incbin "baserom.gba", 0x0D0B74, 0x0000010
-
-gUnk_080D0B84:: @ 080D0B84
-	.incbin "baserom.gba", 0x0D0B84, 0x0000020

data/const/enemy/vaatiWrath.s

@@ -1,56 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D0E1C:: @ 080D0E1C
-	.4byte sub_080413A0
-	.4byte sub_08042428
-	.4byte sub_080424A0
-	.4byte sub_0804250C
-
-gUnk_080D0E2C:: @ 080D0E2C
-	.4byte sub_080413C0
-	.4byte sub_08041490
-	.4byte sub_080415E8
-	.4byte sub_08041618
-	.4byte sub_080416A4
-	.4byte sub_080416DC
-	.4byte sub_080417AC
-	.4byte sub_08041828
-	.4byte sub_08041880
-	.4byte sub_08041904
-	.4byte sub_0804197C
-	.4byte sub_08041A00
-	.4byte sub_08041AF4
-	.4byte sub_08041BD0
-
-gUnk_080D0E64:: @ 080D0E64
-	.incbin "baserom.gba", 0x0D0E64, 0x0000004
-
-gUnk_080D0E68:: @ 080D0E68
-	.4byte sub_08041BE8
-	.4byte sub_08041CD0
-	.4byte sub_08041D14
-	.4byte sub_08041D84
-	.4byte sub_08041E20
-	.4byte sub_08041E50
-
-gUnk_080D0E80:: @ 080D0E80
-	.incbin "baserom.gba", 0x0D0E80, 0x0000010
-
-gUnk_080D0E90:: @ 080D0E90
-	.incbin "baserom.gba", 0x0D0E90, 0x0000010
-
-gUnk_080D0EA0:: @ 080D0EA0
-	.incbin "baserom.gba", 0x0D0EA0, 0x0000008
-
-gUnk_080D0EA8:: @ 080D0EA8
-	.incbin "baserom.gba", 0x0D0EA8, 0x0000004
-
-gUnk_080D0EAC:: @ 080D0EAC
-	.incbin "baserom.gba", 0x0D0EAC, 0x0000004
-
-gUnk_080D0EB0:: @ 080D0EB0
-	.incbin "baserom.gba", 0x0D0EB0, 0x0000020

data/const/npc/vaati.s

@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08110734:: @ 08110734
-	.4byte sub_08066A94
-	.4byte sub_08066ACC