Merge with master

This commit is contained in:
DizzyEggg
2018-07-16 20:23:05 +02:00
1044 changed files with 7296 additions and 7064 deletions
+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