Re-import JParticle

1 files changed, 28 insertions, 38 deletions

diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp
index 09a80c74..430ad101 100644
--- a/src/JSystem/JParticle/JPAResourceManager.cpp
+++ b/src/JSystem/JParticle/JPAResourceManager.cpp
@@ -1,54 +1,47 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAResourceManager
-//
-
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
-#include "string.h"
+#include "JSystem/JUtility/JUTAssert.h"
+#include "egg/core/eggHeap.h"
+#include <cstring>
 
 struct JPAResourceLoader {
-    /* 8027D8A0 */ JPAResourceLoader(u8 const*, JPAResourceManager*);
+    JPAResourceLoader(u8 const*, JPAResourceManager*);
 };
 
-/* 80273E10-80273E68 26E750 0058+00 0/0 2/2 0/0 .text __ct__18JPAResourceManagerFPCvP7JKRHeap */
-JPAResourceManager::JPAResourceManager(void const* pData, EGG::Heap* pHeap) {
-    mpResArr = NULL;
-    mpTexArr = NULL;
-    mResMax = 0;
-    mResNum = 0;
-    mTexMax = 0;
-    mTexNum = 0;
+JPAResourceManager::JPAResourceManager(void const* p_jpc, EGG::Heap* pHeap) {
+    pResAry = NULL;
+    pTexAry = NULL;
+    resMaxNum = 0;
+    resRegNum = 0;
+    texMaxNum = 0;
+    texRegNum = 0;
     mpHeap = pHeap;
-    JPAResourceLoader loader((u8 const*)pData, this);
+    JUT_ASSERT(49, (p_jpc != 0) && (pHeap != 0));
+    JPAResourceLoader loader((u8 const*)p_jpc, this);
 }
 
-/* 80273E68-80273EA8 26E7A8 0040+00 1/1 1/1 0/0 .text getResource__18JPAResourceManagerCFUs */
 JPAResource* JPAResourceManager::getResource(u16 usrIdx) const {
-    for (u16 i = 0; i < mResNum; i++)
-        if (mpResArr[i]->getUsrIdx() == usrIdx)
-            return mpResArr[i];
+    for (u16 i = 0; i < resRegNum; i++)
+        if (pResAry[i]->getUsrIdx() == usrIdx)
+            return pResAry[i];
     return NULL;
 }
 
-/* 80273EA8-80273EEC 26E7E8 0044+00 0/0 2/2 0/0 .text
- * checkUserIndexDuplication__18JPAResourceManagerCFUs          */
 bool JPAResourceManager::checkUserIndexDuplication(u16 usrIdx) const {
-    for (s32 i = 0; i < mResNum; i++)
-        if (mpResArr[i]->getUsrIdx() == usrIdx)
+    for (s32 i = 0; i < resRegNum; i++)
+        if (pResAry[i]->getUsrIdx() == usrIdx)
             return true;
     return false;
 }
 
-/* 80273EEC-80273F8C 26E82C 00A0+00 0/0 2/2 0/0 .text
- * swapTexture__18JPAResourceManagerFPC7ResTIMGPCc              */
 const EGG::ResTIMG* JPAResourceManager::swapTexture(EGG::ResTIMG const* img, char const* swapName) {
     const EGG::ResTIMG* ret = NULL;
+    EGG::Texture* tex = NULL;
 
-    for (s32 i = 0; i < mTexNum; i++) {
-        if (strcmp(swapName, mpTexArr[i]->getName()) == 0) {
-            EGG::Texture* tex = mpTexArr[i]->getJUTTexture();
+    for (s32 i = 0; i < texRegNum; i++) {
+        if (strcmp(swapName, pTexAry[i]->getName()) == 0) {
+            tex = pTexAry[i]->getJUTTexture();
             ret = tex->getTexInfo();
             tex->storeTIMG(img, (u8)0);
             break;
@@ -58,21 +51,18 @@ const EGG::ResTIMG* JPAResourceManager::swapTexture(EGG::ResTIMG const* img, cha
     return ret;
 }
 
-/* 80273F8C-80273FAC 26E8CC 0020+00 0/0 1/1 0/0 .text
- * registRes__18JPAResourceManagerFP11JPAResource               */
 void JPAResourceManager::registRes(JPAResource* res) {
-    mpResArr[mResNum] = res;
-    mResNum++;
+    JUT_ASSERT(151, resRegNum < resMaxNum);
+    pResAry[resRegNum] = res;
+    resRegNum++;
 }
 
-/* 80273FAC-80273FCC 26E8EC 0020+00 0/0 1/1 0/0 .text
- * registTex__18JPAResourceManagerFP10JPATexture                */
 void JPAResourceManager::registTex(JPATexture* tex) {
-    mpTexArr[mTexNum] = tex;
-    mTexNum++;
+    JUT_ASSERT(166, texRegNum < texMaxNum);
+    pTexAry[texRegNum] = tex;
+    texRegNum++;
 }
 
-/* 80273FCC-80274010 26E90C 0044+00 0/0 6/6 0/0 .text getResUserWork__18JPAResourceManagerCFUs */
 u32 JPAResourceManager::getResUserWork(u16 usrIdx) const {
     u32 ret = 0;