alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix things

Browse Source
This commit is contained in:
spannerisms
2024-01-04 06:45:57 -05:00
parent 85581b6813
commit 014b3a719a
18 changed files with 179 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bookofmudora.asm
View File

@@ -65,7 +65,7 @@ GiveBonkItem:
PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key
LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys
LDA.b #$2F : JSL.l Sound_SetSfx3PanLong LDA.b #$2F : JSL.l Sound_SetSfx3PanLong
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
RTL RTL
.notKey .notKey
PHY : TAY : JSL.l Link_ReceiveItem : PLY PHY : TAY : JSL.l Link_ReceiveItem : PLY

BIN
data/customitems.4bpp
View File

Binary file not shown.

BIN
data/customitems.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

50
dialog.asm
View File

@@ -61,7 +61,7 @@ LoadDialogAddressIndirect:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
FreeDungeonItemNotice: FreeDungeonItemNotice:
STA.w ScratchBufferV STA.l ScratchBufferV
PHA : PHX : PHY PHA : PHX : PHY
PHP PHP
@@ -70,59 +70,59 @@ FreeDungeonItemNotice:
REP #$10 ; set 16-bit index registers REP #$10 ; set 16-bit index registers
PEI.b (Scrap00) PEI.b (Scrap00)
LDA.b Scrap02 : PHA LDA.b Scrap02 : PHA
LDA.w ScratchBufferNV : PHA LDA.l ScratchBufferNV : PHA
LDA.w ScratchBufferNV+1 : PHA LDA.l ScratchBufferNV+1 : PHA
;-------------------------------- ;--------------------------------
LDA.l FreeItemText : BNE + : JMP .skip : + LDA.l FreeItemText : BNE + : JMP .skip : +
LDA.b #$00 : STA.w ScratchBufferNV ; initialize scratch LDA.b #$00 : STA.l ScratchBufferNV ; initialize scratch
LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for general small key LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for general small key
LDA.w ScratchBufferV : CMP.b #$24 : BNE + ; general small key LDA.l ScratchBufferV : CMP.b #$24 : BNE + ; general small key
%CopyDialog(Notice_SmallKeyOf) %CopyDialog(Notice_SmallKeyOf)
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
JMP .done JMP .done
+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for general compass + : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for general compass
LDA.w ScratchBufferV : CMP.b #$25 : BNE + ; general compass LDA.l ScratchBufferV : CMP.b #$25 : BNE + ; general compass
%CopyDialog(Notice_CompassOf) %CopyDialog(Notice_CompassOf)
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
JMP .done JMP .done
+ : LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for general map + : LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for general map
LDA.w ScratchBufferV : CMP.b #$33 : BNE + ; general map LDA.l ScratchBufferV : CMP.b #$33 : BNE + ; general map
%CopyDialog(Notice_MapOf) %CopyDialog(Notice_MapOf)
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
JMP .done JMP .done
+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for general big key + : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for general big key
LDA.w ScratchBufferV : CMP.b #$32 : BNE + ; general big key LDA.l ScratchBufferV : CMP.b #$32 : BNE + ; general big key
%CopyDialog(Notice_BigKeyOf) %CopyDialog(Notice_BigKeyOf)
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
JMP .done JMP .done
+ +
LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for dungeon map LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for dungeon map
LDA.w ScratchBufferV : AND.b #$F0 ; looking at high bits only LDA.l ScratchBufferV : AND.b #$F0 ; looking at high bits only
CMP.b #$70 : BNE + ; map of... CMP.b #$70 : BNE + ; map of...
%CopyDialog(Notice_MapOf) %CopyDialog(Notice_MapOf)
JMP .dungeon JMP .dungeon
+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for dungeon compass + : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for dungeon compass
LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of... LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
%CopyDialog(Notice_CompassOf) %CopyDialog(Notice_CompassOf)
JMP .dungeon JMP .dungeon
+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for dungeon big key + : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for dungeon big key
LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of... LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
%CopyDialog(Notice_BigKeyOf) %CopyDialog(Notice_BigKeyOf)
JMP .dungeon JMP .dungeon
+ : LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for dungeon small key + : LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for dungeon small key
LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of... LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
LDA.w ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++ LDA.l ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++
%CopyDialog(Notice_SmallKeyOf) %CopyDialog(Notice_SmallKeyOf)
LDA.b #$01 : STA.w ScratchBufferNV ; set up a flip for small keys LDA.b #$01 : STA.l ScratchBufferNV ; set up a flip for small keys
BRA .dungeon BRA .dungeon
+ : LDA.l FreeItemText : AND.b #$20 : BEQ + ; show message for crystal + : LDA.l FreeItemText : AND.b #$20 : BEQ + ; show message for crystal
LDA.w ScratchBufferV : CMP.b #$B0 : !BLT + ; crystal # LDA.l ScratchBufferV : CMP.b #$B0 : !BLT + ; crystal #
CMP.b #$B7 : !BGE + CMP.b #$B7 : !BGE +
%CopyDialog(Notice_Crystal) %CopyDialog(Notice_Crystal)
JMP .crystal JMP .crystal
@@ -131,14 +131,14 @@ FreeDungeonItemNotice:
.dungeon .dungeon
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
LDA.w ScratchBufferV LDA.l ScratchBufferV
AND.b #$0F AND.b #$0F
STA.w ScratchBufferNV+1 STA.l ScratchBufferNV+1
LDA.w ScratchBufferNV : BEQ + LDA.l ScratchBufferNV : BEQ +
LDA.w ScratchBufferNV LDA.l ScratchBufferNV
LDA.b #$0F : !SUB.w ScratchBufferNV+1 : STA.w ScratchBufferNV+1 ; flip the values for small keys LDA.b #$0F : !SUB.l ScratchBufferNV+1 : STA.l ScratchBufferNV+1 ; flip the values for small keys
+ +
LDA.w ScratchBufferNV+1 LDA.l ScratchBufferNV+1
ASL : TAX ASL : TAX
REP #$20 REP #$20
LDA.l DungeonItemIDMap,X : CMP.w #$0003 : BCC .hc_sewers LDA.l DungeonItemIDMap,X : CMP.w #$0003 : BCC .hc_sewers
@@ -152,7 +152,7 @@ FreeDungeonItemNotice:
JMP.w .done JMP.w .done
+ +
SEP #$20 SEP #$20
LDA.w ScratchBufferNV+1 LDA.l ScratchBufferNV+1
CMP.b #$00 : BNE + ; ...light world CMP.b #$00 : BNE + ; ...light world
%CopyDialog(Notice_LightWorld) : JMP .done %CopyDialog(Notice_LightWorld) : JMP .done
+ : CMP.b #$01 : BNE + ; ...dark world + : CMP.b #$01 : BNE + ; ...dark world
@@ -190,7 +190,7 @@ FreeDungeonItemNotice:
.crystal .crystal
LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
LDA.w ScratchBufferV LDA.l ScratchBufferV
AND.b #$0F ; looking at low bits only AND.b #$0F ; looking at low bits only
CMP.b #$00 : BNE + CMP.b #$00 : BNE +
%CopyDialog(Notice_Six) : JMP .done %CopyDialog(Notice_Six) : JMP .done
@@ -216,8 +216,8 @@ FreeDungeonItemNotice:
;-------------------------------- ;--------------------------------
.skip .skip
PLA : STA.w ScratchBufferNV+1 PLA : STA.l ScratchBufferNV+1
PLA : STA.w ScratchBufferNV PLA : STA.l ScratchBufferNV
PLA : STA.b Scrap02 PLA : STA.b Scrap02
REP #$20 REP #$20
PLA : STA.b Scrap00 PLA : STA.b Scrap00

