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

Cleanup in sram.asm and compasses.asm

Browse Source
This commit is contained in:
cassidy
2021-12-17 13:53:53 -05:00
parent c09839eb33
commit ed225e044b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compasses.asm
View File

@@ -27,11 +27,11 @@ DrawDungeonCompassCounts:
BEQ .done ; skip if we don't have compass BEQ .done ; skip if we don't have compass
++ ++
LDA $040C : LSR TXA : LSR : TAX
BNE + BNE +
INC INC
+ +
TAX : LDA.l CompassTotalsWRAM, X : AND #$00FF LDA.l CompassTotalsWRAM, X : AND #$00FF
SEP #$20 SEP #$20
JSR HudHexToDec2Digit JSR HudHexToDec2Digit
REP #$20 REP #$20

8
sram.asm
View File

@@ -142,8 +142,8 @@ MagicConsumption: skip 1 ; $00 = Normal | $01 = Half Magic | $02 = Quarte
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Small keys earned per dungeon (integers) ; Small keys earned per dungeon (integers)
DungeonKeys: ; DungeonKeys: ;
SewerKeys: skip 1 ; SewerKeys: skip 1 ; \ HC and Sewers small keys increment together
HyruleCastleKeys: skip 1 ; HyruleCastleKeys: skip 1 ; /
EasternKeys: skip 1 ; Eastern Palace small keys EasternKeys: skip 1 ; Eastern Palace small keys
DesertKeys: skip 1 ; Desert Palace small keys DesertKeys: skip 1 ; Desert Palace small keys
CastleTowerKeys: skip 1 ; Agahnim's Tower small keys CastleTowerKeys: skip 1 ; Agahnim's Tower small keys
@@ -467,6 +467,7 @@ endmacro
%assertSRAM(CrystalsField, $7EF37A) %assertSRAM(CrystalsField, $7EF37A)
%assertSRAM(MagicConsumption, $7EF37B) %assertSRAM(MagicConsumption, $7EF37B)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
%assertSRAM(DungeonKeys, $7EF37C)
%assertSRAM(SewerKeys, $7EF37C) %assertSRAM(SewerKeys, $7EF37C)
%assertSRAM(HyruleCastleKeys, $7EF37D) %assertSRAM(HyruleCastleKeys, $7EF37D)
%assertSRAM(EasternKeys, $7EF37E) %assertSRAM(EasternKeys, $7EF37E)
@@ -512,6 +513,9 @@ endmacro
%assertSRAM(CompassCountDisplay, $7EF403) %assertSRAM(CompassCountDisplay, $7EF403)
%assertSRAM(NpcFlags, $7EF410) %assertSRAM(NpcFlags, $7EF410)
%assertSRAM(MapOverlay, $7EF414) %assertSRAM(MapOverlay, $7EF414)
%assertSRAM(HudFlag, $7EF416)
%assertSRAM(IgnoreFaeries, $7EF416)
%assertSRAM(HasGroveItem, $7EF416)
%assertSRAM(GeneralFlags, $7EF416) %assertSRAM(GeneralFlags, $7EF416)
%assertSRAM(HighestSword, $7EF417) %assertSRAM(HighestSword, $7EF417)
%assertSRAM(GoalCounter, $7EF418) %assertSRAM(GoalCounter, $7EF418)