From b7b5fb2a97a1a86d5f087812daf3246b841591d4 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brobert@adobe.com>
Date: Wed, 13 Mar 2024 11:03:21 -0500
Subject: [PATCH] Adjusted watchdog, commented out some debug messages

---
 .../src/main/java/jace/LawlessLegends.java    | 19 +++++++++++++------
 .../src/main/java/jace/apple2e/Apple2e.java   |  2 +-
 .../java/jace/lawless/LawlessComputer.java    |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Platform/Apple/tools/jace/src/main/java/jace/LawlessLegends.java b/Platform/Apple/tools/jace/src/main/java/jace/LawlessLegends.java
index 9a245cef..39e77d30 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/LawlessLegends.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/LawlessLegends.java
@@ -41,6 +41,7 @@ public class LawlessLegends extends Application {
     public JaceUIController controller;
 
     static AtomicBoolean romStarted = new AtomicBoolean(false);
+    int watchdogDelay = 500;
 
     @Override
     public void start(Stage stage) throws Exception {
@@ -66,7 +67,12 @@ public class LawlessLegends extends Application {
         primaryStage.show();
         Platform.runLater(() -> new Thread(() -> {
             Emulator.getInstance(getParameters().getRaw());
-            Emulator.withComputer(c->((LawlessComputer)c).initLawlessLegendsConfiguration());
+            Emulator.withComputer(c-> {
+                ((LawlessComputer)c).initLawlessLegendsConfiguration();
+                if (c.PRODUCTION_MODE) {
+                    watchdogDelay = 7000;
+                }
+            });
             configureEmulatorForGame();
             reconnectUIHooks();
             EmulatorUILogic.scaleIntegerRatio();
@@ -133,21 +139,22 @@ public class LawlessLegends extends Application {
      */
     private void bootWatchdog() {
         Emulator.withComputer(c -> {
-            int watchAddress = c.PRODUCTION_MODE ? 0x02000 : 0x0ff3a;
-            int watchdogDelay = c.PRODUCTION_MODE ? 6500 : 500;
+            // We know the game started properly when it runs the decompressor the first time
+            int watchAddress = c.PRODUCTION_MODE ? 0x0DF00 : 0x0ff3a;
             new Thread(()->{
-                Logger.getLogger(getClass().getName()).log(Level.WARNING, "Booting with watchdog");
+                // Logger.getLogger(getClass().getName()).log(Level.WARNING, "Booting with watchdog");
                 final RAMListener startListener = c.getMemory().observeOnce("Lawless Legends watchdog", RAMEvent.TYPE.EXECUTE, watchAddress, (e) -> {
-                    Logger.getLogger(getClass().getName()).log(Level.WARNING, "Boot was detected, watchdog terminated.");
+                    // Logger.getLogger(getClass().getName()).log(Level.WARNING, "Boot was detected, watchdog terminated.");
                     romStarted.set(true);
                 });
                 romStarted.set(false);
                 c.coldStart();
                 try {
                     Thread.sleep(watchdogDelay);
+                    watchdogDelay = 500;
                     if (!romStarted.get() || !c.isRunning() || c.getCpu().getProgramCounter() == MOS65C02.FASTBOOT || c.getCpu().getProgramCounter() == 0) {
                         Logger.getLogger(getClass().getName()).log(Level.WARNING, "Boot not detected, performing a cold start");
-                        Logger.getLogger(getClass().getName()).log(Level.WARNING, "Old PC: {0}", c.getCpu().getProgramCounter());
+                        Logger.getLogger(getClass().getName()).log(Level.WARNING, "Old PC: {0}", Integer.toHexString(c.getCpu().getProgramCounter()));
                         resetEmulator();
                         configureEmulatorForGame();
                         bootWatchdog();
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Apple2e.java b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Apple2e.java
index b86829a7..ece50ec4 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Apple2e.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Apple2e.java
@@ -245,7 +245,7 @@ public class Apple2e extends Computer {
             return;
         }
         getMotherboard().whileSuspended(()-> {
-            System.err.println("Reconfiguring computer...");
+            // System.err.println("Reconfiguring computer...");
             if (!isMemoryConfigurationCorrect()) {
                 if (getVideo() != null) {
                     getVideo().suspend();
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessComputer.java b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessComputer.java
index 433b8992..c8561515 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessComputer.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessComputer.java
@@ -85,6 +85,7 @@ public class LawlessComputer extends Apple2e {
         if (!performedBootAnimation) {
             try {
                 performedBootAnimation = true;
+                showBootAnimation = false;
                 waitForVBL();
                 waitForVBL();
                 waitForVBL();