Merge with master

2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
@@ -639,7 +639,7 @@ sub_812AA48: @ 812AA48
 	lsls r1, 2
 	movs r0, 0
 	movs r2, 0xE0
-	bl LoadSav2WindowGfx
+	bl LoadUserWindowBorderGfx
 	movs r0, 0
 	bl PutWindowTilemap
 	pop {r0}