summaryrefslogtreecommitdiff
path: root/asm/overworld.s
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-14 10:29:13 -0400
committerGitHub <noreply@github.com>2019-10-14 10:29:13 -0400
commit8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (patch)
tree0680b08568c4c38b96b78d793e7426a85016dce6 /asm/overworld.s
parent6bffe8613e2f764a03f551ad61b360dab9395eec (diff)
parentd4c9b7782835ec6e31fee4e7c18351658da087cd (diff)
Merge pull request #118 from PikalaxALT/start_menu
Decompile start_menu
Diffstat (limited to 'asm/overworld.s')
-rw-r--r--asm/overworld.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/overworld.s b/asm/overworld.s
index c3ff5e3c8..9bcd95eab 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -3754,20 +3754,20 @@ _080568A0: .4byte gFieldCallback
_080568A4: .4byte sub_807DDD0
thumb_func_end c2_8056854
- thumb_func_start sub_80568A8
-sub_80568A8: @ 80568A8
+ thumb_func_start CB2_ReturnToStartMenu
+CB2_ReturnToStartMenu: @ 80568A8
push {lr}
bl sub_80569BC
ldr r1, _080568BC @ =gFieldCallback2
- ldr r0, _080568C0 @ =sub_807E3BC
+ ldr r0, _080568C0 @ =FieldCB2_ReturnToStartMenuInit
str r0, [r1]
bl CB2_ReturnToField
pop {r0}
bx r0
.align 2, 0
_080568BC: .4byte gFieldCallback2
-_080568C0: .4byte sub_807E3BC
- thumb_func_end sub_80568A8
+_080568C0: .4byte FieldCB2_ReturnToStartMenuInit
+ thumb_func_end CB2_ReturnToStartMenu
thumb_func_start sub_80568C4
sub_80568C4: @ 80568C4