diff --git a/src/constants.a b/src/constants.a
index 2c5cb5398..e5c27a92f 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -9,7 +9,7 @@
 ; D000..E611 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; EC26..FFF9 - main program code
+; EC29..FFF9 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2
diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a
index f87aa5e47..d377f19bf 100644
--- a/src/ui.attract.mode.a
+++ b/src/ui.attract.mode.a
@@ -56,14 +56,11 @@ MegaAttractMode
          +LDAY @mname                ; A/Y = address of module name
          jsr   RunAttractModule
          lda   KBD
-         bpl   @jmpattract
+         bpl   MegaAttractMode
          cmp   #$8D                  ; Enter plays the game shown on screen.
-         bne   @jmpsearch            ; Any other key switches to Search Mode.
+         bne   +                     ; Any other key switches to Search Mode.
          jsr   PlayGame              ; (might return if user hits Ctrl-Reset)
-@jmpattract
-         jmp   MegaAttractMode
-@jmpsearch
-         jmp   SearchMode
++        jmp   SearchMode
 
 ;------------------------------------------------------------------------------
 ; MiniAttractMode