summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s10
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s14
-rw-r--r--arm9/modules/05/asm/mod05_021E2E88.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E8310.s2
-rw-r--r--arm9/modules/05/asm/module_05.s2
-rw-r--r--arm9/modules/06/asm/module_06.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/67/asm/module_67.s30
9 files changed, 36 insertions, 36 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 8488759b..e66ad6aa 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -477,10 +477,10 @@ _021D78CE:
ldr r0, [r0, #0xc]
bl MOD05_021DC174
add r0, r6, #0
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r6, r0, #0
add r0, r4, #0
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r1, r0, #0
cmp r6, r1
beq _021D7956
@@ -542,7 +542,7 @@ MOD05_021D79B4: ; 0x021D79B4
add r5, r0, #0
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0
beq _021D79FE
ldr r0, [r5, #0xc]
@@ -954,13 +954,13 @@ MOD05_021D7CF0: ; 0x021D7CF0
str r0, [r5, #0x50]
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034724
+ bl MapHeader_GetAreaDataBank
ldr r1, [r5, #0x4c]
bl MOD05_021F4978
str r0, [r5, #0x2c]
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034738
+ bl MapHeader_GetField1
add r4, r0, #0
ldr r0, [r5, #0x30]
cmp r0, #0
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index 946b25da..c00cb45f 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -1075,7 +1075,7 @@ _021D8992:
_021D8998:
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_020347D8
+ bl MapHeader_HasWildEncounters
cmp r0, #0
beq _021D89B4
add r0, r4, #0
@@ -1846,7 +1846,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
add r6, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r6, #0
@@ -1894,7 +1894,7 @@ MOD05_021D9010: ; 0x021D9010
_021D903E:
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r4, #0
@@ -2216,11 +2216,11 @@ MOD05_021D9290: ; 0x021D9290
beq _021D92DA
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #1
bne _021D931C
ldr r0, [sp, #8]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0
bne _021D931C
ldr r0, [r4, #0x38]
@@ -2246,11 +2246,11 @@ _021D92DA:
beq _021D931C
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #1
bne _021D931C
ldr r0, [sp, #8]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0
bne _021D931C
ldr r0, [r4, #0x38]
diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s
index 6d69341c..0666b52d 100644
--- a/arm9/modules/05/asm/mod05_021E2E88.s
+++ b/arm9/modules/05/asm/mod05_021E2E88.s
@@ -606,7 +606,7 @@ MOD05_021E331C: ; 0x021E331C
bne _021E333E
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r1, r0, #0
ldr r0, [r4, #4]
ldr r0, [r0, #8]
diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s
index e3a28a97..7a66cdcb 100644
--- a/arm9/modules/05/asm/mod05_021E8310.s
+++ b/arm9/modules/05/asm/mod05_021E8310.s
@@ -16,7 +16,7 @@ MOD05_021E8310: ; 0x021E8310
bl Sav2_Pokedex_get
add r7, r0, #0
ldr r0, [r6]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
str r0, [r5, #4]
add r0, r7, #0
bl Pokedex_GetSinnohDexFlag
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 104c1b87..fe346300 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -26953,7 +26953,7 @@ _021F5888:
strh r0, [r4, #0xa]
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_020347D8
+ bl MapHeader_HasWildEncounters
cmp r0, #0
beq _021F58D4
mov r0, #0xa
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 18de2954..d46e003b 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -8668,7 +8668,7 @@ _0223D804:
bne _0223D8F4
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
cmp r0, #0x65
beq _0223D8F4
ldr r0, [r5, #0x1c]
@@ -31270,7 +31270,7 @@ CreateInGameTradeMon: ; 0x022489D4
add r2, r4, #0
bl SetMonData
ldr r0, [sp, #0x2c]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r3, r0, #0
ldr r0, [sp, #0x28]
mov r1, #0
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index 8e41c6cc..5bbfa2ba 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 FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
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 FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
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 8efadd9b..89b23259 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 FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
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 FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0
beq _02254B36
ldr r1, [r4, #0x1c]
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 60757798..4982fa30 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -1248,7 +1248,7 @@ _021D7E32:
add r4, r0, #0
ldr r0, [sp, #0x14]
lsr r0, r0, #0x13
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -1685,7 +1685,7 @@ MOD67_021D8208: ; 0x021D8208
b _021D832E
_021D822A:
ldrh r0, [r0, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r1, _021D8338 ; =0x0000017E
mov r0, #0x1a
@@ -1774,7 +1774,7 @@ _021D82EA:
_021D82F2:
add r0, sp, #0x10
ldrh r0, [r0, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r4, #0x54]
mov r1, #0
@@ -2423,7 +2423,7 @@ MOD67_021D87E4: ; 0x021D87E4
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2674,7 +2674,7 @@ MOD67_021D89E0: ; 0x021D89E0
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2717,7 +2717,7 @@ MOD67_021D8A3C: ; 0x021D8A3C
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2760,7 +2760,7 @@ MOD67_021D8A98: ; 0x021D8A98
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2803,7 +2803,7 @@ MOD67_021D8AF4: ; 0x021D8AF4
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2846,7 +2846,7 @@ MOD67_021D8B50: ; 0x021D8B50
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2889,7 +2889,7 @@ MOD67_021D8BAC: ; 0x021D8BAC
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2932,7 +2932,7 @@ MOD67_021D8C08: ; 0x021D8C08
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -2975,7 +2975,7 @@ MOD67_021D8C64: ; 0x021D8C64
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -3018,7 +3018,7 @@ MOD67_021D8CC0: ; 0x021D8CC0
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -3061,7 +3061,7 @@ MOD67_021D8D1C: ; 0x021D8D1C
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
@@ -3104,7 +3104,7 @@ MOD67_021D8D78: ; 0x021D8D78
bl NewString_ReadMsgData
add r7, r0, #0
ldrh r0, [r4, #2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 13:54:45 +0000