diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /asm/contest.s | |
parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
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} |