revert field name change in JPA

2 files changed, 8 insertions, 8 deletions

diff --git a/src/JSystem/JParticle/JPAResource.cpp b/src/JSystem/JParticle/JPAResource.cpp
index 21828554..d678396e 100644
--- a/src/JSystem/JParticle/JPAResource.cpp
+++ b/src/JSystem/JParticle/JPAResource.cpp
@@ -42,7 +42,7 @@ JPAResource::JPAResource() {
     mpCalcEmitterFuncListNum = 0;
     mTDB1Num = 0;
     mKeyBlockNum = 0;
-    fieldBlockNum = 0;
+    mFieldBlockNum = 0;
     mUsrIdx = 0;
 }
 
@@ -753,7 +753,7 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     } else {
         calcKey(work);
 
-        for (int i = fieldBlockNum - 1; i >= 0; i--) {
+        for (int i = mFieldBlockNum - 1; i >= 0; i--) {
             mpFieldBlocks[i]->initOpParam();
         }
 
@@ -770,7 +770,7 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
             (*mpCalcEmitterFuncList[i])(work);
         }
 
-        for (int i = fieldBlockNum - 1; i >= 0; i--) {
+        for (int i = mFieldBlockNum - 1; i >= 0; i--) {
             mpFieldBlocks[i]->prepare(work);
         }
 
@@ -1059,7 +1059,7 @@ void JPAResource::calc_c(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 /* 80276684-80276700 270FC4 007C+00 0/0 2/2 0/0 .text
  * calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPAResource::calcField(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
-    for (int i = fieldBlockNum - 1; i >= 0; i--) {
+    for (int i = mFieldBlockNum - 1; i >= 0; i--) {
         mpFieldBlocks[i]->calc(work, ptcl);
     }
 }
diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/src/JSystem/JParticle/JPAResourceLoader.cpp
index e6a54aa1..c43c70ab 100644
--- a/src/JSystem/JParticle/JPAResourceLoader.cpp
+++ b/src/JSystem/JParticle/JPAResourceLoader.cpp
@@ -26,7 +26,7 @@ JPAResourceLoader::JPAResourceLoader(u8 const* data, JPAResourceManager* mgr) {
 struct JPAResourceHeader {
     /* 0x0 */ u16 mUsrIdx;
     /* 0x2 */ u16 mBlockNum;
-    /* 0x4 */ u8 fieldBlockNum;
+    /* 0x4 */ u8 mFieldBlockNum;
     /* 0x5 */ u8 mKeyBlockNum;
     /* 0x6 */ u8 mTDB1Num;
 };
@@ -44,9 +44,9 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) {
     for (int i = 0; i < *(u16*)(data + 8); i++) {
         JPAResourceHeader* header = (JPAResourceHeader*)(data + offset);
         JPAResource* res = new (heap, 4) JPAResource();
-        res->fieldBlockNum = header->fieldBlockNum;
-        res->mpFieldBlocks = res->fieldBlockNum != 0 ?
-            new (heap, 4) JPAFieldBlock*[res->fieldBlockNum] : NULL;
+        res->mFieldBlockNum = header->mFieldBlockNum;
+        res->mpFieldBlocks = res->mFieldBlockNum != 0 ?
+            new (heap, 4) JPAFieldBlock*[res->mFieldBlockNum] : NULL;
         res->mKeyBlockNum = header->mKeyBlockNum;
         res->mpKeyBlocks = res->mKeyBlockNum != 0 ?
             new (heap, 4) JPAKeyBlock*[res->mKeyBlockNum] : NULL;