2
entrances.asm
View File

@@ -155,7 +155,7 @@ JML.l AllowStartFromExitReturn
STZ.b SubSubModule STZ.b SubSubModule
STZ.w DeathReloadFlag STZ.w DeathReloadFlag
STZ.w RespawnFlag STZ.w RespawnFlag
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
JSL Equipment_SearchForEquippedItemLong JSL Equipment_SearchForEquippedItemLong
JSL HUD_RebuildLong2 JSL HUD_RebuildLong2

6
events.asm
View File

@@ -22,7 +22,7 @@ JML.l ReturnFromOnDrawHud
OnDungeonEntrance: OnDungeonEntrance:
STA.l PegColor ; thing we wrote over STA.l PegColor ; thing we wrote over
JSL MaybeFlagDungeonTotalsEntrance JSL MaybeFlagDungeonTotalsEntrance
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDungeonBossExit: OnDungeonBossExit:
@@ -46,7 +46,7 @@ OnDungeonExit:
STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
PHA : PHP PHA : PHP
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
JSL.l HUD_RebuildLong JSL.l HUD_RebuildLong
JSL.l FloodGateResetInner JSL.l FloodGateResetInner
JSL.l SetSilverBowMode JSL.l SetSilverBowMode
@@ -226,7 +226,7 @@ OnOWTransition:
PHP PHP
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
LDA.b #$FF : STA.l RNGLockIn ; clear lock-in LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
PLP PLP
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

2
hooks.asm
View File

@@ -1420,7 +1420,7 @@ RebuildHUD_update_long:
JSR.w RebuildHUD_update : RTL JSR.w RebuildHUD_update : RTL
RefreshIcon_UpdateHUD: RefreshIcon_UpdateHUD:
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
JSR.w RebuildHUD JSR.w RebuildHUD
JSR.w UpdateEquippedItem JSR.w UpdateEquippedItem
RTS RTS

4
inventory.asm
View File

@@ -364,7 +364,7 @@ Link_ReceiveItem_HUDRefresh:
+ +
JSL.l HUD_RefreshIconLong ; thing we wrote over JSL.l HUD_RefreshIconLong ; thing we wrote over
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
JSL.l PostItemGet JSL.l PostItemGet
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -379,7 +379,7 @@ HandleBombAbsorbtion:
LDA.b #$04 : STA.w ItemCursor ; set selected item to bombs LDA.b #$04 : STA.w ItemCursor ; set selected item to bombs
LDA.b #$01 : STA.w CurrentYItem ; set selected item to bombs LDA.b #$01 : STA.w CurrentYItem ; set selected item to bombs
JSL.l HUD_RebuildLong JSL.l HUD_RebuildLong
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
+ +
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

90
msu.asm
View File

