alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #13 from wulfy83/master

Browse Source 
contains errors but easier to fix by far than reimplement
This commit is contained in:
Karkat
2017-11-14 21:51:00 -05:00
committed by GitHub
parent 232828b9cb 3d423af2a2
commit d2665d0971
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pendantcrystalhud.asm
View File

@@ -134,15 +134,20 @@ RTL
;RTL ;RTL
;================================================================================ ;================================================================================
BringMenuDownEnhanced: BringMenuDownEnhanced:
LDA.l QuickMenu : AND.l TournamentSeedInverse : BEQ +
REP #$20 ; set 16-bit accumulator REP #$20 ; set 16-bit accumulator
LDA.w #$FF18 : STA $EA ; immediately scroll to the end LDA.l TournamentSeed : AND.w #$00FF
SEP #$20 ; set 8-bit accumulator BEQ +
INC $0200 LDA.w #$0008 : BRA ++ ; use default speed on tournament seeds
RTL
+ +
REP #$20 ; set 16-bit accumulator LDA.l MenuSpeed
LDA $EA : !SUB.w #$0008 : STA $EA : CMP.w #$FF18 ++
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 SEP #$20 ; set 8-bit accumulator
BNE .notDoneScrolling BNE .notDoneScrolling
INC $0200 INC $0200
@@ -150,10 +155,17 @@ BringMenuDownEnhanced:
RTL RTL
;================================================================================ ;================================================================================
RaiseHudMenu: RaiseHudMenu:
LDA.l QuickMenu : AND.l TournamentSeedInverse : AND.w #$00FF : BEQ + LDA.l TournamentSeed : AND.w #$00FF
LDA.w #$0000 : STA $EA : RTL 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 RTL
;================================================================================ ;================================================================================
ShowDungeonItems: ShowDungeonItems:

4
tables.asm
View File

@@ -180,8 +180,8 @@ LinkStartingRupees:
dw #$0000 dw #$0000
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308048 ; PC 0x180048 org $308048 ; PC 0x180048
QuickMenu: MenuSpeed:
db #$00 ; #$00 = Off (default) - #$01 = On db #$08 ; #$08 (default) - higher is faster - #$E8 = instant open
org $0DDD9A ; PC 0x6DD9A (equipment.asm:95) ; Menu Down Chime org $0DDD9A ; PC 0x6DD9A (equipment.asm:95) ; Menu Down Chime
db #$11 ; #$11 = Vwoop Down (Default) - #$20 = Menu Chime db #$11 ; #$11 = Vwoop Down (Default) - #$20 = Menu Chime
org $0DDF2A ; PC 0x6DF2A (equipment.asm:466) ; Menu Up Chime org $0DDF2A ; PC 0x6DF2A (equipment.asm:466) ; Menu Up Chime