summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd_18.s2
-rw-r--r--arm9/asm/scrcmd_3.s2
-rw-r--r--arm9/asm/unk_02028980.s4
-rw-r--r--arm9/asm/unk_020343A8.s2
-rw-r--r--arm9/asm/unk_02034A28.s8
-rw-r--r--arm9/asm/unk_02034FE4.s2
-rw-r--r--arm9/asm/unk_02035068.s2
-rw-r--r--arm9/asm/unk_02038C78.s2
-rw-r--r--arm9/asm/unk_020476CC.s4
-rw-r--r--arm9/asm/unk_02048904.s4
-rw-r--r--arm9/asm/unk_0204AB0C.s8
-rw-r--r--arm9/asm/unk_0205CE48.s10
-rw-r--r--arm9/asm/unk_0205F7A0.s2
-rw-r--r--arm9/asm/unk_02060CCC.s10
-rw-r--r--arm9/asm/unk_0206367C.s4
-rw-r--r--arm9/asm/unk_02063948.s4
-rw-r--r--arm9/asm/unk_0207550C.s2
-rw-r--r--arm9/asm/unk_02086084.s2
18 files changed, 37 insertions, 37 deletions
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 4b0acb12..fe0e3aa9 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -678,7 +678,7 @@ FUN_020448D4: ; 0x020448D4
ldr r0, [r5, #0x0]
ldr r0, [r0, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r7, r0, #0x0
ldr r0, [r6, #0xc]
bl SavArray_PlayerParty_get
diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s
index 28cbd7ac..28df2444 100644
--- a/arm9/asm/scrcmd_3.s
+++ b/arm9/asm/scrcmd_3.s
@@ -206,7 +206,7 @@ FUN_02040028: ; 0x02040028
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r5, #0x80
ldr r3, [r5, #0x0]
add r2, r0, #0x0
diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s
index ad0b1145..8c9178e7 100644
--- a/arm9/asm/unk_02028980.s
+++ b/arm9/asm/unk_02028980.s
@@ -2215,7 +2215,7 @@ FUN_02029880: ; 0x02029880
cmp r0, #0x1
bne _02029942
add r0, r4, #0x0
- bl FUN_02034824
+ bl MapHeader_GetMapSec
lsl r0, r0, #0x10
lsr r0, r0, #0x10
add r1, r6, #0x0
@@ -2248,7 +2248,7 @@ _020298DE:
b _02029942
_020298EE:
add r0, r4, #0x0
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r7, r0, #0x0
lsl r0, r7, #0x10
lsr r0, r0, #0x10
diff --git a/arm9/asm/unk_020343A8.s b/arm9/asm/unk_020343A8.s
index fc2463b8..88fd2560 100644
--- a/arm9/asm/unk_020343A8.s
+++ b/arm9/asm/unk_020343A8.s
@@ -139,7 +139,7 @@ FUN_020344AC: ; 0x020344AC
push {r4-r6, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- bl FUN_0203474C
+ bl MapHeader_GetMatrixId
add r6, r0, #0x0
add r0, r4, #0x4
add r1, r6, #0x0
diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s
index d0cc2c05..e4c8097a 100644
--- a/arm9/asm/unk_02034A28.s
+++ b/arm9/asm/unk_02034A28.s
@@ -67,7 +67,7 @@ FUN_02034A98: ; 0x02034A98
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02034810
+ bl MapHeader_GetEventsBank
add r4, r0, #0x0
mov r0, #0x20
add r1, r4, #0x0
@@ -406,11 +406,11 @@ FUN_02034CB4: ; 0x02034CB4
add r5, r0, #0x0
bl memset
add r0, r4, #0x0
- bl FUN_020347D8
+ bl MapHeader_HasWildEncounters
cmp r0, #0x0
beq _02034CDE
add r0, r4, #0x0
- bl FUN_020347FC
+ bl MapHeader_GetWildEncounterBank
add r2, r0, #0x0
add r0, r5, #0x0
.ifdef DIAMOND
@@ -436,7 +436,7 @@ FUN_02034CEC: ; 0x02034CEC
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_0203479C
+ bl MapHeader_GetLevelScriptsBank
mov r1, #0x82
lsl r1, r1, #0x4
mov r2, #0x1
diff --git a/arm9/asm/unk_02034FE4.s b/arm9/asm/unk_02034FE4.s
index 2d66b396..8ff7abe0 100644
--- a/arm9/asm/unk_02034FE4.s
+++ b/arm9/asm/unk_02034FE4.s
@@ -128,7 +128,7 @@ FUN_02034FE4: ; 0x02034FE4
push {r3-r7, lr}
add r7, r0, #0x0
add r0, r1, #0x0
- bl FUN_02034838
+ bl MapHeader_GetWeatherType
add r4, r0, #0x0
cmp r4, #0x18
blt _0203505C
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 810faa41..0c8e3612 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -67,7 +67,7 @@ FUN_02035068: ; 0x02035068
push {r3, lr}
ldr r0, [r0, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
cmp r0, #0x0
beq _0203507A
mov r0, #0x1
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 7051e8ff..f8d30d92 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -1925,7 +1925,7 @@ ScriptRunByIndex: ; 0x02039484
thumb_func_start LoadScriptsForCurrentMap
LoadScriptsForCurrentMap: ; 0x0203949C
push {r3, lr}
- bl MapHeader_GetScrSeqReleaseNo
+ bl MapHeader_GetScriptsBank
add r1, r0, #0x0
mov r0, #0xa
mov r2, #0xb
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 8eac1942..7e25689f 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -525,7 +525,7 @@ FUN_02047A78: ; 0x02047A78
str r0, [r5, r1]
ldr r0, [r4, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
mov r1, #0x56
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 FUN_02034860
+ bl MapHeader_GetField17_0
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 d9259556..1fcababe 100644
--- a/arm9/asm/unk_02048904.s
+++ b/arm9/asm/unk_02048904.s
@@ -223,14 +223,14 @@ _02048A82:
bl FUN_02034E10
add r6, r0, #0x0
add r0, r7, #0x0
- bl FUN_0203484C
+ bl MapHeader_GetCameraType
cmp r6, r0
beq _02048AB4
bl ErrorHandling
b _02048AB4
_02048AA6:
add r0, r7, #0x0
- bl FUN_0203484C
+ bl MapHeader_GetCameraType
add r1, r0, #0x0
ldr r0, [sp, #0x4]
bl FUN_02034E18
diff --git a/arm9/asm/unk_0204AB0C.s b/arm9/asm/unk_0204AB0C.s
index 45702b12..bea4eefa 100644
--- a/arm9/asm/unk_0204AB0C.s
+++ b/arm9/asm/unk_0204AB0C.s
@@ -121,11 +121,11 @@ FUN_0204ABA8: ; 0x0204ABA8
cmp r0, #0x0
bne _0204ABBE
add r0, r4, #0x0
- bl FUN_020347B0
+ bl MapHeader_GetDayMusicId
b _0204ABC4
_0204ABBE:
add r0, r4, #0x0
- bl FUN_020347C4
+ bl MapHeader_GetNightMusicId
_0204ABC4:
add r6, r0, #0x0
ldr r0, [r5, #0xc]
@@ -338,11 +338,11 @@ FUN_0204AD44: ; 0x0204AD44
cmp r0, #0x0
bne _0204AD58
add r0, r4, #0x0
- bl FUN_020347B0
+ bl MapHeader_GetDayMusicId
pop {r4, pc}
_0204AD58:
add r0, r4, #0x0
- bl FUN_020347C4
+ bl MapHeader_GetNightMusicId
pop {r4, pc}
thumb_func_start FUN_0204AD60
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index 5ad7ca34..6e6f1f85 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -432,7 +432,7 @@ FUN_0205D170: ; 0x0205D170
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
cmp r0, #0x0
bne _0205D184
mov r0, #0x0
@@ -440,7 +440,7 @@ FUN_0205D170: ; 0x0205D170
pop {r3-r5, pc}
_0205D184:
ldr r0, [r5, #0x0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0x0
bne _0205D194
mov r0, #0x0
@@ -697,7 +697,7 @@ _0205D390:
pop {r3-r5, pc}
_0205D396:
ldr r0, [r4, #0x0]
- bl FUN_020348B4
+ bl MapHeader_IsBikeAllowed
cmp r0, #0x0
bne _0205D3A6
mov r0, #0x0
@@ -1178,7 +1178,7 @@ _0205D730: .word 0x000022F6
FUN_0205D734: ; 0x0205D734
push {r3, lr}
ldr r0, [r0, #0x0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0x0
beq _0205D744
mov r0, #0x0
@@ -1595,7 +1595,7 @@ _0205DA8E:
cmp r0, #0x1
bne _0205DAA6
ldr r0, [r4, #0x0]
- bl FUN_0203487C
+ bl MapHeader_GetField17_6
cmp r0, #0x1
bne _0205DAA6
mov r0, #0x0
diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s
index 43358f72..b781112b 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 FUN_0203451C
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0x0
beq _0205F806
str r4, [r5, #0x0]
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 44e19c06..b6692f24 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -1033,7 +1033,7 @@ FUN_02061374: ; 0x02061374
strh r1, [r0, #0x0]
ldr r0, [r4, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r1, sp, #0x0
strh r0, [r1, #0x2]
add r0, r4, #0x0
@@ -1084,7 +1084,7 @@ FUN_020613CC: ; 0x020613CC
bl FUN_02060E34
ldr r0, [r4, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r1, sp, #0x4
strh r0, [r1, #0x6]
add r0, r4, #0x0
@@ -2838,7 +2838,7 @@ _0206218C:
bl FUN_02034FE4
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0x0
add r0, r7, #0x0
mov r1, #0x0
@@ -2949,7 +2949,7 @@ FUN_02062240: ; 0x02062240
bl MOD06_02245910
add r0, sp, #0x0
ldrh r0, [r0, #0x2]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
@@ -3176,7 +3176,7 @@ FUN_020623F4: ; 0x020623F4
lsl r1, r0, #0x1
ldr r0, _0206245C ; =UNK_020F79EE
ldrh r0, [r0, r1]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s
index 431828e8..0696b4e4 100644
--- a/arm9/asm/unk_0206367C.s
+++ b/arm9/asm/unk_0206367C.s
@@ -107,7 +107,7 @@ _02063758:
bne _0206377C
ldr r0, [r5, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_020348B4
+ bl MapHeader_IsBikeAllowed
cmp r0, #0x0
bne _0206377C
mov r0, #0x0
@@ -122,7 +122,7 @@ _0206377C:
_02063786:
ldr r0, [r5, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034908
+ bl MapHeader_MapIsOnOverworldMatrix
cmp r0, #0x0
beq _020637A6
ldr r0, [r5, #0xc]
diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s
index 28b6db5b..854eaedd 100644
--- a/arm9/asm/unk_02063948.s
+++ b/arm9/asm/unk_02063948.s
@@ -303,7 +303,7 @@ _02063B52:
pop {r4, pc}
_02063B66:
ldr r0, [r4, #0x0]
- bl FUN_02034898
+ bl MapHeader_IsFlyAllowed
cmp r0, #0x0
bne _02063B74
mov r0, #0x1
@@ -1129,7 +1129,7 @@ _020641BE:
cmp r0, #0x1
bne _020641D2
ldr r0, [r4, #0x0]
- bl FUN_0203487C
+ bl MapHeader_GetField17_6
cmp r0, #0x1
beq _020641D6
_020641D2:
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index d4608a0d..14488621 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -3503,7 +3503,7 @@ FUN_020772CC: ; 0x020772CC
ldr r0, [r0, #0x1c]
ldr r0, [r0, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r3, pc}
diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s
index 9d8276fd..3a4017d7 100644
--- a/arm9/asm/unk_02086084.s
+++ b/arm9/asm/unk_02086084.s
@@ -279,7 +279,7 @@ _020862D6:
add r7, r0, #0x0
ldr r0, [r6, #0x1c]
ldr r0, [r0, #0x0]
- bl FUN_02034824
+ bl MapHeader_GetMapSec
str r0, [sp, #0x4]
mov r0, #0x0
str r0, [sp, #0x8]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 04:15:18 +0000