Merge pull request #313 from robojumper/vec-mtx-cleanup

Cleanup

1 files changed, 4 insertions, 13 deletions

diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/src/JSystem/JParticle/JPAExTexShape.cpp
index 7d8d08f2..34e72f51 100644
--- a/src/JSystem/JParticle/JPAExTexShape.cpp
+++ b/src/JSystem/JParticle/JPAExTexShape.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAExTexShape
-//
-
 #include "JSystem/JParticle/JPAExTexShape.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPAEmitter.h"
@@ -10,31 +5,27 @@
 #include "rvl/MTX.h"
 #include "rvl/GX.h"
 
-/* 8027B040-8027B13C 275980 00FC+00 0/0 1/1 0/0 .text JPALoadExTex__FP18JPAEmitterWorkData */
 void JPALoadExTex(JPAEmitterWorkData* work) {
-    Mtx m;
     JPAExTexShape* ets = work->mpRes->getEts();
-    
+
     GXTexCoordID secTexCoordID = GX_TEXCOORD1;
     if (ets->isUseIndirect()) {
+        Mtx m;
         MTXIdentity(m);
         GXLoadTexMtxImm(m, GX_TEXMTX2, GX_MTX2x4);
         GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX2, GX_FALSE,
                           GX_PTIDENTITY);
-        u8 texIdx = ets->getIndTexIdx();
-        work->mpResMgr->load(work->mpRes->getTexIdx(texIdx), GX_TEXMAP2);
+        work->mpResMgr->load(work->mpRes->getTexIdx(ets->getIndTexIdx()), GX_TEXMAP2);
         secTexCoordID = GX_TEXCOORD2;
     }
 
     if (ets->isUseSecTex()) {
         GXSetTexCoordGen2(secTexCoordID, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, GX_FALSE,
                           GX_PTIDENTITY);
-        u8 texIdx = ets->getSecTexIdx();
-        work->mpResMgr->load(work->mpRes->getTexIdx(texIdx), GX_TEXMAP3);
+        work->mpResMgr->load(work->mpRes->getTexIdx(ets->getSecTexIdx()), GX_TEXMAP3);
     }
 }
 
-/* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text            __ct__13JPAExTexShapeFPCUc */
 JPAExTexShape::JPAExTexShape(u8 const* data) {
     mpData = (const JPAExTexShapeData*)data;
 }