1 files changed, 4 insertions, 29 deletions

diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp
index 54f4a874..75b7f86a 100644
--- a/src/JSystem/JParticle/JPAEmitterManager.cpp
+++ b/src/JSystem/JParticle/JPAEmitterManager.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAEmitterManager
-//
-
 #include "JSystem/JParticle/JPAList.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "egg/core/eggHeap.h"
@@ -16,8 +11,6 @@
 #include "rvl/GX/GXTypes.h"
 #include "rvl/GX.h"
 
-/* 8027DCA0-8027DEBC 2785E0 021C+00 0/0 1/1 0/0 .text __ct__17JPAEmitterManagerFUlUlP7EGG::HeapUcUc
- */
 JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, EGG::Heap* pHeap, u8 i_gidMax,
                                      u8 i_ridMax) {
     emtrNum = i_emtrNum;
@@ -49,16 +42,13 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, EGG::Heap* pH
     JUT_ASSERT(67, pWd);
 }
 
-/* 8027DEBC-8027DFA0 2787FC 00E4+00 0/0 3/3 0/0 .text
- * createSimpleEmitterID__17JPAEmitterManagerFRCQ29JGeometry8TVec3<f>UsUcUcP18JPAEmitterCallBackP19JPAParticleCallBack
- */
 JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(EGG::Vector3f const& pos,
                                                          u16 resID, u8 group_id, u8 res_mgr_id,
                                                          JPAEmitterCallBack* emtrCB,
                                                          JPAParticleCallBack* ptclCB) {
     JUT_ASSERT(88, group_id < gidMax);
     JUT_ASSERT(89, res_mgr_id < ridMax);
-    JUT_ASSERT(90, pResMgrAry[res_mgr_id] != 0);
+    JUT_ASSERT(90, pResMgrAry[res_mgr_id] != NULL);
     JPAResource* pRes = pResMgrAry[res_mgr_id]->getResource(resID);
 
     if (pRes == NULL) {
@@ -118,7 +108,6 @@ void JPAEmitterManager::fn_80320E20(u8 group_id, f32 of_x, f32 of_z) {
     }
 }
 
-/* 8027DFA0-8027E028 2788E0 0088+00 0/0 3/3 0/0 .text            calc__17JPAEmitterManagerFUc */
 void JPAEmitterManager::calc(u8 group_id) {
     JUT_ASSERT(154, group_id < gidMax);
     JSULink<JPABaseEmitter>* pNext = NULL;
@@ -128,13 +117,11 @@ void JPAEmitterManager::calc(u8 group_id) {
 
         JPABaseEmitter* emtr = pLink->getObject();
 
-        if (emtr->mpRes->calc(pWd, emtr) && !emtr->checkStatus(0x200))
+        if (emtr->pRes->calc(pWd, emtr) && !emtr->checkStatus(0x200))
             forceDeleteEmitter(emtr);
     }
 }
 
-/* 8027E028-8027E220 278968 01F8+00 0/0 1/1 0/0 .text draw__17JPAEmitterManagerFPC11JPADrawInfoUc
- */
 void JPAEmitterManager::draw(JPADrawInfo const* drawInfo, u8 group_id) {
     JUT_ASSERT(192, group_id < gidMax);
     drawInfo->getCamMtx(pWd->mPosCamMtx);
@@ -166,30 +153,24 @@ void JPAEmitterManager::draw(JPADrawInfo const* drawInfo, u8 group_id) {
         JPABaseEmitter* emtr = pLink->getObject();
         if (!emtr->checkStatus(0x04)) {
             pWd->mpResMgr = pResMgrAry[emtr->mResMgrID];
-            emtr->mpRes->draw(pWd, emtr);
+            emtr->pRes->draw(pWd, emtr);
         }
     }
 
     GXSetClipMode(GX_CLIP_ENABLE);
 }
 
-/* 8027E220-8027E278 278B60 0058+00 0/0 1/1 0/0 .text forceDeleteAllEmitter__17JPAEmitterManagerFv
- */
 void JPAEmitterManager::forceDeleteAllEmitter() {
     for (u8 i = 0; i < gidMax; i++)
         forceDeleteGroupEmitter(i);
 }
 
-/* 8027E278-8027E2D8 278BB8 0060+00 1/1 0/0 0/0 .text
- * forceDeleteGroupEmitter__17JPAEmitterManagerFUc              */
 void JPAEmitterManager::forceDeleteGroupEmitter(u8 group_id) {
     JUT_ASSERT(288, group_id < gidMax);
     while (pEmtrUseList[group_id].getNumLinks())
         forceDeleteEmitter(pEmtrUseList[group_id].getLast()->getObject());
 }
 
-/* 8027E2D8-8027E344 278C18 006C+00 3/3 1/1 0/0 .text
- * forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter    */
 void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
     emtr->deleteAllParticle();
     emtr->setStatus(0x300);
@@ -197,17 +178,13 @@ void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
     mFreeEmtrList.prepend(&emtr->mLink);
 }
 
-/* 8027E344-8027E354 278C84 0010+00 0/0 2/2 0/0 .text
- * entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc */
 void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resMgrID) {
-    JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == 0,
+    JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == NULL,
                      "res_id %d res_id_max %d array[%d] = %x", resMgrID, ridMax, resMgrID,
                      pResMgrAry[resMgrID]);
     pResMgrAry[resMgrID] = resMgr;
 }
 
-/* 8027E354-8027E3F4 278C94 00A0+00 0/0 1/1 0/0 .text clearResourceManager__17JPAEmitterManagerFUc
- */
 void JPAEmitterManager::clearResourceManager(u8 res_mgr_id) {
     JUT_ASSERT(339, res_mgr_id < ridMax);
     for (u8 i = 0; i < gidMax; i++) {
@@ -224,8 +201,6 @@ void JPAEmitterManager::clearResourceManager(u8 res_mgr_id) {
     pResMgrAry[res_mgr_id] = NULL;
 }
 
-/* 8027E3F4-8027E51C 278D34 0128+00 1/1 0/0 0/0 .text            calcYBBCam__17JPAEmitterManagerFv
- */
 void JPAEmitterManager::calcYBBCam() {
     EGG::Vector3f v(0.0f, pWd->mPosCamMtx[1][1], pWd->mPosCamMtx[2][1]);
     JUT_ASSERT(367, !v.isZero());