Merge with master

This commit is contained in:
DizzyEggg committed 2018-07-16 20:23:05 +02:00
commit ea5ffa3375
1044 files changed
+7296 -7064

No files matched your search

+1 -1
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl LoadSav2WindowGfx
bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20