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/contest.s | |
parent | a200d9406b15f722b34775050f6fe73894d23629 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/contest.s')
-rw-r--r-- | asm/contest.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest.s b/asm/contest.s index 8ea0d2d94..327a80d75 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5588,7 +5588,7 @@ sub_80DA830: @ 80DA830 bl FreeAllWindowBuffers bl sub_80D7A5C bl FreeMonSpritesGfx - ldr r0, =c2_exit_to_overworld_2_switch + ldr r0, =CB2_ReturnToField bl SetMainCallback2 _080DA860: pop {r0} |