mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-26 15:45:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert field name change in JPA

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-17 21:26:06 -04:00
parent 473afbe9aa
commit ed7aeaceaf
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAResource.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
/* 0x34 */ JPAKeyBlock** mpKeyBlocks;
/* 0x38 */ u16 const* mpTDB1;
/* 0x3C */ u16 mUsrIdx;
/* 0x3E */ u8 fieldBlockNum;
/* 0x3E */ u8 mFieldBlockNum;
/* 0x3F */ u8 mKeyBlockNum;
/* 0x40 */ u8 mTDB1Num;
/* 0x41 */ u8 mpCalcEmitterFuncListNum;
src/JSystem/JParticle/JPAResource.cpp
+4 -4
View File
@@ -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);
}
}
src/JSystem/JParticle/JPAResourceLoader.cpp
+4 -4
View File
@@ -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;