diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
| commit | ffeca135bcaa449267bc7540f25eeb02cf4c92fa (patch) | |
| tree | 4d9ca1668dc8b49a739c3bb8f83b453f20e2e41d /asm/start_menu.s | |
| parent | a200d9406b15f722b34775050f6fe73894d23629 (diff) | |
| parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index a57bbddc3..275d2124e 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -591,7 +591,7 @@ StartMenu_PlayerName: @ 809FC8C cmp r0, 0 beq _0809FCC8 _0809FCB6: - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu bl sub_80C4DDC b _0809FCEA .pool @@ -601,12 +601,12 @@ _0809FCC8: lsls r0, 24 cmp r0, 0 beq _0809FCE4 - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu bl sub_80C51C4 b _0809FCEA .pool _0809FCE4: - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu bl sub_80C4DDC _0809FCEA: movs r0, 0x1 @@ -656,7 +656,7 @@ _0809FD38: ldr r0, =CB2_InitOptionMenu bl SetMainCallback2 ldr r1, =gMain - ldr r0, =sub_8086194 + ldr r0, =CB2_ReturnToFieldWithOpenMenu str r0, [r1, 0x8] movs r0, 0x1 _0809FD52: @@ -703,7 +703,7 @@ _0809FDA0: bl overworld_free_bg_tilemaps ldr r0, =gUnknown_03005DB4 ldrb r0, [r0] - ldr r1, =sub_8086194 + ldr r1, =CB2_ReturnToFieldWithOpenMenu bl sub_80C4E74 movs r0, 0x1 _0809FDB4: |