summaryrefslogtreecommitdiff
path: root/arm9/modules/42
diff options
context:
space:
mode:
authorGliMusings <gcreative7@gmail.com>2021-07-05 12:59:36 -0500
committerGliMusings <gcreative7@gmail.com>2021-07-05 12:59:36 -0500
commit76f29d0a5078061da4cfc0ddef7c5d56d6a005e5 (patch)
tree8ef487fe3929cd7c73fe2be8b3c373e1a3104ad7 /arm9/modules/42
parent6008ec050279c966454f1a3c1e067295b3d9c254 (diff)
parent53664729466e97abbe10c14fe735083b2d604add (diff)
Merge branch 'master' of https://github.com/GliMusings/pokediamond
Diffstat (limited to 'arm9/modules/42')
-rw-r--r--arm9/modules/42/asm/module_42.s4
1 files changed, 2 insertions, 2 deletions
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]