From a5f9d715a4b8a3cabdfd10e3cdcc5cf30da7f73e Mon Sep 17 00:00:00 2001 From: sporchia Date: Sun, 6 Aug 2017 00:17:50 -0400 Subject: [PATCH] fix to include MM spike room for OHKO * dl is 3 bytes so split out date to 4 separate bytes. --- LTTP_RND_GeneralBugfixes.asm | 4 ++-- hardmode.asm | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 55c2b86..adf7542 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -25,8 +25,8 @@ db #$05 ; mark sram as 32k org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb -org $1FFFF8 ; timestamp rom -dl #$20170801 +org $1FFFF8 ; <- FFFF8 timestamp rom +db #$20, #$17, #$08, #$06 ; year/month/day ;================================================================================ diff --git a/hardmode.asm b/hardmode.asm index e1235c2..cb3e752 100644 --- a/hardmode.asm +++ b/hardmode.asm @@ -16,30 +16,36 @@ CalculateSpikeFloorDamage: RTL ;-------------------------------------------------------------------------------- CalculateByrnaUsage: - LDA $1B : BEQ + + LDA $1B : BEQ ++ REP #$20 ; set 16-bit accumulator LDA $A0 ; these are all decimal because i got them that way - CMP.w #279 + CMP.w #279 : BEQ + ; Spike Cave + CMP.w #179 : BEQ + ; Room in Misery Mire SEP #$20 ; set 8-bit accumulator - BNE + + BRA ++ + + + SEP #$20 ; set 8-bit accumulator PHX : TYX LDA.l ByrnaCaveCaneOfByrnaUsage, X : STA $00 PLX - + + ++ LDA $7EF36E ; thing we wrote over RTL ;-------------------------------------------------------------------------------- CalculateCapeUsage: - LDA $1B : BEQ + + LDA $1B : BEQ ++ REP #$20 ; set 16-bit accumulator LDA $A0 ; these are all decimal because i got them that way - CMP.w #279 + CMP.w #279 : BEQ + ; Spike Cave + CMP.w #179 : BEQ + ; Room in Misery Mire SEP #$20 ; set 8-bit accumulator - BNE + + BRA ++ + + + SEP #$20 ; set 8-bit accumulator PHX : TYX LDA.l ByrnaCaveCapeUsage, X : STA $4C PLX - + + ++ LDA $7EF36E ; thing we wrote over RTL ;--------------------------------------------------------------------------------