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

Pottery fix for vanilla hera key

Browse Source
This commit is contained in:
aerinon
2022-04-20 08:52:01 -06:00
parent f6015a8569
commit e8f06f2da6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keydrop/standing_items.asm
View File

@@ -65,6 +65,8 @@ org $1eff81
Sprite_DrawRippleIfInWater: Sprite_DrawRippleIfInWater:
org $0db818 org $0db818
Sprite_LoadProperties: Sprite_LoadProperties:
org $06D038
KeyRoomFlagMasks:
; defines ; defines
; Ram usage ; Ram usage
@@ -313,11 +315,12 @@ BitFieldMasks:
dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100 dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100
dw $0080, $0040, $0020, $0010, $0008, $0004, $0002, $0001 dw $0080, $0040, $0020, $0010, $0008, $0004, $0002, $0001
KeyRoomFlagMasks:
db $40, $20
; Runs during Sprite_E4_SmallKey and duning Sprite_E5_BigKey spawns ; Runs during Sprite_E4_SmallKey and duning Sprite_E5_BigKey spawns
ShouldSpawnItem: ShouldSpawnItem:
LDA $048E : CMP.b #$87 : BNE + ; check for hera basement cage
LDA $A8 : AND.b #$03 : CMP.b #$02 : BNE + ; we're not in that quadrant
LDA.w $0403 : AND.w KeyRoomFlagMasks,Y : RTL
+
; checking our sram table ; checking our sram table
PHX : PHY PHX : PHY
REP #$30 REP #$30
@@ -338,7 +341,11 @@ ShouldSpawnItem:
RTL RTL
MarkSRAMForItem: MarkSRAMForItem:
PHX : PHY : REP #$30 LDA.l StandingItemsOn : BNE +
- LDA.w $0403 : ORA.w KeyRoomFlagMasks, Y : RTL
+ LDA $048E : CMP.b #$87 : BNE + ; check for hera basement cage
LDA $A8 : AND.b #$03 : CMP.b #$02 : BEQ -
+ PHX : PHY : REP #$30
LDA.b $A0 : ASL : TAY LDA.b $A0 : ASL : TAY
LDA.l SpawnedItemIndex : ASL LDA.l SpawnedItemIndex : ASL
TAX : LDA.l BitFieldMasks, X : STA $00 TAX : LDA.l BitFieldMasks, X : STA $00