@@ -164,27 +164,27 @@ CheckMusicLoadRequest:
.continue .continue
LDA.l TournamentSeed : BNE +++ LDA.l TournamentSeed : BNE +++
LDA.w MSUPackRequest LDA.l MSUPackRequest
CMP.w MSUPackCurrent : BEQ +++ CMP.l MSUPackCurrent : BEQ +++
CMP.w MSUPackCount : !BLT ++ CMP.l MSUPackCount : !BLT ++
CMP.b #$FE : !BLT + CMP.b #$FE : !BLT +
STA.w MSUPackCurrent STA.l MSUPackCurrent
SEP #$10 SEP #$10
LDA.b #$00 LDA.b #$00
LDX.b #$07 LDX.b #$07
- -
STA.w MSUFallbackTable,X STA.l MSUFallbackTable,X
DEX : BPL - DEX : BPL -
REP #$10 REP #$10
BRA +++ BRA +++
+ : LDA.w MSUPackCurrent : STA.w MSUPackRequest + : LDA.l MSUPackCurrent : STA.l MSUPackRequest
++ : STA.w MSUPackCurrent ++ : STA.l MSUPackCurrent
JSL MSUInit_check_fallback JSL MSUInit_check_fallback
+++ +++
LDA.w MusicControlRequest : CMP.b #$08 : BEQ ++ ; Mirror SFX is not affected by NoBGM or pack $FE LDA.w MusicControlRequest : CMP.b #$08 : BEQ ++ ; Mirror SFX is not affected by NoBGM or pack $FE
LDA.l NoBGM : BNE + LDA.l NoBGM : BNE +
LDA.w MSUPackCurrent : CMP.b #$FE : BNE ++ LDA.l MSUPackCurrent : CMP.b #$FE : BNE ++
+ : JMP .mute + : JMP .mute
++ ++
@@ -240,7 +240,7 @@ CheckMusicLoadRequest:
LDA.l MusicShuffleTable-1,X : DEC : PHA LDA.l MusicShuffleTable-1,X : DEC : PHA
AND.b #$07 : TAY AND.b #$07 : TAY
PLA : LSR #3 : TAX PLA : LSR #3 : TAX
LDA.w MSUFallbackTable,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute LDA.l MSUFallbackTable,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
- : CPY #$00 : BEQ + - : CPY #$00 : BEQ +
LSR : DEY : BRA - LSR : DEY : BRA -
@@ -348,7 +348,7 @@ SpiralStairsPreCheck:
+ +
LDA.l BigKeyField : AND.w #$0004 : BEQ .done ; Check that we have the GT big key LDA.l BigKeyField : AND.w #$0004 : BEQ .done ; Check that we have the GT big key
LDA.w MSUFallbackTable+7 : AND.w #$0004 : BEQ .done ; Check that we have the extended track LDA.l MSUFallbackTable+7 : AND.w #$0004 : BEQ .done ; Check that we have the extended track
.fade .fade
LDX.b #$F1 : STX.w MusicControlRequest LDX.b #$F1 : STX.w MusicControlRequest
@@ -401,10 +401,10 @@ MSUInit:
PHP PHP
LDA.b #$00 LDA.b #$00
STA.w MSULoadedTrack STA.l MSULoadedTrack
STA.w MSUResumeTrack STA.l MSUResumeTrack
STA.w MSUResumeTime : STA.w MSUResumeTime+1 : STA.w MSUResumeTime+2 : STA.w MSUResumeTime+3 STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
STA.w MSUResumeControl STA.l MSUResumeControl
LDA.l NoBGM : BNE .done LDA.l NoBGM : BNE .done
@@ -431,7 +431,7 @@ MSUInit:
.wait_pack .wait_pack
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_pack LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE .wait_pack
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BEQ .check_pack LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BEQ .check_pack
TXA : STA.w MSUPackCount TXA : STA.l MSUPackCount
BRA + BRA +
; Check the current MSU-1 pack for tracks that require SPC fallback ; Check the current MSU-1 pack for tracks that require SPC fallback
@@ -453,7 +453,7 @@ MSUInit:
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE + LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE +
SEC SEC
+ +
LDA.w MSUFallbackTable,X : ROL : STA.w MSUFallbackTable,X LDA.l MSUFallbackTable,X : ROL : STA.l MSUFallbackTable,X
DEY : BPL .next_track DEY : BPL .next_track
DEX : BPL + DEX : BPL +
@@ -474,11 +474,11 @@ MSUInit:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
MSUStopPlaying: MSUStopPlaying:
PHA : XBA : PHA PHA : XBA : PHA
LDA.w MSULoadedTrack LDA.l MSULoadedTrack
JSR IsResumableTrack : BCC + JSR IsResumableTrack : BCC +
; dont save if we already saved recently ; dont save if we already saved recently
REP #$20 REP #$20
LDA.w MSUResumeTrack : AND #$00FF : BEQ ++ LDA.l MSUResumeTrack : AND #$00FF : BEQ ++
LDA.l NMIFrames : !SUB MSUResumeTime : PHA LDA.l NMIFrames : !SUB MSUResumeTime : PHA
LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE +++ LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE +++
PLA : CMP.l MSUResumeTimer : !BLT .too_early PLA : CMP.l MSUResumeTimer : !BLT .too_early
@@ -487,12 +487,12 @@ PHA : XBA : PHA
PLA PLA
++ ++
; saving ; saving
LDA.l NMIFrames : STA.w MSUResumeTime LDA.l NMIFrames : STA.l MSUResumeTime
LDA.l NMIFrames+2 : STA.w MSUResumeTime+2 LDA.l NMIFrames+2 : STA.l MSUResumeTime+2
SEP #$20 SEP #$20
LDA.w MSULoadedTrack : STA.w MSUResumeTrack LDA.l MSULoadedTrack : STA.l MSUResumeTrack
LDA.b #$00 : STA.w MSULoadedTrack ; dont take this path if we're calling again LDA.b #$00 : STA.l MSULoadedTrack ; dont take this path if we're calling again
LDA.b #!FLAG_MSU_RESUME : STA.w MSUCTL ; save this track's position LDA.b #!FLAG_MSU_RESUME : STA.w MSUCTL ; save this track's position
PLA : XBA : PLA PLA : XBA : PLA
RTS RTS
@@ -523,23 +523,23 @@ MSUMain:
LDX.w MusicControl : BEQ + LDX.w MusicControl : BEQ +
JMP .command_ff JMP .command_ff
+ +
LDA.w MSUDelayedCommand : BEQ .do_fade LDA.l MSUDelayedCommand : BEQ .do_fade
.check_busy .check_busy
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE - LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_BUSY : BNE -
.ready .ready
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE - LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE -
.start .start
LDA.w MSUResumeControl : BIT.b #!FLAG_RESUME_CANCEL : BEQ + LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_CANCEL : BEQ +
EOR.b #!FLAG_RESUME_CANCEL : STA.w MSUResumeControl EOR.b #!FLAG_RESUME_CANCEL : STA.l MSUResumeControl
REP #$20 : LDA.w MSULoadedTrack : STA.w MSUTRACK : SEP #$20 REP #$20 : LDA.l MSULoadedTrack : STA.w MSUTRACK : SEP #$20
BRA - BRA -
+ +
LDA.b #!VAL_VOLUME_FULL LDA.b #!VAL_VOLUME_FULL
STA.w TargetVolume STA.w TargetVolume
LDA.w MSUResumeControl : BIT.b #!FLAG_RESUME_FADEIN : BEQ + LDA.l MSUResumeControl : BIT.b #!FLAG_RESUME_FADEIN : BEQ +
EOR.b #!FLAG_RESUME_FADEIN : STA.w MSUResumeControl EOR.b #!FLAG_RESUME_FADEIN : STA.l MSUResumeControl
LDA.b #$00 LDA.b #$00
BRA ++ BRA ++
+ +
@@ -551,17 +551,17 @@ MSUMain:
LDA.w CurrentMSUTrack : DEC : PHA LDA.w CurrentMSUTrack : DEC : PHA
AND.b #$07 : TAY AND.b #$07 : TAY
PLA : LSR #3 : TAX PLA : LSR #3 : TAX
LDA.w MSUFallbackTable,X : BEQ +++ : CMP.b #$FF : BEQ ++ LDA.l MSUFallbackTable,X : BEQ +++ : CMP.b #$FF : BEQ ++
- : CPY #$00 : BEQ + - : CPY #$00 : BEQ +
LSR : DEY : BRA - LSR : DEY : BRA -
+ +
AND.b #$01 : BEQ +++ AND.b #$01 : BEQ +++
++ : LDA.w MSUDelayedCommand ++ : LDA.l MSUDelayedCommand
+++ : STA.w MSUCTL +++ : STA.w MSUCTL
LDA.b #$00 LDA.b #$00
STA.w MSUDelayedCommand STA.l MSUDelayedCommand
JML SPCContinue JML SPCContinue
.do_fade: .do_fade:
@@ -624,9 +624,9 @@ MSUMain:
+ +
CPX.w CurrentControlRequest : BEQ - CPX.w CurrentControlRequest : BEQ -
LDA.b #$00 : XBA LDA.b #$00 : XBA
LDA.w MSUPackCurrent : BEQ + LDA.l MSUPackCurrent : BEQ +
- : CMP.w MSUPackCount : !BLT + - : CMP.l MSUPackCount : !BLT +
!SUB.w MSUPackCount : BRA - !SUB.l MSUPackCount : BRA -
+ +
JSR MSUStopPlaying JSR MSUStopPlaying
@@ -639,11 +639,11 @@ MSUMain:
DEX : BNE - DEX : BNE -
+ +
STA.w MSUTRACK STA.w MSUTRACK
STA.w MSULoadedTrack STA.l MSULoadedTrack
SEP #$20 SEP #$20
PLX PLX
TXA : CMP.w MSUResumeTrack : BNE + ; dont resume if too late TXA : CMP.l MSUResumeTrack : BNE + ; dont resume if too late
REP #$20 REP #$20
LDA.l NMIFrames : !SUB MSUResumeTime : PHA LDA.l NMIFrames : !SUB MSUResumeTime : PHA
LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE ++ LDA.l NMIFrames+2 : SBC MSUResumeTime+2 : BNE ++
@@ -656,8 +656,8 @@ MSUMain:
SEP #$20 SEP #$20
LDA.b #!FLAG_RESUME_CANCEL LDA.b #!FLAG_RESUME_CANCEL
.done_resume: .done_resume:
STA.w MSUResumeControl STA.l MSUResumeControl
LDA.b #$00 : STA.w MSUResumeTrack LDA.b #$00 : STA.l MSUResumeTrack
+ +
CPX #07 : BNE + ; Kakariko Village CPX #07 : BNE + ; Kakariko Village
LDA.b GameMode : CMP #$07 : BNE + LDA.b GameMode : CMP #$07 : BNE +
@@ -667,12 +667,12 @@ MSUMain:
+ +
TXA TXA
++ ++
STA.w MSULoadedTrack STA.l MSULoadedTrack
STX.w CurrentMSUTrack STX.w CurrentMSUTrack
LDA.w MSUPackCurrent : CMP #$FE : !BLT + LDA.l MSUPackCurrent : CMP #$FE : !BLT +
LDA.b #$00 : BRA ++ LDA.b #$00 : BRA ++
+ : LDA.l MSUTrackList-1,X + : LDA.l MSUTrackList-1,X
++ : STA.w MSUDelayedCommand ++ : STA.l MSUDelayedCommand
LDA.l MSUExtendedFallbackList-1,X LDA.l MSUExtendedFallbackList-1,X
CMP.b #17 : BEQ + CMP.b #17 : BEQ +
CMP.b #22 : BEQ + CMP.b #22 : BEQ +
@@ -722,9 +722,9 @@ PendantFanfareWait:
LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
SEP #$20 SEP #$20
LDA.w MSUPackCurrent : CMP #$FE : !BGE .spc LDA.l MSUPackCurrent : CMP #$FE : !BGE .spc
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
LDA.w MSUDelayedCommand : BNE .continue LDA.l MSUDelayedCommand : BNE .continue
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
.continue .continue
jml PendantFanfareContinue jml PendantFanfareContinue
@@ -746,9 +746,9 @@ CrystalFanfareWait:
LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc LDA.w MSUID+2 : CMP.w #!VAL_MSU_ID_23 : BNE .spc
LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc LDA.w MSUID+4 : CMP.w #!VAL_MSU_ID_45 : BNE .spc
SEP #$20 SEP #$20
LDA.w MSUPackCurrent : CMP.b #$FE : !BGE .spc LDA.l MSUPackCurrent : CMP.b #$FE : !BGE .spc
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
LDA.w MSUDelayedCommand : BNE .continue LDA.l MSUDelayedCommand : BNE .continue
LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done LDA.w MSUSTATUS : BIT.b #!FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
.continue .continue
jml CrystalFanfareContinue jml CrystalFanfareContinue

