From f71759754e9d48af6b2284512cf97cd4742598d9 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 21:49:50 -0500 Subject: [PATCH 1/3] patreon fields --- build_linux.sh | 2 +- stats/credits.asm | 80 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/build_linux.sh b/build_linux.sh index 7c3af51..2e195ea 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -2,4 +2,4 @@ rm ../working.sfc cp ../alttp.sfc ../working.sfc -./bin/linux/asar LTTP_RND_GeneralBugfixes.asm ../working.sfc +./bin/linux/asar -DFEATURE_PATREON_SUPPORTERS=1 LTTP_RND_GeneralBugfixes.asm ../working.sfc diff --git a/stats/credits.asm b/stats/credits.asm index 8466385..bec02c4 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -13,6 +13,44 @@ db 2 db 55 db " " ; $238020 +!FEATURE_PATREON_SUPPORTERS ?= 0 + +table "data/creditscharmapbighi.txt" +PatronCredit1Hi: +db 2 +db 55 +db " " ; $238002 + +table "data/creditscharmapbiglo.txt" +PatronCredit1Lo: +db 2 +db 55 +db " " ; $238020 + +table "data/creditscharmapbighi.txt" +PatronCredit2Hi: +db 2 +db 55 +db " " ; $238038 + +table "data/creditscharmapbiglo.txt" +PatronCredit2Lo: +db 2 +db 55 +db " " ; $238056 + +table "data/creditscharmapbighi.txt" +PatronCredit3Hi: +db 2 +db 55 +db " " ; $238074 + +table "data/creditscharmapbiglo.txt" +PatronCredit3Lo: +db 2 +db 55 +db " " ; $238092 + ;=================================================================================================== CreditsLineTable: @@ -498,6 +536,23 @@ CreditsLineBlank: %blankline() %blankline() +if !FEATURE_PATREON_SUPPORTERS + %smallcredits("PATREON SUPPORTERS", "yellow") + + %addarbline(PatronCredit1Hi) + %addarbline(PatronCredit1Lo) + + %blankline() + %addarbline(PatronCredit2Hi) + %addarbline(PatronCredit2Lo) + + %blankline() + %addarbline(PatronCredit3Hi) + %addarbline(PatronCredit3Lo) + + %blankline() +endif + %smallcredits("SPECIAL THANKS", "red") %blankline() @@ -530,7 +585,7 @@ CreditsLineBlank: %blankline() -%bigcredits("AND&") +%bigcredits("AND") %blankline() @@ -556,16 +611,19 @@ CreditsLineBlank: %emptyline() %emptyline() %emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() + +if !FEATURE_PATREON_SUPPORTERS == 0 + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() +endif ;=================================================================================================== From c5d8c69396f3eb2f4e619ee6b390a98d9825961c Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 22:49:57 -0500 Subject: [PATCH 2/3] fix PC addresses for patrons --- stats/credits.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stats/credits.asm b/stats/credits.asm index bec02c4..4fb1298 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -19,37 +19,37 @@ table "data/creditscharmapbighi.txt" PatronCredit1Hi: db 2 db 55 -db " " ; $238002 +db " " ; $23803E table "data/creditscharmapbiglo.txt" PatronCredit1Lo: db 2 db 55 -db " " ; $238020 +db " " ; $23805C table "data/creditscharmapbighi.txt" PatronCredit2Hi: db 2 db 55 -db " " ; $238038 +db " " ; $23807A table "data/creditscharmapbiglo.txt" PatronCredit2Lo: db 2 db 55 -db " " ; $238056 +db " " ; $238098 table "data/creditscharmapbighi.txt" PatronCredit3Hi: db 2 db 55 -db " " ; $238074 +db " " ; $2380B6 table "data/creditscharmapbiglo.txt" PatronCredit3Lo: db 2 db 55 -db " " ; $238092 +db " " ; $2380D4 ;=================================================================================================== From f133ce7159e54fc5232c78f7e953c2b8515cc49c Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 23:09:35 -0500 Subject: [PATCH 3/3] add some extra space --- stats/credits.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stats/credits.asm b/stats/credits.asm index 4fb1298..0b04c55 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -551,6 +551,7 @@ if !FEATURE_PATREON_SUPPORTERS %addarbline(PatronCredit3Lo) %blankline() + %blankline() endif %smallcredits("SPECIAL THANKS", "red") @@ -610,7 +611,6 @@ endif %emptyline() %emptyline() %emptyline() -%emptyline() if !FEATURE_PATREON_SUPPORTERS == 0 %emptyline() @@ -623,6 +623,7 @@ if !FEATURE_PATREON_SUPPORTERS == 0 %emptyline() %emptyline() %emptyline() + %emptyline() endif ;===================================================================================================