From 397da02e3f44577fcdfebfffa44cd0d031026c58 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 28 Aug 2020 12:23:27 -0600 Subject: [PATCH] Converted file to tabs for consistency --- events.asm | 8 ++++---- itemdowngrade.asm | 4 ++-- stats.asm | 48 +++++++++++++++++++++++------------------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/events.asm b/events.asm index 82da82e..6f72a51 100644 --- a/events.asm +++ b/events.asm @@ -126,10 +126,10 @@ OnNewFile: DEX : DEX BPL - - LDX #$000E : - - LDA $7EF37C, X : STA $7EF4E0, X - DEX : DEX - BPL - + LDX #$000E : - + LDA $7EF37C, X : STA $7EF4E0, X + DEX : DEX + BPL - SEP #$20 ; set 8-bit accumulator ;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in diff --git a/itemdowngrade.asm b/itemdowngrade.asm index 1655a62..aab1763 100644 --- a/itemdowngrade.asm +++ b/itemdowngrade.asm @@ -2,8 +2,8 @@ ; Item Downgrade Fix ;-------------------------------------------------------------------------------- ItemDowngradeFix: - JSR ItemDowngradeFixMain - JSL CountChestKeyLong + JSR ItemDowngradeFixMain + JSL CountChestKeyLong RTL ItemDowngradeFixMain: diff --git a/stats.asm b/stats.asm index 832c51f..0afb25c 100644 --- a/stats.asm +++ b/stats.asm @@ -258,37 +258,37 @@ DecrementSmallKeys: RTL ;-------------------------------------------------------------------------------- CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm - JSR CountChestKey + JSR CountChestKey RTL ;-------------------------------------------------------------------------------- CountChestKey: ; called by neighbor functions - PHA : PHX - CPY #$24 : BEQ + ; small key for this dungeon - use $040C - CPY #$A0 : !BLT .end ; Ignore most items - CPY #$AE : !BGE .end ; Ignore reserved key and generic key - TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key - INC - ++ TAX : BRA .count ; use Key id instead of $040C (Keysanity) - + LDA $040C : LSR : TAX - .count - LDA $7EF4E0, X : INC : STA $7EF4E0, X + PHA : PHX + CPY #$24 : BEQ + ; small key for this dungeon - use $040C + CPY #$A0 : !BLT .end ; Ignore most items + CPY #$AE : !BGE .end ; Ignore reserved key and generic key + TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key + INC + ++ TAX : BRA .count ; use Key id instead of $040C (Keysanity) + + LDA $040C : LSR : TAX + .count + LDA $7EF4E0, X : INC : STA $7EF4E0, X .end - PLX : PLA + PLX : PLA RTS ;-------------------------------------------------------------------------------- CountBonkItem: ; called from GetBonkItem in bookofmudora.asm - LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte - CMP #115 : BNE + ; Desert Bonk Key - LDA.L BonkKey_Desert : BRA ++ - + : CMP #140 : BNE + ; GTower Bonk Key - LDA.L BonkKey_GTower : BRA ++ - + LDA.B #$24 ; default to small key - ++ - CMP #$24 : BNE + - PHY - TAY : JSR CountChestKey - PLY - + + LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte + CMP #115 : BNE + ; Desert Bonk Key + LDA.L BonkKey_Desert : BRA ++ + + : CMP #140 : BNE + ; GTower Bonk Key + LDA.L BonkKey_GTower : BRA ++ + + LDA.B #$24 ; default to small key + ++ + CMP #$24 : BNE + + PHY + TAY : JSR CountChestKey + PLY + + RTL ;-------------------------------------------------------------------------------- IncrementAgahnim2Sword: