Bug fix for vanilla BK at Ball n Chain guard

Bug fix for camera unlock
Bug fix for bad pseudo layer at PoD Map Balcony
Minor fix for non-retro key hud info
This commit is contained in:
aerinon
2020-10-26 11:46:52 -06:00
parent a1782e3edc
commit 8c73947ad7
8 changed files with 52 additions and 20 deletions

View File

@@ -5,7 +5,7 @@ org $06d049 ; <- 35049 sprite_absorbable : 31-32 (JSL Sprite_DrawRippleIfInWater
jsl SpriteKeyDrawGFX : bra + : nop : +
org $06d180
jsl BigKeyGet : bcs $07
jsl BigKeyGet : bcs $07 : nop #5
org $06d18d ; <- 3518D - sprite_absorbable.asm : 274 (LDA $7EF36F : INC A : STA $7EF36F)
jsl KeyGet
@@ -80,8 +80,9 @@ SpriteKeyPrep:
inx : lda.l LootTable, x : sta !MULTIWORLD_SPRITEITEM_PLAYER_ID
inx : lda.l LootTable, x
plx : sta $0e80, x
cmp #$24 : beq +
jsl PrepDynamicTile : bra +
cmp #$24 : bne +++
lda $a0 : cmp #$80 : bne + : lda #$24
+++ jsl PrepDynamicTile : bra +
++ plx : lda #$24 : sta $0e80, x
+ pla
rtl
@@ -99,8 +100,9 @@ SpriteKeyDrawGFX:
.jslrtsreturn
rtl
+ lda $0e80, x
cmp #$24 : beq -
jsl DrawDynamicTile ; see DrawHeartPieceGFX if problems
cmp #$24 : bne +
lda $a0 : cmp #$80 : bne - : lda #$24
+ jsl DrawDynamicTile ; see DrawHeartPieceGFX if problems
cmp #$03 : bne +
pha : lda $0e60, x : ora.b #$20 : sta $0E60, x : pla
+
@@ -138,7 +140,8 @@ KeyGet:
BigKeyGet:
{
lda.l ShuffleKeyDrops : bne +
- stz $02e9 : ldy.b #$32 : phx ; what we wrote over
- stz $02e9 : ldy.b #$32 ; what we wrote over
phx : jsl Link_ReceiveItem : plx ; what we wrote over
clc : rtl
+
ldy $0e80, x