diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index 29398b9..8e42e06 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -134,15 +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.w #$0008 : 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 @@ -150,10 +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.w #$0008 : 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 243efb9..6a5bb0d 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