10
newhud.asm
View File

@@ -65,7 +65,7 @@ NewHUD_DrawArrows:
;================================================================================ ;================================================================================
NewHUD_DrawGoal: NewHUD_DrawGoal:
REP #$20 REP #$20
LDA.w UpdateHUDFlag : BEQ .no_goal LDA.l UpdateHUDFlag : BEQ .no_goal
LDA.l GoalItemRequirement : BEQ .no_goal LDA.l GoalItemRequirement : BEQ .no_goal
LDA.l GoalItemIcon : STA.w HUDGoalIndicator LDA.l GoalItemIcon : STA.w HUDGoalIndicator
@@ -122,7 +122,7 @@ NewHUD_DrawKeys:
;================================================================================ ;================================================================================
NewHUD_DrawDungeonCounters: NewHUD_DrawDungeonCounters:
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawPrizeIcon LDA.l UpdateHUDFlag : BEQ NewHUD_DrawPrizeIcon
LDA.l CompassMode : ORA.l MapHUDMode : BIT.b #$03 : BEQ NewHUD_DrawPrizeIcon LDA.l CompassMode : ORA.l MapHUDMode : BIT.b #$03 : BEQ NewHUD_DrawPrizeIcon
LDX.b IndoorsFlag : BNE + LDX.b IndoorsFlag : BNE +
JMP.w NewHUD_DrawMagicMeter JMP.w NewHUD_DrawMagicMeter
@@ -147,7 +147,7 @@ NewHUD_DrawPrizeIcon:
LDA.b GameMode LDA.b GameMode
CMP.b #$12 : BEQ .no_prize CMP.b #$12 : BEQ .no_prize
CMP.b #$0E : BEQ + CMP.b #$0E : BEQ +
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawItemCounter LDA.l UpdateHUDFlag : BEQ NewHUD_DrawItemCounter
+ +
LDA.w DungeonID LDA.w DungeonID
CMP.b #$1A : BCS .no_prize CMP.b #$1A : BCS .no_prize
@@ -197,7 +197,7 @@ NewHUD_DrawPrizeIcon:
;================================================================================ ;================================================================================
NewHUD_DrawItemCounter: NewHUD_DrawItemCounter:
REP #$20 REP #$20
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawMagicMeter LDA.l UpdateHUDFlag : BEQ NewHUD_DrawMagicMeter
LDA.l ItemCounterHUD : AND.w #$00FF : BEQ NewHUD_DrawMagicMeter LDA.l ItemCounterHUD : AND.w #$00FF : BEQ NewHUD_DrawMagicMeter
LDA.w #!SlashTile : STA.w HUDGoalIndicator+$08 LDA.w #!SlashTile : STA.w HUDGoalIndicator+$08
LDA.l TotalItemCount : CMP.w #1000 : BCS .item_four_digits LDA.l TotalItemCount : CMP.w #1000 : BCS .item_four_digits
@@ -263,7 +263,7 @@ NewHUD_DrawMagicMeter:
;================================================================================ ;================================================================================
NewHUD_DoneDrawing: NewHUD_DoneDrawing:
STZ.w UpdateHUDFlag LDA.b #$00 : STA.l UpdateHUDFlag
PLB PLB
RTL RTL

