Merge remote-tracking branch 'upstream/master' into coord

asm/enemy/chuchuBoss.s

@@ -3676,7 +3676,7 @@ _08027676:
 	mov r0, sl
 	ldrb r2, [r0]
 	adds r0, r5, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldrb r0, [r5, #0xa]
 	cmp r0, #1
 	beq _080276D2
@@ -3692,7 +3692,7 @@ _08027676:
 	adds r2, r0, #0
 	adds r2, #0x83
 	ldrb r2, [r2]
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r0, [r5, #0x68]
 	ldr r1, [r5, #0x54]
 	ldrb r2, [r1, #0xa]
@@ -4033,7 +4033,7 @@ _08027934:
 	adds r0, #0x83
 	ldrb r2, [r0]
 	adds r0, r5, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r0, [r5, #0x2c]
 	str r0, [r6, #0x2c]
 	ldr r0, [r5, #0x30]
@@ -4044,7 +4044,7 @@ _08027934:
 	adds r0, #0x83
 	ldrb r2, [r0]
 	adds r0, r6, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r0, [r6, #0x2c]
 	str r0, [r4, #0x2c]
 	ldr r0, [r6, #0x30]
@@ -4055,7 +4055,7 @@ _08027934:
 	adds r0, #0x83
 	ldrb r2, [r0]
 	adds r0, r4, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	adds r0, r7, #0
 	bl sub_08027984
 	pop {r4, r5, r6, r7, pc}

asm/enemy/cloudPiranha.s

@@ -396,7 +396,7 @@ sub_080386B8: @ 0x080386B8
 	cmp r1, #0
 	beq _08038720
 	adds r0, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _08038720:
 	pop {r4, pc}
 	.align 2, 0
@@ -507,7 +507,7 @@ _080387D8:
 	cmp r1, #0
 	beq _080387EE
 	adds r0, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _080387EE:
 	pop {r4, pc}
 

asm/enemy/enemy64.s

@@ -1236,7 +1236,7 @@ sub_08049998: @ 0x08049998
 	ldrsh r1, [r5, r0]
 	ldrb r2, [r5, #0x15]
 	adds r0, r5, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	adds r0, r5, #0
 	adds r0, #0x7c
 	ldrb r1, [r0]
@@ -1433,7 +1433,7 @@ sub_08049B20: @ 0x08049B20
 	ldrsh r1, [r4, r0]
 	ldrb r2, [r4, #0x15]
 	adds r0, r4, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	adds r0, r4, #0
 	adds r0, #0x7c
 	ldrb r1, [r0]

asm/enemy/enemy66.s

@@ -1,30 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Enemy66
-Enemy66: @ 0x08049CAC
-	push {lr}
-	adds r2, r0, #0
-	ldr r1, _08049CC8 @ =gUnk_080D2ABC
-	ldrb r0, [r2, #0xf]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _08049CCC
-	adds r0, r2, #0
-	bl _call_via_r1
-	b _08049CD0
-	.align 2, 0
-_08049CC8: .4byte gUnk_080D2ABC
-_08049CCC:
-	bl DeleteThisEntity
-_08049CD0:
-	pop {pc}
-	.align 2, 0