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

Refactor dungeon locations checked incrementing

Browse Source 
Fix BowTracking documentation
This commit is contained in:
cassidoxa
2022-02-18 17:45:33 -05:00
parent 905e897b52
commit 838d4e9bf8
2 changed files with 12 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
inventory.asm
View File

@@ -288,57 +288,22 @@ AddInventory:
SEP #$20 ; Set 8-bit Accumulator SEP #$20 ; Set 8-bit Accumulator
LDA $040C ; get dungeon id LDA $040C ; get dungeon id
CMP.b #$FF : BEQ .fullItemCounts
CMP.b #$00 : BNE + ; Sewers (Escape) CMP.l BallNChainDungeon : BNE +
LDA SewersLocations : INC : STA SewersLocations CPY.b #$32 : BNE +
LDA HCLocations : INC : STA HCLocations JMP .done
BRA ++ +
+ CMP.b #$02 : BNE + ; Hyrule Castle (Escape) CMP.b #$04 : BCS +
++ LDA SewersLocations : INC : STA SewersLocations
CPY.b #$32 : BNE ++ : JMP .itemCounts : ++ ; Ball & Chain Guard's Big Key LDA HCLocations : INC : STA HCLocations
LDA HCLocations : INC : STA HCLocations BRA .fullItemCounts
LDA SewersLocations : INC : STA SewersLocations + LSR : TAX : LDA DungeonLocationsChecked, X : INC : STA DungeonLocationsChecked, X
JMP .fullItemCounts ++ CPX.b #$0D : BNE +
+ CMP.b #$04 : BNE + ; Eastern Palace
LDA EPLocations : INC : STA EPLocations
JMP .fullItemCounts
+ CMP.b #$06 : BNE + ; Desert Palace
LDA DPLocations : INC : STA DPLocations
JMP .fullItemCounts
+ CMP.b #$08 : BNE + ; Agahnim's Tower
LDA CTLocations : INC : STA CTLocations
JMP .fullItemCounts
+ CMP.b #$0A : BNE + ; Swamp Palace
LDA SPLocations : INC : STA SPLocations
JMP .fullItemCounts
+ CMP.b #$0C : BNE + ; Palace of Darkness
LDA PDLocations : INC : STA PDLocations
JMP .fullItemCounts
+ CMP.b #$0E : BNE + ; Misery Mire
LDA MMLocations : INC : STA MMLocations
JMP .fullItemCounts
+ CMP.b #$10 : BNE + ; Skull Woods
LDA SWLocations : INC : STA SWLocations
JMP .fullItemCounts
+ CMP.b #$12 : BNE + ; Ice Palace
LDA IPLocations : INC : STA IPLocations
JMP .fullItemCounts
+ CMP.b #$14 : BNE + ; Tower of Hera
LDA THLocations : INC : STA THLocations
JMP .fullItemCounts
+ CMP.b #$16 : BNE + ; Thieves' Town
LDA TTLocations : INC : STA TTLocations
JMP .fullItemCounts
+ CMP.b #$18 : BNE + ; Turtle Rock
LDA TRLocations : INC : STA TRLocations
JMP .fullItemCounts
+ CMP.b #$1A : BNE + ; Ganon's Tower
LDA GTLocations : INC : STA GTLocations
LDA BigKeyField : AND #$04 : BNE ++ LDA BigKeyField : AND #$04 : BNE ++
JSR .incrementGTowerPreBigKey JSR .incrementGTowerPreBigKey
++ ++
+ +
; == END INDOOR-ONLY SECTION ; == END INDOOR-ONLY SECTION
.fullItemCounts .fullItemCounts

2
sram.asm
View File

@@ -170,7 +170,7 @@ InventoryTracking: skip 2 ; b r m p n s k f - - - - - - o q (bitfield)
; p = Magic Powder | n = Mushroom Past | s = Shovel ; p = Magic Powder | n = Mushroom Past | s = Shovel
; k = Inactive Flute | f = Active Flute | o = Any bomb acquired ; k = Inactive Flute | f = Active Flute | o = Any bomb acquired
; q = Quickswap locked ; q = Quickswap locked
BowTracking: skip 2 ; - - - - b s p - (bitfield) BowTracking: skip 2 ; b s p - - - - - - - - - - - - - (bitfield)
; b = Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow ; b = Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow
; The front end writes two distinct progressive bow items. p ; The front end writes two distinct progressive bow items. p
; indicates whether the "second" has been found independent of ; indicates whether the "second" has been found independent of