36
newitems.asm
View File

@@ -429,7 +429,7 @@ ItemBehavior:
.single_arrow .single_arrow
LDA.l ArrowMode : BEQ + LDA.l ArrowMode : BEQ +
LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address
INC.w UpdateHUDFlag ; in retro/rupee bow mode. LDA.b #$01 : STA.l UpdateHUDFlag ; in retro/rupee bow mode.
+ +
RTS RTS
@@ -806,15 +806,15 @@ ResolveLootID:
JMP.w .have_item JMP.w .have_item
.rng_single .rng_single
JSL.l GetRNGItemSingle : STA.w ScratchBufferV+6 JSL.l GetRNGItemSingle : STA.l ScratchBufferV+6
XBA : JSR.w MarkRNGItemSingle XBA : JSR.w MarkRNGItemSingle
LDA.b #$FF : STA.l RNGLockIn ; clear lock-in LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
LDA.w ScratchBufferV+6 : JMP.w .get_item LDA.l ScratchBufferV+6 : JMP.w .get_item
.rng_multi .rng_multi
JSL.l GetRNGItemMulti : STA.w ScratchBufferV+6 JSL.l GetRNGItemMulti : STA.l ScratchBufferV+6
LDA.b #$FF : STA.l RNGLockIn ; clear lock-in LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
LDA.w ScratchBufferV+6 : JMP.w .get_item LDA.l ScratchBufferV+6 : JMP.w .get_item
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DungeonItemMasks: DungeonItemMasks:
@@ -939,32 +939,32 @@ GetRNGItemSingle:
CMP.l RNGSingleTableSize : !BGE .single_reroll CMP.l RNGSingleTableSize : !BGE .single_reroll
+++ +++
STA.w ScratchBufferV ; put our index value here STA.l ScratchBufferV ; put our index value here
LDX.b #$00 LDX.b #$00
TAY TAY
.recheck .recheck
TYA TYA
JSR.w CheckSingleItem : BEQ .single_unused ; already used JSR.w CheckSingleItem : BEQ .single_unused ; already used
LDA.w ScratchBufferV : INC ; increment index LDA.l ScratchBufferV : INC ; increment index
CMP.l RNGSingleTableSize : BCC +++ : LDA.b #$00 : +++ ; rollover index if needed CMP.l RNGSingleTableSize : BCC +++ : LDA.b #$00 : +++ ; rollover index if needed
STA.w ScratchBufferV ; store index STA.l ScratchBufferV ; store index
INX : TAY : TXA : CMP.l RNGSingleTableSize : BCC .recheck INX : TAY : TXA : CMP.l RNGSingleTableSize : BCC .recheck
LDA.b #$5A ; everything is gone, default to null item - MAKE THIS AN OPTION FOR THIS AND THE OTHER ONE LDA.b #$5A ; everything is gone, default to null item - MAKE THIS AN OPTION FOR THIS AND THE OTHER ONE
BRA .single_done BRA .single_done
.single_unused .single_unused
LDA.w ScratchBufferV LDA.l ScratchBufferV
.single_done .single_done
TAX : LDA.l RNGSingleItemTable, X TAX : LDA.l RNGSingleItemTable, X
XBA : LDA.w ScratchBufferV : STA.l RNGLockIn : XBA XBA : LDA.l ScratchBufferV : STA.l RNGLockIn : XBA
PLY PLY
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CheckSingleItem: CheckSingleItem:
LSR #3 : TAX LSR #3 : TAX
LDA.l RNGItem, X : STA.w ScratchBufferV+2 ; load value to temporary LDA.l RNGItem, X : STA.l ScratchBufferV+2 ; load value to temporary
PHX PHX
LDA.w ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X LDA.l ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X
LDA.w ScratchBufferV+2 LDA.l ScratchBufferV+2
--- ---
CPX.b #$00 : BEQ +++ CPX.b #$00 : BEQ +++
LSR LSR
@@ -976,10 +976,10 @@ CheckSingleItem:
RTS RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
MarkRNGItemSingle: MarkRNGItemSingle:
LSR #3 : STA.w ScratchBufferV+1 : TAX LSR #3 : STA.l ScratchBufferV+1 : TAX
LDA.l RNGItem, X LDA.l RNGItem, X
STA.w ScratchBufferV+2 STA.l ScratchBufferV+2
LDA.w ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X LDA.l ScratchBufferV : AND.b #$07 : TAX ; load 0-7 part into X
LDA.b #01 LDA.b #01
--- ---
CPX.b #$00 : BEQ +++ CPX.b #$00 : BEQ +++
@@ -989,9 +989,9 @@ MarkRNGItemSingle:
+++ +++
PHA PHA
LDA.w ScratchBufferV+1 : TAX LDA.l ScratchBufferV+1 : TAX
PLA PLA
ORA.w ScratchBufferV+2 ORA.l ScratchBufferV+2
STA.l RNGItem, X STA.l RNGItem, X
RTS RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

