diff --git a/src/constants.a b/src/constants.a
index a4fca21cb..c41901540 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -9,7 +9,7 @@
 ; D000..E5F4 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; EABB..FFF9 - main program code
+; EABC..FFF9 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2
diff --git a/src/ui.cheats.a b/src/ui.cheats.a
index 1f7159476..59af49075 100644
--- a/src/ui.cheats.a
+++ b/src/ui.cheats.a
@@ -33,13 +33,11 @@ BuildUILine1WithNoDots
 ; in:    X = game index, or #$FF if no game selected
 ; out:   all registers clobbered
 ;        UILine1 contains 40-character buffer (not length-prefixed) to print
-         cpx   #$FF
-         beq   +
          ldy   gCheatsAvailable,x
-         +HIDE_NEXT_2_BYTES
-+
+         cpx   #$FF
+         bne   +
          ldy   #.kCheatsEnabled
-
++
          ldx   #40
          lda   #$00                  ; horizontal bar
 -        sta   UILine1-1,x           ; first, reset entire line to solid bar
@@ -84,13 +82,11 @@ BuildCheatLine1
 ; out:   gPathname contains length-prefixed string to print centered
 ;        all registers clobbered
 ;        PTR clobbered
-         cpx   #$FF
-         beq   +
          ldy   gCheatsAvailable,x
-         +HIDE_NEXT_2_BYTES
-+
+         cpx   #$FF
+         bne   +
          ldy   #.kCheatsEnabled
-
++
          ldx   #39                   ; reset gPathname+2 to gPathname+41 to
          lda   #$00                  ; horizontal bar character
 -        sta   gPathname+1,x
@@ -121,13 +117,11 @@ BuildCheatLine2
 ;        all registers clobbered
 ;        PTR clobbered
 ;        SAVE clobbered
-         cpx   #$FF
-         beq   +
          ldy   gCheatsAvailable,x
-         +HIDE_NEXT_2_BYTES
-+
+         cpx   #$FF
+         bne   +
          ldy   #.kCheatsEnabled
-         lda   .kCheatDescriptionLo,y
++        lda   .kCheatDescriptionLo,y
          sta   SAVE
          lda   .kCheatDescriptionHi,y
          sta   SAVE+1