Name remaining map_header.c routines

10 files changed, 55 insertions, 55 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]
diff --git a/arm9/global.inc b/arm9/global.inc
index 9be9b63d..b0d5df7e 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2508,12 +2508,12 @@
 .extern MapHeader_IsEscapeRopeAllowed
 .extern MapHeader_IsFlyAllowed
 .extern MapHeader_IsBikeAllowed
-.extern FUN_020348E4
+.extern MapHeader_IsOutdoorNotTown
 .extern MapHeader_MapIsOnMainMatrix
-.extern FUN_02034930
-.extern FUN_02034944
-.extern FUN_02034964
-.extern FUN_02034984
+.extern MapHeader_IsCave
+.extern MapHeader_IsBuilding
+.extern MapHeader_IsOutdoor
+.extern MapHeader_MapIsPokemonCenter
 .extern MapHeader_MapIsUnionRoom
 .extern MapHeader_MapIsMtCoronetFeebasRoom
 .extern MapHeader_MapIsTrophyGarden
diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s
index 9a7c0b1f..eba8807c 100644
--- a/arm9/modules/05/asm/mod05_021E2E88.s
+++ b/arm9/modules/05/asm/mod05_021E2E88.s
@@ -601,7 +601,7 @@ MOD05_021E331C: ; 0x021E331C
 	add r4, r0, #0
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0]
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0
 	bne _021E333E
 	ldr r0, [r4, #0x1c]
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 48bd9b4a..b435d1ed 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -199,7 +199,7 @@ _0225498C:
 	bl MOD47_02254E24
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0]
-	bl FUN_02034984
+	bl MapHeader_MapIsPokemonCenter
 	cmp r0, #0
 	beq _022549CA
 	add r0, r4, #0
diff --git a/arm9/src/map_header.c b/arm9/src/map_header.c
index 6fb321ed..a766a8fd 100644
--- a/arm9/src/map_header.c
+++ b/arm9/src/map_header.c
@@ -746,17 +746,17 @@ u8 MapHeader_IsBikeAllowed(u32 mapno)
     return sMapHeaders[mapno].is_bike_allowed;
 }
 
-u8 MapHeader_GetField16(u32 mapno)
+u8 MapHeader_GetMapType(u32 mapno)
 {
     mapno = MapNumberBoundsCheck(mapno);
-    return sMapHeaders[mapno].unk16;
+    return sMapHeaders[mapno].map_type;
 }
 
-BOOL FUN_020348E4(u32 mapno)
+BOOL MapHeader_IsOutdoorNotTown(u32 mapno)
 {
     if (!MapHeader_IsFlyAllowed(mapno))
         return FALSE;
-    if (MapHeader_GetField16(mapno) != 1)
+    if (MapHeader_GetMapType(mapno) != 1)
         return TRUE;
     return FALSE;
 }
@@ -766,54 +766,54 @@ BOOL MapHeader_MapIsOnMainMatrix(u32 mapno)
     return MapHeader_GetMatrixId(mapno) == NARC_map_matrix_narc_0000_bin;
 }
 
-BOOL FUN_0203491C(u32 mapno)
+BOOL MapHeader_IsPokemonCenter(u32 mapno)
 {
-    return MapHeader_GetField16(mapno) == 5;
+    return MapHeader_GetMapType(mapno) == 5;
 }
 
-BOOL FUN_02034930(u32 mapno)
+BOOL MapHeader_IsCave(u32 mapno)
 {
-    return MapHeader_GetField16(mapno) == 3;
+    return MapHeader_GetMapType(mapno) == 3;
 }
 
-BOOL FUN_02034944(u32 mapno)
+BOOL MapHeader_IsBuilding(u32 mapno)
 {
-    return MapHeader_GetField16(mapno) == 4 || MapHeader_GetField16(mapno) == 5;
+    return MapHeader_GetMapType(mapno) == 4 || MapHeader_GetMapType(mapno) == 5;
 }
 
-BOOL FUN_02034964(u32 mapno)
+BOOL MapHeader_IsOutdoor(u32 mapno)
 {
-    return MapHeader_GetField16(mapno) == 1 || MapHeader_GetField16(mapno) == 2;
+    return MapHeader_GetMapType(mapno) == 1 || MapHeader_GetMapType(mapno) == 2;
 }
 
-BOOL FUN_02034984(u32 mapno)
+BOOL MapHeader_MapIsPokemonCenter(u32 mapno)
 {
-    return FUN_0203491C(mapno) != FALSE;
+    return MapHeader_IsPokemonCenter(mapno) != FALSE;
 }
 
 BOOL MapHeader_MapIsUnionRoom(u32 mapno)
 {
-    return mapno == 466;
+    return mapno == MAP_UNION;
 }
 
 BOOL MapHeader_MapIsMtCoronetFeebasRoom(u32 mapno)
 {
-    return mapno == 219;
+    return mapno == MAP_D05R0113;
 }
 
 BOOL MapHeader_MapIsTrophyGarden(u32 mapno)
 {
-    return mapno == 287;
+    return mapno == MAP_D23R0101;
 }
 
 BOOL MapHeader_MapIsAmitySquare(u32 mapno)
 {
-    return mapno == 253;
+    return mapno == MAP_D11R0101;
 }
 
 BOOL MapHeader_MapIsSpearPillar(u32 mapno)
 {
-    return mapno == 220;
+    return mapno == MAP_D05R0114;
 }
 
 BOOL MapHeader_MapIsPokemonCenterSecondFloor(u32 mapno)
diff --git a/include/map_header.h b/include/map_header.h
index 3e6fb6a7..cb2c3dae 100644
--- a/include/map_header.h
+++ b/include/map_header.h
@@ -16,7 +16,7 @@ struct MapHeader
     u16 mapsec;
     u8 weather_type;
     u8 camera_type;
-    u8 unk16;
+    u8 map_type;
     u8 battle_bg:4;
     u8 is_bike_allowed:1;
     u8 is_running_allowed:1; // unused
@@ -42,14 +42,14 @@ u8 MapHeader_GetBattleBg(u32 mapno);
 u8 MapHeader_IsEscapeRopeAllowed(u32 mapno);
 u8 MapHeader_IsFlyAllowed(u32 mapno);
 u8 MapHeader_IsBikeAllowed(u32 mapno);
-u8 MapHeader_GetField16(u32 mapno);
-BOOL FUN_020348E4(u32 mapno);
+u8 MapHeader_GetMapType(u32 mapno);
+BOOL MapHeader_IsOutdoorNotTown(u32 mapno);
 BOOL MapHeader_MapIsOnMainMatrix(u32 mapno);
-BOOL FUN_0203491C(u32 mapno);
-BOOL FUN_02034930(u32 mapno);
-BOOL FUN_02034944(u32 mapno);
-BOOL FUN_02034964(u32 mapno);
-BOOL FUN_02034984(u32 mapno);
+BOOL MapHeader_IsPokemonCenter(u32 mapno);
+BOOL MapHeader_IsCave(u32 mapno);
+BOOL MapHeader_IsBuilding(u32 mapno);
+BOOL MapHeader_IsOutdoor(u32 mapno);
+BOOL MapHeader_MapIsPokemonCenter(u32 mapno);
 BOOL MapHeader_MapIsUnionRoom(u32 mapno);
 BOOL MapHeader_MapIsMtCoronetFeebasRoom(u32 mapno);
 BOOL MapHeader_MapIsTrophyGarden(u32 mapno);