fix merge conflicts, evo scene

2017-10-31 19:36:25 +01:00
parent 665734d689 4cb8528d94
commit 6cb1c4fd6e
76 changed files with 17762 additions and 55002 deletions
@@ -2035,7 +2035,7 @@ sub_81C4EFC: @ 81C4EFC
 	thumb_func_start sub_81C4F10
 sub_81C4F10: @ 81C4F10
 	push {lr}
-	ldr r1, =sub_8059D50
+	ldr r1, =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x1
 	bl sub_81C4F98
 	pop {r0}