From 86c970dc3aaa8ea747811424d6f0da9d57df097a Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 21 Jun 2024 11:37:56 -0600 Subject: [PATCH] fix: some bytes designations on moved variables --- msu.asm | 8 ++++---- swordswap.asm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msu.asm b/msu.asm index 987465c..f1bc445 100644 --- a/msu.asm +++ b/msu.asm @@ -497,8 +497,8 @@ PHA : XBA : PHA ; dont save if we already saved recently REP #$20 LDA.l MSUResumeTrack : AND.w #$00FF : BEQ ++ - LDA.l NMIFrames : !SUB.w MSUResumeTime : PHA - LDA.l NMIFrames+2 : SBC.w MSUResumeTime+2 : BNE +++ + LDA.l NMIFrames : !SUB.l MSUResumeTime : PHA + LDA.l NMIFrames+2 : SBC.l MSUResumeTime+2 : BNE +++ PLA : CMP.l MSUResumeTimer : !BLT .too_early BRA ++ +++ @@ -663,8 +663,8 @@ MSUMain: PLX TXA : CMP.l MSUResumeTrack : BNE + ; dont resume if too late REP #$20 - LDA.l NMIFrames : !SUB.w MSUResumeTime : PHA - LDA.l NMIFrames+2 : SBC.w MSUResumeTime+2 : BNE ++ + LDA.l NMIFrames : !SUB.l MSUResumeTime : PHA + LDA.l NMIFrames+2 : SBC.l MSUResumeTime+2 : BNE ++ PLA : CMP.l MSUResumeTimer : !BGE +++ SEP #$20 LDA.b #!FLAG_RESUME_FADEIN : BRA .done_resume diff --git a/swordswap.asm b/swordswap.asm index a2c0c56..da1539d 100644 --- a/swordswap.asm +++ b/swordswap.asm @@ -49,7 +49,7 @@ LoadModifiedArmorLevel: CMP.b #$03 : !BLT + : LDA.b #$02 : + STA.l ScratchBufferV PLA - !ADD.w ScratchBufferV + !ADD.l ScratchBufferV RTL ;================================================================================ ; MagicConsumption - Magic Inventory