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

Fix HC/Sewers keys and inverted castle hole

Browse Source
This commit is contained in:
cassidoxa
2023-08-19 21:41:58 -04:00
parent 8a63b7ca91
commit ba080ef556
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
invertedmaps.asm
View File

@@ -783,7 +783,7 @@ dw $0000 ; 7F
dw !OWW_END dw !OWW_END
.map1B_check_aga .map1B_check_aga
LDA.w OverworldEventDataWRAM+$2B LDA.l OverworldEventDataWRAM+$5B
AND.w #$0020 AND.w #$0020
BNE ++ BNE ++
@@ -1533,6 +1533,8 @@ dw $0000 ; 7F
dw !OWW_END dw !OWW_END
.map5B_pick_warp_tile .map5B_pick_warp_tile
LDA.w #$3BBE
STA.b Scrap03
LDX.w #$0034 LDX.w #$0034
LDA.l ProgressIndicator LDA.l ProgressIndicator
@@ -1542,7 +1544,8 @@ dw $0000 ; 7F
LDX.w #$0212 LDX.w #$0212
++ STX.w $3BBE ++ TXA
STA.b [Scrap03]
RTS RTS

13
newitems.asm
View File

@@ -531,18 +531,23 @@ ItemBehavior:
LSR LSR
AND.w #$000F : TAX AND.w #$000F : TAX
ASL : CMP.w DungeonID : BEQ .same_dungeon ASL : CMP.w DungeonID : BEQ .same_dungeon
LSR : TAX
LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
RTS RTS
.same_dungeon .same_dungeon
SEP #$20 SEP #$20
LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
LSR : TAX LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X ; Update menu key count too RTS
.same_dungeon_hc
SEP #$20
LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
LDA.l SewerKeys : INC
STA.l SewerKeys : STA.l HyruleCastleKeys
RTS RTS
.hc_smallkey .hc_smallkey
LDA.w DungeonID : CMP.b #$03 : BCC .same_dungeon LDA.w DungeonID : CMP.b #$03 : BCC .same_dungeon_hc
LDA.l HyruleCastleKeys : INC : STA.l HyruleCastleKeys LDA.l HyruleCastleKeys : INC : STA.l HyruleCastleKeys
LDA.l SewerKeys : INC : STA.l SewerKeys LDA.l SewerKeys : INC : STA.l SewerKeys
RTS RTS