Merge branch 'master' into map_matrix

8 files changed, 14 insertions, 14 deletions

diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index f2ef44dc..94c65983 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -341,7 +341,7 @@ _0203529A:
 _020352AC:
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_020349CC
+	bl MapHeader_MapIsAmitySquare
 	cmp r0, #0x1
 	bne _020352BC
 	mov r0, #0x6
@@ -2145,7 +2145,7 @@ _02036170:
 	add r7, r0, #0x0
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034A04
+	bl MapHeader_GetMapEvolutionMethod
 	strh r0, [r7, #0x2]
 	mov r0, #0x0
 	strb r0, [r7, #0x1]
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index be2b4770..cfbae230 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -536,7 +536,7 @@ FUN_02047A78: ; 0x02047A78
 	str r0, [r5, r1]
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034A04
+	bl MapHeader_GetMapEvolutionMethod
 	mov r1, #0x59
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
@@ -1161,7 +1161,7 @@ FUN_0204806C: ; 0x0204806C
 	add r6, r0, #0x0
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl MapHeader_GetField17_0
+	bl MapHeader_GetBattleBg
 	mov r1, #0x15
 	lsl r1, r1, #0x4
 	str r0, [r5, r1]
diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s
index a3631340..8cf0ee61 100644
--- a/arm9/asm/unk_02048904.s
+++ b/arm9/asm/unk_02048904.s
@@ -506,7 +506,7 @@ FUN_02048CDC: ; 0x02048CDC
 	add r4, r0, #0x0
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_020349E4
+	bl MapHeader_MapIsPokemonCenterSecondFloor
 	cmp r0, #0x0
 	beq _02048CFE
 	ldr r1, [r4, #0x1c]
@@ -860,7 +860,7 @@ FUN_02048FC8: ; 0x02048FC8
 	add r4, r0, #0x0
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034998
+	bl MapHeader_MapIsUnionRoom
 	cmp r0, #0x0
 	bne _02049000
 	add r0, r4, #0x0
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index ba92a404..ccff7b32 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -440,7 +440,7 @@ FUN_0205D170: ; 0x0205D170
 	pop {r3-r5, pc}
 _0205D184:
 	ldr r0, [r5, #0x0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0x0
 	bne _0205D194
 	mov r0, #0x0
@@ -1178,7 +1178,7 @@ _0205D730: .word 0x000022F6
 FUN_0205D734: ; 0x0205D734
 	push {r3, lr}
 	ldr r0, [r0, #0x0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0x0
 	beq _0205D744
 	mov r0, #0x0
@@ -1595,7 +1595,7 @@ _0205DA8E:
 	cmp r0, #0x1
 	bne _0205DAA6
 	ldr r0, [r4, #0x0]
-	bl MapHeader_GetField17_6
+	bl MapHeader_IsEscapeRopeAllowed
 	cmp r0, #0x1
 	bne _0205DAA6
 	mov r0, #0x0
@@ -1675,7 +1675,7 @@ _0205DB1A:
 	pop {r3-r5, pc}
 _0205DB30:
 	ldr r0, [r4, #0x0]
-	bl FUN_020349D8
+	bl MapHeader_MapIsSpearPillar
 	cmp r0, #0x0
 	beq _0205DB3E
 	mov r0, #0x0
diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s
index 3ad96b92..67b26aea 100644
--- a/arm9/asm/unk_0205F7A0.s
+++ b/arm9/asm/unk_0205F7A0.s
@@ -55,7 +55,7 @@ FUN_0205F7A0: ; 0x0205F7A0
 	asr r1, r1, #0x5
 	asr r2, r2, #0x5
 	bl MapMatrix_GetMapHeader
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0x0
 	beq _0205F806
 	str r4, [r5, #0x0]
diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s
index b475c1e5..3a92648f 100644
--- a/arm9/asm/unk_0206367C.s
+++ b/arm9/asm/unk_0206367C.s
@@ -122,7 +122,7 @@ _0206377C:
 _02063786:
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0x0
 	beq _020637A6
 	ldr r0, [r5, #0xc]
diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s
index 1b2bc0a5..632e129d 100644
--- a/arm9/asm/unk_02063948.s
+++ b/arm9/asm/unk_02063948.s
@@ -1129,7 +1129,7 @@ _020641BE:
 	cmp r0, #0x1
 	bne _020641D2
 	ldr r0, [r4, #0x0]
-	bl MapHeader_GetField17_6
+	bl MapHeader_IsEscapeRopeAllowed
 	cmp r0, #0x1
 	beq _020641D6
 _020641D2:
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index ee3ba62f..0ad8aad2 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -2248,7 +2248,7 @@ _02076814:
 	ldr r0, [r0, #0x1c]
 	ldr r0, [r0, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034A04
+	bl MapHeader_GetMapEvolutionMethod
 	add r3, r0, #0x0
 	ldr r0, _02076878 ; =0x000005A4
 	lsl r3, r3, #0x10