From d41c1fbafd50f954796db12410366cde5f542741 Mon Sep 17 00:00:00 2001
From: Wulfy <wulf38@gmail.com>
Date: Sun, 12 Nov 2017 23:17:00 -0500
Subject: [PATCH 1/2] Add MenuSpeed option

---
 pendantcrystalhud.asm | 10 ++++++++--
 tables.asm            |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index 29398b9..2f79a9d 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -142,7 +142,10 @@ BringMenuDownEnhanced:
 		RTL
 	+
 	REP #$20 ; set 16-bit accumulator
-		LDA $EA : !SUB.w #$0008 : STA $EA : CMP.w #$FF18
+		LDA $EA : !SUB.l MenuSpeed : STA $EA : CMP.w #$FF18
+		!BGE .noOvershoot
+			LDA.w #$FF18 : STA $EA : CMP.w #$FF18
+		.noOvershoot
 	SEP #$20 ; set 8-bit accumulator
 	BNE .notDoneScrolling
 		INC $0200
@@ -153,7 +156,10 @@ RaiseHudMenu:
 	LDA.l QuickMenu : AND.l TournamentSeedInverse : AND.w #$00FF : BEQ +
 		LDA.w #$0000 : STA $EA : RTL
 	+
-	LDA $EA : !ADD.w #$0008 : STA $EA
+	LDA $EA : !ADD.l MenuSpeed : STA $EA
+	!BLT .noOvershoot
+		LDA.w #$0000 : STA $EA
+	.noOvershoot
 RTL
 ;================================================================================
 ShowDungeonItems:
diff --git a/tables.asm b/tables.asm
index fd98a04..3b8654a 100644
--- a/tables.asm
+++ b/tables.asm
@@ -227,6 +227,10 @@ db #$04 ; #$04 - 4 Bottles (default)
 BottleLimitReplacement:
 db #$47 ; #$47 - 20 Rupees (default)
 ;--------------------------------------------------------------------------------
+org $3080b0 ; PC 0x1800b0
+MenuSpeed:
+dw #$0008 ; #$0008 (default)
+;--------------------------------------------------------------------------------
 org $308100 ; PC 0x180100 (0x40 bytes)
 ShovelSpawnTable:
 	db $B2 ; Gold Bee

From 3d423af2a213100fac6c101a618b65616e596e0a Mon Sep 17 00:00:00 2001
From: Wulfy <wulf38@gmail.com>
Date: Mon, 13 Nov 2017 01:24:10 -0500
Subject: [PATCH 2/2] Combine MenuSpeed and QuickMenu options

---
 pendantcrystalhud.asm | 36 +++++++++++++++++++++---------------
 tables.asm            |  8 ++------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index 2f79a9d..8e42e06 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -134,18 +134,20 @@ RTL
 ;RTL
 ;================================================================================
 BringMenuDownEnhanced:
-	LDA.l QuickMenu : AND.l TournamentSeedInverse : BEQ +
-		REP #$20 ; set 16-bit accumulator
-			LDA.w #$FF18 : STA $EA ; immediately scroll to the end
-		SEP #$20 ; set 8-bit accumulator
-		INC $0200
-		RTL
-	+
 	REP #$20 ; set 16-bit accumulator
-		LDA $EA : !SUB.l MenuSpeed : STA $EA : CMP.w #$FF18
-		!BGE .noOvershoot
-			LDA.w #$FF18 : STA $EA : CMP.w #$FF18
+		LDA.l TournamentSeed : AND.w #$00FF
+		BEQ +
+			LDA.w #$0008 : BRA ++ ; use default speed on tournament seeds
+		+
+			LDA.l MenuSpeed
+		++
+
+		EOR.w #$FFFF : !ADD.w #$0001 ; negate menu speed
+
+		!ADD.w $EA : CMP.w #$FF18 : !BGE .noOvershoot
+			LDA.w #$FF18 ; if we went past the limit, go to the limit
 		.noOvershoot
+		STA $EA : CMP.w #$FF18
 	SEP #$20 ; set 8-bit accumulator
 	BNE .notDoneScrolling
 		INC $0200
@@ -153,13 +155,17 @@ BringMenuDownEnhanced:
 RTL
 ;================================================================================
 RaiseHudMenu:
-	LDA.l QuickMenu : AND.l TournamentSeedInverse : AND.w #$00FF : BEQ +
-		LDA.w #$0000 : STA $EA : RTL
+	LDA.l TournamentSeed : AND.w #$00FF
+	BEQ +
+		LDA.w #$0008 : BRA ++ ; use default speed on tournament seeds
 	+
-	LDA $EA : !ADD.l MenuSpeed : STA $EA
-	!BLT .noOvershoot
-		LDA.w #$0000 : STA $EA
+		LDA.l MenuSpeed : AND.w #$00FF
+	++
+
+	!ADD.w $EA : BMI .noOvershoot
+		LDA.w #$0000 ; if we went past the limit, go to the limit
 	.noOvershoot
+	STA $EA
 RTL
 ;================================================================================
 ShowDungeonItems:
diff --git a/tables.asm b/tables.asm
index 3b8654a..6f406ba 100644
--- a/tables.asm
+++ b/tables.asm
@@ -180,8 +180,8 @@ LinkStartingRupees:
 dw #$0000
 ;--------------------------------------------------------------------------------
 org $308048 ; PC 0x180048
-QuickMenu:
-db #$00 ; #$00 = Off (default) - #$01 = On
+MenuSpeed:
+db #$08 ; #$08 (default) - higher is faster - #$E8 = instant open
 org $0DDD9A ; PC 0x6DD9A (equipment.asm:95) ; Menu Down Chime
 db #$11 ; #$11 = Vwoop Down (Default) - #$20 = Menu Chime
 org $0DDF2A ; PC 0x6DF2A (equipment.asm:466) ; Menu Up Chime
@@ -227,10 +227,6 @@ db #$04 ; #$04 - 4 Bottles (default)
 BottleLimitReplacement:
 db #$47 ; #$47 - 20 Rupees (default)
 ;--------------------------------------------------------------------------------
-org $3080b0 ; PC 0x1800b0
-MenuSpeed:
-dw #$0008 ; #$0008 (default)
-;--------------------------------------------------------------------------------
 org $308100 ; PC 0x180100 (0x40 bytes)
 ShovelSpawnTable:
 	db $B2 ; Gold Bee