From 5cacf5da149ba5cce2dd698576e158f2428ea0b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Ahlstro=CC=88m?= <fredrikahlstrom75@gmail.com>
Date: Sun, 5 Jan 2025 13:58:30 +0100
Subject: [PATCH] Some clean up of comments regarding Timer Done bit, updated
 history and todo lists.

---
 .vscode/launch.json                                |  2 +-
 .vscode/tasks.json                                 | 14 ++++++--------
 History.txt                                        |  2 +-
 .../xcshareddata/xcschemes/LodjurDS.xcscheme       |  1 -
 LodjurDS_todo.txt                                  |  3 +--
 source/ARMMikey                                    |  2 +-
 source/ARMSuzy                                     |  2 +-
 source/Gui.c                                       |  2 +-
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5ab1efe..56f65dc 100755
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,7 +17,7 @@
             "externalConsole": true,
             "cwd": "${workspaceFolder}",
             "targetArchitecture": "arm",
-            "miDebuggerServerAddress": "localhost:20000",
+            "miDebuggerServerAddress": "localhost:3333",
             "windows": {
                 "miDebuggerPath": "C:/devkitPro/devkitARM/bin/arm-none-eabi-gdb.exe"
             },
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index f375b79..fa1abf5 100755
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -10,7 +10,7 @@
                 "command": "taskkill /im mGBA.exe /F"
             },
             "osx": {
-                "command": "killall desmume"
+                "command": "killall melonDS"
             }
         },
         {
@@ -51,11 +51,7 @@
                 "command": "C:/mGBA/mGBA.exe -g ${workspaceFolder}/${workspaceFolderBasename}.nds;sleep 5;echo debuggerReady"
             },
             "osx": {
-                "command": "/Applications/desmume.app/Contents/MacOS/desmume",
-                "args": [
-                    //"--arm9gdb=20000",
-                    "${workspaceFolder}/${workspaceFolderBasename}.nds"
-                ]
+                "command": "open /Applications/melonDS.app --args ${workspaceFolder}/${workspaceFolderBasename}.nds"
             },
             "presentation": {
                 "clear": true,
@@ -86,9 +82,11 @@
                 "make release"
             ],
             "isBackground": true,
-            "command": "C:/NO$GBA/NO$GBA.exe ${workspaceFolder}/${workspaceFolderBasename}.nds",
+            "windows": {
+                "command": "C:/NO$GBA/NO$GBA.exe ${workspaceFolder}/${workspaceFolderBasename}.nds",
+            },
             "osx": {
-                "command": "/Applications/desmume.app/Contents/MacOS/desmume ${workspaceFolder}/${workspaceFolderBasename}.nds",
+                "command": "open /Applications/melonDS.app --args ${workspaceFolder}/${workspaceFolderBasename}.nds",
             },
            "problemMatcher": []
         }
diff --git a/History.txt b/History.txt
index 89eb6e1..e0caf31 100644
--- a/History.txt
+++ b/History.txt
@@ -1,7 +1,7 @@
 LodjurDS revision history
 -=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-V0.1.0 - 2025-01-04 (FluBBa)
+V0.1.0 - 2025-01-05 (FluBBa)
 	First real version.
 	Most things should work.
 
diff --git a/LodjurDS.xcodeproj/xcshareddata/xcschemes/LodjurDS.xcscheme b/LodjurDS.xcodeproj/xcshareddata/xcschemes/LodjurDS.xcscheme
index 66f35eb..90de000 100644
--- a/LodjurDS.xcodeproj/xcshareddata/xcschemes/LodjurDS.xcscheme
+++ b/LodjurDS.xcodeproj/xcshareddata/xcschemes/LodjurDS.xcscheme
@@ -42,7 +42,6 @@
       allowLocationSimulation = "YES">
       <PathRunnable
          runnableDebuggingMode = "0"
-         BundleIdentifier = "org.desmume.DeSmuME"
          FilePath = "/Applications/DeSmuME.app">
       </PathRunnable>
       <MacroExpansion>
diff --git a/LodjurDS_todo.txt b/LodjurDS_todo.txt
index d0d4168..677c7a3 100644
--- a/LodjurDS_todo.txt
+++ b/LodjurDS_todo.txt
@@ -13,7 +13,6 @@ CPU:
 	See ARM6502 Todo.
 
 Suzy:
-	make different versions of lineRender.
 	See Suzy todo.
 
 Mikey:
@@ -46,7 +45,7 @@ Games with different refresh rate:
 
 Games Not Working:
 	Baseball Heroes. (EEPROM?)
-	Gates of zendocon.  Hangs in intro. Writes 0x40? Expects some sound thing?
+	Gates of Zendocon - Intro hangs if Timer Done bit in Timer 5 is not correct.
 	Rampage. Hangs on title screen after some time?
 
 Games Not Working Fixed:
diff --git a/source/ARMMikey b/source/ARMMikey
index d034a7a..858725a 160000
--- a/source/ARMMikey
+++ b/source/ARMMikey
@@ -1 +1 @@
-Subproject commit d034a7aadb05243dc57bbc9687dac368ff48afe3
+Subproject commit 858725ac0962d4775544419ea3ef844d043de4b9
diff --git a/source/ARMSuzy b/source/ARMSuzy
index 4457c07..4134535 160000
--- a/source/ARMSuzy
+++ b/source/ARMSuzy
@@ -1 +1 @@
-Subproject commit 4457c0713917a9cb63616ae4bdc46d410295efc2
+Subproject commit 413453584f250279b52b9fb129ae85fc956a1b79
diff --git a/source/Gui.c b/source/Gui.c
index 2ddd19b..ad6852c 100644
--- a/source/Gui.c
+++ b/source/Gui.c
@@ -14,7 +14,7 @@
 #include "ARMMikey/Version.h"
 #include "ARMSuzy/Version.h"
 
-#define EMUVERSION "V0.1.0 2025-01-04"
+#define EMUVERSION "V0.1.0 2025-01-05"
 
 static void gammaChange(void);
 static void machineSet(void);