From e7a58b2ea84a683fa00f5c237faa090157093790 Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Fri, 23 Feb 2018 18:46:03 -0500 Subject: [PATCH] Remove purple chest despawn code The blind despawn fix makes this unnecessary. Dungeon Entrance event hook retained for possible future use, but is commented out. --- events.asm | 16 ++++------------ hooks.asm | 6 +++--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/events.asm b/events.asm index 22f89a4..fc64932 100644 --- a/events.asm +++ b/events.asm @@ -13,18 +13,10 @@ OnDrawHud: JSL.l DrawDungeonCompassCounts RTL ;-------------------------------------------------------------------------------- -OnDungeonEntrance: - PHA : PHP - SEP #$20 ; set 8-bit accumulator - LDA $040C : CMP #$FF : BEQ + ; don't do this unless it's a real dungeon - REP #$20 : LDA $A0 : CMP.w #18 : BEQ + : SEP #$20 ; skip if we're in the sanctuary - LDA $7EF3CC ; load follower - CMP #$0C : BNE + ; skip if not the purple chest - LDA #$00 : STA $7EF3CC - + ; this might get hit from above in either accumulator mode - PLP : PLA - STA $7EC172 ; thing we wrote over -RTL +;OnDungeonEntrance: +; +; STA $7EC172 ; thing we wrote over +;RTL ;-------------------------------------------------------------------------------- OnDungeonExit: STA $040C : STZ $04AC ; thing we wrote over diff --git a/hooks.asm b/hooks.asm index 8ce1eb2..7f2d12e 100644 --- a/hooks.asm +++ b/hooks.asm @@ -31,10 +31,10 @@ ReturnCheckZSNES: ;-------------------------------------------------------------------------------- ;================================================================================ -; Dungeon Entrance Hook +; Dungeon Entrance Hook (works, but not needed at the moment) ;-------------------------------------------------------------------------------- -org $02D8C7 ; <- 158C7 - Bank02.asm : 10981 (STA $7EC172) -JSL.l OnDungeonEntrance +;org $02D8C7 ; <- 158C7 - Bank02.asm : 10981 (STA $7EC172) +;JSL.l OnDungeonEntrance ;-------------------------------------------------------------------------------- ;================================================================================