From b45a089e15d79821b07be020db628e01a49b1fd2 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Thu, 4 Sep 2025 07:56:59 -0700
Subject: some J3D/misc cleanup (#2628)

* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
---
 src/m_Do/m_Do_machine.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 44e40aba06..989c5c28b3 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -415,7 +415,7 @@ static void my_PrintHeap(char const* heapName, u32 heapSize) {
 /* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text            my_SysPrintHeap__FPCcPvUl */
 void my_SysPrintHeap(char const* message, void* start, u32 size) {
     OSReport_System("\x1b[32m%-24s = %08x-%08x size=%d KB\n\x1b[m", message, start,
-                    (u32)start + size, size / 1024);
+                    (uintptr_t)start + size, size / 1024);
 }
 
 #if VERSION != VERSION_GCN_PAL
@@ -552,15 +552,15 @@ int mDoMch_Create() {
     JFWSystem::setMaxStdHeap(1);
 
     #ifndef DEBUG
-    u32 arenaHi = (u32)OSGetArenaHi();
-    u32 arenaLo =(u32)OSGetArenaLo();
+    uintptr_t arenaHi = (uintptr_t)OSGetArenaHi();
+    uintptr_t arenaLo = (uintptr_t)OSGetArenaLo();
 
     if (arenaHi > 0x81800000 && arenaHi - 0x1800000 > arenaLo) {
         OSSetArenaHi((void*)(arenaHi - 0x1800000));
     }
     #endif
 
-    u32 arenaSize = ((u32)OSGetArenaHi() - (u32)OSGetArenaLo()) - 0xF0;
+    u32 arenaSize = ((uintptr_t)OSGetArenaHi() - (uintptr_t)OSGetArenaLo()) - 0xF0;
     my_PrintHeap("アリーナ", arenaSize);
 
     if (mDoMain::memMargin != -1) {
-- 
cgit v1.2.3