Create enums for Vvvs and MetaTiles

asm/src/intr.s

@@ -86,12 +86,12 @@ arm_sub_080B1A0C: @ 0x080B1A0C
 	add r1, r1, r2
 	ldrb r2, [r0, #0x38]
 	mov r0, r3
-	b arm_GetTileTypeByPos
-arm_GetTileTypeByEntity:
+	b arm_GetMetaTileTypeByPos
+arm_GetMetaTileTypeByEntity:
 	ldrb r2, [r0, #0x38]
 	ldrh r1, [r0, #0x32]
 	ldrh r0, [r0, #0x2e]
-arm_GetTileTypeByPos:
+arm_GetMetaTileTypeByPos:
 	ldr ip, _080B1C18 @ =gRoomControls
 	ldrh r3, [ip, #6]
 	sub r0, r0, r3
@@ -106,8 +106,8 @@ arm_sub_080B1A58:
 	add r0, r0, r1, lsl #6
 	mov r1, r2
 
-	arm_func_start arm_GetTileType
-arm_GetTileType: @ 0x080B1A60
+	arm_func_start arm_GetMetaTileType
+arm_GetMetaTileType: @ 0x080B1A60
 	ldr r2, _080B1C1C @ =gMapDataPtrs
 _080B1A64:
 	add r2, r2, r1, lsl #3
@@ -208,7 +208,7 @@ arm_sub_080B1B68: @ 0x080B1B68
 	arm_func_start arm_sub_080B1B84
 arm_sub_080B1B84: @ 0x080B1B84
 	mov ip, lr
-	bl arm_GetTileType
+	bl arm_GetMetaTileType
 	lsls r0, r0, #0x12
 	ldrlo r1, _080B1C3C @ =gUnk_08000360
 	ldrhs r1, _080B1C40 @ =gUnk_080B7A3E
@@ -220,7 +220,7 @@ arm_sub_080B1B84: @ 0x080B1B84
 arm_sub_080B1BA4: @ 0x080B1BA4
 	mov ip, lr
 	mov r3, r2
-	bl arm_GetTileType
+	bl arm_GetMetaTileType
 	lsls r0, r0, #0x12
 	ldrlo r1, _080B1C44 @ =gUnk_08000360
 	ldrhs r1, _080B1C48 @ =gUnk_080B7A3E

asm/src/player.s

@@ -326,7 +326,7 @@ sub_08008796: @ 0x08008796
 	adds r1, r7, #0
 	movs r2, #0x38
 	ldrb r2, [r4, r2]
-	bl GetTileTypeByPos
+	bl GetMetaTileTypeByPos
 	ldr r1, _080088D8 @ =gUnk_080046A4
 	bl sub_08007DE0
 	beq _080087CE

asm/src/script.s

@@ -80,7 +80,7 @@ ResolveCollisionLayer: @ 0x08016A30
 	ldrh r0, [r4, #0x2e]
 	ldrh r1, [r4, #0x32]
 	movs r2, #2
-	bl GetTileTypeByPos
+	bl GetMetaTileTypeByPos
 	movs r3, #1
 	cmp r0, #0
 	beq _08016A62

asm/src/veneer.s

@@ -5,6 +5,7 @@
 
 	.text
 
+@ copies from the gMapDataBottomSpecial to the bg buffers depending on gUpdateVisibleTiles
 	thumb_func_start UpdateScrollVram
 UpdateScrollVram: @ 0x08000108
 	push {r4, lr}
@@ -54,8 +55,8 @@ CloneTile: @ 0x08000152
 	ldrh r0, [r3, r0]
 	lsrs r2, r2, #2
 
-	non_word_aligned_thumb_func_start SetTile
-SetTile: @ r0 = tile type, r1, = tile position, r2 = layer
+	non_word_aligned_thumb_func_start SetMetaTile
+SetMetaTile: @ r0 = tile type, r1, = tile position, r2 = layer
 	push {r4-r7, lr}
 	lsls r3, r2, #3 @ 1: 8, 2: 16
 	ldr r4, _08000208 @ =gMapDataPtrs
@@ -80,7 +81,7 @@ SetTile: @ r0 = tile type, r1, = tile position, r2 = layer
 	bl DeleteLoadedTileEntity @ DeleteLoadedTileEntity(metaTilePos, layer)
 	adds r0, r7, #0 @ r0 = oldMetaTile
 	pop {r1, r2}
-	bl sub_0801AF48 @ sub_0801AF48(oldMetaTile, metaTilePos, layer)
+	bl StoreMetaTileForSpecialTile @ StoreMetaTileForSpecialTile(oldMetaTile, metaTilePos, layer)
 	pop {r4, r5, r6, r7, pc} @ pop pc results in returning to the calling function
 _0800019A:
 	adds r3, #4 @ r3 = layer * 8 + 4
@@ -113,8 +114,8 @@ SetVvvAtMetaTilePos: @ 0x080001D0
 	strb r0, [r3, r1] @ gMapBottom.vvv[metaTilePos] = r0
 	bx lr
 
-	non_word_aligned_thumb_func_start GetTileIndex
-GetTileIndex: @ 0x080001DA
+	non_word_aligned_thumb_func_start GetMetaTileIndex
+GetMetaTileIndex: @ 0x080001DA
 	lsls r1, r1, #3
 	ldr r2, _08000224 @ =gMapDataPtrs
 	ldr r1, [r2, r1]
@@ -221,9 +222,9 @@ sub_080B1A0C: @ 0x0800029C
 @ call 0x080B1A28
 @ r0: entity
 @ return: u32 (tileType)
-	thumb_func_start GetTileTypeByEntity
-GetTileTypeByEntity: @ 0x080002A0
-	ldr r3, _0800030C @ =ram_GetTileTypeByEntity
+	thumb_func_start GetMetaTileTypeByEntity
+GetMetaTileTypeByEntity: @ 0x080002A0
+	ldr r3, _0800030C @ =ram_GetMetaTileTypeByEntity
 	bx r3
 
 @ call 0x080B1A34
@@ -231,9 +232,9 @@ GetTileTypeByEntity: @ 0x080002A0
 @ r1: s32 (yPos)
 @ r2: u32 (layer)
 @ return: u32 (tileType)
-	thumb_func_start GetTileTypeByPos
-GetTileTypeByPos: @ 0x080002A4
-	ldr r3, _08000310 @ =ram_GetTileTypeByPos
+	thumb_func_start GetMetaTileTypeByPos
+GetMetaTileTypeByPos: @ 0x080002A4
+	ldr r3, _08000310 @ =ram_GetMetaTileTypeByPos
 	bx r3
 
 @ call 0x080B1A48
@@ -258,9 +259,9 @@ sub_080B1A58: @ 0x080002AC
 @ r0: u32 (tileIndex)
 @ r1: u32 (layer)
 @ return: u32 (tileType)
-	thumb_func_start GetTileType
-GetTileType: @ 0x080002B0
-	ldr r3, _0800031C @ =ram_GetTileType
+	thumb_func_start GetMetaTileType
+GetMetaTileType: @ 0x080002B0
+	ldr r3, _0800031C @ =ram_GetMetaTileType
 	bx r3
 
 @ call 0x080B1A8C
@@ -409,11 +410,11 @@ _080002FC: .4byte ram_sub_080B19EC
 _08000300: .4byte ram_sub_080B19FC
 _08000304: .4byte ram_sub_080B1A04
 _08000308: .4byte ram_sub_080B1A0C
-_0800030C: .4byte ram_GetTileTypeByEntity
-_08000310: .4byte ram_GetTileTypeByPos
+_0800030C: .4byte ram_GetMetaTileTypeByEntity
+_08000310: .4byte ram_GetMetaTileTypeByPos
 _08000314: .4byte ram_sub_080B1A48
 _08000318: .4byte ram_sub_080B1A58
-_0800031C: .4byte ram_GetTileType
+_0800031C: .4byte ram_GetMetaTileType
 _08000320: .4byte ram_GetVvvRelativeToEntity
 _08000324: .4byte ram_GetVvvAtEntity
 _08000328: .4byte ram_GetVvvAtWorldCoords