Merge remote-tracking branch 'pret/master' into dump_maps

2017-11-09 19:43:30 -06:00
parent 2d3044aaa6 af197ccd3b
commit 09e431077a
147 changed files with 37165 additions and 72938 deletions
@@ -547,7 +547,7 @@ _081358D4:
 	thumb_func_start sub_81358F4
 sub_81358F4: @ 81358F4
 	push {lr}
-	ldr r1, =sub_8059D50
+	ldr r1, =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x1
 	bl sub_81357FC
 	pop {r0}