diff options
Diffstat (limited to 'asm/pokenav.s')
| -rw-r--r-- | asm/pokenav.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 680752c85..56bf3d41f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -14,7 +14,7 @@ CB2_PokeNav: @ 81C7250 str r0, [r4] cmp r0, 0 bne _081C7270 - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu bl SetMainCallback2 b _081C7292 .pool @@ -66,7 +66,7 @@ sub_81C72BC: @ 81C72BC str r0, [r4] cmp r0, 0 bne _081C72F0 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScript bl SetMainCallback2 b _081C7320 .pool @@ -351,12 +351,12 @@ _081C752C: bl sub_81C7334 cmp r4, 0 beq _081C755C - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScript bl SetMainCallback2 b _081C7562 .pool _081C755C: - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu bl SetMainCallback2 _081C7562: pop {r4-r7} @@ -8095,7 +8095,7 @@ sub_81CB0C8: @ 81CB0C8 ldrh r2, [r0, 0xA] ldrh r1, [r0, 0xC] adds r0, r2, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x14] pop {r1} bx r1 @@ -30295,7 +30295,7 @@ sub_81D6120: @ 81D6120 push {lr} movs r0, 0x1A movs r1, 0x40 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] adds r0, 0x8 @@ -30334,7 +30334,7 @@ _081D6162: adds r0, r1 ldrh r1, [r0] movs r0, 0x1A - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] _081D6176: |