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

Merge branch 'DRUnstable' into OWMain

Browse Source
This commit is contained in:
codemann8
2025-12-09 09:23:48 -06:00
parent 5b7a4c11ed 4437194cfe
commit dd9ea4d38e
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doorrando/hudadditions.asm
View File

@@ -266,6 +266,7 @@ ConvertToDisplay2:
CountAbsorbedKeys: CountAbsorbedKeys:
PHA : PHX PHA : PHX
LDA.l StandingItemsOn : BEQ .count_it LDA.l StandingItemsOn : BEQ .count_it
LDA.w SpawnedItemKeyCounted : BNE .done
CPY.b #$24 : BEQ .count_it ; small key for this dungeon CPY.b #$24 : BEQ .count_it ; small key for this dungeon
LDA.w DungeonID : LSR : TAX LDA.w DungeonID : LSR : TAX
TYA : CMP.l KeyTable, X : BNE .done TYA : CMP.l KeyTable, X : BNE .done
@@ -275,6 +276,7 @@ CountAbsorbedKeys:
REP #$10 : JSL CountAllKey : SEP #$10 REP #$10 : JSL CountAllKey : SEP #$10
LDY.b Scrap02 LDY.b Scrap02
.done .done
STZ.w SpawnedItemKeyCounted ; reset to zero for next time
PLX : PLA PLX : PLA
JML IncrementSmallKeysNoPrimary JML IncrementSmallKeysNoPrimary

1
inventory.asm
View File

@@ -220,7 +220,6 @@ DungeonIncrement:
REP #$10 REP #$10
PHX PHX
LDA.w InventoryTable_properties,X : BIT.b #$40 : BEQ + LDA.w InventoryTable_properties,X : BIT.b #$40 : BEQ +
CPY.w #$0024 : BEQ + ; keys for this dungeon are done elsewhere
JSL CountAllKey JSL CountAllKey
+ +
LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .done LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .done

3
keydrop/standing_items.asm
View File

@@ -696,7 +696,8 @@ KeyGet:
+ LSR : TAX + LSR : TAX
LDA.b Scrap00 : CMP.l KeyTable, X : BNE + LDA.b Scrap00 : CMP.l KeyTable, X : BNE +
.countIt .countIt
LDA.l StandingItemCounterMask : AND.w SpawnedItemFlag : BEQ ++ LDA.l StandingItemCounterMask : AND SpawnedItemFlag : BEQ ++
STA.w SpawnedItemKeyCounted
JSL AddInventory JSL AddInventory
++ PLX : PLA : RTL ++ PLX : PLA : RTL
+ CMP.b #$AF : beq .countIt ; universal key + CMP.b #$AF : beq .countIt ; universal key

6
ram.asm
View File

@@ -330,7 +330,8 @@ SpawnedItemFlag = $7E0726 ; 0x02 - one for pot, 2 for sprite drop
SpawnedItemMWPlayer = $7E0728 ; Player Id for spawned item if Multiworld item 0x02 SpawnedItemMWPlayer = $7E0728 ; Player Id for spawned item if Multiworld item 0x02
; ;
EnemyDropIndicator = $7E072A ; Used by HUD to indicate enemy drops remaining EnemyDropIndicator = $7E072A ; Used by HUD to indicate enemy drops remaining
SkipBeeTrapDisguise = $7E072C ; Flag to skip bee trap disguise during draw routine SpawnedItemKeyCounted = $7E072C ; If set, the spawned item has been counted towards dungeon key total
SkipBeeTrapDisguise = $7E072D ; Flag to skip bee trap disguise during draw routine
SprDropsItem = $7E0730 ; Array for whether a sprite drops an item 0x16 SprDropsItem = $7E0730 ; Array for whether a sprite drops an item 0x16
SprItemReceipt = $7E0740 ; Array for item id for each sprite 0x16 SprItemReceipt = $7E0740 ; Array for item id for each sprite 0x16
@@ -914,7 +915,8 @@ endmacro
%assertRAM(SpawnedItemFlag, $7E0726) %assertRAM(SpawnedItemFlag, $7E0726)
%assertRAM(SpawnedItemMWPlayer, $7E0728) %assertRAM(SpawnedItemMWPlayer, $7E0728)
%assertRAM(EnemyDropIndicator, $7E072A) %assertRAM(EnemyDropIndicator, $7E072A)
%assertRAM(SkipBeeTrapDisguise, $7E072C) %assertRAM(SpawnedItemKeyCounted, $7E072C)
%assertRAM(SkipBeeTrapDisguise, $7E072D)
%assertRAM(SprDropsItem, $7E0730) %assertRAM(SprDropsItem, $7E0730)
%assertRAM(SprItemReceipt, $7E0740) %assertRAM(SprItemReceipt, $7E0740)
%assertRAM(SprItemIndex, $7E0750) %assertRAM(SprItemIndex, $7E0750)