4
pendantcrystalhud.asm
View File

@@ -17,7 +17,7 @@ RTL
;================================================================================ ;================================================================================
HUDRebuildIndoorHole: HUDRebuildIndoorHole:
PHA PHA
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
LDA.l GenericKeys : BEQ .normal LDA.l GenericKeys : BEQ .normal
.generic .generic
PLA PLA
@@ -30,7 +30,7 @@ RTL
RTL RTL
;================================================================================ ;================================================================================
HUDRebuildIndoor: HUDRebuildIndoor:
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
LDA.l GenericKeys : BEQ .normal LDA.l GenericKeys : BEQ .normal
.generic .generic
LDA.b #$00 : STA.l RoomDarkness LDA.b #$00 : STA.l RoomDarkness

2
quickswap.asm
View File

@@ -10,7 +10,7 @@ QuickSwap:
LDA.l QuickSwapFlag : BEQ .done LDA.l QuickSwapFlag : BEQ .done
LDA.w ItemCursor : BEQ .done ; Skip everything if we don't have any items LDA.w ItemCursor : BEQ .done ; Skip everything if we don't have any items
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
LDY.b #$14 LDY.b #$14
PHX PHX
XBA ; restore the stashed value XBA ; restore the stashed value

82
ram.asm
View File

@@ -376,6 +376,13 @@ SpriteCoordCacheY = $7E0FDA ;
; ;
NoMenu = $7E0FFC ; When set prevents menu, mirror, medallions NoMenu = $7E0FFC ; When set prevents menu, mirror, medallions
; ;
;===================================================================================================
;===================================================================================================
; DO NOT ADD ANY RANDOMIZER VARIABLES TO THE SPACE FROM $1100 to $1FFF
;---------------------------------------------------------------------------------------------------
; It causes isses with major glitches
;===================================================================================================
;===================================================================================================
GFXStripes = $7E1000 ; Used by stripes for arbitrary VRAM transfers. $100 bytes. GFXStripes = $7E1000 ; Used by stripes for arbitrary VRAM transfers. $100 bytes.
RoomStripes = $7E1100 ; Used for room drawing. RoomStripes = $7E1100 ; Used for room drawing.
; ;
@@ -388,26 +395,7 @@ DelayTimer = $7E1CE9 ;
; ;
TextID = $7E1CF0 ; Message ID and page. Word length. TextID = $7E1CF0 ; Message ID and page. Word length.
; ;
UpdateHUDFlag = $7E1E03 ; Flag used to mark HUD updates and avoid heavy code segments.
;
ToastBuffer = $7E1E0E ; Multiworld buffer. Word length.
;
MSUResumeTime = $7E1E6B ; Mirrored MSU block
MSUResumeControl = $7E1E6F ;
MSUFallbackTable = $7E1E70 ;
MSUDelayedCommand = $7E1E79 ;
MSUPackCount = $7E1E7A ;
MSUPackCurrent = $7E1E7B ;
MSUPackRequest = $7E1E7C ;
MSULoadedTrack = $7E1E7D ;
MSUResumeTrack = $7E1E7F ;
ClockHours = $7E1E90 ; Clock Hours
ClockMinutes = $7E1E94 ; Clock Minutes
ClockSeconds = $7E1E98 ; Clock Seconds
ClockBuffer = $7E1E9C ; Clock Temporary
ScratchBufferNV = $7E1EA0 ; Non-volatile scratch buffer. Must preserve values through return.
ScratchBufferV = $7E1EB0 ; Volatile scratch buffer. Can clobber at will.
;================================================================================ ;================================================================================
; UNMIRRORED WRAM ; UNMIRRORED WRAM
@@ -419,6 +407,28 @@ TileUploadBuffer = $7EA180 ; 0x300 bytes
; ;
ItemGetGFX = $7EBD40 ; Item receipt graphics location ItemGetGFX = $7EBD40 ; Item receipt graphics location
; ;
UpdateHUDFlag = $7EBE00 ; Flag used to mark HUD updates and avoid heavy code segments.
;
ToastBuffer = $7EBE02 ; Multiworld buffer. Word length.
;
MSUResumeTime = $7EBE6B ; Mirrored MSU block
MSUResumeControl = $7EBE6F ;
MSUFallbackTable = $7EBE70 ;
MSUDelayedCommand = $7EBE79 ;
MSUPackCount = $7EBE7A ;
MSUPackCurrent = $7EBE7B ;
MSUPackRequest = $7EBE7C ;
MSULoadedTrack = $7EBE7D ;
MSUResumeTrack = $7EBE7F ;
ClockHours = $7EBE90 ; Clock Hours
ClockMinutes = $7EBE94 ; Clock Minutes
ClockSeconds = $7EBE98 ; Clock Seconds
ClockBuffer = $7EBE9C ; Clock Temporary
ScratchBufferNV = $7EBEA0 ; Non-volatile scratch buffer. Must preserve values through return.
ScratchBufferV = $7EBEB0 ; Volatile scratch buffer. Can clobber at will.
RoomFade = $7EC005 ; Flags fade to black on room transitions. Word length. RoomFade = $7EC005 ; Flags fade to black on room transitions. Word length.
FadeTimer = $7EC007 ; Timer for transition fading and mosaics. Word length. FadeTimer = $7EC007 ; Timer for transition fading and mosaics. Word length.
FadeDirection = $7EC009 ; Word length FadeDirection = $7EC009 ; Word length
@@ -861,23 +871,23 @@ endmacro
%assertRAM(MessageSubModule, $7E1CD8) %assertRAM(MessageSubModule, $7E1CD8)
%assertRAM(MessageCursor, $7E1CE8) %assertRAM(MessageCursor, $7E1CE8)
%assertRAM(DelayTimer, $7E1CE9) %assertRAM(DelayTimer, $7E1CE9)
%assertRAM(TextID, $7E1CF0) ;%assertRAM(TextID, $7E1CF0)
%assertRAM(ToastBuffer, $7E1E0E) ;%assertRAM(ToastBuffer, $7E1E0E)
%assertRAM(MSUResumeTime, $7E1E6B) ;%assertRAM(MSUResumeTime, $7E1E6B)
%assertRAM(MSUResumeControl, $7E1E6F) ;%assertRAM(MSUResumeControl, $7E1E6F)
%assertRAM(MSUFallbackTable, $7E1E70) ;%assertRAM(MSUFallbackTable, $7E1E70)
%assertRAM(MSUDelayedCommand, $7E1E79) ;%assertRAM(MSUDelayedCommand, $7E1E79)
%assertRAM(MSUPackCount, $7E1E7A) ;%assertRAM(MSUPackCount, $7E1E7A)
%assertRAM(MSUPackCurrent, $7E1E7B) ;%assertRAM(MSUPackCurrent, $7E1E7B)
%assertRAM(MSUPackRequest, $7E1E7C) ;%assertRAM(MSUPackRequest, $7E1E7C)
%assertRAM(MSULoadedTrack, $7E1E7D) ;%assertRAM(MSULoadedTrack, $7E1E7D)
%assertRAM(MSUResumeTrack, $7E1E7F) ;%assertRAM(MSUResumeTrack, $7E1E7F)
%assertRAM(ClockHours, $7E1E90) ;%assertRAM(ClockHours, $7E1E90)
%assertRAM(ClockMinutes, $7E1E94) ;%assertRAM(ClockMinutes, $7E1E94)
%assertRAM(ClockSeconds, $7E1E98) ;%assertRAM(ClockSeconds, $7E1E98)
%assertRAM(ClockBuffer, $7E1E9C) ;%assertRAM(ClockBuffer, $7E1E9C)
%assertRAM(ScratchBufferNV, $7E1EA0) ;%assertRAM(ScratchBufferNV, $7E1EA0)
%assertRAM(ScratchBufferV, $7E1EB0) ;%assertRAM(ScratchBufferV, $7E1EB0)
%assertRAM(TileUploadBuffer, $7EA180) %assertRAM(TileUploadBuffer, $7EA180)
%assertRAM(RoomFade, $7EC005) %assertRAM(RoomFade, $7EC005)
%assertRAM(FadeTimer, $7EC007) %assertRAM(FadeTimer, $7EC007)

