rearrage logic in checkmem.s slightly

2 files changed, 12 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 02237bc..6dd4921 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,8 @@ test: all
 # C. There's probably a clever way to get ctags to handle this, but I
 # don't know it, so I wrote a perl script to do the job.
 tags:
-	ctags $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC)
-	perl fixtags.pl tags
+	@ctags $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC)
+	@perl fixtags.pl tags
 
 # The above is fast & easy, but from time to time it's necessary
 # to test slow loading, make sure the title screen stuff works OK.
diff --git a/checkmem.s b/checkmem.s
index b48c12b..06c7917 100644
--- a/checkmem.s
+++ b/checkmem.s
@@ -42,9 +42,14 @@ init:
 
  lda RAMTOP
  cmp #$c0
- bcs done ; if ramtop is $c000, we're OK
+ bcc have_cart
 
- ; if ramtop is below $c000, we have a cartridge (or XL BASIC)
+ ; if ramtop is $c000 or higher, we're OK, just exit.
+ rts
+
+have_cart:
+ ; if ramtop is below $c000, we have a cartridge (or XL BASIC).
+ ; print the "remove cart" message...
  lda #<msg
  sta FR0
  lda #>msg
@@ -57,14 +62,14 @@ msgloop:
  dey
  bpl msgloop
 
+ ; ...wait for a keystroke...
 wait4key:
  lda CH
  cmp #$ff
  beq wait4key
- jmp WARMSV
 
-done:
- rts
+ ; ...and do a warmstart.
+ jmp WARMSV
 
 end:
  .word INITAD