Merge branch 'master' into fldeff

This commit is contained in:
ultima-soul
2019-04-28 16:55:43 -07:00
523 changed files with 19874 additions and 6922 deletions
+1 -1
View File
@@ -1912,7 +1912,7 @@ _0806FC14:
movs r0, 0
movs r1, 0x8
movs r2, 0xF
bl sub_8150048
bl DrawTextBorderOuter
movs r0, 0
bl PutWindowTilemap
movs r0, 0