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

Converted file to tabs for consistency

Browse Source
This commit is contained in:
aerinon
2020-08-28 12:23:27 -06:00
parent d58fa5d5b7
commit 397da02e3f
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
events.asm
View File

@@ -126,10 +126,10 @@ OnNewFile:
DEX : DEX DEX : DEX
BPL - BPL -
LDX #$000E : - LDX #$000E : -
LDA $7EF37C, X : STA $7EF4E0, X LDA $7EF37C, X : STA $7EF4E0, X
DEX : DEX DEX : DEX
BPL - BPL -
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in ;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in

4
itemdowngrade.asm
View File

@@ -2,8 +2,8 @@
; Item Downgrade Fix ; Item Downgrade Fix
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ItemDowngradeFix: ItemDowngradeFix:
JSR ItemDowngradeFixMain JSR ItemDowngradeFixMain
JSL CountChestKeyLong JSL CountChestKeyLong
RTL RTL
ItemDowngradeFixMain: ItemDowngradeFixMain:

48
stats.asm
View File

@@ -258,37 +258,37 @@ DecrementSmallKeys:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm
JSR CountChestKey JSR CountChestKey
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountChestKey: ; called by neighbor functions CountChestKey: ; called by neighbor functions
PHA : PHX PHA : PHX
CPY #$24 : BEQ + ; small key for this dungeon - use $040C CPY #$24 : BEQ + ; small key for this dungeon - use $040C
CPY #$A0 : !BLT .end ; Ignore most items CPY #$A0 : !BLT .end ; Ignore most items
CPY #$AE : !BGE .end ; Ignore reserved key and generic key 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 TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key
INC INC
++ TAX : BRA .count ; use Key id instead of $040C (Keysanity) ++ TAX : BRA .count ; use Key id instead of $040C (Keysanity)
+ LDA $040C : LSR : TAX + LDA $040C : LSR : TAX
.count .count
LDA $7EF4E0, X : INC : STA $7EF4E0, X LDA $7EF4E0, X : INC : STA $7EF4E0, X
.end .end
PLX : PLA PLX : PLA
RTS RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
CountBonkItem: ; called from GetBonkItem in bookofmudora.asm 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 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 CMP #115 : BNE + ; Desert Bonk Key
LDA.L BonkKey_Desert : BRA ++ LDA.L BonkKey_Desert : BRA ++
+ : CMP #140 : BNE + ; GTower Bonk Key + : CMP #140 : BNE + ; GTower Bonk Key
LDA.L BonkKey_GTower : BRA ++ LDA.L BonkKey_GTower : BRA ++
+ LDA.B #$24 ; default to small key + LDA.B #$24 ; default to small key
++ ++
CMP #$24 : BNE + CMP #$24 : BNE +
PHY PHY
TAY : JSR CountChestKey TAY : JSR CountChestKey
PLY PLY
+ +
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
IncrementAgahnim2Sword: IncrementAgahnim2Sword: