Merge remote-tracking branch 'baserom/master' into DRMain

# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
This commit is contained in:
aerinon
2021-10-21 14:15:54 -06:00
12 changed files with 123 additions and 64 deletions

View File

@@ -1,11 +1,13 @@
;===================================================================================================
; LEAVE THIS HERE FOR PHP WRITES
;===================================================================================================
table "creditscharmapbighi.txt"
YourSpriteCreditsHi:
db 2
db 55
db " " ; $238002
table "creditscharmapbiglo.txt"
YourSpriteCreditsLo:
db 2
db 55
@@ -501,6 +503,15 @@ CreditsLineBlank:
%blankline()
%blankline()
%smallcredits("WEBSITE LOGO", "green")
%blankline()
%bigcredits("PLEASURE")
%blankline()
%blankline()
%smallcredits("SPECIAL THANKS", "red")
%blankline()
@@ -568,12 +579,6 @@ CreditsLineBlank:
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
%emptyline()
;===================================================================================================

View File

@@ -218,7 +218,7 @@ endmacro
!ColonOffset = $83
!PeriodOffset = $80
!BlankTile = $883D
!BlankTile = #$883D
RenderCreditsStatCounter:
PHB