Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex

2018-02-15 18:20:53 -05:00
parent 4a71a61e58 cfec30413c
commit 6cbea9af6d
91 changed files with 3746 additions and 7331 deletions
@@ -967,7 +967,7 @@ _080BBE18:
 	bl sub_80BC890
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, =sub_8086194
+	ldr r0, =CB2_ReturnToFieldWithOpenMenu
 	bl SetMainCallback2
 	ldr r0, =gMPlayInfo_BGM
 	ldr r1, =0x0000ffff