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/JSystem/J2DGraph/J2DPrint.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/JSystem/J2DGraph/J2DPrint.cpp')

diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index d1bc81352c..18c2e2d9b2 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -237,7 +237,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
             b2ByteCharacter = true;
         }
 
-        if (iCharacter == 0 || ((u32)pString - (u32)pStringStart) > length) {
+        if (iCharacter == 0 || ((uintptr_t)pString - (uintptr_t)pStringStart) > length) {
             if (!param_6 && param_3 != NULL) {
                 param_3[someIndex] = 0.5f + f31;
             }
@@ -284,7 +284,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
                         f31 = 0.0f;
                     }
                 }
-            } else if (b2ByteCharacter && ((u32)pString - (u32)pStringStart > (u32)length)) {
+            } else if (b2ByteCharacter && ((uintptr_t)pString - (uintptr_t)pStringStart > (u32)length)) {
                 if (!param_6 && param_3 != NULL) {
                     param_3[someIndex] = 0.5f + f31;
                 }
@@ -560,8 +560,8 @@ s32 J2DPrint::getNumberS32(const u8** ppu8String, s32 defaultValue, s32 errorVal
         number = strtol((char*)*ppu8String, &pEnd, base);
     } else if (base == 16) {
         number = strtoul((char*)*ppu8String, &pEnd, base);
-        if ((u32)pEnd - (u32)*ppu8String != 8) {
-            if ((u32)pEnd - (u32)*ppu8String == 6) {
+        if ((uintptr_t)pEnd - (uintptr_t)*ppu8String != 8) {
+            if ((uintptr_t)pEnd - (uintptr_t)*ppu8String == 6) {
                 number = (number << 8) | 0xFF;
             } else {
                 *ppu8String = pStringStart;
@@ -600,8 +600,8 @@ f32 J2DPrint::getNumberF32(const u8** ppu8String, f32 defaultValue, f32 errorVal
         number = strtol((char*)*ppu8String, &pEnd, base);
     } else if (base == 16) {
         number = strtoul((char*)*ppu8String, &pEnd, base);
-        if ((u32)pEnd - (u32)*ppu8String != 8) {
-            if ((u32)pEnd - (u32)*ppu8String == 6) {
+        if ((uintptr_t)pEnd - (uintptr_t)*ppu8String != 8) {
+            if ((uintptr_t)pEnd - (uintptr_t)*ppu8String == 6) {
                 number = (number << 8) | 0xFF;
             } else {
                 *ppu8String = pStringStart;
-- 
cgit v1.2.3