From 7fb0bbc35e7fc7cc10be5453772c032c84ee921c Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Wed, 16 Oct 2024 07:07:44 -0700
Subject: [PATCH] disable Mapple debug key, mark in-game cheat

---
 res/GAMES.CONF         |  2 +-
 src/prelaunch/mapple.a | 35 +++--------------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/res/GAMES.CONF b/res/GAMES.CONF
index 361f085bd..c99c3054a 100755
--- a/res/GAMES.CONF
+++ b/res/GAMES.CONF
@@ -278,7 +278,7 @@
 10001,MAD.BOMBER=Mad Bomber
 00011,MAD.RAT=Mad Rat
 00011,MANIC.MINER=Manic Miner
-00041,MAPPLE=Mapple
+00071,MAPPLE=Mapple
 10010,MARAUDER=Marauder
 11050,MARBLE.MADNESS=Marble Madness
 00011,MB=Mario Bros.
diff --git a/src/prelaunch/mapple.a b/src/prelaunch/mapple.a
index cfe5aa2c6..6943b4883 100644
--- a/src/prelaunch/mapple.a
+++ b/src/prelaunch/mapple.a
@@ -8,42 +8,13 @@
     !source "src/macros.a"
 
          +ENABLE_ACCEL
-         jmp   skip
-
-!pseudopc $200+*-$100 {
-callback
-         pla
-         pha
-         cmp   #$5f
-         beq   +
-         dec   $512B
-+        jmp   $50C0
-}
-
-skip
-         ldy   #0
--        lda   $100,y
-         sta   $200,y
-         iny
-         bne   -
-         +RESET_VECTOR_HALF $200
+         +NEW_RESET_VECTOR $200
          lda   #$60
          sta   $950B
          jsr   $6C17       ; decompress
+         dey
+         sty   $4DE8       ; disable debug key
          +READ_RAM2_NO_WRITE
-         lda   MachineStatus
-         and   #CHEATS_ENABLED
-         beq   +
-         lda   #$ad
-         sta   $4276       ; patch - don't increase lives
-         sta   $4B75       ; patch - don't decrease lives
-         lda   #$4C
-         sta   $50BD
-         lda   #<callback
-         sta   $50BE
-         lda   #>callback
-         sta   $50BF
-+
          lda   MockingboardStuff
          beq   no_mb
          and   #7