Name remaining map_header.c routines

5 files changed, 21 insertions, 21 deletions

diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s
index 8299ea95..ca48ecc9 100644
--- a/arm9/asm/unk_02028980.s
+++ b/arm9/asm/unk_02028980.s
@@ -2207,11 +2207,11 @@ FUN_02029880: ; 0x02029880
 	str r1, [sp, #0x0]
 	add r5, r2, #0x0
 	ldr r6, [sp, #0x20]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _020298BA
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r4, #0x0
@@ -2224,11 +2224,11 @@ FUN_02029880: ; 0x02029880
 	b _02029942
 _020298BA:
 	add r0, r4, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x1
 	bne _0202991A
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	ldr r0, _02029958 ; =0x0000019E
@@ -2271,11 +2271,11 @@ _02029910:
 	b _02029942
 _0202991A:
 	add r0, r4, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r7, #0x0
diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s
index 7ca0881c..ea61b039 100644
--- a/arm9/asm/unk_0204C1B4.s
+++ b/arm9/asm/unk_0204C1B4.s
@@ -162,25 +162,25 @@ FUN_0204C29C: ; 0x0204C29C
 	ldr r0, [r7, #0x1c]
 	ldr r0, [r0, #0x0]
 	str r0, [sp, #0x8]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C308
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C2E6
 	mov r4, #0x6
 	b _0204C36A
 _0204C2E6:
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	beq _0204C2F4
 	mov r4, #0x5
 	b _0204C36A
 _0204C2F4:
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C302
 	mov r4, #0x6
@@ -190,18 +190,18 @@ _0204C302:
 	b _0204C36A
 _0204C308:
 	ldr r0, [sp, #0x8]
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	beq _0204C334
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C320
 	mov r4, #0x4
 	b _0204C36A
 _0204C320:
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C32E
 	mov r4, #0x6
@@ -211,22 +211,22 @@ _0204C32E:
 	b _0204C36A
 _0204C334:
 	ldr r0, [sp, #0x8]
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C366
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	bne _0204C36A
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C356
 	mov r4, #0x6
 	b _0204C36A
 _0204C356:
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	bne _0204C36A
 	bl GF_AssertFail
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index 43f1137e..14dfd9ef 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -1591,7 +1591,7 @@ FUN_0205DA80: ; 0x0205DA80
 	pop {r4, pc}
 _0205DA8E:
 	ldr r0, [r4, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _0205DAA6
 	ldr r0, [r4, #0x0]
diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s
index 3a92648f..0cb2156c 100644
--- a/arm9/asm/unk_0206367C.s
+++ b/arm9/asm/unk_0206367C.s
@@ -88,7 +88,7 @@ _020636F8:
 	bl FUN_02060478
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	bne _02063758
 	ldr r0, [r5, #0xc]
diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s
index 632e129d..7b29aaba 100644
--- a/arm9/asm/unk_02063948.s
+++ b/arm9/asm/unk_02063948.s
@@ -1015,7 +1015,7 @@ FUN_020640CC: ; 0x020640CC
 	pop {r4, pc}
 _020640DE:
 	ldr r0, [r4, #0x0]
-	bl FUN_020348E4
+	bl MapHeader_IsOutdoorNotTown
 	cmp r0, #0x0
 	bne _020640EC
 	mov r0, #0x1
@@ -1125,7 +1125,7 @@ FUN_020641AC: ; 0x020641AC
 	pop {r4, pc}
 _020641BE:
 	ldr r0, [r4, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _020641D2
 	ldr r0, [r4, #0x0]