cleanup/doc JMessage / d_msg_class (#2484)

* jmessage cleanup pass

* more JMessage cleanup

* d_msg_class cleanup
This commit is contained in:
TakaRikka
2025-06-13 05:33:33 -07:00
committed by GitHub
parent 7f6be99616
commit bf8a906790
24 changed files with 3660 additions and 3302 deletions
+21 -13
View File
@@ -5,6 +5,9 @@
#include "__va_arg.h"
class JUTFont;
class J2DPrint;
extern "C" f32 J2DPrint_print_alpha_va(J2DPrint*, u8, const char*, va_list);
/**
* @ingroup jsystem-j2d
@@ -17,12 +20,15 @@ public:
/* 0x4 */ f32 field_0x4;
};
/* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
J2DPrint(JUTFont*, JUtility::TColor, JUtility::TColor);
void initiate();
/* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
/* 802F4658 */ static u8* setBuffer(size_t);
/* 802F46C4 */ void setFontSize();
/* 802F475C */ void locate(f32, f32);
/* 802F4778 */ void print(f32, f32, u8, char const*, ...);
/* 802F4778 */ f32 print(f32, f32, u8, char const*, ...);
/* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
f32, f32, u8);
/* 802F4B4C */ f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
@@ -34,6 +40,10 @@ public:
/* 802F4420 */ virtual ~J2DPrint();
f32 print_va(u8 alpha, const char* fmt, va_list args) {
return J2DPrint_print_alpha_va(this, alpha, fmt, args);
}
void setFontSize(f32 sizeX, f32 sizeY) {
f32 x;
if (sizeX > 0.0f) {
@@ -52,7 +62,7 @@ public:
mFontSizeY = y;
}
static const u8* mStrBuff;
static char* mStrBuff;
static size_t mStrBuffSize;
private:
@@ -64,27 +74,25 @@ private:
/* 0x0C */ JUtility::TColor field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x18 */ f32 mScaleX;
/* 0x1C */ f32 mScaleY;
/* 0x20 */ s16 field_0x20;
/* 0x22 */ bool field_0x22;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x2C */ f32 mCursorH;
/* 0x30 */ f32 mCursorV;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ JUtility::TColor field_0x38;
/* 0x3C */ JUtility::TColor field_0x3c;
/* 0x38 */ JUtility::TColor mBlackColor;
/* 0x3C */ JUtility::TColor mWhiteColor;
/* 0x40 */ JUtility::TColor mCharColor;
/* 0x44 */ JUtility::TColor mGradColor;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x48 */ f32 mCharSpacing;
/* 0x4C */ f32 mLineSpacing;
/* 0x50 */ f32 mFontSizeX;
/* 0x54 */ f32 mFontSizeY;
/* 0x58 */ s16 field_0x58;
/* 0x5A */ bool field_0x5a;
}; // Size: 0x5C
f32 J2DPrint_print_alpha_va(J2DPrint*, u8, const char*, va_list);
#endif /* J2DPRINT_H */
+27 -3
View File
@@ -18,9 +18,9 @@ public:
JGadget_outMessage& operator<<(int param_1) { return *this << (s32)param_1; }
JGadget_outMessage& operator<<(u16);
JGadget_outMessage& operator<<(unsigned int);
JGadget_outMessage& operator<<(u8);
JGadget_outMessage& operator<<(u8 param_1) { return *this << (char)param_1; }
JGadget_outMessage& operator<<(const char* str);
JGadget_outMessage& operator<<(s8);
JGadget_outMessage& operator<<(char);
JGadget_outMessage& operator<<(s32);
JGadget_outMessage& operator<<(u32);
JGadget_outMessage& operator<<(const void*);
@@ -33,13 +33,37 @@ private:
int mLine;
};
#define JGADGET_ASSERTWARN(cond) ((cond) || (false))
#ifdef DEBUG
// these macros are probably wrong, needs work
#define JGADGET_ASSERTWARN(line, COND) \
if (!(COND)) { \
JGadget_outMessage out(JGadget_outMessage::warning, __FILE__, line); \
out << #COND; \
}
#define JGADGET_WARNMSG(line, msg) \
JGadget_outMessage out(JGadget_outMessage::warning, __FILE__, line); \
out << msg;
#define JGADGET_WARNMSG1(line, msg, arg) \
JGadget_outMessage out(JGadget_outMessage::warning, __FILE__, line); \
out << msg << (arg);
#define JGADGET_WARNMSG4(line, msg, arg1, arg2, arg3, arg4) \
JGadget_outMessage out(JGadget_outMessage::warning, __FILE__, line); \
out << msg << (arg1) << (arg2) << (arg3) << (arg4);
#define JGADGET_EXITWARN(cond) \
if (!(cond)) { \
false; \
return false; \
}
#else
#define JGADGET_ASSERTWARN(line, COND) (void)0
#define JGADGET_WARNMSG(line, msg) (void)0
#define JGADGET_WARNMSG1(line, msg, arg) (void)0
#define JGADGET_WARNMSG4(line, msg, arg1, arg2, arg3, arg4) (void)0
#endif
}
#endif
+6 -3
View File
@@ -2,6 +2,7 @@
#define LINKLIST_H
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JGadget/define.h"
#include <iterator.h>
namespace JGadget {
@@ -75,8 +76,8 @@ struct TNodeLinkList {
const_iterator begin() const { return const_iterator(ocObject_.getNext()); }
iterator end() { return iterator(&ocObject_); }
const_iterator end() const { return const_iterator((TLinkListNode*)(&ocObject_)); }
u32 size() { return count; }
bool empty() { return size() == 0; }
u32 size() const { return count; }
bool empty() const { return size() == 0; }
iterator pop_front() { return erase(begin()); }
iterator erase(JGadget::TNodeLinkList::iterator, JGadget::TNodeLinkList::iterator);
@@ -248,7 +249,9 @@ struct TLinkList_factory : public TLinkList<T, I> {
};
template <typename T, int I>
TLinkList_factory<T, I>::~TLinkList_factory() {}
TLinkList_factory<T, I>::~TLinkList_factory() {
JGADGET_ASSERTWARN(934, empty());
}
template <typename T>
struct TEnumerator {
+26 -28
View File
@@ -16,30 +16,36 @@ struct TControl {
/* 802A75D4 */ void reset();
/* 802A7634 */ int update();
/* 802A76BC */ void render();
/* 802A77E8 */ int setMessageCode(u16, u16);
/* 802A78F4 */ int setMessageID(u32, u32, bool*);
/* 802A7A20 */ bool setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16);
/* 802A77E8 */ int setMessageCode(u16 u16GroupID, u16 u16Index);
/* 802A78F4 */ int setMessageID(u32 uMsgID, u32 param_1, bool* pbValid);
/* 802A7A20 */ bool setMessageCode_inSequence_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index);
bool isReady_update_() const { return pMessageText_begin_ != 0 && pSequenceProcessor_ != NULL; }
bool isReady_render_() const { return field_0x20 != 0 && pRenderingProcessor_ != NULL; }
bool isReady_render_() const { return pMessageText_current_ != 0 && pRenderingProcessor_ != NULL; }
TProcessor* getProcessor() const {
return pSequenceProcessor_ != NULL ? (TProcessor*)pSequenceProcessor_ :
(TProcessor*)pRenderingProcessor_;
if (pSequenceProcessor_ != NULL) {
return (TProcessor*)pSequenceProcessor_;
} else {
return (TProcessor*)pRenderingProcessor_;
}
}
int setMessageCode(u32 code) {
return setMessageCode(code >> 16, code);
int setMessageCode(u32 uCode) {
return setMessageCode(uCode >> 16, uCode);
}
int setMessageCode_inReset_(TProcessor* pProcessor, u16 param_1, u16 param_2) {
if (!setMessageCode_inSequence_(pProcessor, param_1, param_2)) {
int setMessageCode_inReset_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index) {
JUT_ASSERT(138, pEntry_==0);
JUT_ASSERT(139, pszText_update_current_==0);
JUT_ASSERT(140, oStack_renderingProcessor_.empty());
if (!setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
return 0;
}
if (isReady_update_()) {
pSequenceProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_,
pMessageText_begin_);
pSequenceProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, pMessageText_begin_);
}
return 1;
@@ -47,8 +53,10 @@ struct TControl {
const char* getMessageText_begin() const { return pMessageText_begin_; }
void* getMessageEntry() const { return pEntry_; }
void setSequenceProcessor(TSequenceProcessor* processor) { pSequenceProcessor_ = processor; }
void setRenderingProcessor(TRenderingProcessor* processor) { pRenderingProcessor_ = processor; }
u32 getMessageCode() const { return (uMessageGroupID_ << 16) | uMessageID_; }
void setSequenceProcessor(TSequenceProcessor* pProcessor) { pSequenceProcessor_ = pProcessor; }
void setRenderingProcessor(TRenderingProcessor* pProcessor) { pRenderingProcessor_ = pProcessor; }
void resetResourceCache() {
if (pSequenceProcessor_ != NULL) {
pSequenceProcessor_->resetResourceCache();
@@ -63,32 +71,22 @@ struct TControl {
void render_synchronize() {
if (isReady_render_()) {
field_0x20 = pszText_update_current_;
pMessageText_current_ = pszText_update_current_;
oStack_renderingProcessor_ = pRenderingProcessor_->oStack_;
}
}
/* 0x04 */ TSequenceProcessor* pSequenceProcessor_;
/* 0x08 */ TRenderingProcessor* pRenderingProcessor_;
/* 0x0C */ u16 messageCode_;
/* 0x0E */ u16 field_0xe;
/* 0x0C */ u16 uMessageGroupID_;
/* 0x0E */ u16 uMessageID_;
/* 0x10 */ const TResource* pResourceCache_;
/* 0x14 */ void* pEntry_;
/* 0x18 */ const char* pMessageText_begin_;
/* 0x1C */ const char* pszText_update_current_;
/* 0x20 */ const char* field_0x20;
/* 0x20 */ const char* pMessageText_current_;
/* 0x24 */ TProcessor::TStack_ oStack_renderingProcessor_;
};
}; // namespace JMessage
/**
* @ingroup jsystem-jmessage
*
*/
struct jmessage_tControl : public JMessage::TControl {
/* 802299EC */ jmessage_tControl();
/* 80039B0C */ virtual ~jmessage_tControl();
};
#endif /* JMESSAGE_CONTROL_H */
+32 -14
View File
@@ -10,8 +10,9 @@ namespace JMessage {
*
*/
struct data {
// TParse_THeader handles parsing the BMG file header data
struct TParse_THeader : public JGadget::binary::TParseData_aligned<4> {
TParse_THeader(const void* data) : TParseData_aligned(data) {}
TParse_THeader(const void* pData) : TParseData_aligned(pData) {}
const void* getContent() const { return (char*)getRaw() + 0x20; }
char* get() const { return (char*)getRaw(); }
@@ -22,8 +23,9 @@ struct data {
u8 get_encoding() const { return *(u8*)(get() + 0x10); }
};
// TParse_TBlock handles parsing the generic section header data
struct TParse_TBlock : public JGadget::binary::TParseData_aligned<4> {
TParse_TBlock(const void* data) : TParseData_aligned(data) {}
TParse_TBlock(const void* pData) : TParseData_aligned(pData) {}
const char* get() const { return (char*)getRaw(); }
u32 get_size() const { return *(u32*)(get() + 0x4); }
@@ -31,53 +33,69 @@ struct data {
u32 get_type() const { return *(u32*)(get() + 0x0); }
};
// TParse_TBlock_info handles parsing INF1 section data
struct TParse_TBlock_info : public TParse_TBlock {
TParse_TBlock_info(const void* data) : TParse_TBlock(data) {}
TParse_TBlock_info(const void* pData) : TParse_TBlock(pData) {}
char* get() const { return (char*)getRaw(); }
char* getContent() const { return (char*)getRaw() + 0x10; }
u16 get_messageEntrySize() const { return *(u16*)(get() + 0xA); }
u32 get_messageEntrySize() const { return *(u16*)(get() + 0xA); }
u16 get_messageEntryNumber() const { return *(u16*)(get() + 0x8); }
u32 get_messageEntryNumber() const { return *(u16*)(get() + 0x8); }
u16 get_groupID() const { return *(u16*)(get() + 0xC); }
};
// TParse_TBlock_messageID handles parsing MID1 section data
struct TParse_TBlock_messageID : public TParse_TBlock {
TParse_TBlock_messageID(const void* data) : TParse_TBlock(data) {}
TParse_TBlock_messageID(const void* pData) : TParse_TBlock(pData) {}
char* get() const { return (char*)getRaw(); }
u8 get_formSupplement() const { return *(u8*)(get() + 0xB); }
int get_number() const { return *(u16*)(get() + 0x8); }
u32* getContent() const { return (u32*)((u32)getRaw() + 0x10); }
u8 get_form() const { return *(u8*)(get() + 0xA) & 0xF; }
u32 get_form() const { return *(u8*)(get() + 0xA) & 0xF; }
bool get_isOrdered() const { return *(u8*)(get() + 0xA) & 0xF0; }
};
struct TParse_TBlock_color : public TParse_TBlock {
TParse_TBlock_color(const void* data) : TParse_TBlock(data) {}
TParse_TBlock_color(const void* pData) : TParse_TBlock(pData) {}
};
// TParse_TBlock_messageText handles parsing DAT1 section data
struct TParse_TBlock_messageText : public TParse_TBlock {
TParse_TBlock_messageText(const void* data) : TParse_TBlock(data) {}
TParse_TBlock_messageText(const void* pData) : TParse_TBlock(pData) {}
char* getContent() const { return (char*)getRaw() + 0x8; }
};
// TParse_TBlock_stringAttribute handles parsing STR1 section data
struct TParse_TBlock_stringAttribute : public TParse_TBlock {
TParse_TBlock_stringAttribute(const void* data) : TParse_TBlock(data) {}
TParse_TBlock_stringAttribute(const void* pData) : TParse_TBlock(pData) {}
char* getContent() const { return (char*)getRaw() + 0x8; }
};
static u32 getTagCode(u32 tag) { return tag & 0xFFFF; }
static u32 getTagGroup(u32 tag) { return (tag >> 0x10) & 0xFF; }
static unsigned int getTagCode(u32 tag) { return tag & 0xFFFF; }
static u8 getTagGroup(u32 tag) { return tag >> 0x10; }
static u32 ga4cSignature;
static const u32 ga4cSignature;
static const u32 ga4cSignature_color;
static const int gcTagBegin = '\x1A';
static const int gcTagBegin = '\x1A'; // All text Control Tags will begin with this character
enum {
MESSAGEINDEX_USER_ENUM_MIN = 0x0000,
MESSAGEINDEX_USER_ENUM_MAX = 0xFEFF,
MESSAGEINDEX_RESERVED_ENUM_MIN = 0xFF00,
MESSAGEINDEX_RESERVED_ENUM_MAX = 0xFFFF,
MESSAGEGROUPID_USER_ENUM_MIN = 0x0000,
MESSAGEGROUPID_USER_ENUM_MAX = 0xFFFF,
};
};
}; // namespace JMessage
+5 -4
View File
@@ -1,6 +1,7 @@
#ifndef JMESSAGE_LOCALE_H
#define JMESSAGE_LOCALE_H
#include <dolphin.h>
namespace JMessage {
@@ -15,10 +16,10 @@ struct locale {
return c >= 0x81 && (c <= 0x9F || (c >= 0xE0 && c <= 0xFC));
}
/* 802A9490 */ static int parseCharacter_1Byte(char const**);
/* 802A94A8 */ static int parseCharacter_2Byte(char const**);
/* 802A9528 */ static int parseCharacter_ShiftJIS(char const**);
/* 802A958C */ static int parseCharacter_UTF8(char const**);
/* 802A9490 */ static int parseCharacter_1Byte(const char** ppszText);
/* 802A94A8 */ static int parseCharacter_2Byte(const char** ppszText);
/* 802A9528 */ static int parseCharacter_ShiftJIS(const char** ppszText);
/* 802A958C */ static int parseCharacter_UTF8(const char** ppszText);
};
}; // namespace JMessage
+129 -116
View File
@@ -2,7 +2,8 @@
#define JMESSAGE_PROCESSOR_H
#include "JSystem/JMessage/resource.h"
#include "algorithm.h"
#include <algorithm.h>
#include "global.h"
namespace JMessage {
struct TResource;
@@ -18,15 +19,15 @@ struct TReference {
/* 802A7AF8 */ virtual ~TReference();
/* 802A7B40 */ virtual const char* do_word(u32) const;
int on_parseCharacter(const char** string) const { return pcResource_->parseCharacter(string); }
int on_parseCharacter(const char** ppszText) const {
JUT_ASSERT(97, pcResource_!=0);
return pcResource_->parseCharacter(ppszText);
}
const char* on_word(u32 param_0) const { return do_word(param_0); }
TResource* getResource_groupID(u16 groupID) const {
if (pcResource_ == NULL) {
return NULL;
}
return pcResource_->getResource_groupID(groupID);
TResource* getResource_groupID(u16 u16GroupID) const {
return pcResource_ == NULL ? NULL : pcResource_->getResource_groupID(u16GroupID);
}
TResourceContainer* getResourceContainer() const { return pcResource_; }
@@ -40,8 +41,13 @@ struct TReference {
*
*/
struct TProcessor {
TProcessor(const TReference* reference)
: pReference_(reference), pResourceCache_(NULL), pszCurrent_(NULL) {}
TProcessor(const TReference* pReference)
: pReference_(pReference),
pResourceCache_(NULL),
pszCurrent_(NULL)
{
JUT_ASSERT(584, pReference_!=0);
}
typedef bool (*pfnProcess_func)(TProcessor*);
@@ -55,14 +61,25 @@ struct TProcessor {
u32 max_size() const { return 4; }
u32 size() const { return upsz_; }
const char* top() const { return stack[upsz_ - 1]; }
const char* top() const {
JUT_ASSERT(181, upsz_>0);
return stack[upsz_ - 1];
}
void push(const char* string) {
stack[upsz_] = string;
void push(const char* pszText) {
JUT_ASSERT(186, IsPushable());
stack[upsz_] = pszText;
upsz_++;
}
void pop() { upsz_--; }
void pop() {
JUT_ASSERT(192, upsz_>0);
upsz_--;
#if PLATFORM_SHIELD
stack[upsz_] = NULL;
#endif
}
TStack_& operator=(const TStack_& other) {
upsz_ = other.upsz_;
@@ -79,11 +96,11 @@ struct TProcessor {
struct TProcess_ {
TProcess_() { reset_normal(); }
void reset_normal() { pfnProcess_CharacterEnd = process_onCharacterEnd_normal_; }
void reset_select() { pfnProcess_CharacterEnd = process_onCharacterEnd_select_; }
void reset_normal() { pfnProcess_onCharacterEnd = process_onCharacterEnd_normal_; }
void reset_select() { pfnProcess_onCharacterEnd = process_onCharacterEnd_select_; }
/* 0x0 */ pfnProcess_func pfnProcess_CharacterEnd;
struct {
/* 0x0 */ pfnProcess_func pfnProcess_onCharacterEnd;
struct rdata {
/* 0x0 */ const char* (*pfn)(TProcessor*);
/* 0x4 */ const char* pcBase;
/* 0x8 */ const void* pOffset;
@@ -93,51 +110,50 @@ struct TProcessor {
}; // Size: 0x14
/* 802A7B90 */ void reset();
/* 802A7BF8 */ void stack_pushCurrent(char const*);
/* 802A7BF8 */ void stack_pushCurrent(char const* pszText);
/* 802A7C30 */ void stack_popCurrent();
/* 802A7C54 */ const TResource* getResource_groupID(u16) const;
/* 802A7CD4 */ u32 toMessageCode_messageID(u32, u32, bool*) const;
/* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*,
char const*, u32);
/* 802A7C54 */ const TResource* getResource_groupID(u16 u16GroupID) const;
/* 802A7CD4 */ u32 toMessageCode_messageID(u32 uMsgID, u32, bool* pbValid) const;
/* 802A7E38 */ void on_select_begin(char const* (*pfn)(JMessage::TProcessor*), void const* pOffset,
char const* pcBase, u32 uNumber);
/* 802A7EDC */ void on_select_end();
/* 802A7F34 */ void on_select_separate();
/* 802A7FE4 */ void on_tag_();
/* 802A8090 */ // void do_tag_(u32, void const*, u32);
/* 802A81EC */ bool process_character_();
/* 802A828C */ static bool process_onCharacterEnd_normal_(JMessage::TProcessor*);
/* 802A82F4 */ static bool process_onCharacterEnd_select_(JMessage::TProcessor*);
/* 802A833C */ static const char* process_onSelect_limited_(JMessage::TProcessor*);
/* 802A8358 */ static const char* process_onSelect_(JMessage::TProcessor*);
/* 802A8C24 */ const char* on_message(u32 param_0) const { return getMessageText_messageCode(param_0); }
/* 802A8C44 */ const char* getMessageText_messageCode(u32 param_0) const {
return getMessageText_messageCode(param_0 >> 0x10, param_0 & 0xFFFF);
/* 802A828C */ static bool process_onCharacterEnd_normal_(JMessage::TProcessor* pThis);
/* 802A82F4 */ static bool process_onCharacterEnd_select_(JMessage::TProcessor* pThis);
/* 802A833C */ static const char* process_onSelect_limited_(JMessage::TProcessor* pThis);
/* 802A8358 */ static const char* process_onSelect_(JMessage::TProcessor* pThis);
/* 802A8C24 */ const char* on_message(u32 uCode) const { return getMessageText_messageCode(uCode); }
/* 802A8C44 */ const char* getMessageText_messageCode(u32 uCode) const {
return getMessageText_messageCode(uCode >> 16, uCode & 0xFFFF);
}
/* 802A7B48 */ virtual ~TProcessor();
/* 802A7FC0 */ virtual void do_reset();
/* 802A7FC4 */ virtual void do_begin(void const*, char const*);
/* 802A7FC4 */ virtual void do_begin(void const* pEntry, char const* pszText);
/* 802A7FC8 */ virtual void do_end();
/* 802A7FCC */ virtual void do_character(int);
/* 802A7FD0 */ virtual bool do_tag(u32, void const*, u32);
/* 802A7FD8 */ virtual void do_select_begin(u32);
/* 802A7FCC */ virtual void do_character(int iCharacter);
/* 802A7FD0 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
/* 802A7FD8 */ virtual void do_select_begin(u32 uNumber);
/* 802A7FDC */ virtual void do_select_end();
/* 802A7FE0 */ virtual void do_select_separate();
/* 802A8084 */ virtual void do_resetStatus_(char const*);
/* 802A8084 */ virtual void do_resetStatus_(char const* pszText);
/* 802A8088 */ virtual bool do_setBegin_isReady_() const;
virtual void do_begin_(void const*, char const*) = 0;
virtual void do_begin_(void const* pEntry, char const* pszText) = 0;
virtual void do_end_() = 0;
virtual void do_tag_(u32, void const*, u32) = 0;
virtual void do_tag_(u32 uTag, void const* pData, u32 uSize) = 0;
void on_resetStatus_(const char* param_0) {
pszCurrent_ = param_0;
void on_resetStatus_(const char* pszText) {
pszCurrent_ = pszText;
oStack_.clear();
oProcess_.reset_normal();
do_resetStatus_(param_0);
do_resetStatus_(pszText);
}
void on_begin(const void* entry, const char* param_1) {
do_begin_(entry, param_1);
do_begin(entry, param_1);
void on_begin(const void* pEntry, const char* pszText) {
do_begin_(pEntry, pszText);
do_begin(pEntry, pszText);
}
void on_end() {
@@ -145,49 +161,52 @@ struct TProcessor {
do_end();
}
void on_tag(u32 param_0, const void* param_1, u32 param_2) {
if (!do_tag(param_0, param_1, param_2)) {
do_tag_(param_0, param_1, param_2);
void on_tag(u32 uTag, const void* pData, u32 uSize) {
if (!do_tag(uTag, pData, uSize)) {
do_tag_(uTag, pData, uSize);
}
}
const char* on_word(u32 param_0) const { return pReference_->on_word(param_0); }
int on_parseCharacter(const char** string) const {
return pReference_->on_parseCharacter(string);
int on_parseCharacter(const char** ppszText) const {
return pReference_->on_parseCharacter(ppszText);
}
void on_character(int character) { do_character(character); }
void on_character(int iCharacter) { do_character(iCharacter); }
const char* on_message_limited(u16 messageIndex) const {
return pResourceCache_->getMessageText_messageIndex(messageIndex);
const char* on_message_limited(u16 u16Index) const {
JUT_ASSERT(482, pResourceCache_!=0);
return pResourceCache_->getMessageText_messageIndex(u16Index);
}
int setBegin_messageEntryText(const TResource* resource, const void* entry,
const char* param_2) {
pResourceCache_ = resource;
on_resetStatus_(param_2);
on_begin(entry, param_2);
bool on_setBegin_isReady_() const { return do_setBegin_isReady_(); }
int setBegin_messageEntryText(const TResource* pResource, const void* pEntry, const char* pszText) {
JUT_ASSERT(297, on_setBegin_isReady_());
pResourceCache_ = pResource;
on_resetStatus_(pszText);
on_begin(pEntry, pszText);
return 1;
}
int setBegin_messageEntryText(const TProcessor* processor, const void* entry,
const char* param_2) {
setBegin_messageEntryText(processor->getResourceCache(), entry, param_2);
int setBegin_messageEntryText(const TProcessor* pProcessor, const void* pEntry, const char* pszText) {
JUT_ASSERT(306, pProcessor!=0);
setBegin_messageEntryText(pProcessor->getResourceCache(), pEntry, pszText);
return 1;
}
void* getMessageEntry_messageCode(u16 messageCode, u16 messageIndex) const {
const TResource* pResource = getResource_groupID(messageCode);
void* getMessageEntry_messageCode(u16 u16Code, u16 u16Index) const {
const TResource* pResource = getResource_groupID(u16Code);
if (pResource == NULL) {
return NULL;
}
return pResource->getMessageEntry_messageIndex(messageIndex);
return pResource->getMessageEntry_messageIndex(u16Index);
}
const char* getMessageText_messageCode(u16 messageCode, u16 messageIndex) const {
void* pEntry = getMessageEntry_messageCode(messageCode, messageIndex);
const char* getMessageText_messageCode(u16 u16Code, u16 u16Index) const {
void* pEntry = getMessageEntry_messageCode(u16Code, u16Index);
if (pEntry == NULL) {
return NULL;
@@ -196,9 +215,9 @@ struct TProcessor {
return pResourceCache_->getMessageText_messageEntry(pEntry);
}
void stack_pushCurrent_(const char* string) {
void stack_pushCurrent_(const char* pszText) {
oStack_.push(getCurrent());
pszCurrent_ = string;
pszCurrent_ = pszText;
}
void stack_popCurrent_() {
@@ -212,27 +231,23 @@ struct TProcessor {
const char* getCurrent() const { return pszCurrent_; }
const TReference* getReference() const { return pReference_; }
const TResource* getResource_groupID_uncached(u16 groupID) const {
return pReference_->getResource_groupID(groupID);
const TResource* getResource_groupID_uncached(u16 u16GroupID) const {
return pReference_->getResource_groupID(u16GroupID);
}
bool isResourceCache_groupID(u16 groupID) const {
return pResourceCache_ != NULL && groupID == pResourceCache_->getGroupID();
bool isResourceCache_groupID(u16 u16GroupID) const {
return pResourceCache_ != NULL && u16GroupID == pResourceCache_->getGroupID();
}
TResourceContainer* getResourceContainer() const {
if (pReference_ == NULL) {
return NULL;
}
return pReference_->getResourceContainer();
return pReference_ == NULL ? NULL : pReference_->getResourceContainer();
}
void setResourceCache(TResource* cache) { pResourceCache_ = cache; }
void setResourceCache(TResource* pResource) { pResourceCache_ = pResource; }
void resetResourceCache() { setResourceCache(NULL); }
/* 0x04 */ const TReference* pReference_;
/* 0x08 */ const TResource* pResourceCache_;
/* 0x08 */ const mutable TResource* pResourceCache_;
/* 0x0C */ const char* pszCurrent_;
/* 0x10 */ TStack_ oStack_;
/* 0x24 */ TProcess_ oProcess_;
@@ -253,13 +268,13 @@ struct TSequenceProcessor : public TProcessor {
void reset() {}
union {
struct {
union processData {
struct branchData {
/* 0x0 */ branchPfn branchFn;
/* 0x4 */ const void* pTarget;
/* 0x8 */ u32 uTarget;
} branch_process;
struct {
struct jumpData {
/* 0x0 */ jumpPfn jumpFn;
/* 0x4 */ u32 u32Target;
} jump_process;
@@ -275,48 +290,45 @@ struct TSequenceProcessor : public TProcessor {
STATUS_BRANCH,
};
/* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*);
/* 802A8418 */ const char* process(char const*);
/* 802A8374 */ TSequenceProcessor(JMessage::TReference const* pReference, JMessage::TControl* pControl);
/* 802A8418 */ const char* process(char const* pszText);
/* 802A85A4 */ bool on_isReady();
/* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), u32);
/* 802A85D0 */ void on_jump_register(jumpPfn pfn, u32 u32Target);
/* 802A85E4 */ bool on_jump_isReady();
/* 802A8610 */ void on_jump(void const*, char const*);
/* 802A8690 */ void
on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, u32), void const*, u32);
/* 802A86A0 */ void on_branch_query(u32);
/* 802A8610 */ void on_jump(void const* pEntry, char const* pszText);
/* 802A8690 */ void on_branch_register(branchPfn pfn, void const* pTarget, u32 uTarget);
/* 802A86A0 */ void on_branch_query(u32 uCode);
/* 802A86D4 */ u32 on_branch_queryResult();
/* 802A8700 */ void on_branch(void const*, char const*);
/* 802A892C */ static void process_setMessageIndex_reserved_(u16);
/* 802A8944 */ static void* process_setMessageCode_(JMessage::TSequenceProcessor const*, u16,
u16);
/* 802A89B8 */ static const void* process_onJump_limited_(JMessage::TSequenceProcessor const*);
/* 802A89EC */ static const void* process_onJump_(JMessage::TSequenceProcessor const*);
/* 802A8A18 */ static const void* process_onBranch_limited_(JMessage::TSequenceProcessor const*,
u32);
/* 802A8A50 */ static const void* process_onBranch_(JMessage::TSequenceProcessor const*, u32);
/* 802A8700 */ void on_branch(void const* pEntry, char const* pszText);
/* 802A892C */ static void process_setMessageIndex_reserved_(u16 u16Index);
/* 802A8944 */ static void* process_setMessageCode_(TSequenceProcessor const* pProcessor, u16 u16GroupID, u16 u16Index);
/* 802A89B8 */ static const void* process_onJump_limited_(TSequenceProcessor const* pProcessor);
/* 802A89EC */ static const void* process_onJump_(TSequenceProcessor const* pProcessor);
/* 802A8A18 */ static const void* process_onBranch_limited_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
/* 802A8A50 */ static const void* process_onBranch_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
/* 802A83B8 */ virtual ~TSequenceProcessor();
/* 802A87A4 */ virtual void do_resetStatus_(char const*);
/* 802A87A4 */ virtual void do_resetStatus_(char const* pszText);
/* 802A87C0 */ virtual bool do_setBegin_isReady_() const;
/* 802A87D0 */ virtual void do_begin_(void const*, char const*);
/* 802A87D0 */ virtual void do_begin_(void const* pEntry, char const* pszText);
/* 802A87D4 */ virtual void do_end_();
/* 802A87E0 */ virtual void do_tag_(u32, void const*, u32);
/* 802A87E0 */ virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
/* 802A8780 */ virtual bool do_isReady();
/* 802A8788 */ virtual bool do_jump_isReady();
/* 802A8790 */ virtual void do_jump(void const*, char const*);
/* 802A8794 */ virtual void do_branch_query(u32);
/* 802A8790 */ virtual void do_jump(void const* pEntry, char const* pszText);
/* 802A8794 */ virtual void do_branch_query(u32 uCode);
/* 802A8798 */ virtual s32 do_branch_queryResult();
/* 802A87A0 */ virtual void do_branch(void const*, char const*);
/* 802A87A0 */ virtual void do_branch(void const* pEntry, char const* pszText);
TControl* getControl() const { return pControl_; }
static const void* process_setMessageIndex_(const TSequenceProcessor* pProcessor, u16 param_1) {
static const void* process_setMessageIndex_(const TSequenceProcessor* pProcessor, u16 u16Index) {
return process_setMessageCode_(pProcessor, pProcessor->getResourceCache()->getGroupID(),
param_1);
u16Index);
}
static const void* process_setMessageCode_(const TSequenceProcessor* pProcessor, u32 param_1) {
return process_setMessageCode_(pProcessor, param_1 >> 0x10, param_1 & 0xFFFF);
static const void* process_setMessageCode_(const TSequenceProcessor* pProcessor, u32 uCode) {
return process_setMessageCode_(pProcessor, uCode >> 16, uCode & 0xFFFF);
}
/* 0x38 */ TControl* pControl_;
@@ -329,20 +341,21 @@ struct TSequenceProcessor : public TProcessor {
*
*/
struct TRenderingProcessor : public TProcessor {
/* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*);
/* 802A8B20 */ int process(char const*);
/* 802A8A84 */ TRenderingProcessor(JMessage::TReference const* pReference);
/* 802A8B20 */ int process(char const* pszText);
/* 802A8AC0 */ virtual ~TRenderingProcessor();
/* 802A8BA4 */ virtual void do_begin_(void const*, char const*);
/* 802A8BA4 */ virtual void do_begin_(void const* pEntry, char const* pszText);
/* 802A8BA8 */ virtual void do_end_();
/* 802A8BAC */ virtual void do_tag_(u32, void const*, u32);
/* 802A8BAC */ virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
bool process_messageEntryText(TProcessor *param_0,void const*param_1,const char *param_2) {
int rv = TProcessor::setBegin_messageEntryText(param_0, param_1, param_2);
if (rv != 0) {
process(NULL);
bool process_messageEntryText(const TProcessor* pProcessor, void const* pEntry, const char* pszText) {
if (!TProcessor::setBegin_messageEntryText(pProcessor, pEntry, pszText)) {
return false;
}
return rv != 0;
process(NULL);
return true;
}
};
}; // namespace JMessage
+59 -42
View File
@@ -13,33 +13,40 @@ namespace JMessage {
*/
struct TResource {
TResource()
: field_0x8(NULL), field_0xc(NULL), field_0x10(NULL), field_0x14(NULL), mMessageID(NULL) {}
: oParse_THeader_(NULL),
oParse_TBlock_info_(NULL),
pMessageText_(NULL),
pStringAttribute_(NULL),
oParse_TBlock_messageID_(NULL)
{}
/* 802A8CDC */ u16 toMessageIndex_messageID(u32, u32, bool*) const;
/* 802A8CDC */ u16 toMessageIndex_messageID(u32 uMsgID, u32, bool* pbValid) const;
bool isContained_messageIndex(u16 messageIndex) const {
return messageIndex < getMessageEntryNumber();
bool isContained_messageIndex(u16 uMessageIndex) const {
return uMessageIndex < getMessageEntryNumber();
}
u16 getMessageEntrySize() const { return field_0xc.get_messageEntrySize(); }
u16 getMessageEntryNumber() const { return field_0xc.get_messageEntryNumber(); }
u32 getMessageEntrySize() const { return oParse_TBlock_info_.get_messageEntrySize(); }
u32 getMessageEntryNumber() const { return oParse_TBlock_info_.get_messageEntryNumber(); }
u16 getGroupID() const { return field_0xc.get_groupID(); }
u16 getGroupID() const { return oParse_TBlock_info_.get_groupID(); }
void* getMessageEntry_messageIndex(u16 messageIndex) const {
if (!isContained_messageIndex(messageIndex)) {
void* getMessageEntry_messageIndex(u16 uMessageIndex) const {
if (!isContained_messageIndex(uMessageIndex)) {
return NULL;
}
return field_0xc.getContent() + (messageIndex * getMessageEntrySize());
void* pEntry = oParse_TBlock_info_.getContent() + (uMessageIndex * getMessageEntrySize());
return pEntry;
}
char* getMessageText_messageEntry(const void* pEntry) const {
return field_0x10 + *(int*)pEntry;
JUT_ASSERT(141, pEntry!=0);
return pMessageText_ + *(int*)pEntry;
}
const char* getMessageText_messageIndex(u16 messageIndex) const {
void* pEntry = getMessageEntry_messageIndex(messageIndex);
const char* getMessageText_messageIndex(u16 uMessageIndex) const {
void* pEntry = getMessageEntry_messageIndex(uMessageIndex);
if (pEntry == NULL) {
return NULL;
}
@@ -48,31 +55,35 @@ struct TResource {
}
void setData_header(const void* pData) {
field_0x8.setRaw(pData);
oParse_THeader_.setRaw(pData);
}
void setData_block_info(const void* pData) {
field_0xc.setRaw(pData);
oParse_TBlock_info_.setRaw(pData);
JGADGET_ASSERTWARN(75, oParse_TBlock_info_.get_groupID()<= data::MESSAGEGROUPID_USER_ENUM_MAX);
JGADGET_ASSERTWARN(77, oParse_TBlock_info_.get_messageEntryNumber()<= data::MESSAGEINDEX_USER_ENUM_MAX);
}
void setData_block_messageText(const void* pData) {
field_0x10 = data::TParse_TBlock_messageText(pData).getContent();
pMessageText_ = data::TParse_TBlock_messageText(pData).getContent();
}
void setData_block_stringAttribute(const void* pData) {
field_0x14 = data::TParse_TBlock_stringAttribute(pData).getContent();
pStringAttribute_ = data::TParse_TBlock_stringAttribute(pData).getContent();
}
void setData_block_messageID(const void* pData) {
mMessageID.setRaw(pData);
oParse_TBlock_messageID_.setRaw(pData);
}
JGadget::TLinkListNode ocObject_;
/* 0x08 */ data::TParse_THeader field_0x8;
/* 0x0C */ data::TParse_TBlock_info field_0xc;
/* 0x10 */ char* field_0x10;
/* 0x14 */ char* field_0x14;
/* 0x18 */ data::TParse_TBlock_messageID mMessageID;
/* 0x08 */ data::TParse_THeader oParse_THeader_;
/* 0x0C */ data::TParse_TBlock_info oParse_TBlock_info_;
/* 0x10 */ char* pMessageText_;
/* 0x14 */ char* pStringAttribute_;
/* 0x18 */ data::TParse_TBlock_messageID oParse_TBlock_messageID_;
};
/**
@@ -80,14 +91,18 @@ struct TResource {
*
*/
struct TResource_color {
TResource_color() : field_0x0(NULL), field_0x4(NULL) {}
TResource_color()
: oParse_THeader_(NULL),
oParse_TBlock_color_(NULL)
{}
void reset() {
field_0x0.setRaw(NULL);
field_0x4.setRaw(NULL);
oParse_THeader_.setRaw(NULL);
oParse_TBlock_color_.setRaw(NULL);
}
/* 0x0 */ data::TParse_THeader field_0x0;
/* 0x4 */ data::TParse_TBlock_color field_0x4;
/* 0x0 */ data::TParse_THeader oParse_THeader_;
/* 0x4 */ data::TParse_TBlock_color oParse_TBlock_color_;
}; // Size: 0x8
/**
@@ -97,24 +112,26 @@ struct TResource_color {
struct TResourceContainer {
struct TCResource : public JGadget::TLinkList_factory<TResource, 0> {
/* 802A8EC0 */ TCResource();
/* 802A8F6C */ TResource* Get_groupID(u16);
/* 802A8F6C */ TResource* Get_groupID(u16 u16GroupID);
/* 802A8EF8 */ virtual ~TCResource();
/* 802A8FFC */ virtual JMessage::TResource* Do_create();
/* 802A9048 */ virtual void Do_destroy(JMessage::TResource*);
// u8 field_0x0[0x10];
/* 802A9048 */ virtual void Do_destroy(JMessage::TResource* pResource);
};
/* 802A906C */ TResourceContainer();
/* 802A90B8 */ void setEncoding(u8);
/* 802A90F0 */ void setEncoding_(u8);
/* 802A90B8 */ void setEncoding(u8 e);
/* 802A90F0 */ void setEncoding_(u8 e);
int parseCharacter(const char** string) const { return pfnParseCharacter_(string); }
TResource* getResource_groupID(u16 groupID) { return resContainer_.Get_groupID(groupID); }
TResource* getResource_groupID(u16 groupID) const { return getResource_groupID(groupID); }
int parseCharacter(const char** ppszText) const {
JUT_ASSERT(330, pfnParseCharacter_!=0);
return pfnParseCharacter_(ppszText);
}
bool isEncodingSettable(u8 e) const { return mEncodingType == e || mEncodingType == 0; }
TResource* getResource_groupID(u16 u16GroupID) { return resContainer_.Get_groupID(u16GroupID); }
TResource* getResource_groupID(u16 u16GroupID) const { return getResource_groupID(u16GroupID); }
bool isEncodingSettable(u8 e) const { return encodingType_ == e || encodingType_ == 0; }
const TCResource* getResourceContainer() const { return &resContainer_; }
void destroyResource() {
resContainer_.Clear_destroy();
@@ -129,7 +146,7 @@ struct TResourceContainer {
static JMessage::locale::parseCharacter_function sapfnParseCharacter_[5];
/* 0x00 */ u8 mEncodingType;
/* 0x00 */ u8 encodingType_;
/* 0x04 */ JMessage::locale::parseCharacter_function pfnParseCharacter_;
/* 0x08 */ TCResource resContainer_;
/* 0x18 */ TResource_color resColor_;
@@ -140,11 +157,11 @@ struct TResourceContainer {
*
*/
struct TParse : public JGadget::binary::TParse_header_block {
/* 802A9130 */ TParse(JMessage::TResourceContainer*);
/* 802A9130 */ TParse(JMessage::TResourceContainer* pContainer);
/* 802A9158 */ virtual ~TParse();
/* 802A91B8 */ virtual bool parseHeader_next(void const**, u32*, u32);
/* 802A92F4 */ virtual bool parseBlock_next(void const**, u32*, u32);
/* 802A91B8 */ virtual bool parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32);
/* 802A92F4 */ virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32);
/* 0x4 */ TResourceContainer* pContainer_;
/* 0x8 */ TResource* pResource_;