diff --git a/asm/bakerOven.s b/asm/bakerOven.s
index fb5b16e1..afb026d5 100644
--- a/asm/bakerOven.s
+++ b/asm/bakerOven.s
@@ -26,7 +26,7 @@ sub_0809CC74: @ 0x0809CC74
 	adds r5, r0, #0
 	movs r4, #1
 	strb r4, [r5, #0xc]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r0, [r5, #0xa]
 	cmp r0, #0
 	bne _0809CCD4
diff --git a/asm/beetle.s b/asm/beetle.s
index ea7afc04..a5215475 100644
--- a/asm/beetle.s
+++ b/asm/beetle.s
@@ -364,7 +364,7 @@ _080219C2:
 	movs r1, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08021A04:
 	pop {r4, pc}
 	.align 2, 0
diff --git a/asm/bell.s b/asm/bell.s
index 8454fb78..fdc37e1b 100644
--- a/asm/bell.s
+++ b/asm/bell.s
@@ -44,7 +44,7 @@ sub_08097D90: @ 0x08097D90
 	ands r0, r1
 	strb r0, [r2]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitAnimationForceUpdate
diff --git a/asm/bigBarrel.s b/asm/bigBarrel.s
index a61d2dac..caa4d348 100644
--- a/asm/bigBarrel.s
+++ b/asm/bigBarrel.s
@@ -509,7 +509,7 @@ _08088DEC:
 _08088E1E:
 	strb r1, [r4, #0xb]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _08088E6E
 _08088E28:
 	ldrb r0, [r4, #0xb]
diff --git a/asm/bird.s b/asm/bird.s
index a2f52f0e..3ae45e1b 100644
--- a/asm/bird.s
+++ b/asm/bird.s
@@ -74,7 +74,7 @@ sub_0809CF54: @ 0x0809CF54
 	ldr r0, _0809CFE8 @ =0x00000123
 	bl PlaySFX
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitAnimationForceUpdate
@@ -162,7 +162,7 @@ sub_0809D048: @ 0x0809D048
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x17
 	bl InitAnimationForceUpdate
@@ -266,7 +266,7 @@ sub_0809D10C: @ 0x0809D10C
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x17
 	bl InitAnimationForceUpdate
@@ -323,7 +323,7 @@ sub_0809D178: @ 0x0809D178
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r1, r4, #0
 	adds r1, #0x5a
 	movs r0, #0x80
diff --git a/asm/book.s b/asm/book.s
index 561f4120..07893253 100644
--- a/asm/book.s
+++ b/asm/book.s
@@ -71,7 +71,7 @@ _0809B420:
 	strb r0, [r4, #0xb]
 _0809B424:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r1, [r4, #0xa]
 	adds r1, #0x39
 	adds r0, r4, #0
diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s
index 7d6edaf9..5d66e4b3 100644
--- a/asm/code_0800857C.s
+++ b/asm/code_0800857C.s
@@ -387,7 +387,7 @@ _0800882C:
 	movs r3, #0x38
 	ldrb r1, [r4, r3]
 	strb r1, [r0, r3]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0800883A:
 	ldr r1, _080088E0 @ =gRoomControls
 	ldrh r0, [r1, #6]
@@ -4030,8 +4030,8 @@ gUnk_080169A4::
 	.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
 	.byte 0x00, 0x00, 0x01, 0x00
 
-	thumb_func_start UpdateSpriteOrderAndFlip
-UpdateSpriteOrderAndFlip: @ 0x08016A04
+	thumb_func_start UpdateSpriteForCollisionLayer
+UpdateSpriteForCollisionLayer: @ 0x08016A04
 	movs r1, #0x38
 	ldrb r1, [r0, r1]
 	lsls r1, r1, #1
@@ -4083,7 +4083,7 @@ _08016A62:
 	strb r3, [r4, r5]
 _08016A64:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, r5, pc}
 
 	thumb_func_start sub_08016A6C
@@ -4123,6 +4123,6 @@ sub_08016AD2: @ 0x08016AD2
 	bl sub_08016A6C
 	push {r0}
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r0, r4, pc}
 
diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s
index d5b8213c..312d0bdd 100644
--- a/asm/code_08016DF8.s
+++ b/asm/code_08016DF8.s
@@ -1567,7 +1567,7 @@ sub_08017940: @ 0x08017940
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080179CC:
 	movs r1, #0
 	ldr r0, _080179E8 @ =gLinkEntity
diff --git a/asm/code_08049CD4.s b/asm/code_08049CD4.s
index dcd0d0a1..d415811d 100644
--- a/asm/code_08049CD4.s
+++ b/asm/code_08049CD4.s
@@ -1290,7 +1290,7 @@ _0804A612:
 	strb r0, [r1]
 _0804A638:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r5, r4, #0
 	adds r5, #0x6d
 	ldrb r1, [r5]
diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s
index 592838bf..ee505e5d 100644
--- a/asm/code_0805436C.s
+++ b/asm/code_0805436C.s
@@ -685,7 +685,7 @@ _08054842:
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0805486A:
 	adds r0, r4, #0
 _0805486C:
@@ -1551,7 +1551,7 @@ sub_08054EFC: @ 0x08054EFC
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x35
 	movs r2, #0
diff --git a/asm/code_0806EC20.s b/asm/code_0806EC20.s
index 8e3fbf72..7a47cab4 100644
--- a/asm/code_0806EC20.s
+++ b/asm/code_0806EC20.s
@@ -163,7 +163,7 @@ _0806ECD0:
 	strb r1, [r0]
 	strb r1, [r4, #0x1e]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0806ED4A:
 	pop {r4, r5, pc}
 	.align 2, 0
diff --git a/asm/code_08070698.s b/asm/code_08070698.s
index 3ad8e6c2..ebe42a24 100644
--- a/asm/code_08070698.s
+++ b/asm/code_08070698.s
@@ -3241,7 +3241,7 @@ sub_08071F80: @ 0x08071F80
 	cmp r5, #0
 	bne _08071FB8
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r0, _08071FB4 @ =gLinkState
 	strb r5, [r0, #2]
 	ldrb r0, [r0, #0x14]
@@ -3537,7 +3537,7 @@ _080721AC:
 	orrs r0, r1
 	strb r0, [r4, #0x10]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	bl sub_080791BC
 _080721DE:
 	pop {r4, pc}
@@ -3774,7 +3774,7 @@ sub_08072354: @ 0x08072354
 	ands r0, r1
 	str r0, [r2, #0x30]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0xc
 	movs r2, #0
diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s
index 1fe8ae46..0cce55f5 100644
--- a/asm/code_080732D0.s
+++ b/asm/code_080732D0.s
@@ -3153,7 +3153,7 @@ sub_08074A48: @ 0x08074A48
 	movs r0, #1
 	strb r0, [r1, #0xe]
 	adds r0, r1, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrh r1, [r5, #0x22]
 	adds r0, r4, #0
 	adds r0, #0x38
diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s
index 5b61adf0..8e3f6f87 100644
--- a/asm/code_08077B98.s
+++ b/asm/code_08077B98.s
@@ -3397,7 +3397,7 @@ _080794F4:
 	bne _080794F4
 _08079514:
 	ldr r0, _0807951C @ =gLinkEntity
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, r5, pc}
 	.align 2, 0
 _0807951C: .4byte gLinkEntity
diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s
index 2360e828..9a17aa0a 100644
--- a/asm/code_0807B9B8.s
+++ b/asm/code_0807B9B8.s
@@ -1807,7 +1807,7 @@ _0807C7C2:
 	movs r1, #1
 	strb r1, [r0]
 	ldr r0, [r4, #0x30]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0807C7FC:
 	ldrb r1, [r4, #0xf]
 	movs r0, #0xfb
diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index c1bff554..fa29b577 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -5065,7 +5065,7 @@ sub_0807F158: @ 0x0807F158
 	adds r2, #0x38
 	movs r1, #1
 	strb r1, [r2]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 
 	thumb_func_start sub_0807F168
@@ -5076,7 +5076,7 @@ sub_0807F168: @ 0x0807F168
 	adds r2, #0x38
 	movs r1, #1
 	strb r1, [r2]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 	.align 2, 0
 _0807F17C: .4byte gLinkEntity
@@ -5088,7 +5088,7 @@ sub_0807F180: @ 0x0807F180
 	adds r2, #0x38
 	movs r1, #2
 	strb r1, [r2]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 
 	thumb_func_start sub_0807F190
diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s
index bd86ceb8..a9591b8c 100644
--- a/asm/code_080A5574.s
+++ b/asm/code_080A5574.s
@@ -5202,7 +5202,7 @@ _080A7E14:
 	ldr r0, [r5, #4]
 	str r0, [r4, #0x48]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080A7E4A:
 	movs r0, #1
 _080A7E4C:
@@ -10441,7 +10441,7 @@ sub_080AA534: @ 0x080AA534
 	adds r2, #0x38
 	movs r1, #3
 	strb r1, [r2]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 
 	thumb_func_start sub_080AA544
@@ -15257,7 +15257,7 @@ sub_080AC928: @ 0x080AC928
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitializeAnimation
@@ -16380,7 +16380,7 @@ _080AD188:
 	bl PlaySFX
 _080AD196:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #3
 	strb r0, [r5, #0xd]
 	ldrb r2, [r4, #0x19]
diff --git a/asm/crow.s b/asm/crow.s
index 4d1f98f3..4dca91a7 100644
--- a/asm/crow.s
+++ b/asm/crow.s
@@ -220,7 +220,7 @@ sub_08032928: @ 0x08032928
 	adds r1, #0x7a
 	strh r0, [r1]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r6, #0
 	bl sub_08032AF4
 	pop {r4, r5, r6, pc}
@@ -368,7 +368,7 @@ sub_08032A48: @ 0x08032A48
 	movs r0, #3
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_08032AF4
 _08032AAE:
diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s
index 0329c554..d7161fa4 100644
--- a/asm/cuccoAggr.s
+++ b/asm/cuccoAggr.s
@@ -240,7 +240,7 @@ sub_08038E18: @ 0x08038E18
 	adds r0, r4, #0
 	bl sub_080AEF88
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08038E70:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
diff --git a/asm/deathFx.s b/asm/deathFx.s
index f74bd960..43281d5a 100644
--- a/asm/deathFx.s
+++ b/asm/deathFx.s
@@ -42,7 +42,7 @@ sub_08081634: @ 0x08081634
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r0, [r4, #0x19]
 	movs r1, #3
 	orrs r0, r1
diff --git a/asm/enemy64.s b/asm/enemy64.s
index dd9105f2..5131a1fa 100644
--- a/asm/enemy64.s
+++ b/asm/enemy64.s
@@ -570,7 +570,7 @@ _0804948C:
 	strb r0, [r1]
 	str r4, [r2, #0x50]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080494B2:
 	adds r0, r4, #0
 	bl sub_08049944
@@ -1414,7 +1414,7 @@ sub_08049AB0: @ 0x08049AB0
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08049B18:
 	pop {r4, r5, pc}
 	.align 2, 0
diff --git a/asm/fallingBoulder.s b/asm/fallingBoulder.s
index 052f8a8e..78842d96 100644
--- a/asm/fallingBoulder.s
+++ b/asm/fallingBoulder.s
@@ -340,7 +340,7 @@ _0802C48C:
 	orrs r0, r1
 	strb r0, [r2]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0802C4AA:
 	pop {r4, r5, r6, r7, pc}
 
diff --git a/asm/floatingBlock.s b/asm/floatingBlock.s
index 22ab5a8b..af82890d 100644
--- a/asm/floatingBlock.s
+++ b/asm/floatingBlock.s
@@ -33,7 +33,7 @@ FloatingBlock: @ 0x080A0554
 	adds r0, #0x38
 	strb r2, [r0]
 	adds r0, r3, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080A0588:
 	pop {pc}
 	.align 2, 0
diff --git a/asm/furniture.s b/asm/furniture.s
index 81bed6a9..43187642 100644
--- a/asm/furniture.s
+++ b/asm/furniture.s
@@ -95,7 +95,7 @@ _08090640:
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r7, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _080906E6
 _08090650:
 	ldrh r1, [r7, #0x32]
@@ -657,7 +657,7 @@ _08090B14:
 	movs r0, #1
 	strb r0, [r3]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08090B2C:
 	adds r0, r5, #0
 	bl GetTileTypeByEntity
@@ -1095,7 +1095,7 @@ sub_08090E64: @ 0x08090E64
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08090EA0:
 	pop {r4, r5, pc}
 	.align 2, 0
diff --git a/asm/gentariCurtains.s b/asm/gentariCurtains.s
index a281b998..5b249efb 100644
--- a/asm/gentariCurtains.s
+++ b/asm/gentariCurtains.s
@@ -62,7 +62,7 @@ _0809207A:
 	adds r0, #2
 	strh r0, [r6, #0x2e]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x2e
 	ldrsh r2, [r6, r0]
 	ldr r3, _08092130 @ =gRoomControls
@@ -248,7 +248,7 @@ sub_080921F0: @ 0x080921F0
 	orrs r0, r1
 	strb r0, [r3]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08092212:
 	pop {pc}
 
@@ -271,7 +271,7 @@ sub_08092214: @ 0x08092214
 	orrs r0, r1
 	strb r0, [r3]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0809223A:
 	pop {pc}
 
@@ -290,5 +290,5 @@ sub_0809223C: @ 0x0809223C
 	movs r2, #3
 	orrs r1, r2
 	strb r1, [r3]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
diff --git a/asm/giantRock.s b/asm/giantRock.s
index e545cbcc..2a1786ca 100644
--- a/asm/giantRock.s
+++ b/asm/giantRock.s
@@ -27,7 +27,7 @@ GiantRock: @ 0x08090FB8
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r2, r4, #0
 	adds r2, #0x29
 	ldrb r1, [r2]
diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s
index e520a382..e9456371 100644
--- a/asm/guardWithSpear.s
+++ b/asm/guardWithSpear.s
@@ -280,7 +280,7 @@ _08063EFE:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_0807DD64
 	adds r0, r4, #0
diff --git a/asm/gyorgChild.s b/asm/gyorgChild.s
index 0cd568fa..54351bef 100644
--- a/asm/gyorgChild.s
+++ b/asm/gyorgChild.s
@@ -315,7 +315,7 @@ sub_0804882C: @ 0x0804882C
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	adds r0, #0x7a
 	ldrb r0, [r0]
diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s
index f2d87de7..20c48072 100644
--- a/asm/gyorgFemale.s
+++ b/asm/gyorgFemale.s
@@ -125,7 +125,7 @@ sub_0804614C: @ 0x0804614C
 	adds r1, r0, #0
 	adds r1, #0x38
 	strb r5, [r1]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _08046258 @ =sub_08046498
 	adds r0, r6, #0
 	movs r2, #0
@@ -846,7 +846,7 @@ _0804674C:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080467CC:
 	adds r1, r4, #0
 	adds r1, #0x7c
diff --git a/asm/gyorgMale.s b/asm/gyorgMale.s
index b4a99616..b629c4d4 100644
--- a/asm/gyorgMale.s
+++ b/asm/gyorgMale.s
@@ -997,7 +997,7 @@ _08046F12:
 	strb r0, [r1]
 	str r4, [r2, #0x50]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08046F58:
 	adds r0, r4, #0
 	bl sub_08047E48
@@ -1052,7 +1052,7 @@ _08046F82:
 	strb r0, [r1]
 	str r4, [r2, #0x50]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08046FC8:
 	ldr r0, [r4, #0x64]
 	ldr r0, [r0]
@@ -2751,7 +2751,7 @@ sub_08047BF0: @ 0x08047BF0
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08047C74:
 	adds r0, r5, #0
 	adds r0, #0x76
diff --git a/asm/houseDoorExterior.s b/asm/houseDoorExterior.s
index c05b8c50..50b7a415 100644
--- a/asm/houseDoorExterior.s
+++ b/asm/houseDoorExterior.s
@@ -108,7 +108,7 @@ _08086718:
 	ldrb r0, [r5, #5]
 	strb r0, [r4, #0xd]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r0, [r6, #0x68]
 	orrs r0, r7
 	str r0, [r6, #0x68]
diff --git a/asm/initializeLink.s b/asm/initializeLink.s
index 8968f0ef..ef69d458 100644
--- a/asm/initializeLink.s
+++ b/asm/initializeLink.s
@@ -162,7 +162,7 @@ _080525C2:
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #1
 	bl sub_0805EA2C
diff --git a/asm/itemForSale.s b/asm/itemForSale.s
index 4483e12e..6c82a3af 100644
--- a/asm/itemForSale.s
+++ b/asm/itemForSale.s
@@ -288,7 +288,7 @@ _080819D4:
 	orrs r0, r1
 	strb r0, [r2]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r5, #0
 	bl sub_08081A5C
 	pop {r4, r5, r6, pc}
diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s
index 32076405..835a13ca 100644
--- a/asm/itemOnGround.s
+++ b/asm/itemOnGround.s
@@ -1473,7 +1473,7 @@ _08081522:
 	ldrb r0, [r4, #0xa]
 	bl sub_0808148C
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08081532:
 	adds r0, r4, #0
 	bl sub_080AEFE0
@@ -1510,7 +1510,7 @@ sub_0808153C: @ 0x0808153C
 	ldrb r0, [r4, #0xa]
 	bl sub_0808148C
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _08081596
 _0808157E:
 	movs r1, #0xa0
diff --git a/asm/jailBars.s b/asm/jailBars.s
index 524ee493..2760cce6 100644
--- a/asm/jailBars.s
+++ b/asm/jailBars.s
@@ -54,7 +54,7 @@ _080A08F6:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, pc}
 	.align 2, 0
 
diff --git a/asm/ladderHoleInBookshelf.s b/asm/ladderHoleInBookshelf.s
index 71ba81cc..4f2b4648 100644
--- a/asm/ladderHoleInBookshelf.s
+++ b/asm/ladderHoleInBookshelf.s
@@ -29,7 +29,7 @@ sub_08093FCC: @ 0x08093FCC
 	adds r2, #0x38
 	movs r1, #2
 	strb r1, [r2]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 
 	thumb_func_start sub_08093FE0
@@ -54,7 +54,7 @@ _08094002:
 	movs r0, #1
 	strb r0, [r3]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r2, r4, #0
 	adds r2, #0x29
 	ldrb r1, [r2]
@@ -76,7 +76,7 @@ _08094024:
 	movs r0, #2
 	strb r0, [r3]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r2, r4, #0
 	adds r2, #0x29
 	ldrb r1, [r2]
diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s
index e505fa7a..ce50eb1b 100644
--- a/asm/lavaPlatform.s
+++ b/asm/lavaPlatform.s
@@ -66,7 +66,7 @@ sub_0809229C: @ 0x0809229C
 	orrs r0, r1
 	strb r0, [r4, #0x18]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r0, [r4, #0x54]
 	ldrb r1, [r0, #0x14]
 	adds r0, r4, #0
@@ -502,7 +502,7 @@ _080925B8:
 	ldr r0, [r5]
 	str r0, [r4, #0x78]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r1, r4, #0
 	adds r1, #0x78
 	adds r2, r4, #0
diff --git a/asm/leever.s b/asm/leever.s
index 99c2e4da..d20b77f3 100644
--- a/asm/leever.s
+++ b/asm/leever.s
@@ -143,7 +143,7 @@ sub_0801FCB0: @ 0x0801FCB0
 	movs r1, #0
 	bl InitializeAnimation
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _0801FD28
 	.align 2, 0
 _0801FD14: .4byte gUnk_020000B0
diff --git a/asm/macroBook.s b/asm/macroBook.s
index 5d6f901b..6ec09881 100644
--- a/asm/macroBook.s
+++ b/asm/macroBook.s
@@ -62,7 +62,7 @@ sub_0809A78C: @ 0x0809A78C
 	adds r1, r2, #0
 	bl sub_0805EC9C
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r1, [r4, #0xf]
 	adds r0, r4, #0
 	bl InitAnimationForceUpdate
diff --git a/asm/macroDecorations.s b/asm/macroDecorations.s
index 87347714..0d6cd142 100644
--- a/asm/macroDecorations.s
+++ b/asm/macroDecorations.s
@@ -27,7 +27,7 @@ sub_08097DEC: @ 0x08097DEC
 	movs r0, #1
 	strb r0, [r4, #0xc]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r0, [r4, #0xa]
 	cmp r0, #1
 	beq _08097E46
diff --git a/asm/manager2D.s b/asm/manager2D.s
index a89e3807..c3129650 100644
--- a/asm/manager2D.s
+++ b/asm/manager2D.s
@@ -34,7 +34,7 @@ sub_0805D1FC: @ 0x0805D1FC
 	movs r0, #3
 	strb r0, [r1]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0805D236:
 	adds r0, r4, #0
 	bl sub_0805E900
diff --git a/asm/manager3.s b/asm/manager3.s
index 0a084297..2f755748 100644
--- a/asm/manager3.s
+++ b/asm/manager3.s
@@ -170,7 +170,7 @@ _080577F2:
 	mov r1, r8
 	strb r1, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08057808:
 	pop {r3}
 	mov r8, r3
diff --git a/asm/manager37.s b/asm/manager37.s
index 3db0ff86..f9dca8f3 100644
--- a/asm/manager37.s
+++ b/asm/manager37.s
@@ -265,7 +265,7 @@ sub_0805E000: @ 0x0805E000
 	movs r5, #1
 	strb r5, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r0, _0805E068 @ =gUnk_030010A0
 	adds r0, #0x38
 	ldrb r1, [r0]
diff --git a/asm/mazaalMacro.s b/asm/mazaalMacro.s
index 8d91be75..d294485a 100644
--- a/asm/mazaalMacro.s
+++ b/asm/mazaalMacro.s
@@ -170,7 +170,7 @@ sub_08034D4C: @ 0x08034D4C
 	strb r0, [r1]
 	str r5, [r4, #0x50]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x96
 	lsls r0, r0, #2
 	strh r0, [r6]
@@ -264,7 +264,7 @@ sub_08034E30: @ 0x08034E30
 	ands r0, r1
 	strb r0, [r2]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #2
 	bl InitializeAnimation
@@ -385,7 +385,7 @@ sub_08034EE4: @ 0x08034EE4
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r3, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08034F46:
 	adds r0, r5, #0
 	movs r1, #0
@@ -553,7 +553,7 @@ sub_08035050: @ 0x08035050
 	strb r0, [r1]
 	str r4, [r2, #0x50]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08035082:
 	pop {r4, pc}
 
@@ -625,7 +625,7 @@ _080350F2:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r5, #1
 	adds r4, #2
 	cmp r5, #5
diff --git a/asm/minishLight.s b/asm/minishLight.s
index c437e8fe..f824b8a3 100644
--- a/asm/minishLight.s
+++ b/asm/minishLight.s
@@ -40,7 +40,7 @@ sub_0809F840: @ 0x0809F840
 	strb r0, [r2, #0x18]
 _0809F860:
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {pc}
 
 	thumb_func_start sub_0809F868
diff --git a/asm/minishSizedArchway.s b/asm/minishSizedArchway.s
index 273bb726..cc3b1074 100644
--- a/asm/minishSizedArchway.s
+++ b/asm/minishSizedArchway.s
@@ -23,7 +23,7 @@ MinishSizedArchway: @ 0x080973E4
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	bl CheckIsDungeon
 	cmp r0, #0
 	beq _0809741E
diff --git a/asm/moldworm.s b/asm/moldworm.s
index 5f88a6c9..3db9e88b 100644
--- a/asm/moldworm.s
+++ b/asm/moldworm.s
@@ -1275,7 +1275,7 @@ sub_08023990: @ 0x08023990
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r5, #0
 	movs r1, #0x16
 	bl InitializeAnimation
diff --git a/asm/npc5.s b/asm/npc5.s
index d0f70ed1..770ffb42 100644
--- a/asm/npc5.s
+++ b/asm/npc5.s
@@ -550,7 +550,7 @@ sub_08060DFC: @ 0x08060DFC
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x1c
 	bl sub_08060E70
diff --git a/asm/object21.s b/asm/object21.s
index 0425edd8..8367e2d3 100644
--- a/asm/object21.s
+++ b/asm/object21.s
@@ -117,7 +117,7 @@ _08087A68:
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08087A76:
 	ldrb r1, [r4, #0x10]
 	movs r0, #0x80
diff --git a/asm/object35.s b/asm/object35.s
index c5943573..903fe6a1 100644
--- a/asm/object35.s
+++ b/asm/object35.s
@@ -44,7 +44,7 @@ sub_0808B89C: @ 0x0808B89C
 	adds r1, #0x38
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r2, r4, #0
 	adds r2, #0x29
 	ldrb r1, [r2]
diff --git a/asm/object6A.s b/asm/object6A.s
index 93f54024..057c0c45 100644
--- a/asm/object6A.s
+++ b/asm/object6A.s
@@ -59,7 +59,7 @@ sub_08094A90: @ 0x08094A90
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _08094AE4 @ =gUnk_08114F30
 	ldrb r2, [r4, #0x19]
 	lsrs r0, r2, #6
@@ -252,7 +252,7 @@ sub_08094BE0: @ 0x08094BE0
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #1
 	bl InitAnimationForceUpdate
@@ -1209,7 +1209,7 @@ sub_08095364: @ 0x08095364
 	movs r4, #1
 	strb r4, [r0]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	str r5, [r6, #0x54]
 	strb r4, [r6, #0xd]
 	ldr r0, _080953A0 @ =0x0000FFF0
@@ -1868,7 +1868,7 @@ _08095880:
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _080958D4 @ =gUnk_08114F30
 	ldrb r2, [r5, #0x19]
 	lsrs r0, r2, #6
@@ -2225,7 +2225,7 @@ sub_08095B48: @ 0x08095B48
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _08095BA8 @ =gUnk_08114F30
 	ldrb r2, [r5, #0x19]
 	lsrs r0, r2, #6
diff --git a/asm/object80.s b/asm/object80.s
index 1373da3e..14d17bd5 100644
--- a/asm/object80.s
+++ b/asm/object80.s
@@ -83,7 +83,7 @@ sub_08098B28: @ 0x08098B28
 	adds r7, #0x38
 	strb r4, [r7]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r2, r5, #0
 	adds r2, #0x29
 	ldrb r1, [r2]
diff --git a/asm/object81.s b/asm/object81.s
index 134fa910..97108ec1 100644
--- a/asm/object81.s
+++ b/asm/object81.s
@@ -67,7 +67,7 @@ _08098CD0:
 	strb r5, [r0]
 _08098CD6:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	adds r0, #0x80
 	ldrh r1, [r0]
diff --git a/asm/object8A.s b/asm/object8A.s
index cd8584b3..b6f8f79f 100644
--- a/asm/object8A.s
+++ b/asm/object8A.s
@@ -47,7 +47,7 @@ sub_0809ADCC: @ 0x0809ADCC
 	adds r0, #0x38
 	ldrb r7, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r0, [r4, #0xa]
 	cmp r0, #1
 	beq _0809AEBC
diff --git a/asm/object8B.s b/asm/object8B.s
index eb3cd691..a81bd48e 100644
--- a/asm/object8B.s
+++ b/asm/object8B.s
@@ -72,7 +72,7 @@ _0809AFC4:
 	adds r0, #0x84
 	strb r6, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x8b
 	movs r1, #1
 	movs r2, #0
diff --git a/asm/object93.s b/asm/object93.s
index 4dc6be8e..2862be71 100644
--- a/asm/object93.s
+++ b/asm/object93.s
@@ -26,7 +26,7 @@ sub_0809CEA8: @ 0x0809CEA8
 	movs r0, #1
 	strb r0, [r4, #0xc]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitializeAnimation
diff --git a/asm/object96.s b/asm/object96.s
index dab90295..be3b6f07 100644
--- a/asm/object96.s
+++ b/asm/object96.s
@@ -78,7 +78,7 @@ sub_0809D7A8: @ 0x0809D7A8
 	strb r1, [r5, #0x15]
 _0809D80C:
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r4, [r5, #0xa]
 	adds r0, r5, #0
 	bl sub_08080CB4
@@ -151,7 +151,7 @@ _0809D888:
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, [r6]
 	cmp r1, #0
 	beq _0809D8AC
diff --git a/asm/object97.s b/asm/object97.s
index c7072469..0582a23e 100644
--- a/asm/object97.s
+++ b/asm/object97.s
@@ -243,7 +243,7 @@ sub_0809DB58: @ 0x0809DB58
 	orrs r0, r1
 	strb r0, [r4, #0x19]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x3c
 	bl InitAnimationForceUpdate
@@ -357,7 +357,7 @@ _0809DC3C:
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0809DC54:
 	movs r0, #0x6e
 	bl PlaySFX
@@ -430,7 +430,7 @@ sub_0809DC80: @ 0x0809DC80
 	adds r0, #2
 	strb r2, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #3
 	bl InitAnimationForceUpdate
@@ -659,7 +659,7 @@ sub_0809DE50: @ 0x0809DE50
 	ldr r0, _0809DEF8 @ =0x0000FFC0
 	strh r0, [r4, #0x36]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _0809DEFC @ =gUnk_08124128
 	ldrb r0, [r4, #0xb]
 	adds r0, r0, r1
diff --git a/asm/object9E.s b/asm/object9E.s
index aa3e2d94..8bffc8e2 100644
--- a/asm/object9E.s
+++ b/asm/object9E.s
@@ -76,7 +76,7 @@ Object9E: @ 0x0809EC4C
 	adds r1, r4, #0
 	bl SetTile
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x9e
 	movs r1, #1
 	movs r2, #0
@@ -100,7 +100,7 @@ _0809ED04:
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0809ED14:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
diff --git a/asm/objectBA.s b/asm/objectBA.s
index 2497b2f6..e85896f3 100644
--- a/asm/objectBA.s
+++ b/asm/objectBA.s
@@ -1026,7 +1026,7 @@ sub_080A1E54: @ 0x080A1E54
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080A1ECA:
 	pop {r4, r5, pc}
 	.align 2, 0
@@ -1241,7 +1241,7 @@ sub_080A1FF0: @ 0x080A1FF0
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080A2066:
 	adds r4, r5, #0
 	adds r4, #0x7b
diff --git a/asm/objectOnPillar.s b/asm/objectOnPillar.s
index 7ed564f8..614b63e8 100644
--- a/asm/objectOnPillar.s
+++ b/asm/objectOnPillar.s
@@ -79,7 +79,7 @@ sub_08096E28: @ 0x08096E28
 	subs r1, #0x2b
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_080970F4
 	ldr r1, _08096EB8 @ =gUnk_08123264
diff --git a/asm/pesto.s b/asm/pesto.s
index d281d484..5e5b2c14 100644
--- a/asm/pesto.s
+++ b/asm/pesto.s
@@ -306,7 +306,7 @@ _08024132:
 	strh r0, [r4, #0x36]
 _08024136:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	bl CheckIsDungeon
 	cmp r0, #0
 	beq _08024150
diff --git a/asm/picoBloom.s b/asm/picoBloom.s
index bd66f005..9447336e 100644
--- a/asm/picoBloom.s
+++ b/asm/picoBloom.s
@@ -40,7 +40,7 @@ _08098A9C:
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r1, _08098ACC @ =gUnk_08123574
 	ldrb r0, [r4, #0xa]
 	adds r0, r0, r1
diff --git a/asm/pullableLever.s b/asm/pullableLever.s
index 4c312107..538bbf7a 100644
--- a/asm/pullableLever.s
+++ b/asm/pullableLever.s
@@ -333,7 +333,7 @@ sub_08091444: @ 0x08091444
 	adds r0, r4, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, pc}
 
 	thumb_func_start sub_08091470
@@ -447,7 +447,7 @@ sub_08091504: @ 0x08091504
 	adds r0, r4, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, pc}
 
 	thumb_func_start sub_0809153C
diff --git a/asm/rope.s b/asm/rope.s
index 40d0aae0..f50525be 100644
--- a/asm/rope.s
+++ b/asm/rope.s
@@ -212,7 +212,7 @@ _080314CC:
 	orrs r0, r1
 	strb r0, [r4, #0x18]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x84
 	bl sub_08004488
 _080314FA:
diff --git a/asm/sluggula.s b/asm/sluggula.s
index b5914318..0b860cca 100644
--- a/asm/sluggula.s
+++ b/asm/sluggula.s
@@ -291,7 +291,7 @@ _08023D94:
 	movs r0, #0x84
 	bl sub_08004488
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _08023E0A
 _08023DC0:
 	adds r0, r4, #0
diff --git a/asm/spinyChuchu.s b/asm/spinyChuchu.s
index ecc587b9..8e2b6aba 100644
--- a/asm/spinyChuchu.s
+++ b/asm/spinyChuchu.s
@@ -331,7 +331,7 @@ _0802268C:
 	movs r0, #0x7d
 	bl sub_08004488
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080226BE:
 	adds r0, r4, #0
 	bl GetNextFrame
diff --git a/asm/stalfos.s b/asm/stalfos.s
index 0e0ed424..a751e19b 100644
--- a/asm/stalfos.s
+++ b/asm/stalfos.s
@@ -80,7 +80,7 @@ _0803930C:
 	b _0803933A
 _08039334:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0803933A:
 	pop {r4, pc}
 
diff --git a/asm/sub_080A2838.s b/asm/sub_080A2838.s
index d6c6f06c..57383f72 100644
--- a/asm/sub_080A2838.s
+++ b/asm/sub_080A2838.s
@@ -20,7 +20,7 @@ sub_080A2838: @ 0x080A2838
 	cmp r0, #2
 	bne _080A2856
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080A2856:
 	pop {r4, pc}
 	.align 2, 0
diff --git a/asm/swordsmanNewsletter.s b/asm/swordsmanNewsletter.s
index 1dc5c316..3ead564f 100644
--- a/asm/swordsmanNewsletter.s
+++ b/asm/swordsmanNewsletter.s
@@ -29,7 +29,7 @@ sub_080933D8: @ 0x080933D8
 	ldrb r0, [r4, #0xa]
 	strb r0, [r4, #0x1e]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldr r0, _080933F8 @ =gUnk_081228A8
 	str r0, [r4, #0x48]
 	adds r0, r4, #0
diff --git a/asm/takkuri.s b/asm/takkuri.s
index 0d84a082..b382ddcb 100644
--- a/asm/takkuri.s
+++ b/asm/takkuri.s
@@ -213,7 +213,7 @@ sub_0803BCA4: @ 0x0803BCA4
 	adds r1, #0x7a
 	strh r0, [r1]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r6, #0
 	bl sub_0803BF2C
 	pop {r4, r5, r6, pc}
@@ -459,7 +459,7 @@ sub_0803BE7C: @ 0x0803BE7C
 	movs r0, #3
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_0803BF2C
 _0803BEE6:
diff --git a/asm/vaatiEyesMacro.s b/asm/vaatiEyesMacro.s
index 623ce8a9..ba21e690 100644
--- a/asm/vaatiEyesMacro.s
+++ b/asm/vaatiEyesMacro.s
@@ -411,7 +411,7 @@ _0802EF5E:
 	strb r0, [r1]
 	str r6, [r4, #0x50]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r6, #0
 	adds r1, r4, #0
 	bl CopyPosition
diff --git a/asm/wallMaster.s b/asm/wallMaster.s
index 7efe19a3..8a7f47f4 100644
--- a/asm/wallMaster.s
+++ b/asm/wallMaster.s
@@ -156,7 +156,7 @@ sub_0802A4E4: @ 0x0802A4E4
 	adds r1, #0x78
 	strh r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_0802A7D0
 	pop {r4, pc}
diff --git a/asm/wallMaster2.s b/asm/wallMaster2.s
index e426c3bd..4113319c 100644
--- a/asm/wallMaster2.s
+++ b/asm/wallMaster2.s
@@ -135,7 +135,7 @@ sub_0802CCE0: @ 0x0802CCE0
 	adds r0, #0x7c
 	strh r5, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitializeAnimation
diff --git a/asm/waterDrop.s b/asm/waterDrop.s
index 19098e60..fe057fbd 100644
--- a/asm/waterDrop.s
+++ b/asm/waterDrop.s
@@ -52,7 +52,7 @@ sub_0802A250: @ 0x0802A250
 	movs r1, #0
 	bl InitializeAnimation
 	adds r0, r5, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	movs r0, #0x66
 	movs r1, #0
 	movs r2, #0
@@ -186,7 +186,7 @@ _0802A38C:
 _0802A392:
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, r5, pc}
 
 	thumb_func_start sub_0802A39C
diff --git a/include/entity.h b/include/entity.h
index 1b904c02..8a04bc42 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -72,7 +72,7 @@ typedef struct Entity {
     /*    */     u8 alphaBlend : 2; // 4-8
     /*    */     u8 b2         : 2; //0x10
     /*    */     u8 b3         : 2; //0x40
-    /*    */ } PACKED spriteOrder;
+    /*    */ } PACKED spriteRendering;
     /*0x1a*/ u8 palette;
     /*0x1b*/ struct {
     /*    */     u8 b0    : 4;
@@ -90,7 +90,7 @@ typedef struct Entity {
     /*    */     u8 b0 : 3; // 1-4
     /*    */     u8 b1 : 3; //   8
     /*    */     u8 b2 : 2; //0x40
-    /*    */ } PACKED ticks;
+    /*    */ } PACKED spritePriority;
     /*0x2a*/ u16 collisions;
     /*0x2c*/ union SplitWord x;
     /*0x30*/ union SplitWord y;
@@ -163,7 +163,7 @@ typedef struct Entity {
 extern void InitializeAnimation(Entity*, u32);
 extern void InitAnimationForceUpdate(Entity*, u32);
 extern void UpdateAnimationSingleFrame(Entity*);
-extern void UpdateSpriteOrderAndFlip(Entity*);
+extern void UpdateSpriteForCollisionLayer(Entity*);
 extern void GetNextFrame(Entity*);
 extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
 extern void SetExtraSpriteFrame(Entity*, u32, u32);
diff --git a/include/main.h b/include/main.h
index 61c3f6ae..d9c8719c 100644
--- a/include/main.h
+++ b/include/main.h
@@ -11,7 +11,7 @@ typedef struct { // 0x03001000
     u8 field_0x9;
     u8 field_0xa;
     u8 field_0xb;
-    u32 ticks;
+    u32 spritePriority;
 } MainStruct;
 
 extern s32 sub_08055F70();
diff --git a/src/archway.c b/src/archway.c
index af72be33..ff6c7b14 100644
--- a/src/archway.c
+++ b/src/archway.c
@@ -18,10 +18,10 @@ void Archway(Entity *this)
         this->spriteSettings.raw = v1 | 1;
         this->frameIndex = this->entityType.parameter;
         this->collisionLayer = 2;
-        UpdateSpriteOrderAndFlip(this);
+        UpdateSpriteForCollisionLayer(this);
         v3 = CheckIsDungeon();
     if (v3 != 0) {
-      this->ticks.b0 = (this->ticks.b0 & 0xf8) | 1;
+      this->spritePriority.b0 = (this->spritePriority.b0 & 0xf8) | 1;
     }
   }
 }
\ No newline at end of file
diff --git a/src/bell.c b/src/bell.c
index 62f1a81b..072b0798 100644
--- a/src/bell.c
+++ b/src/bell.c
@@ -11,8 +11,8 @@ void sub_08097D90(Entity* ent) {
     ent->action = 1;
     ent->spriteSettings.b.draw = 1;
     ent->collisionLayer = 1;
-    ent->ticks.b0 = 0;
-    UpdateSpriteOrderAndFlip(ent);
+    ent->spritePriority.b0 = 0;
+    UpdateSpriteForCollisionLayer(ent);
     InitAnimationForceUpdate(ent, 0);
 }
 
diff --git a/src/bladeBrothers.c b/src/bladeBrothers.c
index 83ff32a2..68630e8e 100644
--- a/src/bladeBrothers.c
+++ b/src/bladeBrothers.c
@@ -176,7 +176,7 @@ void sub_08068BEC(Entity* this, u32 unused) {
 
     target = CreateFx(this, 0x44, 0);
     if (target) {
-        target->ticks.b0 = 1;
+        target->spritePriority.b0 = 1;
         PositionRelative(this, target, 0, -0x100000);
         PlaySFX(0xfa);
     }
diff --git a/src/chestSpawner.c b/src/chestSpawner.c
index 43cb1c1a..8af7769d 100644
--- a/src/chestSpawner.c
+++ b/src/chestSpawner.c
@@ -29,7 +29,7 @@ void sub_08083E20(Entity *this)
 {
   this->action = 3;
   this->spriteSettings.b.draw = 1;
-  this->spriteOrder.alphaBlend = 0;
+  this->spriteRendering.alphaBlend = 0;
   sub_080842D8(this);
   sub_08078828(this);
 }
diff --git a/src/code_080A29BC.c b/src/code_080A29BC.c
index 0e093ab3..7fa80ee2 100644
--- a/src/code_080A29BC.c
+++ b/src/code_080A29BC.c
@@ -63,7 +63,7 @@ Entity * sub_080A2A64(Entity *parent)
   
   pEVar1 = CreateFx(parent, 0x20, 0);
   if (pEVar1 != NULL) {
-    pEVar1->ticks.b0 = 7;
+    pEVar1->spritePriority.b0 = 7;
   }
   return pEVar1;
 }
\ No newline at end of file
diff --git a/src/giantLeaf.c b/src/giantLeaf.c
index cf2ee5ec..9003f28b 100644
--- a/src/giantLeaf.c
+++ b/src/giantLeaf.c
@@ -13,8 +13,8 @@ void GiantLeaf(Entity* ent) {
     if (ent->action == 0) {
         ent->action = 1;
         ent->spriteSettings.b.draw = 1;
-        ent->spriteOrder.b3 = 3;
-        ent->ticks.b0 = 7;
+        ent->spriteRendering.b3 = 3;
+        ent->spritePriority.b0 = 7;
         ent->frameIndex = ent->entityType.form;
         sub_0808D618(ent);
     }
diff --git a/src/greatFairy.c b/src/greatFairy.c
index c2aa5e08..2f3276b9 100644
--- a/src/greatFairy.c
+++ b/src/greatFairy.c
@@ -160,9 +160,9 @@ void GreatFairy_WingsCallBehavior(Entity* this) {
 
 void GreatFairy_WingsInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     this->spriteSettings.b.draw = 1;
-    this->spriteOrder.alphaBlend = 1;
+    this->spriteRendering.alphaBlend = 1;
     gScreen.controls.windowOutsideControl = 3904;
     gScreen.controls.mosaicSize = 2057;
     this->nonPlanarMovement = 1024;
@@ -193,7 +193,7 @@ void GreatFairy_WakeCallBehavior(Entity* this) {
 void GreatFairy_WakeInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
 }
 
 void GreatFairy_WakeUpdate(Entity* this) {
@@ -252,7 +252,7 @@ void GreatFairy_MiniAffineCallBehavior(Entity* this) {
 
 void GreatFairy_MiniAffineInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
     this->spriteSettings.b.draw = 1;
 }
 
@@ -266,7 +266,7 @@ void GreatFairy_MiniAffineInit2(Entity* this) {
         this->action = 2;
         this->actionDelay = 90;
         this->nonPlanarMovement = 4096;
-        this->spriteOrder.b0 = 3;
+        this->spriteRendering.b0 = 3;
         sub_0805EC9C(this, 256, 256, 0);
     }
 }
@@ -295,7 +295,7 @@ void GreatFairy_DropletInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
     this->height.HALF.HI = 0;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     PlaySFX(320);
 }
 
@@ -314,7 +314,7 @@ void GreatFairy_RippleCallBehavior(Entity* this) {
 void GreatFairy_RippleInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
 }
 
 void GreatFairy_RippleUpdate(Entity* this) {
@@ -334,7 +334,7 @@ void GreatFairy_BigRippleInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->actionDelay = 120;
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     PlaySFX(249);
 }
 
@@ -362,7 +362,7 @@ void GreatFairy_EnergyCallBehavior(Entity* this) {
 void GreatFairy_EnergyInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
 }
 
 void GreatFairy_EnergyUpdate(Entity* this) {
@@ -389,8 +389,8 @@ void sub_08087150(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
     this->spriteOrientation &= 63;
-    this->spriteOrder.b0 = 0;
-    this->ticks.b0 = 3;
+    this->spriteRendering.b0 = 0;
+    this->spritePriority.b0 = 3;
     this->nonPlanarMovement = 128;
     this->direction = 16;
     var = gUnk_0812079C[0];
@@ -474,7 +474,7 @@ void sub_08087294(Entity* this) {
 void sub_080872AC(Entity* this) {
     this->spriteSettings.b.draw = 1;
     this->spriteOrientation.flipY = 1;
-    this->spriteOrder.b0 = 0;
+    this->spriteRendering.b0 = 0;
     this->field_0x68 = (u16)(this->x).HALF.HI;
     this->field_0x6a = (u16)(this->y).HALF.HI;
     this->direction = (u8)Random() & 0x1F;
diff --git a/src/hangingSeed.c b/src/hangingSeed.c
index f823582a..7f0ba1dc 100644
--- a/src/hangingSeed.c
+++ b/src/hangingSeed.c
@@ -32,8 +32,8 @@ void sub_08021720(Entity *this)
   this->action = 1;
   this->spriteSettings.b.draw = 1;
   this->frameIndex = (this->entityType).form;
-  this->spriteOrder.b3 = 1;
-  this->ticks.b0 = 3;
+  this->spriteRendering.b3 = 1;
+  this->spritePriority.b0 = 3;
 }
 
 void nullsub_08(Entity* this){}
\ No newline at end of file
diff --git a/src/heartContainer.c b/src/heartContainer.c
index 1c58034b..10714a8e 100644
--- a/src/heartContainer.c
+++ b/src/heartContainer.c
@@ -30,7 +30,7 @@ void sub_0808E6E4(Entity* this) {
     if (CheckFlags(this->field_0x86)) {
         this->action = 2;
         this->spriteSettings.b.draw = 1;
-        this->spriteOrder.b0 = 3;
+        this->spriteRendering.b0 = 3;
         sub_0808E714(this);
     }
 }
diff --git a/src/item11.c b/src/item11.c
index 1396dbe0..362ba771 100644
--- a/src/item11.c
+++ b/src/item11.c
@@ -90,7 +90,7 @@ void sub_08018DE8(Entity *this)
             this->attachedEntity->previousActionFlag = 4;
             this->flags = this->flags | 0x80;
             this->action = 2;
-            this->ticks.b0 = 2;
+            this->spritePriority.b0 = 2;
             this->attachedEntity->spriteSettings.b.draw = 1;
             sub_08018FA0(this);
             break;
diff --git a/src/keese.c b/src/keese.c
index 953f5b02..0cbc9acd 100644
--- a/src/keese.c
+++ b/src/keese.c
@@ -69,14 +69,14 @@ void sub_08021DF0(Entity *this)
   
   sub_0804A720(this);
   if ((this->entityType).form != 0) {
-    this->ticks.b1 = 1;
+    this->spritePriority.b1 = 1;
     this->height.HALF.HI = -0x10;
   }
   this->direction = Random() & 0x1f;
   this->filler[0] = 1;
-  this->ticks.b0 = 3;
+  this->spritePriority.b0 = 3;
   this->collisionLayer = 3;
-  UpdateSpriteOrderAndFlip(this);
+  UpdateSpriteForCollisionLayer(this);
   sub_08021EF0(this);
 }
 
diff --git a/src/lakitu.c b/src/lakitu.c
index d813da9e..9189c525 100644
--- a/src/lakitu.c
+++ b/src/lakitu.c
@@ -270,7 +270,7 @@ void sub_0803CA0C(Entity *this) {
     if (sub_08003FC4(this, 0x1800) == 0 && this->animIndex <= 19) {
         InitAnimationForceUpdate(this, this->animationState + 20);
 
-        this->ticks.b1 = 0;
+        this->spritePriority.b1 = 0;
     }
 
     UpdateAnimationSingleFrame(this);
@@ -370,7 +370,7 @@ void sub_0803CBAC(Entity *this) {
     this->action = 7;
     this->spriteSettings.b.draw = 1;
 
-    this->ticks.b1 = 1;
+    this->spritePriority.b1 = 1;
 
     this->flags2 &= 0x7b;
 
diff --git a/src/lightableSwitch.c b/src/lightableSwitch.c
index a98a66ba..2368da04 100644
--- a/src/lightableSwitch.c
+++ b/src/lightableSwitch.c
@@ -38,7 +38,7 @@ void sub_0809EA34(Entity* this) {
     this->flags2 = 10;
     this->boundingBox = &gUnk_080FD150;
     sub_0809EAD8(this);
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     sub_0809EABC(this);
 }
 
@@ -110,7 +110,7 @@ void sub_0809EB80(Entity* this) {
     this->flags2 = 10;
     this->boundingBox = &gUnk_080FD150;
     sub_0809EAD8(this);
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     if (CheckFlags(this->cutsceneBeh.HWORD) != 0) {
         this->action = 3;
         this->frameIndex = 2;
diff --git a/src/mask.c b/src/mask.c
index 0d8712bb..6dd866c9 100644
--- a/src/mask.c
+++ b/src/mask.c
@@ -103,7 +103,7 @@ void sub_08092A94(Entity *this) {
     this->height.HALF.HI -= 0x20;
     this->y.HALF.HI += 0x20;
 
-    this->spriteOrder.b3 = 2;
+    this->spriteRendering.b3 = 2;
 }
 
 // Probably falling down
diff --git a/src/minishSizedEntrance.c b/src/minishSizedEntrance.c
index 10ad0113..ca261d35 100644
--- a/src/minishSizedEntrance.c
+++ b/src/minishSizedEntrance.c
@@ -16,8 +16,8 @@ void MinishSizedEntrance(Entity* this)
 void sub_08090EC0(Entity *this)
 {
   this->action = 1;
-  this->spriteOrder.b3 = 3;
-  this->ticks.b0 = 7;
+  this->spriteRendering.b3 = 3;
+  this->spritePriority.b0 = 7;
   this->frameIndex = (this->entityType).parameter;
   if (CheckIsDungeon()) {
     this->frameIndex += 4;
diff --git a/src/object49.c b/src/object49.c
index c00af534..6a6d29b3 100644
--- a/src/object49.c
+++ b/src/object49.c
@@ -92,11 +92,11 @@ void sub_0808F1F8(Entity *this)
 {
   u8 bVar1;
   
-  this->spriteOrder.b0 = 3;
+  this->spriteRendering.b0 = 3;
   this->action++;
-  this->spriteOrder.b3 = this->parent->spriteOrder.b3;
+  this->spriteRendering.b3 = this->parent->spriteRendering.b3;
   this->spriteOrientation.flipY = this->parent->spriteOrientation.flipY;
-  this->ticks.b0 = 7;
+  this->spritePriority.b0 = 7;
   InitializeAnimation(this, 1);
   sub_0808F244(this);
 }
\ No newline at end of file
diff --git a/src/object86.c b/src/object86.c
index 78800531..979ab47a 100644
--- a/src/object86.c
+++ b/src/object86.c
@@ -17,8 +17,8 @@ void Object86(Entity* this) {
 
 void sub_08099DD0(Entity* this) {
     this->collisionLayer = 1;
-    this->spriteOrder.b3 = 3;
-    this->ticks.b0 = 7;
+    this->spriteRendering.b3 = 3;
+    this->spritePriority.b0 = 7;
     this->previousActionFlag = 0;
     if (GetInventoryValue(0x46)) {
         this->action = 4;
diff --git a/src/position.c b/src/position.c
index 1c96046f..50aa4c6f 100644
--- a/src/position.c
+++ b/src/position.c
@@ -28,7 +28,7 @@ void PositionRelative(Entity* source, Entity* target, s32 offsetX, s32 offsetY)
 
     target->height = source->height; // ldr
     target->collisionLayer = source->collisionLayer;
-    UpdateSpriteOrderAndFlip(target);
+    UpdateSpriteForCollisionLayer(target);
 }
 
 void CopyPositionAndSpriteOffset(Entity *param_1,Entity *param_2)
@@ -47,10 +47,10 @@ void sub_0806FA90(Entity *param_1,Entity *param_2, s32 offsetX, s32 offsetY)
 
 void ResolveEntityOnTop(Entity *param_1,Entity *param_2)
 {
-    param_2->ticks.b0 = gUnk_08114F78[param_1->ticks.b0];
+    param_2->spritePriority.b0 = gUnk_08114F78[param_1->spritePriority.b0];
 }
 
 void sub_0806FAD8(Entity *param_1,Entity *param_2)
 {
-  param_2->ticks.b0 = gUnk_08114F80[param_1->ticks.b0];
+  param_2->spritePriority.b0 = gUnk_08114F80[param_1->spritePriority.b0];
 }
diff --git a/src/treeHidingPortal.c b/src/treeHidingPortal.c
index 5c7ef846..8ea54861 100644
--- a/src/treeHidingPortal.c
+++ b/src/treeHidingPortal.c
@@ -29,7 +29,7 @@ void sub_0809E83C(Entity* this) {
     }
     this->action = 1;
     this->collisionLayer = 2;
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
 }
 
 void sub_0809E86C(Entity* this) {
@@ -76,7 +76,7 @@ void sub_0809E918(Entity* this) {
             fx->x.HALF.HI += i[0];
             fx->y.HALF.HI += i[1];
             fx->collisionLayer = 2;
-            UpdateSpriteOrderAndFlip(fx);
+            UpdateSpriteForCollisionLayer(fx);
         }
         i += sizeof(s16);
     }
diff --git a/src/windTribeFlag.c b/src/windTribeFlag.c
index 1decf382..f9c82da8 100644
--- a/src/windTribeFlag.c
+++ b/src/windTribeFlag.c
@@ -13,7 +13,7 @@ void WindTribeFlag(Entity *this)
     else {
       this->spriteSettings.b.flipX = 1;
     }
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     InitializeAnimation(this,0);
   }
   else {