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

Revert "Fixed issue with vanilla HCBK acting like a small key"

Browse Source 
This reverts commit d3eb4c229f.
This commit is contained in:
codemann8
2025-01-02 03:28:31 -06:00
parent 51ee4f94c2
commit 94f8bec8ae
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inventory.asm
View File

@@ -228,7 +228,6 @@ DungeonIncrement:
LDA.w DungeonID : BMI .done LDA.w DungeonID : BMI .done
CMP.l BallNChainDungeon : BNE + CMP.l BallNChainDungeon : BNE +
CPY.b #$32 : BEQ .ballchain_bigkey CPY.b #$32 : BEQ .ballchain_bigkey
CPY.b #$9F : BEQ .ballchain_bigkey
+ +
CMP.b #$00 : BNE + CMP.b #$00 : BNE +
INC #2 INC #2

11
keydrop/standing_items.asm
View File

@@ -432,10 +432,8 @@ CheckIfDropValid:
LDA.w SprSourceItemId, X : STA.w SpawnedItemID LDA.w SprSourceItemId, X : STA.w SpawnedItemID
LDA.w SprItemMWPlayer, X : STA.w SpawnedItemMWPlayer LDA.w SprItemMWPlayer, X : STA.w SpawnedItemMWPlayer
LDY.b #$01 ; trigger the small key routines LDY.b #$01 ; trigger the small key routines
LDA.w SpawnedItemID : STA.b Scrap00 LDA.w SpawnedItemID : STA.b Scrap00 : CMP.b #$32 : BNE +
CMP.b #$32 : BEQ ++ LDA.l StandingItemsOn : BNE +
CMP.b #$9F : BNE + ; HC BK check
++ LDA.l StandingItemsOn : BNE +
INY ; big key routine INY ; big key routine
+ +
PHX PHX
@@ -704,9 +702,8 @@ db $A0, $A0, $A2, $A3, $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB, $AC, $AD
BigKeyGet: BigKeyGet:
LDY.w SprItemReceipt, X LDY.w SprItemReceipt, X
CPY.b #$32 : BEQ ++ CPY.b #$32 : BNE +
CPY.b #$9F : BNE + : LDA.l StandingItemsOn : BNE +; HC BK check STZ.w ItemReceiptMethod : LDY.b #$32 ; what we wrote over
++ STZ.w ItemReceiptMethod : LDY.b #$32 ; what we wrote over
PHX : JSL Link_ReceiveItem : PLX ; what we wrote over PHX : JSL Link_ReceiveItem : PLX ; what we wrote over
CLC : RTL CLC : RTL
+ SEC : RTL + SEC : RTL