Merge pull request #177 from octorock/projectiles

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/enemy5F.s

@@ -279,7 +279,7 @@ _080484BC:
 	ands r0, r1
 	strb r0, [r3]
 	movs r0, #0x24
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _080484E6

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/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/octorokBoss.s

@@ -2256,7 +2256,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]
@@ -2847,7 +2847,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
@@ -3277,7 +3277,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
@@ -3323,7 +3323,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/vaatiArm.s

@@ -1451,7 +1451,7 @@ sub_08042FD8: @ 0x08042FD8
 	cmp r0, #0
 	beq _08043018
 	movs r0, #0x20
-	bl sub_080A7EE0
+	bl CreateProjectile
 	adds r4, r0, #0
 	cmp r4, #0
 	beq _08043046

asm/vaatiRebornEnemy.s

@@ -812,7 +812,7 @@ _0803D6C8:
 	ldrb r2, [r5]
 	adds r0, r4, #0
 	movs r1, #0x1a
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0803D6EE
@@ -1041,7 +1041,7 @@ _0803D870:
 	adds r0, r5, #0
 	movs r1, #0x18
 	movs r2, #0
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r4, r0, #0
 	cmp r4, #0
 	beq _0803D8EE

asm/vaatiTransfigured.s

@@ -906,7 +906,7 @@ _0803FE34:
 	ldrb r2, [r4, #0xf]
 	adds r0, r4, #0
 	movs r1, #0x1f
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _0803FE46:
 	ldrb r0, [r4, #0xf]
 	cmp r0, #0
@@ -1015,7 +1015,7 @@ _0803FEFC:
 	ldrb r2, [r4, #0xf]
 	adds r0, r4, #0
 	movs r1, #0x1f
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _0803FF14:
 	ldrb r0, [r4, #0xe]
 	cmp r0, #5
@@ -1033,7 +1033,7 @@ _0803FF24:
 	adds r0, r4, #0
 	movs r1, #0x1f
 	movs r2, #2
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0803FF74
@@ -1137,7 +1137,7 @@ _0803FFE4:
 	ldrb r2, [r4, #0xf]
 	adds r0, r4, #0
 	movs r1, #0x1f
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 _0803FFFC:
 	ldrb r0, [r4, #0xe]
 	cmp r0, #5
@@ -1155,7 +1155,7 @@ _0804000C:
 	adds r0, r4, #0
 	movs r1, #0x1f
 	movs r2, #2
-	bl sub_0804A98C
+	bl CreateProjectileWithParent
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _08040062

asm/vaatiWrath.s

@@ -2160,7 +2160,7 @@ sub_080422C0: @ 0x080422C0
 	cmp r0, r4
 	bne _08042306
 	movs r0, #0x21
-	bl sub_080A7EE0
+	bl CreateProjectile
 	cmp r0, #0
 	beq _08042354
 	mov r1, r8

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

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/projectile/projectile0.s

@@ -1,197 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081293B8:: @ 081293B8
-	.incbin "baserom.gba", 0x1293B8, 0x0000014
-
-gUnk_081293CC:: @ 081293CC
-	.4byte sub_080A7FB4
-	.4byte sub_080A801C
-	.4byte sub_080A7FD8
-	.4byte sub_080A7FEC
-	.4byte sub_080A7FEC
-
-gUnk_081293E0:: @ 081293E0
-	.4byte gUnk_08129460
-	.4byte gUnk_081294A8
-	.4byte gUnk_081294F0
-	.4byte gUnk_08129538
-
-gUnk_081293F0:: @ 081293F0
-	.4byte gUnk_08129550
-	.4byte gUnk_08129558
-	.4byte gUnk_08129560
-	.4byte gUnk_08129568
-
-gUnk_08129400:: @ 08129400
-	.4byte gUnk_08129590
-	.4byte gUnk_081295A0
-	.4byte gUnk_081295B0
-	.4byte gUnk_081295C0
-
-gUnk_08129410:: @ 08129410
-	.4byte gUnk_08129598
-	.4byte gUnk_081295A8
-	.4byte gUnk_081295B8
-	.4byte gUnk_081295C8
-
-gUnk_08129420:: @ 08129420
-	.4byte gUnk_08129570
-	.4byte gUnk_08129578
-	.4byte gUnk_08129580
-	.4byte gUnk_08129588
-
-gUnk_08129430:: @ 08129430
-	.incbin "baserom.gba", 0x129430, 0x0000008
-
-gUnk_08129438:: @ 08129438
-	.incbin "baserom.gba", 0x129438, 0x0000008
-
-gUnk_08129440:: @ 08129440
-	.incbin "baserom.gba", 0x129440, 0x0000008
-
-gUnk_08129448:: @ 08129448
-	.incbin "baserom.gba", 0x129448, 0x0000008
-
-gUnk_08129450:: @ 08129450
-	.incbin "baserom.gba", 0x129450, 0x0000008
-
-gUnk_08129458:: @ 08129458
-	.incbin "baserom.gba", 0x129458, 0x0000008
-
-gUnk_08129460:: @ 08129460
-	.4byte gUnk_08129430
-	.4byte gUnk_08129438
-	.4byte gUnk_08129440
-	.4byte gUnk_08129448
-	.4byte gUnk_08129450
-	.4byte gUnk_08129458
-
-gUnk_08129478:: @ 08129478
-	.incbin "baserom.gba", 0x129478, 0x0000008
-
-gUnk_08129480:: @ 08129480
-	.incbin "baserom.gba", 0x129480, 0x0000008
-
-gUnk_08129488:: @ 08129488
-	.incbin "baserom.gba", 0x129488, 0x0000008
-
-gUnk_08129490:: @ 08129490
-	.incbin "baserom.gba", 0x129490, 0x0000008
-
-gUnk_08129498:: @ 08129498
-	.incbin "baserom.gba", 0x129498, 0x0000008
-
-gUnk_081294A0:: @ 081294A0
-	.incbin "baserom.gba", 0x1294A0, 0x0000008
-
-gUnk_081294A8:: @ 081294A8
-	.4byte gUnk_08129478
-	.4byte gUnk_08129480
-	.4byte gUnk_08129488
-	.4byte gUnk_08129490
-	.4byte gUnk_08129498
-	.4byte gUnk_081294A0
-
-gUnk_081294C0:: @ 081294C0
-	.incbin "baserom.gba", 0x1294C0, 0x0000008
-
-gUnk_081294C8:: @ 081294C8
-	.incbin "baserom.gba", 0x1294C8, 0x0000008
-
-gUnk_081294D0:: @ 081294D0
-	.incbin "baserom.gba", 0x1294D0, 0x0000008
-
-gUnk_081294D8:: @ 081294D8
-	.incbin "baserom.gba", 0x1294D8, 0x0000008
-
-gUnk_081294E0:: @ 081294E0
-	.incbin "baserom.gba", 0x1294E0, 0x0000008
-
-gUnk_081294E8:: @ 081294E8
-	.incbin "baserom.gba", 0x1294E8, 0x0000008
-
-gUnk_081294F0:: @ 081294F0
-	.4byte gUnk_081294C0
-	.4byte gUnk_081294C8
-	.4byte gUnk_081294D0
-	.4byte gUnk_081294D8
-	.4byte gUnk_081294E0
-	.4byte gUnk_081294E8
-
-gUnk_08129508:: @ 08129508
-	.incbin "baserom.gba", 0x129508, 0x0000008
-
-gUnk_08129510:: @ 08129510
-	.incbin "baserom.gba", 0x129510, 0x0000008
-
-gUnk_08129518:: @ 08129518
-	.incbin "baserom.gba", 0x129518, 0x0000008
-
-gUnk_08129520:: @ 08129520
-	.incbin "baserom.gba", 0x129520, 0x0000008
-
-gUnk_08129528:: @ 08129528
-	.incbin "baserom.gba", 0x129528, 0x0000008
-
-gUnk_08129530:: @ 08129530
-	.incbin "baserom.gba", 0x129530, 0x0000008
-
-gUnk_08129538:: @ 08129538
-	.4byte gUnk_08129508
-	.4byte gUnk_08129510
-	.4byte gUnk_08129518
-	.4byte gUnk_08129520
-	.4byte gUnk_08129528
-	.4byte gUnk_08129530
-
-gUnk_08129550:: @ 08129550
-	.incbin "baserom.gba", 0x129550, 0x0000008
-
-gUnk_08129558:: @ 08129558
-	.incbin "baserom.gba", 0x129558, 0x0000008
-
-gUnk_08129560:: @ 08129560
-	.incbin "baserom.gba", 0x129560, 0x0000008
-
-gUnk_08129568:: @ 08129568
-	.incbin "baserom.gba", 0x129568, 0x0000008
-
-gUnk_08129570:: @ 08129570
-	.incbin "baserom.gba", 0x129570, 0x0000008
-
-gUnk_08129578:: @ 08129578
-	.incbin "baserom.gba", 0x129578, 0x0000008
-
-gUnk_08129580:: @ 08129580
-	.incbin "baserom.gba", 0x129580, 0x0000008
-
-gUnk_08129588:: @ 08129588
-	.incbin "baserom.gba", 0x129588, 0x0000008
-
-gUnk_08129590:: @ 08129590
-	.incbin "baserom.gba", 0x129590, 0x0000008
-
-gUnk_08129598:: @ 08129598
-	.incbin "baserom.gba", 0x129598, 0x0000008
-
-gUnk_081295A0:: @ 081295A0
-	.incbin "baserom.gba", 0x1295A0, 0x0000008
-
-gUnk_081295A8:: @ 081295A8
-	.incbin "baserom.gba", 0x1295A8, 0x0000008
-
-gUnk_081295B0:: @ 081295B0
-	.incbin "baserom.gba", 0x1295B0, 0x0000008
-
-gUnk_081295B8:: @ 081295B8
-	.incbin "baserom.gba", 0x1295B8, 0x0000008
-
-gUnk_081295C0:: @ 081295C0
-	.incbin "baserom.gba", 0x1295C0, 0x0000008
-
-gUnk_081295C8:: @ 081295C8
-	.incbin "baserom.gba", 0x1295C8, 0x0000008

data/const/projectile/projectile1.s

@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081295D0:: @ 081295D0
-	.4byte sub_080A804C
-	.4byte sub_080A8064
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_081295E4:: @ 081295E4
-	.4byte sub_080A8088
-	.4byte sub_080A80A0
-	.4byte sub_080A80F4
-	.4byte sub_080A8118

data/const/projectile/projectile10.s

@@ -1,33 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129AE0:: @ 08129AE0
-	.4byte sub_080A9A1C
-	.4byte sub_080A9A34
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080A9A64
-
-gUnk_08129AF8:: @ 08129AF8
-	.4byte sub_080A9ACC
-	.4byte sub_080A9B24
-	.4byte sub_080A9B54
-	.4byte sub_080A9B80
-
-gUnk_08129B08:: @ 08129B08
-	.4byte sub_080A9A94
-	.4byte sub_080A9AA4
-	.4byte sub_080A9AAC
-	.4byte sub_080A9AB4
-	.4byte nullsub_128
-	.4byte sub_080A9AC4
-
-gUnk_08129B20:: @ 08129B20
-	.incbin "baserom.gba", 0x129B20, 0x0000030
-
-gUnk_08129B50:: @ 08129B50
-	.incbin "baserom.gba", 0x129B50, 0x0000008

data/const/projectile/projectile11.s

@@ -1,23 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129B58:: @ 08129B58
-	.4byte sub_080A9CD4
-	.4byte nullsub_539
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080A9CF0
-
-gUnk_08129B70:: @ 08129B70
-	.4byte sub_080A9D6C
-	.4byte sub_080A9D80
-
-gUnk_08129B78:: @ 08129B78
-	.4byte sub_080A9D20
-	.4byte nullsub_540
-	.4byte sub_080A9D2C
-

data/const/projectile/projectile12.s

@@ -1,17 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129BEC:: @ 08129BEC
-	.4byte sub_080A9DC0
-	.4byte sub_080A9DD8
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_08129C00:: @ 08129C00
-	.4byte sub_080A9DFC
-	.4byte sub_080A9E14
-

data/const/projectile/projectile13.s

@@ -1,63 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129C7C:: @ 08129C7C
-	.4byte sub_080A9E94
-	.4byte sub_080A9EBC
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_08129C90:: @ 08129C90
-	.4byte sub_080A9F50
-	.4byte sub_080A9F90
-	.4byte sub_080A9FD0
-	.4byte sub_080AA044
-	.4byte sub_080AA110
-
-gUnk_08129CA4:: @ 08129CA4
-	.incbin "baserom.gba", 0x129CA4, 0x0000008
-
-gUnk_08129CAC:: @ 08129CAC
-	.incbin "baserom.gba", 0x129CAC, 0x0000008
-
-gUnk_08129CB4:: @ 08129CB4
-	.incbin "baserom.gba", 0x129CB4, 0x0000008
-
-gUnk_08129CBC:: @ 08129CBC
-	.incbin "baserom.gba", 0x129CBC, 0x0000008
-
-gUnk_08129CC4:: @ 08129CC4
-	.incbin "baserom.gba", 0x129CC4, 0x0000008
-
-gUnk_08129CCC:: @ 08129CCC
-	.incbin "baserom.gba", 0x129CCC, 0x0000008
-
-gUnk_08129CD4:: @ 08129CD4
-	.incbin "baserom.gba", 0x129CD4, 0x0000008
-
-gUnk_08129CDC:: @ 08129CDC
-	.incbin "baserom.gba", 0x129CDC, 0x0000008
-
-gUnk_08129CE4:: @ 08129CE4
-	.incbin "baserom.gba", 0x129CE4, 0x0000008
-
-gUnk_08129CEC:: @ 08129CEC
-	.incbin "baserom.gba", 0x129CEC, 0x0000008
-
-gUnk_08129CF4:: @ 08129CF4
-	.4byte gUnk_08129CB4
-	.4byte gUnk_08129CBC
-	.4byte gUnk_08129CC4
-	.4byte gUnk_08129CCC
-	.4byte gUnk_08129CD4
-	.4byte gUnk_08129CDC
-	.4byte gUnk_08129CE4
-	.4byte gUnk_08129CEC
-
-gUnk_08129D14:: @ 08129D14
-	.incbin "baserom.gba", 0x129D14, 0x0000008
-

data/const/projectile/projectile14.s

@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129FB8:: @ 08129FB8
-	.4byte sub_080AA41C
-	.4byte sub_080AA450
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080AA464
-
-gUnk_08129FD0:: @ 08129FD0
-	.incbin "baserom.gba", 0x129FD0, 0x0000014
-
-gUnk_08129FE4:: @ 08129FE4
-	.incbin "baserom.gba", 0x129FE4, 0x0000014
-
-gUnk_08129FF8:: @ 08129FF8
-	.incbin "baserom.gba", 0x129FF8, 0x000000C
-
-gUnk_0812A004:: @ 0812A004
-	.incbin "baserom.gba", 0x12A004, 0x0000010

data/const/projectile/projectile15.s

@@ -1,45 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A014:: @ 0812A014
-	.4byte sub_080AA6A8
-	.4byte sub_080AA6C0
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080AA78C
-
-gUnk_0812A02C:: @ 0812A02C
-	.4byte sub_080AA834
-	.4byte sub_080AA878
-	.4byte sub_080AA898
-	.4byte sub_080AA9C4
-
-gUnk_0812A03C:: @ 0812A03C
-	.incbin "baserom.gba", 0x12A03C, 0x0000010
-
-gUnk_0812A04C:: @ 0812A04C
-	.4byte gUnk_080FD41C
-	.4byte gUnk_080FD424
-	.4byte gUnk_080FD42C
-	.4byte gUnk_080FD434
-
-gUnk_0812A05C:: @ 0812A05C
-	.4byte sub_080AA8B8
-	.4byte sub_080AA9AC
-
-gUnk_0812A064:: @ 0812A064
-	.incbin "baserom.gba", 0x12A064, 0x0000008
-
-gUnk_0812A06C:: @ 0812A06C
-	.incbin "baserom.gba", 0x12A06C, 0x0000008
-
-gUnk_0812A074:: @ 0812A074
-	.incbin "baserom.gba", 0x12A074, 0x0000010
-
-gUnk_0812A084:: @ 0812A084
-	.incbin "baserom.gba", 0x12A084, 0x0000008
-

data/const/projectile/projectile16.s

@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A3C0:: @ 0812A3C0
-	.4byte sub_080AAB04
-	.4byte sub_080AAB1C
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_0812A3D4:: @ 0812A3D4
-	.4byte sub_080AAB24
-	.4byte sub_080AAB38
-	.4byte sub_080AAB64
-
-gUnk_0812A3E0:: @ 0812A3E0
-	.incbin "baserom.gba", 0x12A3E0, 0x0000014
-
-gUnk_0812A3F4:: @ 0812A3F4
-	.4byte gUnk_0812A3E0
-	.incbin "baserom.gba", 0x12A3F8, 0x0000004

data/const/projectile/projectile18.s

@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A418:: @ 0812A418
-	.4byte sub_080AAC0C
-	.4byte sub_080AAC44
-	.4byte DeleteEntity
-	.4byte sub_080AACE0
-	.4byte DeleteEntity
-	.4byte sub_080AAD70
-
-gUnk_0812A430:: @ 0812A430
-	.4byte sub_080AADBC
-	.4byte sub_080AAE88
-	.4byte sub_080AAF00
-	.4byte sub_080AAF10
-
-gUnk_0812A440:: @ 0812A440
-	.4byte sub_080AAD98
-	.4byte nullsub_541
-	.4byte sub_080AADA4
-

data/const/projectile/projectile19.s

@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A494:: @ 0812A494
-	.4byte sub_080AB074
-	.4byte sub_080AB170
-	.4byte sub_080AB170
-	.4byte sub_080AB170
-	.4byte sub_080AB26C
-
-gUnk_0812A4A8:: @ 0812A4A8
-	.incbin "baserom.gba", 0x12A4A8, 0x0000020

data/const/projectile/projectile1A.s

@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A4C8:: @ 0812A4C8
-	.4byte sub_080AB2C4
-	.4byte sub_080AB2DC
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_0812A4DC:: @ 0812A4DC
-	.4byte sub_080AB318
-	.4byte sub_080AB414
-	.4byte sub_080AB45C
-	.4byte sub_080AB488
-
-gUnk_0812A4EC:: @ 0812A4EC
-	.incbin "baserom.gba", 0x12A4EC, 0x00000A0

data/const/projectile/projectile1B.s

@@ -1,17 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A58C:: @ 0812A58C
-	.4byte sub_080AB52C
-	.4byte sub_080AB544
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_0812A5A0:: @ 0812A5A0
-	.4byte sub_080AB580
-	.4byte sub_080AB59C
-	.4byte sub_080AB5C4

data/const/projectile/projectile1C.s

@@ -1,36 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A5E8:: @ 0812A5E8
-	.4byte sub_080AB6B8
-	.4byte sub_080AB6FC
-	.4byte sub_080AB728
-
-gUnk_0812A5F4:: @ 0812A5F4
-	.4byte gUnk_0812A61C
-	.4byte gUnk_0812A61C
-	.4byte gUnk_0812A624
-	.4byte gUnk_0812A61C
-	.4byte gUnk_0812A62C
-	.4byte gUnk_0812A624
-	.4byte gUnk_0812A634
-	.4byte gUnk_0812A624
-
-gUnk_0812A614:: @ 0812A614
-	.incbin "baserom.gba", 0x12A614, 0x0000008
-
-gUnk_0812A61C:: @ 0812A61C
-	.incbin "baserom.gba", 0x12A61C, 0x0000008
-
-gUnk_0812A624:: @ 0812A624
-	.incbin "baserom.gba", 0x12A624, 0x0000008
-
-gUnk_0812A62C:: @ 0812A62C
-	.incbin "baserom.gba", 0x12A62C, 0x0000008
-
-gUnk_0812A634:: @ 0812A634
-	.incbin "baserom.gba", 0x12A634, 0x0000008
-

data/const/projectile/projectile1D.s

@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A6B4:: @ 0812A6B4
-	.4byte sub_080AB8E8
-	.4byte sub_080AB950
-
-gUnk_0812A6BC:: @ 0812A6BC
-	.incbin "baserom.gba", 0x12A6BC, 0x0000008
-
-gUnk_0812A6C4:: @ 0812A6C4
-	.incbin "baserom.gba", 0x12A6C4, 0x0000008

data/const/projectile/projectile1E.s

@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A6CC:: @ 0812A6CC
-	.4byte sub_080ABA74
-	.4byte sub_080ABAE0
-
-gUnk_0812A6D4:: @ 0812A6D4
-	.incbin "baserom.gba", 0x12A6D4, 0x000000E
-

data/const/projectile/projectile1F.s

@@ -1,32 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A7D4:: @ 0812A7D4
-	.4byte sub_080ABBA8
-	.4byte sub_080ABBF4
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080ABC54
-
-gUnk_0812A7EC:: @ 0812A7EC
-	.4byte sub_080ABCC4
-	.4byte sub_080ABD44
-	.4byte sub_080ABD70
-
-gUnk_0812A7F8:: @ 0812A7F8
-	.4byte sub_080ABE04
-	.4byte sub_080ABE88
-
-gUnk_0812A800:: @ 0812A800
-	.4byte sub_080ABEA8
-	.4byte sub_080ABF04
-
-gUnk_0812A808:: @ 0812A808
-	.4byte sub_080ABC84
-	.4byte nullsub_542
-	.4byte sub_080ABC90
-

data/const/projectile/projectile2.s

@@ -1,20 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812960C:: @ 0812960C
-	.4byte sub_080A81AC
-	.4byte sub_080A81C4
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_08129620:: @ 08129620
-	.4byte sub_080A81E0
-	.4byte sub_080A81FC
-	.4byte sub_080A8248
-	.4byte sub_080A827C
-	.4byte sub_080A82B4
-

data/const/projectile/projectile20.s

@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A84C:: @ 0812A84C
-	.4byte sub_080ABF40
-	.4byte sub_080ABFA8
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-

data/const/projectile/projectile21.s

@@ -1,28 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A954:: @ 0812A954
-	.4byte sub_080ABFCC
-	.4byte sub_080ABFE4
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_0812A968:: @ 0812A968
-	.4byte sub_080ABFEC
-	.4byte sub_080AC074
-	.4byte sub_080AC100
-	.4byte sub_080AC168
-	.4byte sub_080AC200
-
-gUnk_0812A97C:: @ 0812A97C
-	.incbin "baserom.gba", 0x12A97C, 0x0000006
-
-gUnk_0812A982:: @ 0812A982
-	.incbin "baserom.gba", 0x12A982, 0x0000008
-
-gUnk_0812A98A:: @ 0812A98A
-	.incbin "baserom.gba", 0x12A98A, 0x000000A

data/const/projectile/projectile22.s

@@ -1,29 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A994:: @ 0812A994
-	.4byte sub_080AC328
-	.4byte sub_080AC510
-	.4byte sub_080AC510
-	.4byte sub_080AC510
-	.4byte sub_080AC560
-
-gUnk_0812A9A8:: @ 0812A9A8
-	.4byte sub_080AC340
-	.4byte sub_080AC388
-	.4byte sub_080AC480
-
-gUnk_0812A9B4:: @ 0812A9B4
-	.incbin "baserom.gba", 0x12A9B4, 0x0000004
-
-gUnk_0812A9B8:: @ 0812A9B8
-	.incbin "baserom.gba", 0x12A9B8, 0x0000002
-
-gUnk_0812A9BA:: @ 0812A9BA
-	.incbin "baserom.gba", 0x12A9BA, 0x0000006
-
-gUnk_0812A9C0:: @ 0812A9C0
-	.incbin "baserom.gba", 0x12A9C0, 0x0000018

data/const/projectile/projectile23.s

@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812A9D8:: @ 0812A9D8
-	.4byte sub_080AC8C4
-	.4byte sub_080AC8DC
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_0812A9EC:: @ 0812A9EC
-	.4byte sub_080AC928
-	.4byte sub_080AC954
-	.4byte sub_080AC9CC
-	.4byte sub_080ACA14
-

data/const/projectile/projectile24.s

@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812AA5C:: @ 0812AA5C
-	.4byte sub_080ACA50
-	.4byte sub_080ACA68
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte sub_080ACA50
-
-gUnk_0812AA74:: @ 0812AA74
-	.4byte sub_080ACAC8
-	.4byte sub_080ACAF0
-	.4byte sub_080ACB10

data/const/projectile/projectile3.s

@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08129650:: @ 08129650
-	.4byte sub_080A8314
-	.4byte sub_080A832C
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_08129664:: @ 08129664
-	.4byte sub_080A83A0
-	.4byte sub_080A83B4
-
-gUnk_0812966C:: @ 0812966C
-	.incbin "baserom.gba", 0x12966C, 0x0000084

data/const/projectile/projectile4.s

@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081296F0:: @ 081296F0
-	.4byte sub_080A8458
-	.4byte sub_080A8470
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-	.4byte DeleteEntity
-
-gUnk_08129704:: @ 08129704
-	.4byte sub_080A84C8
-	.4byte sub_080A8504
-	.4byte sub_080A85B8
-	.4byte sub_080A8610
-	.4byte sub_080A862C