summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s4
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s8
-rw-r--r--arm9/modules/05/asm/module_05.s20
-rw-r--r--arm9/modules/06/asm/module_06.s14
-rw-r--r--arm9/modules/07/asm/module_07.s2
-rw-r--r--arm9/modules/18/asm/module_18.s4
-rw-r--r--arm9/modules/42/asm/module_42.s4
-rw-r--r--arm9/modules/43/asm/module_43.s4
-rw-r--r--arm9/modules/66/asm/module_66.s8
9 files changed, 34 insertions, 34 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 9cea7a32..1aad5cc7 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/module_05.s b/arm9/modules/05/asm/module_05.s
index 0157aedb..36143bb3 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
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 0701bc8c..5567f4d2 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4775,7 +4775,7 @@ MOD06_0223B9A8: ; 0x0223B9A8
ldr r0, [r0]
add r6, r2, #0
add r7, r3, #0
- bl FUN_020349B8
+ bl MapHeader_MapIsTrophyGarden
cmp r0, #0
beq _0223B9FC
add r1, sp, #0
@@ -5248,7 +5248,7 @@ _0223BD8A:
ldr r0, [sp, #8]
ldr r0, [r0, #0x1c]
ldr r0, [r0]
- bl FUN_020349AC
+ bl MapHeader_MapIsMtCoronetFeebasRoom
cmp r0, #0
beq _0223BDFC
ldr r0, [sp, #8]
@@ -23774,7 +23774,7 @@ MOD06_02245198: ; 0x02245198
lsl r2, r2, #0xb
lsr r1, r1, #0x10
lsr r2, r2, #0x10
- bl FUN_020345FC
+ bl GetMapHeader
b _022451D6
_022451BA:
cmp r5, #5
@@ -23790,7 +23790,7 @@ _022451C2:
ldr r0, [r0, #0x28]
lsr r1, r1, #5
lsr r2, r2, #5
- bl FUN_0203451C
+ bl MapMatrix_GetMapHeader
_022451D6:
lsl r3, r5, #2
add r1, r4, r3
@@ -38544,7 +38544,7 @@ MOD06_0224C27C: ; 0x0224C27C
strb r0, [r4, #0xe]
strb r0, [r4, #0xf]
ldr r0, [r5, #0x28]
- bl FUN_020344FC
+ bl MapMatrix_GetWidth
add r1, r0, #0
ldr r0, [sp]
add r2, sp, #0x14
@@ -39797,7 +39797,7 @@ _0224CC80:
add r2, sp, #0x14
bl FUN_020572B8
ldr r0, [r5, #0x28]
- bl FUN_020344FC
+ bl MapMatrix_GetWidth
str r0, [sp]
mov r0, #0
str r0, [sp, #4]
@@ -42943,7 +42943,7 @@ MOD06_0224E554: ; 0x0224E554
strb r0, [r4, #0xe]
strb r0, [r4, #0xf]
ldr r0, [r5, #0x28]
- bl FUN_020344FC
+ bl MapMatrix_GetWidth
add r1, r0, #0
ldr r0, [sp]
add r2, sp, #0x14
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index dbf02f8d..6e4f14c2 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -5037,7 +5037,7 @@ MOD07_02214720: ; 0x02214720
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r1, r0]
- bl FUN_02034998
+ bl MapHeader_MapIsUnionRoom
cmp r0, #1
bne _0221479C
mov r0, #1
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 074ed1e0..85c8a425 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -405,7 +405,7 @@ MOD18_02239994: ; 0x02239994
ldr r0, [r0]
ldr r0, [r0]
ldr r0, [r0, #0x28]
- bl FUN_020344FC
+ bl MapMatrix_GetWidth
sub r0, r0, #2
lsl r0, r0, #0x15
lsr r6, r0, #0x10
@@ -413,7 +413,7 @@ MOD18_02239994: ; 0x02239994
ldr r0, [r0]
ldr r0, [r0]
ldr r0, [r0, #0x28]
- bl FUN_0203450C
+ bl MapMatrix_GetHeight
sub r0, r0, #2
lsl r0, r0, #0x15
lsr r4, r0, #0x10
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index 9e502906..3a2eb2e3 100644
--- a/arm9/modules/42/asm/module_42.s
+++ b/arm9/modules/42/asm/module_42.s
@@ -139,7 +139,7 @@ _02254932:
add r6, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl MapHeader_MapIsOnOverworldMatrix
+ bl MapHeader_MapIsOnMainMatrix
cmp r0, #0
beq _02254984
ldr r0, [r4, #0x1c]
@@ -527,7 +527,7 @@ MOD42_02254C04: ; 0x02254C04
add r6, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl MapHeader_MapIsOnOverworldMatrix
+ bl MapHeader_MapIsOnMainMatrix
cmp r0, #0
beq _02254C3C
ldr r1, [r4, #0x1c]
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s
index 59f7e81d..cb9d4f4d 100644
--- a/arm9/modules/43/asm/module_43.s
+++ b/arm9/modules/43/asm/module_43.s
@@ -62,7 +62,7 @@ MOD43_0225489C: ; 0x0225489C
add r6, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl MapHeader_MapIsOnOverworldMatrix
+ bl MapHeader_MapIsOnMainMatrix
cmp r0, #0
beq _022548E0
ldr r0, [r4, #0x1c]
@@ -395,7 +395,7 @@ MOD43_02254AF8: ; 0x02254AF8
add r7, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl MapHeader_MapIsOnOverworldMatrix
+ bl MapHeader_MapIsOnMainMatrix
cmp r0, #0
beq _02254B36
ldr r1, [r4, #0x1c]
diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s
index 95660bd2..ca8faeb0 100644
--- a/arm9/modules/66/asm/module_66.s
+++ b/arm9/modules/66/asm/module_66.s
@@ -259,7 +259,7 @@ _021D7694:
add r1, #0x88
str r0, [r1]
ldr r0, [r4, #4]
- bl FUN_020345A8
+ bl MapMatrix_MapData_New
str r0, [r4, #0x30]
ldr r0, _021D7744 ; =0x021D9AA0
ldr r1, [r4, #4]
@@ -345,7 +345,7 @@ _021D7782:
ldr r0, [r5, #0x40]
bl MOD66_021D9544
ldr r0, [r5, #0x30]
- bl FUN_020345DC
+ bl MapMatrix_MapData_Free
add r0, r5, #0
add r0, #0x88
ldr r0, [r0]
@@ -1648,7 +1648,7 @@ MOD66_021D818C: ; 0x021D818C
ldr r0, [r5, #0x30]
ldr r1, [r4, #0x18]
ldr r2, [r4, #0x1c]
- bl FUN_020345F0
+ bl MapMatrix_MapData_GetData
str r0, [r4, #0x20]
ldrh r3, [r5, #2]
ldr r0, [r5, #0x40]
@@ -1932,7 +1932,7 @@ MOD66_021D8380: ; 0x021D8380
ldr r0, [r6, #0x30]
ldr r1, [sp, #4]
add r2, r7, #0
- bl FUN_020345F0
+ bl MapMatrix_MapData_GetData
add r1, r5, #0
add r2, r0, #0
ldr r3, [sp, #4]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 23:50:23 +0000