2
retro.asm
View File

@@ -11,7 +11,7 @@ LoadBombCount16:
.infinite .infinite
RTL RTL
StoreBombCount: StoreBombCount:
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
PHA : LDA.l InfiniteBombs : BEQ .finite PHA : LDA.l InfiniteBombs : BEQ .finite
.infinite .infinite
PLA : LDA.b #$01 : RTL PLA : LDA.b #$01 : RTL

6
stats.asm
View File

@@ -78,12 +78,12 @@ IncrementSmallKeys:
STA.l CurrentSmallKeys ; thing we wrote over, write small key count STA.l CurrentSmallKeys ; thing we wrote over, write small key count
PHX PHX
LDA.l StatsLocked : BNE + LDA.l StatsLocked : BNE +
LDA.l SmallKeyCounter : INC : STA.l SmallKeyCounter LDA.l SmallKeyCounter : INC : STA.l SmallKeyCounter
+ +
JSL.l UpdateKeys JSL.l UpdateKeys
PHY : LDY.b #24 : JSL.l AddInventory : PLY PHY : LDY.b #24 : JSL.l AddInventory : PLY
JSL.l HUD_RebuildLong JSL.l HUD_RebuildLong
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
PLX PLX
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ IncrementSmallKeysNoPrimary:
++ ++
PLP PLP
+ +
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
JSL.l HUD_RebuildLong JSL.l HUD_RebuildLong
PLX PLX
RTL RTL

45
timer.asm
View File

