diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-07-04 20:44:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 20:44:12 +0100 |
| commit | 0abd1681d26ea064a9e69542a4858d09a38b8222 (patch) | |
| tree | 36f86009831d6eeeff1eafa3ee19fdccc1c8eabb /arm9/modules/42 | |
| parent | 9420f469c47e678c10342111cc3279715148ac1b (diff) | |
| parent | 97efa5f28e697c85d0a47c45f04b0b69dbf699b0 (diff) | |
Merge branch 'master' into unk_020040F4
Diffstat (limited to 'arm9/modules/42')
| -rw-r--r-- | arm9/modules/42/asm/module_42.s | 4 |
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] |