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

15 files changed, 23 insertions, 331 deletions

diff --git a/asm/object/evilSpirit.s b/asm/object/evilSpirit.s
index 9b159acd..8aa425f4 100644
--- a/asm/object/evilSpirit.s
+++ b/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
diff --git a/asm/object/fairy.s b/asm/object/fairy.s
index 9ae61b7f..bde31a70 100644
--- a/asm/object/fairy.s
+++ b/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
diff --git a/asm/object/fourElements.s b/asm/object/fourElements.s
index 0e248794..598edaa5 100644
--- a/asm/object/fourElements.s
+++ b/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]
diff --git a/asm/object/lilypadLarge.s b/asm/object/lilypadLarge.s
index c178744a..cdc6ede6 100644
--- a/asm/object/lilypadLarge.s
+++ b/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
diff --git a/asm/object/macroPlayer.s b/asm/object/macroPlayer.s
index 7c8b3e9d..c741786a 100644
--- a/asm/object/macroPlayer.s
+++ b/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
diff --git a/asm/object/object30.s b/asm/object/object30.s
index 8ad2185f..6e3caadb 100644
--- a/asm/object/object30.s
+++ b/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:
diff --git a/asm/object/object91.s b/asm/object/object91.s
index 6a8d37f8..f4fed50e 100644
--- a/asm/object/object91.s
+++ b/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
diff --git a/asm/object/object96.s b/asm/object/object96.s
index 5fb797f2..62c8674d 100644
--- a/asm/object/object96.s
+++ b/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
diff --git a/asm/object/object97.s b/asm/object/object97.s
index 65f2f74a..d49bbd58 100644
--- a/asm/object/object97.s
+++ b/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
diff --git a/asm/object/objectA8.s b/asm/object/objectA8.s
index c7b728bc..d719aaf3 100644
--- a/asm/object/objectA8.s
+++ b/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
diff --git a/asm/object/objectB4.s b/asm/object/objectB4.s
index eb36b53e..27adbace 100644
--- a/asm/object/objectB4.s
+++ b/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
diff --git a/asm/object/objectOnSpinyBeetle.s b/asm/object/objectOnSpinyBeetle.s
index bcf85560..f93fa2a3 100644
--- a/asm/object/objectOnSpinyBeetle.s
+++ b/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
diff --git a/asm/object/pressurePlate.s b/asm/object/pressurePlate.s
deleted file mode 100644
index 37a2339d..00000000
--- a/asm/object/pressurePlate.s
+++ /dev/null
@@ -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
diff --git a/asm/object/specialFx.s b/asm/object/specialFx.s
index 5a0f7a1b..286e0046 100644
--- a/asm/object/specialFx.s
+++ b/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}
diff --git a/asm/object/windTribeTeleporter.s b/asm/object/windTribeTeleporter.s
index 34541e9e..4fe081a9 100644
--- a/asm/object/windTribeTeleporter.s
+++ b/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