@@ -36,12 +36,12 @@ endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CalculateTimer: CalculateTimer:
LDA.w #$0000 LDA.w #$0000
STA.w ClockHours ; clear digit storage STA.l ClockHours ; clear digit storage
STA.w ClockHours+2 STA.l ClockHours+2
STA.w ClockMinutes STA.l ClockMinutes
STA.w ClockMinutes+2 STA.l ClockMinutes+2
STA.w ClockSeconds STA.l ClockSeconds
STA.w ClockSeconds+2 STA.l ClockSeconds+2
LDA.l TimerStyle : AND.w #$00FF : CMP.w #$0002 : BNE + ; Stopwatch Mode LDA.l TimerStyle : AND.w #$00FF : CMP.w #$0002 : BNE + ; Stopwatch Mode
%Sub32(NMIFrames,ChallengeTimer,ClockBuffer) %Sub32(NMIFrames,ChallengeTimer,ClockBuffer)
@@ -57,8 +57,8 @@ CalculateTimer:
LDA.l NMIFrames+2 : STA.l ChallengeTimer+2 LDA.l NMIFrames+2 : STA.l ChallengeTimer+2
RTS RTS
++ CMP.w #$0001 : BNE ++ ; Negative Time ++ CMP.w #$0001 : BNE ++ ; Negative Time
LDA.w ClockBuffer : EOR.w #$FFFF : !ADD.w #$0001 : STA.w ClockBuffer LDA.l ClockBuffer : EOR.w #$FFFF : !ADD.w #$0001 : STA.l ClockBuffer
LDA.w ClockBuffer+2 : EOR.w #$FFFF : ADC.w #$0000 : STA.w ClockBuffer+2 LDA.l ClockBuffer+2 : EOR.w #$FFFF : ADC.w #$0000 : STA.l ClockBuffer+2
LDA.w #$0001 : STA.l ClockStatus ; Set Negative Mode LDA.w #$0001 : STA.l ClockStatus ; Set Negative Mode
BRA .prepDigits BRA .prepDigits
++ CMP.w #$0002 : BNE ++ ; OHKO ++ CMP.w #$0002 : BNE ++ ; OHKO
@@ -92,12 +92,12 @@ CalculateTimer:
%Sub32(ClockBuffer,.second,ClockBuffer) : BRA - %Sub32(ClockBuffer,.second,ClockBuffer) : BRA -
+ +
LDA.w ClockHours : !ADD.w #$2490 : STA.w ClockHours ; convert decimal values to tiles LDA.l ClockHours : !ADD.w #$2490 : STA.l ClockHours ; convert decimal values to tiles
LDA.w ClockHours+2 : !ADD.w #$2490 : STA.w ClockHours+2 LDA.l ClockHours+2 : !ADD.w #$2490 : STA.l ClockHours+2
LDA.w ClockMinutes : !ADD.w #$2490 : STA.w ClockMinutes LDA.l ClockMinutes : !ADD.w #$2490 : STA.l ClockMinutes
LDA.w ClockMinutes+2 : !ADD.w #$2490 : STA.w ClockMinutes+2 LDA.l ClockMinutes+2 : !ADD.w #$2490 : STA.l ClockMinutes+2
LDA.w ClockSeconds : !ADD.w #$2490 : STA.w ClockSeconds LDA.l ClockSeconds : !ADD.w #$2490 : STA.l ClockSeconds
LDA.w ClockSeconds+2 : !ADD.w #$2490 : STA.w ClockSeconds+2 LDA.l ClockSeconds+2 : !ADD.w #$2490 : STA.l ClockSeconds+2
RTS RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
.hour .hour
@@ -148,14 +148,14 @@ DrawChallengeTimer:
BRA ++ BRA ++
+ ; Show Timer + ; Show Timer
LDA.l ClockStatus : AND.w #$0001 : !ADD.w #$2804 : STA.l HUDTileMapBuffer+$94 LDA.l ClockStatus : AND.w #$0001 : !ADD.w #$2804 : STA.l HUDTileMapBuffer+$94
LDA.w ClockHours+2 : STA.l HUDTileMapBuffer+$96 LDA.l ClockHours+2 : STA.l HUDTileMapBuffer+$96
LDA.w ClockHours : STA.l HUDTileMapBuffer+$98 LDA.l ClockHours : STA.l HUDTileMapBuffer+$98
LDA.w #$2806 : STA.l HUDTileMapBuffer+$9A LDA.w #$2806 : STA.l HUDTileMapBuffer+$9A
LDA.w ClockMinutes+2 : STA.l HUDTileMapBuffer+$9C LDA.l ClockMinutes+2 : STA.l HUDTileMapBuffer+$9C
LDA.w ClockMinutes : STA.l HUDTileMapBuffer+$9E LDA.l ClockMinutes : STA.l HUDTileMapBuffer+$9E
LDA.w #$2806 : STA.l HUDTileMapBuffer+$A0 LDA.w #$2806 : STA.l HUDTileMapBuffer+$A0
LDA.w ClockSeconds+2 : STA.l HUDTileMapBuffer+$A2 LDA.l ClockSeconds+2 : STA.l HUDTileMapBuffer+$A2
LDA.w ClockSeconds : STA.l HUDTileMapBuffer+$A4 LDA.l ClockSeconds : STA.l HUDTileMapBuffer+$A4
++ ++
LDA.b FrameCounter : AND.w #$001F : BNE + : JSR CalculateTimer : + LDA.b FrameCounter : AND.w #$001F : BNE + : JSR CalculateTimer : +
@@ -174,12 +174,11 @@ RTL
CheckOHKO: CheckOHKO:
SEP #$20 SEP #$20
LDA.l OHKOFlag : CMP.l OHKOCached : BNE .change LDA.l OHKOFlag : CMP.l OHKOCached : BNE .change
REP #$20 REP #$21
CLC
RTS RTS
.change .change
STA.l OHKOCached STA.l OHKOCached
INC.w UpdateHUDFlag LDA.b #$01 : STA.l UpdateHUDFlag
REP #$20 REP #$20
SEC SEC
RTS RTS

5
toast.asm
View File

@@ -4,8 +4,9 @@
; in: X(w) - Length in Tiles ; in: X(w) - Length in Tiles
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DoToast: DoToast:
PHY : PHP PHY : PHP : PHA
LDY.w ToastBuffer LDA.l ToastBuffer : TAY
PLA
JSL.l WriteVRAMBlock JSL.l WriteVRAMBlock
PLP : PLY PLP : PLY
RTL RTL