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

asm/code_08054C04.s

@@ -446,7 +446,7 @@ sub_08054EFC: @ 0x08054EFC
 	subs r0, #0x10
 	strh r0, [r1, #0x32]
 	adds r0, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _08054F54:
 	movs r0, #0xfd
 	bl SoundReq

asm/code_08078778.s

@@ -724,7 +724,7 @@ _08078DE0:
 	strh r0, [r4, #0x32]
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 	ldr r0, _08078E34 @ =gPlayerState
 	ldrb r0, [r0, #5]
 	cmp r0, #4

asm/code_0808091C.s

@@ -419,7 +419,7 @@ _08080DB4:
 	adds r2, #1
 	strb r0, [r2]
 	adds r0, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 	b _08080E00
 _08080DEE:
 	ldr r0, _08080E04 @ =gRoomTransition

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

asm/non_matching/castorWildsStatue/sub_080675D4.inc

@@ -54,7 +54,7 @@ _080675EC:
 	strb r0, [r3, #0x19]
 	adds r0, r4, #0
 	adds r1, r3, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _08067646:
 	subs r6, #1
 	adds r5, #2
@@ -107,7 +107,7 @@ _08067656:
 	strb r0, [r3, #0x19]
 	adds r0, r4, #0
 	adds r1, r3, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _080676B0:
 	subs r6, #1
 	adds r5, #2

asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc

@@ -95,7 +95,7 @@ _0809A25C:
 	ldrsh r1, [r7, r2]
 	ldrb r2, [r7, #0x15]
 	adds r0, r7, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r1, [r4]
 	ldrb r0, [r7, #0xe]
 	lsls r0, r0, #2
@@ -206,7 +206,7 @@ _0809A33E:
 	lsls r1, r1, #2
 	ldrb r2, [r7, #0x15]
 	adds r0, r7, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r1, [r7, #0x50]
 	adds r0, r7, #0
 	movs r2, #0x48
@@ -216,7 +216,7 @@ _0809A378:
 	ldrb r2, [r7, #0x15]
 	adds r0, r7, #0
 	movs r1, #0x80
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	adds r0, r7, #0
 	adds r0, #0x5a
 	ldrb r0, [r0]
@@ -335,7 +335,7 @@ _0809A436:
 	ldrh r3, [r3]
 	adds r2, r2, r3
 	adds r0, r7, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	b _0809A632
 	.align 2, 0
 _0809A468: .4byte gUnk_0812388C

asm/non_matching/pressurePlate/sub_08088938.inc

@@ -0,0 +1,59 @@
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	mov r7, r8
+	push {r7}
+	movs r5, #0
+	ldrh r1, [r0, #0x2e]
+	subs r1, #8
+	lsls r1, r1, #0x10
+	lsrs r1, r1, #0x10
+	mov ip, r1
+	ldrh r1, [r0, #0x32]
+	subs r1, #8
+	lsls r1, r1, #0x10
+	lsrs r7, r1, #0x10
+	movs r4, #0
+	ldr r1, _080889A0 @ =gRoomVars
+	ldr r2, _080889A4 @ =sSpriteOffsets
+	mov r8, r2
+	adds r3, r1, #0
+	adds r3, #0xac
+	adds r6, r0, #0
+	adds r6, #0x72
+_08088962:
+	ldr r2, [r3]
+	cmp r2, #0
+	beq _08088990
+	ldrh r0, [r2, #0x2e]
+	mov r1, ip
+	subs r0, r0, r1
+	lsls r0, r0, #0x10
+	lsrs r0, r0, #0x10
+	cmp r0, #0x10
+	bhi _08088990
+	ldrh r0, [r2, #0x32]
+	subs r0, r0, r7
+	lsls r0, r0, #0x10
+	lsrs r0, r0, #0x10
+	cmp r0, #0x10
+	bhi _08088990
+	ldrb r0, [r6]
+	add r0, r8
+	ldrb r1, [r0]
+	adds r0, r2, #0
+	adds r0, #0x63
+	strb r1, [r0]
+	adds r5, #1
+_08088990:
+	adds r3, #4
+	adds r4, #1
+	cmp r4, #7
+	bls _08088962
+	adds r0, r5, #0
+	pop {r3}
+	mov r8, r3
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_080889A0: .4byte gRoomVars
+_080889A4: .4byte sSpriteOffsets
+    .syntax divided

asm/object/evilSpirit.s

@@ -235,7 +235,7 @@ _08086428:
 	ldrsh r1, [r6, r0]
 	ldrb r2, [r6, #0x15]
 	adds r0, r6, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	b _0808654A
 _08086440:
 	adds r0, r6, #0
@@ -507,7 +507,7 @@ _0808663A:
 	ldrsh r1, [r7, r0]
 	ldrb r2, [r7, #0x15]
 	adds r0, r7, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldrb r0, [r7, #0x15]
 	movs r1, #0x80
 	eors r0, r1

asm/object/fairy.s

@@ -392,7 +392,7 @@ _0808D972:
 	strh r0, [r4, #0x36]
 	ldr r1, _0808D994 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080177A0
+	bl IsColliding
 	cmp r0, #0
 	beq _0808D992
 	adds r0, r4, #0

asm/object/fourElements.s

@@ -151,7 +151,7 @@ sub_080A02CC: @ 0x080A02CC
 	adds r0, r4, #0
 	bl sub_080A0444
 	adds r0, r4, #0
-	bl sub_08017850
+	bl IsCollidingPlayer
 	cmp r0, #0
 	beq _080A0342
 	ldr r0, [r4, #0x54]

asm/object/lilypadLarge.s

@@ -919,7 +919,7 @@ _08085BB4:
 	lsls r1, r1, #1
 	ldrb r2, [r5, #0x15]
 	adds r0, r4, #0
-	bl sub_0806F5BC
+	bl LinearMoveDirection
 _08085BE8:
 	adds r1, r5, #0
 	adds r1, #0x82

asm/object/macroPlayer.s

@@ -90,7 +90,7 @@ _0808CB70:
 	movs r5, #0
 	str r5, [r4, #0x34]
 	adds r1, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 	ldrb r0, [r4, #0xd]
 	cmp r0, #0
 	beq _0808CB98

asm/object/object30.s

@@ -144,7 +144,7 @@ _0808A930:
 	asrs r0, r0, #0x18
 	strh r0, [r4, #0x36]
 	adds r0, r4, #0
-	bl sub_08017850
+	bl IsCollidingPlayer
 	cmp r0, #0
 	beq _0808A962
 _0808A954:

asm/object/object91.s

@@ -291,7 +291,7 @@ _0809C5E0: @ jump table
 _0809C600:
 	ldr r0, [r5, #0x50]
 	adds r1, r5, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 	ldr r0, [r5, #0x50]
 	ldrb r0, [r0, #0xd]
 	adds r6, r5, #0
@@ -382,7 +382,7 @@ _0809C6B4: .4byte gUnk_08123E1C
 _0809C6B8:
 	ldr r0, [r5, #0x50]
 	adds r1, r5, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 	ldr r0, [r5, #0x50]
 	ldrb r0, [r0, #0xd]
 	adds r6, r5, #0
@@ -864,7 +864,7 @@ _0809CA30:
 	adds r2, #2
 	ldrb r2, [r2]
 	rsbs r2, r2, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	ldr r1, [r4, #0x54]
 	adds r0, r4, #0
 	movs r2, #0x48

asm/object/object96.s

@@ -189,7 +189,7 @@ sub_0809D8C8: @ 0x0809D8C8
 _0809D8E4: .4byte gPlayerState
 _0809D8E8:
 	adds r0, r5, #0
-	bl sub_08017850
+	bl IsCollidingPlayer
 	cmp r0, #0
 	beq _0809D90A
 	ldrb r0, [r6, #0xd]
@@ -223,7 +223,7 @@ sub_0809D91C: @ 0x0809D91C
 	cmp r1, #0
 	beq _0809D934
 	adds r0, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _0809D934:
 	movs r0, #0x72
 	bl SoundReq

asm/object/object97.s

@@ -1024,7 +1024,7 @@ _0809E170:
 	ldrsh r1, [r5, r0]
 	ldrb r2, [r5, #0x15]
 	adds r0, r5, #0
-	bl sub_0806F62C
+	bl LinearMoveAngle
 	movs r1, #0x2e
 	ldrsh r0, [r5, r1]
 	mov r2, r8

asm/object/objectA8.s

@@ -340,7 +340,7 @@ _0809FD1C:
 	strh r0, [r4, #0x36]
 	ldr r1, _0809FD48 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080177A0
+	bl IsColliding
 	cmp r0, #0
 	beq _0809FD44
 	adds r0, r4, #0

asm/object/objectB4.s

@@ -95,7 +95,7 @@ _080A0C08:
 	strh r0, [r4, #0x32]
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _080A0C40:
 	ldrb r0, [r5, #0xf]
 	adds r0, #1
@@ -136,7 +136,7 @@ _080A0C6E:
 	strh r0, [r4, #0x32]
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _080A0C92:
 	ldrb r0, [r5, #0xf]
 	adds r0, #1
@@ -159,7 +159,7 @@ _080A0CA0:
 	strh r0, [r4, #0x32]
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _080A0CC0:
 	movs r0, #0xb4
 	movs r1, #3
@@ -174,7 +174,7 @@ _080A0CC0:
 	strh r0, [r4, #0x32]
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 _080A0CE0:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/object/objectOnSpinyBeetle.s

@@ -67,7 +67,7 @@ _080985AC:
 _080985AE:
 	ldr r1, [r4, #0x50]
 	adds r0, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 	adds r0, r4, #0
 	bl sub_08098918
 	pop {r4, r5, pc}
@@ -569,7 +569,7 @@ _0809892E:
 	strb r0, [r2]
 	ldr r1, [r4, #0x50]
 	adds r0, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _08098968:
 	ldr r2, _0809898C @ =gUnk_08123558
 	adds r0, r6, #0
@@ -606,7 +606,7 @@ _08098990:
 	strb r0, [r2]
 	ldr r1, [r4, #0x50]
 	adds r0, r4, #0
-	bl ResolveEntityBelow
+	bl SortEntityBelow
 _080989B2:
 	strh r5, [r4, #0x36]
 	adds r1, r4, #0

asm/object/pressurePlate.s

@@ -1,308 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start PressurePlate
-PressurePlate: @ 0x08088804
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _08088828
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08088828
-	ldrb r0, [r4, #0x14]
-	adds r1, r4, #0
-	adds r1, #0x72
-	strb r0, [r1]
-	ldrb r1, [r4, #0x14]
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08088828:
-	ldr r0, _0808883C @ =gUnk_08120BE0
-	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
-_0808883C: .4byte gUnk_08120BE0
-
-	thumb_func_start sub_08088840
-sub_08088840: @ 0x08088840
-	movs r3, #1
-	movs r1, #1
-	strb r1, [r0, #0xc]
-	ldrb r2, [r0, #0x18]
-	subs r1, #5
-	ands r1, r2
-	orrs r1, r3
-	strb r1, [r0, #0x18]
-	adds r3, r0, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r2, #7
-	orrs r1, r2
-	strb r1, [r3]
-	ldr r1, _08088868 @ =gUnk_080FD1D4
-	str r1, [r0, #0x48]
-	ldrb r1, [r0, #0x14]
-	adds r0, #0x72
-	strb r1, [r0]
-	bx lr
-	.align 2, 0
-_08088868: .4byte gUnk_080FD1D4
-
-	thumb_func_start sub_0808886C
-sub_0808886C: @ 0x0808886C
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_08088938
-	adds r4, r0, #0
-	adds r0, r5, #0
-	bl sub_080889A8
-	adds r4, r4, r0
-	lsls r4, r4, #0x18
-	lsrs r4, r4, #0x18
-	ldrb r1, [r5, #0xa]
-	adds r0, r1, #2
-	cmp r0, r4
-	bgt _080888B8
-	movs r1, #0
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	strb r1, [r5, #0xf]
-	movs r0, #4
-	strb r0, [r5, #0x14]
-	strh r1, [r5, #0x36]
-	adds r0, r5, #0
-	movs r1, #4
-	bl InitializeAnimation
-	adds r0, r5, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl SetFlag
-	ldr r0, _080888B4 @ =0x0000016B
-	bl EnqueueSFX
-	b _080888F2
-	.align 2, 0
-_080888B4: .4byte 0x0000016B
-_080888B8:
-	ldrb r0, [r5, #0x14]
-	cmp r4, r0
-	bls _080888E4
-	adds r0, r1, #1
-	cmp r0, r4
-	bne _080888D2
-	movs r0, #4
-	strb r0, [r5, #0xf]
-	adds r1, r4, #1
-	adds r0, r5, #0
-	bl InitializeAnimation
-	b _080888DA
-_080888D2:
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl InitializeAnimation
-_080888DA:
-	movs r0, #0x86
-	lsls r0, r0, #1
-	bl EnqueueSFX
-	b _080888F0
-_080888E4:
-	cmp r4, r0
-	bhs _080888F0
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl InitializeAnimation
-_080888F0:
-	strb r4, [r5, #0x14]
-_080888F2:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_080888F4
-sub_080888F4: @ 0x080888F4
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	adds r0, #0x70
-	ldrh r0, [r0]
-	cmp r0, #0
-	beq _08088934
-	adds r0, r5, #0
-	bl sub_08088938
-	adds r4, r0, #0
-	adds r0, r5, #0
-	bl sub_080889A8
-	adds r4, r4, r0
-	lsls r4, r4, #0x18
-	lsrs r4, r4, #0x18
-	ldrb r0, [r5, #0xa]
-	adds r0, #2
-	cmp r0, r4
-	ble _08088934
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	strb r4, [r5, #0x14]
-	adds r0, r5, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl ClearFlag
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl InitializeAnimation
-_08088934:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08088938
-sub_08088938: @ 0x08088938
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	movs r5, #0
-	ldrh r1, [r0, #0x2e]
-	subs r1, #8
-	lsls r1, r1, #0x10
-	lsrs r1, r1, #0x10
-	mov ip, r1
-	ldrh r1, [r0, #0x32]
-	subs r1, #8
-	lsls r1, r1, #0x10
-	lsrs r7, r1, #0x10
-	movs r4, #0
-	ldr r1, _080889A0 @ =gRoomVars
-	ldr r2, _080889A4 @ =gUnk_08120BEC
-	mov r8, r2
-	adds r3, r1, #0
-	adds r3, #0xac
-	adds r6, r0, #0
-	adds r6, #0x72
-_08088962:
-	ldr r2, [r3]
-	cmp r2, #0
-	beq _08088990
-	ldrh r0, [r2, #0x2e]
-	mov r1, ip
-	subs r0, r0, r1
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0x10
-	bhi _08088990
-	ldrh r0, [r2, #0x32]
-	subs r0, r0, r7
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #0x10
-	bhi _08088990
-	ldrb r0, [r6]
-	add r0, r8
-	ldrb r1, [r0]
-	adds r0, r2, #0
-	adds r0, #0x63
-	strb r1, [r0]
-	adds r5, #1
-_08088990:
-	adds r3, #4
-	adds r4, #1
-	cmp r4, #7
-	bls _08088962
-	adds r0, r5, #0
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080889A0: .4byte gRoomVars
-_080889A4: .4byte gUnk_08120BEC
-
-	thumb_func_start sub_080889A8
-sub_080889A8: @ 0x080889A8
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	movs r5, #0
-	bl sub_08017850
-	cmp r0, #0
-	beq _080889CA
-	ldr r1, _08088A40 @ =gPlayerEntity
-	ldr r2, _08088A44 @ =gUnk_08120BEC
-	adds r0, r4, #0
-	adds r0, #0x72
-	ldrb r0, [r0]
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	adds r1, #0x63
-	strb r0, [r1]
-	movs r5, #1
-_080889CA:
-	ldr r0, _08088A48 @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #0xf
-	ands r0, r1
-	cmp r0, #0
-	beq _08088A3A
-	ldr r6, _08088A4C @ =gPlayerClones
-	ldr r1, [r6]
-	adds r0, r4, #0
-	bl sub_080177A0
-	cmp r0, #0
-	beq _080889FA
-	ldr r1, [r6]
-	ldr r2, _08088A44 @ =gUnk_08120BEC
-	adds r0, r4, #0
-	adds r0, #0x72
-	ldrb r0, [r0]
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	adds r1, #0x63
-	strb r0, [r1]
-	adds r5, #1
-_080889FA:
-	ldr r1, [r6, #4]
-	adds r0, r4, #0
-	bl sub_080177A0
-	cmp r0, #0
-	beq _08088A1A
-	ldr r1, [r6, #4]
-	ldr r2, _08088A44 @ =gUnk_08120BEC
-	adds r0, r4, #0
-	adds r0, #0x72
-	ldrb r0, [r0]
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	adds r1, #0x63
-	strb r0, [r1]
-	adds r5, #1
-_08088A1A:
-	ldr r1, [r6, #8]
-	adds r0, r4, #0
-	bl sub_080177A0
-	cmp r0, #0
-	beq _08088A3A
-	ldr r1, [r6, #8]
-	ldr r2, _08088A44 @ =gUnk_08120BEC
-	adds r0, r4, #0
-	adds r0, #0x72
-	ldrb r0, [r0]
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	adds r1, #0x63
-	strb r0, [r1]
-	adds r5, #1
-_08088A3A:
-	adds r0, r5, #0
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08088A40: .4byte gPlayerEntity
-_08088A44: .4byte gUnk_08120BEC
-_08088A48: .4byte gPlayerState
-_08088A4C: .4byte gPlayerClones

asm/object/specialFx.s

@@ -459,7 +459,7 @@ _080847F0:
 	strh r0, [r5, #0x36]
 	adds r0, r4, #0
 	adds r1, r5, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 	adds r0, r5, #0
 	bl sub_080845DC
 	pop {r4, r5, pc}

asm/object/windTribeTeleporter.s

@@ -709,7 +709,7 @@ sub_080A11C0: @ 0x080A11C0
 	cmp r0, #0
 	bne _080A11DC
 	adds r0, r1, #0
-	bl sub_08017850
+	bl IsCollidingPlayer
 	b _080A11DE
 	.align 2, 0
 _080A11D8: .4byte gPlayerEntity

asm/objectUtils.s

@@ -167,7 +167,7 @@ _080A2BB4:
 	bl PositionRelative
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 	adds r0, r5, #0
 	adds r0, #0x62
 	ldrb r0, [r0]
@@ -380,7 +380,7 @@ CreateSpeechBubble: @ 0x080A2D2C
 	bl CopyPosition
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl ResolveEntityOnTop
+	bl SortEntityAbove
 	str r5, [r4, #0x50]
 	adds r0, r4, #0
 	adds r0, #0x62