summaryrefslogtreecommitdiff
path: root/src/JSystem
diff options
context:
space:
mode:
Diffstat (limited to 'src/JSystem')
-rw-r--r--src/JSystem/JMessage/processor.cpp18
-rw-r--r--src/JSystem/JStudio/JStudio/stb-data-parse.cpp59
2 files changed, 39 insertions, 38 deletions
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index a59b2d277d..77ecc72bb5 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -216,11 +216,11 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
switch (uCode & 0xFFFF) {
case 4:
JUT_ASSERT(331, uSize==4);
- stack_pushCurrent(on_word(JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData)));
+ stack_pushCurrent(on_word(JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(pData)));
break;
case 5:
JUT_ASSERT(341, uSize==4);
- stack_pushCurrent(on_message(JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData)));
+ stack_pushCurrent(on_message(JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(pData)));
break;
default:
JGADGET_WARNMSG1(351, "unknown system-tag-code : ", uCode & 0xFFFF);
@@ -315,7 +315,7 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor
JUT_ASSERT(457, rData.uRest>0);
u16* puOffset = (u16*)rData.pOffset;
- u16 uData = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(puOffset);
+ u16 uData = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(puOffset);
rData.pOffset = (void*)(puOffset + 1);
return &rData.pcBase[uData];
@@ -331,7 +331,7 @@ const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis)
JUT_ASSERT(474, rData.uRest>0);
u32* puOffset = (u32*)rData.pOffset;
- u32 uData = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(puOffset);
+ u32 uData = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(puOffset);
rData.pOffset = (void*)(puOffset + 1);
return &rData.pcBase[uData];
@@ -574,7 +574,7 @@ void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSiz
break;
case 6: {
JUT_ASSERT(807, uSize==4);
- u32 u32Target = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData);
+ u32 u32Target = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(pData);
on_jump_register(process_onJump_, u32Target);
break;
}
@@ -610,7 +610,7 @@ void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSiz
}
case 0xF8: {
u16* pu16Data = (u16*)pData;
- u32 uNumber = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(pu16Data);
+ u32 uNumber = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(pu16Data);
JUT_ASSERT(859, uSize==2+2*uNumber);
on_branch_register(process_onBranch_limited_, pu16Data + 1, uNumber);
on_branch_query(uCode & 0xFFFF);
@@ -618,7 +618,7 @@ void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSiz
}
case 0xF7: {
u16* pu16Data = (u16*)pData;
- u32 uNumber = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(pu16Data);
+ u32 uNumber = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(pu16Data);
JUT_ASSERT(871, uSize==2+4*uNumber);
on_branch_register(process_onBranch_, pu16Data + 1, uNumber);
on_branch_query(uCode & 0xFFFF);
@@ -689,7 +689,7 @@ JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProce
JUT_ASSERT(942, rData.pTarget!=0);
JUT_ASSERT(943, uTargetIndex<rData.uTarget);
- u16 u16Index = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(rData.pTarget, uTargetIndex);
+ u16 u16Index = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(rData.pTarget, uTargetIndex);
return process_setMessageIndex_(pProcessor, u16Index);
}
@@ -702,7 +702,7 @@ JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor con
JUT_ASSERT(957, rData.pTarget!=0);
JUT_ASSERT(958, uTargetIndex<rData.uTarget);
- u32 uCode = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(rData.pTarget, uTargetIndex);
+ u32 uCode = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(rData.pTarget, uTargetIndex);
return process_setMessageCode_(pProcessor, uCode);
}
diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
index 7824291527..9701cc3cc6 100644
--- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
@@ -4,6 +4,7 @@
//
#include "JSystem/JStudio/JStudio/stb-data-parse.h"
+#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/os.h"
namespace JStudio {
@@ -47,37 +48,37 @@ void TParse_TParagraph::getData(TData* pData) const {
}
}
-void TParse_TParagraph_data::getData(data::TParse_TParagraph_data::TData* pData) const {
- u8* set2;
-
- int dSize = pData->dataSize = 0;
- pData->_8 = 0;
- pData->fileCount = NULL;
- pData->_10 = NULL;
- u8* filedata = (u8*)getRaw();
- if (filedata == NULL)
- return;
- u8 set = *filedata;
- pData->status = set & ~0x8;
- if (!set)
- return;
- int is8;
- int set3 = 1;
- is8 = set & 8;
- // Probably fake match
- if (set2 = (filedata + 1), is8) {
- set3 = *set2++;
- }
- pData->_8 = set3;
- pData->fileCount = set2;
+void TParse_TParagraph_data::getData(TParse_TParagraph_data::TData* pData) const {
+ JUT_ASSERT(104, pData!=0);
+ pData->entrySize = 0;
+ pData->entryCount = 0;
+ pData->content = NULL;
+ pData->next = NULL;
+ u8* temp = (u8*)getRaw();
+ u8* filedata = temp;
+ if (filedata == NULL)
+ return;
+ u8 r29 = *filedata;
+ pData->status = r29 & ~0x8;
+ if (!r29)
+ return;
+ filedata++;
+ u32 r28 = 1;
+ if (r29 & 8) {
+ r28 = *filedata;
+ filedata++;
+ }
+ pData->entryCount = r28;
+ pData->content = filedata;
- if (!(set & 7))
- return;
- dSize = (gauDataSize_TEParagraph_data)[set &= 7];
- pData->dataSize = dSize;
- pData->_10 = (u8*)set2 + (dSize * set3);
+ u8 r27 = r29 & 7;
+ if (r27 == 0)
+ return;
+ u32 dataSize = (gauDataSize_TEParagraph_data)[r27];
+ pData->entrySize = dataSize;
+ pData->next = filedata + (dataSize * r28);
}
} // namespace data
} // namespace stb
-} // namespace JStudio \ No newline at end of file
+} // namespace JStudio
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 12:24:03 +0000