berry blender merge conflicts

2017-11-19 22:58:13 +01:00
parent a3b5af17ea 5dc8beb034
commit ad3a97e178
16 changed files with 1777 additions and 2892 deletions
@@ -25722,7 +25722,7 @@ sub_81D3AD8: @ 81D3AD8
 	adds r5, r0, 0
 	adds r4, r1, 0
 	movs r0, 0x1E
-	bl sub_81535DC
+	bl TryCopySpecialSaveSection
 	cmp r0, 0x1
 	bne _081D3B04
 	ldr r2, =0x00000ee8