From 850fae1aa304f7703ef973cf2126f246048ca25d Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Sun, 19 Oct 2025 10:30:49 -0700
Subject: m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits
---
 src/m_Do/m_Do_machine.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'src/m_Do/m_Do_machine.cpp')

diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 989c5c28b3..cd54ce571f 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -26,12 +26,19 @@
 #include "m_Do/m_Do_main.h"
 
 /* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss            None */
-static u8 mDebugFill;
-
-#ifdef DEBUG
-static u8 mDebugFillNotuse;
-static u8 mDebugFillNew;
-static u8 mDebugFillDelete;
+#if DEBUG
+u8 mDoMch::mDebugFill = true;
+u8 mDoMch::mDebugFillNotuse = 0xDD;
+u8 mDoMch::mDebugFillNew = 0xF7;
+u8 mDoMch::mDebugFillDelete = 0xDD;
+
+u8 mDoMch::myHeapVerbose;
+u8 mDoMch::myHeapCallbackCheck;
+u8 mDoMch::FpscrEnableBits;
+u8 mDoMch::GXWarningLevel;
+u8 mDoMch::GXWarningExecuteFrame;
+#else
+u8 mDoMch::mDebugFill;
 #endif
 
 /* 80450BF4-80450BF8 0000F4 0004+00 1/1 0/0 0/0 .sbss            solidHeapErrors */
@@ -543,11 +550,11 @@ int mDoMch_Create() {
         OSReportDisable();
     }
 
-    JKRHeap::setDefaultDebugFill(mDebugFill);
+    JKRHeap::setDefaultDebugFill(mDoMch::mDebugFill);
     #ifdef DEBUG
-    JKRSetDebugFillNotuse(mDebugFillNotuse);
-    JKRSetDebugFillNew(mDebugFillNew);
-    JKRSetDebugFillDelete(mDebugFillDelete);
+    JKRSetDebugFillNotuse(mDoMch::mDebugFillNotuse);
+    JKRSetDebugFillNew(mDoMch::mDebugFillNew);
+    JKRSetDebugFillDelete(mDoMch::mDebugFillDelete);
     #endif
     JFWSystem::setMaxStdHeap(1);
 
-- 
cgit v1.2.3