From f95351183c9cf39559cb4f9f716bff1a3944e089 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 25 Mar 2021 05:17:03 -0400 Subject: [PATCH] SEC BEQ IMPLIES SET CARRY --- heartpieces.asm | 33 +++++++++++---------------------- icepalacegraphics.asm | 2 +- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/heartpieces.asm b/heartpieces.asm index 5c20ebd..6a4c3fe 100644 --- a/heartpieces.asm +++ b/heartpieces.asm @@ -379,30 +379,19 @@ CheckIfBossRoom: ;-------------------------------------------------------------------------------- REP #$20 ; set 16-bit accumulator LDA $A0 ; these are all decimal because i got them that way - CMP.w #200 : BNE + - SEC : JMP .done - + CMP.w #51 : BNE + - SEC : JMP .done - + CMP.w #7 : BNE + - SEC : JMP .done - + CMP.w #90 : BNE + - SEC : JMP .done - + CMP.w #6 : BNE + - SEC : JMP .done - + CMP.w #41 : BNE + - SEC : JMP .done - + CMP.w #172 : BNE + - SEC : JMP .done - + CMP.w #222 : BNE + - SEC : JMP .done - + CMP.w #144 : BNE + - SEC : JMP .done - + CMP.w #164 : BNE + - SEC : JMP .done - + + CMP.w #200 : BEQ .done + CMP.w #51 : BEQ .done + CMP.w #7 : BEQ .done + CMP.w #90 : BEQ .done + CMP.w #6 : BEQ .done + CMP.w #41 : BEQ .done + CMP.w #172 : BEQ .done + CMP.w #222 : BEQ .done + CMP.w #144 : BEQ .done + CMP.w #164 : BEQ .done CLC .done - SEP #$20 ; set 8-bit accumulator ++ SEP #$20 ; set 8-bit accumulator RTL ;-------------------------------------------------------------------------------- ;#200 - Eastern Palace - Armos Knights diff --git a/icepalacegraphics.asm b/icepalacegraphics.asm index 8d2677f..22d5903 100644 --- a/icepalacegraphics.asm +++ b/icepalacegraphics.asm @@ -9,7 +9,7 @@ ShouldOverrideFileLoad: .no CLC : RTS .yes - SEC : RTS + RTS BgGraphicsLoading: ; Instructions overwritten