Merge remote-tracking branch 'origin/master' into pikalax_work

5 files changed, 19 insertions, 19 deletions

diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 8bebb5b3..52073cac 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -424,7 +424,7 @@ MOD05_021D7894: ; 0x021D7894
 	asr r2, r1, #5
 	ldr r0, [r5, #0x28]
 	add r1, r4, #0
-	bl FUN_0203451C
+	bl MapMatrix_GetMapHeader
 	add r4, r0, #0
 	ldr r0, [r5, #0x1c]
 	ldr r6, [r0]
@@ -542,7 +542,7 @@ MOD05_021D79B4: ; 0x021D79B4
 	add r5, r0, #0
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0
 	beq _021D79FE
 	ldr r0, [r5, #0xc]
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index bda94277..7af8c0ec 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -2216,11 +2216,11 @@ MOD05_021D9290: ; 0x021D9290
 	beq _021D92DA
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #1
 	bne _021D931C
 	ldr r0, [sp, #8]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0
 	bne _021D931C
 	ldr r0, [r4, #0x38]
@@ -2246,11 +2246,11 @@ _021D92DA:
 	beq _021D931C
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #1
 	bne _021D931C
 	ldr r0, [sp, #8]
-	bl MapHeader_MapIsOnOverworldMatrix
+	bl MapHeader_MapIsOnMainMatrix
 	cmp r0, #0
 	bne _021D931C
 	ldr r0, [r4, #0x38]
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s
index 79954077..20fc2752 100644
--- a/arm9/modules/05/asm/mod05_021E1AD8.s
+++ b/arm9/modules/05/asm/mod05_021E1AD8.s
@@ -2073,10 +2073,10 @@ MOD05_021E2AD4: ; 0x021E2AD4
 	bl NewString_ReadMsgData
 	str r0, [sp, #0x10]
 	ldr r0, [r6, #0xc]
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	mov r1, #0
 	add r2, r1, #0
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	add r2, r0, #0
 	mov r0, #1
 	str r0, [sp]
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index 9bd14da2..0537d0db 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1474,7 +1474,7 @@ MOD05_021E3F68: ; 0x021E3F68
 	ldr r0, [sp, #4]
 	add r3, r7, #0
 	ldr r0, [r0, #0xc]
-	bl FUN_02003974
+	bl BlendPalette
 	add r0, r6, #0
 	add r1, r5, #0
 	mov r2, #0x20
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 47360829..3cc1b9fe 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -11251,7 +11251,7 @@ MOD05_021EE114: ; 0x021EE114
 	cmp r0, r1
 	bge _021EE1D0
 	add r1, r2, #0
-	bl FUN_02034660
+	bl GetMapData
 	add r1, r0, #0
 	ldr r0, _021EE1D4 ; =0x0000FFFF
 	cmp r1, r0
@@ -11356,7 +11356,7 @@ MOD05_021EE1E4: ; 0x021EE1E4
 	mul r3, r2
 	cmp r0, r3
 	bge _021EE286
-	bl FUN_02034660
+	bl GetMapData
 	add r1, r0, #0
 	ldr r0, _021EE298 ; =0x0000FFFF
 	cmp r1, r0
@@ -11440,7 +11440,7 @@ MOD05_021EE2A4: ; 0x021EE2A4
 	cmp r1, r5
 	bge _021EE37A
 	add r1, r3, #0
-	bl FUN_02034660
+	bl GetMapData
 	add r1, r0, #0
 	ldr r0, _021EE380 ; =0x0000FFFF
 	cmp r1, r0
@@ -11556,7 +11556,7 @@ MOD05_021EE38C: ; 0x021EE38C
 	cmp r1, r2
 	bge _021EE43E
 	add r1, r3, #0
-	bl FUN_02034660
+	bl GetMapData
 	add r1, r0, #0
 	ldr r0, _021EE450 ; =0x0000FFFF
 	cmp r1, r0
@@ -13633,17 +13633,17 @@ MOD05_021EF300: ; 0x021EF300
 	lsl r0, r0, #0x10
 	lsr r4, r0, #0x10
 	add r0, r7, #0
-	bl FUN_020344FC
+	bl MapMatrix_GetWidth
 	str r0, [sp, #8]
 	add r0, r7, #0
-	bl FUN_02034574
+	bl MapMatrix_GetMatrixID
 	add r1, r0, #0
 	ldr r0, [sp, #8]
 	add r2, r6, #0
 	str r0, [sp]
 	add r0, r7, #0
 	add r3, r4, #0
-	bl FUN_02034578
+	bl MapMatrix_GetMapAltitude
 	lsl r0, r0, #0xf
 	str r0, [r5, #4]
 	ldr r1, [r5]
@@ -13707,12 +13707,12 @@ _021EF3AE:
 	add r0, #0xbc
 	str r5, [r0]
 	add r0, r5, #0
-	bl FUN_020344FC
+	bl MapMatrix_GetWidth
 	add r1, r4, #0
 	add r1, #0xc0
 	str r0, [r1]
 	add r0, r5, #0
-	bl FUN_0203450C
+	bl MapMatrix_GetHeight
 	add r1, r4, #0
 	add r1, #0xc4
 	str r0, [r1]
@@ -25857,7 +25857,7 @@ MOD05_021F5068: ; 0x021F5068
 	ldr r0, [r5, #0x28]
 	add r7, r1, #0
 	add r1, r2, #0
-	bl FUN_02034554
+	bl MapMatrix_GetMapHeaderFromID
 	bl MOD05_021F50FC
 	add r4, r0, #0
 	cmp r4, #0x15