diff options
| author | Charles D <gogume1er@gmail.com> | 2021-07-04 22:17:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 22:17:19 +0200 |
| commit | 042e8e5a558d3fb9470234f1ffdfa42d3556d5d3 (patch) | |
| tree | b4d547f092ec9fedf15c2e2a4fb0be4e55b438e5 /arm9/modules/06 | |
| parent | 50d1f49f2b2b73663c447ae09e0fb3c602a1a973 (diff) | |
| parent | 97efa5f28e697c85d0a47c45f04b0b69dbf699b0 (diff) | |
Merge branch 'master' into map_matrix
Diffstat (limited to 'arm9/modules/06')
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 8d26492c..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] |