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/Z2AudioLib/Z2SceneMgr.cpp    | 4 ++--
 src/Z2AudioLib/Z2SeMgr.cpp       | 2 +-
 src/Z2AudioLib/Z2SoundObjMgr.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Z2AudioLib')

diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp
index 37ed2979d4..b1402c1fa9 100644
--- a/src/Z2AudioLib/Z2SceneMgr.cpp
+++ b/src/Z2AudioLib/Z2SceneMgr.cpp
@@ -216,12 +216,12 @@ void Z2SceneMgr::setSceneName(char* spotName, s32 room, s32 layer) {
     }
 
     if (spotName != NULL) {
-        for (spot = 0; spot < (int)ARRAY_SIZE(sSpotName); spot++) {
+        for (spot = 0; spot < ARRAY_SIZE(sSpotName); spot++) {
             if (!strcmp(spotName, sSpotName[spot])) {
                 break;
             }
         }
-        if (spot == (int)ARRAY_SIZE(sSpotName)) {
+        if (spot == ARRAY_SIZE(sSpotName)) {
             spot = SPOT_NONE;
         }
     }
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp
index b5886c6a3f..cbb20a3614 100644
--- a/src/Z2AudioLib/Z2SeMgr.cpp
+++ b/src/Z2AudioLib/Z2SeMgr.cpp
@@ -694,7 +694,7 @@ bool Z2SeMgr::seStartLevel(JAISoundID i_soundID, Vec const* i_pos, u32 param_2,
             Z2GetAudience()->calcOffMicSound(i_volume);
         }
 
-        (*handle)->setUserData((u32)i_pos);
+        (*handle)->setUserData((uintptr_t)i_pos);
 
         if (ret) {
             (*handle)->setLifeTime(1, false);
diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp
index 47d0d36c15..761b8dba4d 100644
--- a/src/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -340,7 +340,7 @@ void Z2SoundObjMgr::setGhostEnemyState(u8 p1) {
  * getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */
 u8 Z2SoundObjMgr::getEnemyID(char const* param_0, JSULink<Z2CreatureEnemy>* param_1) {
     if (param_0 != NULL) {
-        for (u8 uVar2 = 0; uVar2 < ARRAY_SIZE(mEnemyInfo); uVar2++) {
+        for (u8 uVar2 = 0; uVar2 < ARRAY_SIZEU(mEnemyInfo); uVar2++) {
             if (strcmp(param_0, mEnemyInfo[(u32)uVar2].mName) == 0) {
                 append(param_1);
                 return uVar2;
-- 
cgit v1.2.3