more JStudio progress

1 files changed, 100 insertions, 79 deletions

diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index 0a9a1b55..beffcf70 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -6,296 +6,317 @@
 #include "JSystem/JMessage/processor.h"
 #include "dolphin/types.h"
 
+namespace JMessage {
 
+namespace {
 
+/* 8029EDA4-8029EDCC       .text process_setMessageIndex_reserved___Q28JMessage23@unnamed@processor_cpp@FUs */
+void process_setMessageIndex_reserved_(u16) {
+    /* Nonmatching */
+}
+
+/* 8029EDCC-8029EE18       .text process_setMessage_index___Q28JMessage23@unnamed@processor_cpp@FPQ28JMessage8TControlUs */
+void process_setMessage_index_(TControl*, u16) {
+    /* Nonmatching */
+}
+
+/* 8029EE18-8029EE6C       .text process_setMessage_code___Q28JMessage23@unnamed@processor_cpp@FPQ28JMessage8TControlUl */
+void process_setMessage_code_(TControl*, u32) {
+    /* Nonmatching */
+}
+
+}; // namespace
 
 /* 8029EE6C-8029EEA4       .text pushCurrent__Q28JMessage10TProcessorFPCc */
-void JMessage::TProcessor::pushCurrent(const char*) {
+void TProcessor::pushCurrent(const char*) {
     /* Nonmatching */
 }
 
 /* 8029EEA4-8029EEC8       .text popCurrent__Q28JMessage10TProcessorFv */
-void JMessage::TProcessor::popCurrent() {
+const char* TProcessor::popCurrent() {
     /* Nonmatching */
 }
 
 /* 8029EEC8-8029EF54       .text on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl */
-void JMessage::TProcessor::on_select_begin(const char* (*)(JMessage::TProcessor*), const void*, const char*, unsigned long) {
-    /* Nonmatching */
+void TProcessor::on_select_begin(OnSelectBeginCallBack, const void*, const char*, u32) { /* Nonmatching */
 }
 
 /* 8029EF54-8029EFA0       .text on_select_end__Q28JMessage10TProcessorFv */
-void JMessage::TProcessor::on_select_end() {
+void TProcessor::on_select_end() {
     /* Nonmatching */
 }
 
 /* 8029EFA0-8029EFFC       .text on_select_separate__Q28JMessage10TProcessorFv */
-void JMessage::TProcessor::on_select_separate() {
+void TProcessor::on_select_separate() {
     /* Nonmatching */
 }
 
 /* 8029EFFC-8029F000       .text do_character__Q28JMessage10TProcessorFi */
-void JMessage::TProcessor::do_character(int) {
-    /* Nonmatching */
+void TProcessor::do_character(int) {
 }
 
 /* 8029F000-8029F008       .text do_tag__Q28JMessage10TProcessorFUlPCvUl */
-void JMessage::TProcessor::do_tag(unsigned long, const void*, unsigned long) {
-    /* Nonmatching */
+bool TProcessor::do_tag(u32, const void*, u32) {
+    return false;
 }
 
 /* 8029F008-8029F010       .text do_systemTagCode__Q28JMessage10TProcessorFUsPCvUl */
-void JMessage::TProcessor::do_systemTagCode(unsigned short, const void*, unsigned long) {
-    /* Nonmatching */
+bool TProcessor::do_systemTagCode(u16, const void*, u32) {
+    return false;
 }
 
 /* 8029F010-8029F014       .text do_select_begin__Q28JMessage10TProcessorFUl */
-void JMessage::TProcessor::do_select_begin(unsigned long) {
-    /* Nonmatching */
+void TProcessor::do_select_begin(u32) {
 }
 
 /* 8029F014-8029F018       .text do_select_end__Q28JMessage10TProcessorFv */
-void JMessage::TProcessor::do_select_end() {
-    /* Nonmatching */
+void TProcessor::do_select_end() {
 }
 
 /* 8029F018-8029F01C       .text do_select_separate__Q28JMessage10TProcessorFv */
-void JMessage::TProcessor::do_select_separate() {
-    /* Nonmatching */
+void TProcessor::do_select_separate() {
 }
 
 /* 8029F01C-8029F064       .text __dt__Q28JMessage10TProcessorFv */
-JMessage::TProcessor::~TProcessor() {
-    /* Nonmatching */
+TProcessor::~TProcessor() {
 }
 
 /* 8029F064-8029F080       .text reset___Q28JMessage10TProcessorFPCc */
-void reset___Q28JMessage10TProcessorFPCc {
+void TProcessor::reset_(const char*) {
     /* Nonmatching */
 }
 
 /* 8029F080-8029F120       .text on_tag___Q28JMessage10TProcessorFv */
-void on_tag___Q28JMessage10TProcessorFv {
+void TProcessor::on_tag_() {
     /* Nonmatching */
 }
 
 /* 8029F120-8029F248       .text do_tag___Q28JMessage10TProcessorFUlPCvUl */
-void do_tag___Q28JMessage10TProcessorFUlPCvUl {
+bool TProcessor::do_tag_(u32, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 8029F248-8029F2A0       .text do_systemTagCode___Q28JMessage10TProcessorFUsPCvUl */
-void do_systemTagCode___Q28JMessage10TProcessorFUsPCvUl {
+void TProcessor::do_systemTagCode_(u16, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 8029F2A0-8029F37C       .text process_character___Q28JMessage10TProcessorFv */
-void process_character___Q28JMessage10TProcessorFv {
+void TProcessor::process_character_() {
     /* Nonmatching */
 }
 
 /* 8029F37C-8029F3C4       .text process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
-void process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor {
+bool TProcessor::process_onCharacterEnd_normal_(TProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029F3C4-8029F40C       .text process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
-void process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor {
+bool TProcessor::process_onCharacterEnd_select_(TProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029F40C-8029F428       .text process_select_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
-void process_select_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor {
+void TProcessor::process_select_limited_(TProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029F428-8029F444       .text process_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
-void process_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor {
+void TProcessor::process_select_(TProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029F444-8029F480       .text __ct__Q28JMessage18TSequenceProcessorFPQ28JMessage8TControl */
-JMessage::TSequenceProcessor::TSequenceProcessor(JMessage::TControl*) {
+TSequenceProcessor::TSequenceProcessor(TControl*) {
     /* Nonmatching */
 }
 
 /* 8029F480-8029F4E0       .text __dt__Q28JMessage18TSequenceProcessorFv */
-JMessage::TSequenceProcessor::~TSequenceProcessor() {
-    /* Nonmatching */
+TSequenceProcessor::~TSequenceProcessor() {
 }
 
 /* 8029F4E0-8029F658       .text process__Q28JMessage18TSequenceProcessorFPCc */
-void JMessage::TSequenceProcessor::process(const char*) {
+char* TSequenceProcessor::process(const char*) {
     /* Nonmatching */
 }
 
 /* 8029F658-8029F684       .text on_isReady__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::on_isReady() {
+bool TSequenceProcessor::on_isReady() {
     /* Nonmatching */
 }
 
 /* 8029F684-8029F698       .text on_jump_register__Q28JMessage18TSequenceProcessorFPFPQ28JMessage18TSequenceProcessor_bUl */
-void JMessage::TSequenceProcessor::on_jump_register(bool (*)(JMessage::TSequenceProcessor*), unsigned long) {
+void TSequenceProcessor::on_jump_register(OnJumpRegisterCallBack*, u32) {
     /* Nonmatching */
 }
 
 /* 8029F698-8029F6C4       .text on_jump_isReady__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::on_jump_isReady() {
+void TSequenceProcessor::on_jump_isReady() {
     /* Nonmatching */
 }
 
 /* 8029F6C4-8029F720       .text on_jump__Q28JMessage18TSequenceProcessorFPCvPCc */
-void JMessage::TSequenceProcessor::on_jump(const void*, const char*) {
+void TSequenceProcessor::on_jump(const void*, const char*) {
     /* Nonmatching */
 }
 
 /* 8029F720-8029F730       .text on_branch_register__Q28JMessage18TSequenceProcessorFPFPQ28JMessage18TSequenceProcessorUl_bPCvUl */
-void JMessage::TSequenceProcessor::on_branch_register(bool (*)(JMessage::TSequenceProcessor*, unsigned long), const void*, unsigned long) {
+void TSequenceProcessor::on_branch_register(OnBranchRegisterCallBack*, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 8029F730-8029F764       .text on_branch_query__Q28JMessage18TSequenceProcessorFUs */
-void JMessage::TSequenceProcessor::on_branch_query(unsigned short) {
+void TSequenceProcessor::on_branch_query(u16) {
     /* Nonmatching */
 }
 
 /* 8029F764-8029F790       .text on_branch_queryResult__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::on_branch_queryResult() {
+void TSequenceProcessor::on_branch_queryResult() {
     /* Nonmatching */
 }
 
 /* 8029F790-8029F7EC       .text on_branch__Q28JMessage18TSequenceProcessorFPCvPCc */
-void JMessage::TSequenceProcessor::on_branch(const void*, const char*) {
+void TSequenceProcessor::on_branch(const void*, const char*) {
     /* Nonmatching */
 }
 
 /* 8029F7EC-8029F7F0       .text do_begin__Q28JMessage18TSequenceProcessorFPCvPCc */
-void JMessage::TSequenceProcessor::do_begin(const void*, const char*) {
-    /* Nonmatching */
+void TSequenceProcessor::do_begin(const void*, const char*) {
 }
 
 /* 8029F7F0-8029F7F4       .text do_end__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::do_end() {
-    /* Nonmatching */
+void TSequenceProcessor::do_end() {
 }
 
 /* 8029F7F4-8029F7FC       .text do_isReady__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::do_isReady() {
-    /* Nonmatching */
+bool TSequenceProcessor::do_isReady() {
+    return true;
 }
 
 /* 8029F7FC-8029F804       .text do_jump_isReady__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::do_jump_isReady() {
-    /* Nonmatching */
+bool TSequenceProcessor::do_jump_isReady() {
+    return true;
 }
 
 /* 8029F804-8029F808       .text do_jump__Q28JMessage18TSequenceProcessorFPCvPCc */
-void JMessage::TSequenceProcessor::do_jump(const void*, const char*) {
-    /* Nonmatching */
+void TSequenceProcessor::do_jump(const void*, const char*) {
 }
 
 /* 8029F808-8029F80C       .text do_branch_query__Q28JMessage18TSequenceProcessorFUs */
-void JMessage::TSequenceProcessor::do_branch_query(unsigned short) {
-    /* Nonmatching */
+void TSequenceProcessor::do_branch_query(u16) {
 }
 
 /* 8029F80C-8029F814       .text do_branch_queryResult__Q28JMessage18TSequenceProcessorFv */
-void JMessage::TSequenceProcessor::do_branch_queryResult() {
-    /* Nonmatching */
+int TSequenceProcessor::do_branch_queryResult() {
+    return -2;
 }
 
 /* 8029F814-8029F818       .text do_branch__Q28JMessage18TSequenceProcessorFPCvPCc */
-void JMessage::TSequenceProcessor::do_branch(const void*, const char*) {
-    /* Nonmatching */
+void TSequenceProcessor::do_branch(const void*, const char*) {
 }
 
 /* 8029F818-8029F868       .text reset___Q28JMessage18TSequenceProcessorFPCc */
-void reset___Q28JMessage18TSequenceProcessorFPCc {
+void TSequenceProcessor::reset_(const char*) {
     /* Nonmatching */
 }
 
 /* 8029F868-8029F894       .text do_begin___Q28JMessage18TSequenceProcessorFPCvPCc */
-void do_begin___Q28JMessage18TSequenceProcessorFPCvPCc {
+void TSequenceProcessor::do_begin_(const void*, const char*) {
     /* Nonmatching */
 }
 
 /* 8029F894-8029F8C8       .text do_end___Q28JMessage18TSequenceProcessorFv */
-void do_end___Q28JMessage18TSequenceProcessorFv {
+void TSequenceProcessor::do_end_() {
     /* Nonmatching */
 }
 
 /* 8029F8C8-8029F9D4       .text do_tag___Q28JMessage18TSequenceProcessorFUlPCvUl */
-void do_tag___Q28JMessage18TSequenceProcessorFUlPCvUl {
+bool TSequenceProcessor::do_tag_(u32, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 8029F9D4-8029FA2C       .text do_systemTagCode___Q28JMessage18TSequenceProcessorFUsPCvUl */
-void do_systemTagCode___Q28JMessage18TSequenceProcessorFUsPCvUl {
-    /* Nonmatching */
+void TSequenceProcessor::do_systemTagCode_(u16 p1, const void* p2, u32 p3) {
+    /* Nonmatching */
+	switch (p1) {
+	case 6:
+		_3C = 3;
+		_40 = &process_onJump_;
+		_44 = *(u32*)p2;
+		break;
+	case 0:
+	case 1:
+	case 2:
+	case 3:
+		break;
+	case 4:
+	case 5:
+	default:
+		TProcessor::do_systemTagCode_(p1, p2, p3);
+		break;
+	}
 }
 
 /* 8029FA2C-8029FA5C       .text process_jump_limited___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessor */
-void process_jump_limited___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessor {
+void TSequenceProcessor::process_jump_limited_(TSequenceProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029FA5C-8029FA88       .text process_jump___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessor */
-void process_jump___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessor {
+void TSequenceProcessor::process_jump_(TSequenceProcessor*) {
     /* Nonmatching */
 }
 
 /* 8029FA88-8029FAB8       .text process_branch_limited___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessorUl */
-void process_branch_limited___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessorUl {
+void TSequenceProcessor::process_branch_limited_(TSequenceProcessor*, u32) {
     /* Nonmatching */
 }
 
 /* 8029FAB8-8029FAE8       .text process_branch___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessorUl */
-void process_branch___Q28JMessage18TSequenceProcessorFPQ28JMessage18TSequenceProcessorUl {
+void TSequenceProcessor::process_branch_(TSequenceProcessor*, u32) {
     /* Nonmatching */
 }
 
 /* 8029FAE8-8029FB20       .text __ct__Q28JMessage19TRenderingProcessorFPQ28JMessage8TControl */
-JMessage::TRenderingProcessor::TRenderingProcessor(JMessage::TControl*) {
+TRenderingProcessor::TRenderingProcessor(TControl*) {
     /* Nonmatching */
 }
 
 /* 8029FB20-8029FB80       .text __dt__Q28JMessage19TRenderingProcessorFv */
-JMessage::TRenderingProcessor::~TRenderingProcessor() {
-    /* Nonmatching */
+TRenderingProcessor::~TRenderingProcessor() {
 }
 
 /* 8029FB80-8029FBF0       .text process__Q28JMessage19TRenderingProcessorFPCc */
-void JMessage::TRenderingProcessor::process(const char*) {
+void TRenderingProcessor::process(const char*) {
     /* Nonmatching */
 }
 
 /* 8029FBF0-8029FBF4       .text do_begin__Q28JMessage19TRenderingProcessorFPCvPCc */
-void JMessage::TRenderingProcessor::do_begin(const void*, const char*) {
-    /* Nonmatching */
+void TRenderingProcessor::do_begin(const void*, const char*) {
 }
 
 /* 8029FBF4-8029FBF8       .text do_end__Q28JMessage19TRenderingProcessorFv */
-void JMessage::TRenderingProcessor::do_end() {
-    /* Nonmatching */
+void TRenderingProcessor::do_end() {
 }
 
 /* 8029FBF8-8029FC24       .text do_begin___Q28JMessage19TRenderingProcessorFPCvPCc */
-void do_begin___Q28JMessage19TRenderingProcessorFPCvPCc {
+void TRenderingProcessor::do_begin_(const void*, const char*) {
     /* Nonmatching */
 }
 
 /* 8029FC24-8029FC50       .text do_end___Q28JMessage19TRenderingProcessorFv */
-void do_end___Q28JMessage19TRenderingProcessorFv {
+void TRenderingProcessor::do_end_() {
     /* Nonmatching */
 }
 
 /* 8029FC50-8029FC84       .text do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl */
-void do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl {
+bool TRenderingProcessor::do_tag_(u32, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 8029FC84-8029FCC4       .text do_systemTagCode___Q28JMessage19TRenderingProcessorFUsPCvUl */
-void do_systemTagCode___Q28JMessage19TRenderingProcessorFUsPCvUl {
+void TRenderingProcessor::do_systemTagCode_(u16, const void*, u32) {
     /* Nonmatching */
 }
 
+}; // namespace JMessage