misc function renaming

1 files changed, 24 insertions, 24 deletions

diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s
index 2c7e1fbe..6f4068e0 100644
--- a/asm/code_08077B98.s
+++ b/asm/code_08077B98.s
@@ -575,7 +575,7 @@ sub_08077F84: @ 0x08077F84
 	ldrsh r1, [r4, r2]
 	subs r1, #0xc
 	movs r2, #2
-	bl sub_080002A4
+	bl GetTileTypeByPos
 	ldr r1, _08077FE4 @ =0xFFFFFCBD
 	adds r0, r0, r1
 	cmp r0, #3
@@ -5133,7 +5133,7 @@ sub_0807A1E8: @ 0x0807A1E8
 	ldr r2, _0807A28C @ =gLinkEntity
 	adds r2, #0x38
 	ldrb r2, [r2]
-	bl sub_080002A4
+	bl GetTileTypeByPos
 	adds r2, r0, #0
 	ldr r1, _0807A290 @ =gLinkState
 	ldrh r0, [r1, #0x24]
@@ -6398,7 +6398,7 @@ sub_0807AB44: @ 0x0807AB44
 	adds r1, r6, #0
 	adds r1, #0x38
 	ldrb r1, [r1]
-	bl sub_080002B0
+	bl GetTileType
 	movs r1, #0xb
 	bl sub_0806FC50
 	adds r5, r0, #0
@@ -6485,7 +6485,7 @@ _0807ABF4:
 	adds r2, r4, #0
 	adds r2, #0x38
 	ldrb r2, [r2]
-	bl UpdateCollisionLayer
+	bl SetTile
 _0807AC44:
 	pop {r3, r4, r5}
 	mov r8, r3
@@ -7410,8 +7410,8 @@ _0807B310:
 	pop {pc}
 	.align 2, 0
 
-	thumb_func_start sub_0807B314
-sub_0807B314: @ 0x0807B314
+	thumb_func_start SetTileType
+SetTileType: @ 0x0807B314
 	push {r4, r5, r6, r7, lr}
 	adds r5, r0, #0
 	adds r4, r1, #0
@@ -7421,9 +7421,9 @@ sub_0807B314: @ 0x0807B314
 	bhi _0807B410
 	adds r0, r4, #0
 	adds r1, r6, #0
-	bl sub_0801AF8C
+	bl DeleteLoadedTileEntity
 	adds r0, r6, #0
-	bl sub_0808094C
+	bl GetLayerByIndex
 	adds r2, r0, #0
 	lsls r1, r5, #1
 	ldr r3, _0807B3A4 @ =0x00006004
@@ -7534,7 +7534,7 @@ _0807B410:
 	adds r0, r5, #0
 	adds r1, r4, #0
 	adds r2, r6, #0
-	bl UpdateCollisionLayer
+	bl SetTile
 	b _0807B430
 	.align 2, 0
 _0807B424: .4byte 0x00003FFF
@@ -7551,7 +7551,7 @@ sub_0807B434: @ 0x0807B434
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	adds r5, r1, #0
-	bl sub_080002B0
+	bl GetTileType
 	cmp r0, #0x37
 	bhi _0807B44A
 	cmp r0, #0x36
@@ -7635,7 +7635,7 @@ sub_0807B480: @ 0x0807B480
 	orrs r5, r0
 	adds r0, r4, #0
 	movs r1, #2
-	bl sub_080002B0
+	bl GetTileType
 	cmp r0, #0
 	beq _0807B4FA
 	adds r0, r6, #0
@@ -7651,7 +7651,7 @@ _0807B4FA:
 	ldrh r4, [r1]
 	adds r0, r6, #0
 	movs r1, #2
-	bl sub_080002B0
+	bl GetTileType
 	lsls r0, r0, #0x10
 	lsrs r0, r0, #0x10
 	ldr r2, _0807B518 @ =gUnk_0811C2EC
@@ -7694,7 +7694,7 @@ _0807B54E:
 	adds r0, r4, #0
 	adds r1, r6, #0
 	movs r2, #2
-	bl sub_0807B314
+	bl SetTileType
 _0807B558:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
@@ -7734,7 +7734,7 @@ sub_0807B55C: @ 0x0807B55C
 	ldrh r0, [r0]
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0807B314
+	bl SetTileType
 _0807B5AC:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
@@ -7797,7 +7797,7 @@ sub_0807B600: @ 0x0807B600
 _0807B61A:
 	adds r0, r5, #0
 	movs r1, #1
-	bl sub_080002B0
+	bl GetTileType
 	adds r1, r0, #0
 	ldr r0, _0807B634 @ =0x0000026A
 	cmp r1, r0
@@ -7858,13 +7858,13 @@ _0807B698: .4byte 0x00000287
 _0807B69C:
 	adds r0, r5, #0
 	movs r1, #2
-	bl sub_080002B0
+	bl GetTileType
 	cmp r0, #0
 	beq _0807B6EC
 	ldr r0, _0807B6E8 @ =0x000002F2
 	adds r1, r5, #0
 	movs r2, #1
-	bl sub_0807B314
+	bl SetTileType
 	adds r0, r6, #0
 	movs r1, #1
 	bl sub_080002E0
@@ -7874,7 +7874,7 @@ _0807B69C:
 	lsls r0, r0, #2
 	adds r1, r6, #0
 	movs r2, #1
-	bl sub_0807B314
+	bl SetTileType
 _0807B6CA:
 	adds r0, r5, #0
 	adds r0, #0x40
@@ -7886,7 +7886,7 @@ _0807B6CA:
 	lsls r0, r0, #2
 	adds r1, r5, #0
 	movs r2, #1
-	bl sub_0807B314
+	bl SetTileType
 	b _0807B6F8
 	.align 2, 0
 _0807B6E8: .4byte 0x000002F2
@@ -7895,7 +7895,7 @@ _0807B6EC:
 	lsls r0, r0, #2
 	adds r1, r5, #0
 	movs r2, #1
-	bl sub_0807B314
+	bl SetTileType
 _0807B6F8:
 	adds r0, r6, #0
 	movs r1, #2
@@ -7905,10 +7905,10 @@ _0807B6F8:
 	movs r0, #0
 	adds r1, r6, #0
 	movs r2, #2
-	bl sub_0807B314
+	bl SetTileType
 	adds r0, r6, #0
 	movs r1, #1
-	bl sub_080002B0
+	bl GetTileType
 	ldr r1, _0807B770 @ =0x000002F2
 	cmp r0, r1
 	bne _0807B728
@@ -7916,7 +7916,7 @@ _0807B6F8:
 	lsls r0, r0, #2
 	adds r1, r6, #0
 	movs r2, #1
-	bl sub_0807B314
+	bl SetTileType
 _0807B728:
 	adds r0, r5, #1
 	ldr r4, _0807B774 @ =gUnk_0811C2AC
@@ -7993,7 +7993,7 @@ sub_0807B778: @ 0x0807B778
 	ldrh r0, [r0]
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0807B314
+	bl SetTileType
 _0807B7D0:
 	pop {r4, r5, r6, pc}
 	.align 2, 0