Merge branch 'master' into DRMain

# Conflicts:
#	tables.asm
This commit is contained in:
aerinon
2022-01-05 14:26:48 -07:00
11 changed files with 180 additions and 212 deletions

View File

@@ -536,6 +536,10 @@ CreditsLineBlank:
%blankline()
%bigcredits("PINKUS YUZUHARA")
%blankline()
%bigcredits("SAKURATSUBASA")
%blankline()
@@ -576,9 +580,6 @@ CreditsLineBlank:
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
;===================================================================================================