From 21522f29d178d1056d75dfd670d348fdd8d2408c Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Thu, 30 Mar 2023 01:51:12 -0400
Subject: [PATCH] credits

---
 fastcredits.asm | 70 +++++++++++++++++++++++++++++++++++++------------
 hooks.asm       |  3 +++
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/fastcredits.asm b/fastcredits.asm
index c8aaf28..c1f59ae 100644
--- a/fastcredits.asm
+++ b/fastcredits.asm
@@ -1,21 +1,51 @@
+FastCreditsActive = $50
+
+;===================================================================================================
+
+
+FlagFastCredits:
+	LDA.b #$40
+	TRB.b FastCreditsActive
+
+	AND.b Joy1B_All
+	TSB.b FastCreditsActive
+
+	LDA.b #$10
+	AND.b Joy1A_New
+	EOR.b FastCreditsActive
+	STA.b FastCreditsActive
+
+	LDA.b FastCreditsActive
+	AND.b #$50
+	BEQ .slow
+
+	LDA.b #$01
+	TSB.b FastCreditsActive
+
+.slow
+	LDA.b $11
+	ASL
+	TAX
+
+	RTL
+
 ;===================================================================================================
 
 FastCreditsCutsceneTimer:
-	BIT.b Joy1B_All-1 : BVC .slow
-
-	LDA.w #$0001 : STA.b $50
-
 	LDA.b ScrapBufferBD+$0B
-	CLC
-	ADC.w #$0004
+	INC
+
+	JSR IsFastCredits
+	BEQ .slow
+
+	INC
+	INC
+	INC
+
 	AND.w #$FFFE
-	STA.b ScrapBufferBD+$0B
-	SEP #$20
-	RTL
-	
 
 .slow
-	INC.b ScrapBufferBD+$0B
+	STA.b ScrapBufferBD+$0B
 
 	SEP #$20
 	RTL
@@ -58,9 +88,11 @@ FastCreditsCutsceneScroll:
 ++	ROR.b Scrap00 ; recover carry
 
 	BCC ++ ; scroll if carry not set
+
 	LDA.w #$0000
 
-++	BIT.b Joy1B_All-1 : BVC .slow ; check for X held
+++	JSR IsFastCredits
+	BEQ .slow
 
 	AND.w #$FFFF ; get sign of A
 	BPL .positive
@@ -77,8 +109,6 @@ FastCreditsCutsceneScroll:
 	ASL
 	ASL
 
-
-
 .slow
 	RTS
 
@@ -106,8 +136,8 @@ FastCreditsCutsceneUnderworldY:
 
 
 FastTextScroll:
-	LDA.b FrameCounter
-	BIT.b Joy1B_All-1 : BVC .slow
+	JSR IsFastCredits
+	BEQ .slow
 
 	AND.w #$0000
 	RTL
@@ -118,7 +148,13 @@ FastTextScroll:
 
 DumbFlagForMSU:
 	STA.l CurrentWorld
-	STZ.b $50
+	STZ.b FastCreditsActive
 	RTL
 
+IsFastCredits:
+	PHA
+	LDA.b FastCreditsActive
+	AND.w #$0050
+	PLA
+	RTS
 
diff --git a/hooks.asm b/hooks.asm
index 05216b5..96f0ee2 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2378,6 +2378,9 @@ db $00, $00
 ;================================================================================
 ; Fast credits
 
+org $8EC2B1
+JSL FlagFastCredits
+
 org $82A096
 JSL DumbFlagForMSU