d_a_kytag06 fully done / d_msg_class/object work (#300)

* d_a_kytag06 OK and d_msg_class/object wip

* add some GXDraw functions

* cleanup kytag6

* remove asm

1 files changed, 5 insertions, 171 deletions

diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h
index 5ca3f9c77a..f90f03264b 100644
--- a/include/JSystem/JMessage/processor.h
+++ b/include/JSystem/JMessage/processor.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/JMessage/resource.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include "SSystem/SComponent/c_xyz.h"
 #include "init.h"
 
 namespace JMessage {
@@ -11,6 +10,8 @@ struct TResource;
 struct TResourceContainer;
 
 struct TReference {
+    TReference() { pcResource_ = NULL; }
+
     /* 802A7AF8 */ virtual ~TReference();
     /* 802A7B40 */ virtual const char* do_word(u32) const;
 
@@ -183,6 +184,7 @@ struct TProcessor {
 
     const TResource* getResourceCache() const { return pResourceCache_; }
     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);
@@ -268,7 +270,8 @@ struct TSequenceProcessor : public TProcessor {
     TControl* getControl() const { return pControl_; }
 
     static const void* process_setMessageIndex_(const TSequenceProcessor* pProcessor, u16 param_1) {
-        return process_setMessageCode_(pProcessor, pProcessor->getResourceCache()->getGroupID(), param_1);
+        return process_setMessageCode_(pProcessor, pProcessor->getResourceCache()->getGroupID(),
+                                       param_1);
     }
 
     static const void* process_setMessageCode_(const TSequenceProcessor* pProcessor, u32 param_1) {
@@ -291,173 +294,4 @@ struct TRenderingProcessor : public TProcessor {
 };
 };  // namespace JMessage
 
-struct STControl;
-struct dMsgObject_c;
-struct jmessage_tReference : public JMessage::TReference {
-    /* 80228B04 */ jmessage_tReference();
-    /* 80228D28 */ void calcDistance();
-    /* 80228DE0 */ void getLineMax();
-    /* 80228E6C */ void isKanban();
-    /* 80228EA0 */ void isPlaceName();
-    /* 80228ED4 */ void isBossName();
-    /* 80228F08 */ void isSaveSeq();
-    /* 80228F3C */ void isBook();
-    /* 80228F70 */ void isStaffRoll();
-    /* 80228FA4 */ void isHowl();
-    /* 80228FD8 */ void isMidona();
-    /* 8022900C */ void resetReference();
-    /* 80229034 */ void pageSend();
-    /* 80229168 */ void selectMessage();
-    /* 802294A8 */ void inputNumber();
-    /* 80229730 */ void getWord(int);
-    /* 80229744 */ void resetWord();
-    /* 80229768 */ void setCharactor(u16);
-    /* 80229788 */ void addCharactor(u16);
-    /* 802297B0 */ void resetCharactor();
-    /* 802297E4 */ void shiftCharCountBuffer();
-    /* 80229810 */ void resetCharCountBuffer();
-    /* 80229848 */ void allsetCharCountBuffer();
-    /* 8022986C */ void isCharSend();
-    /* 802298DC */ void isLightSend();
-    /* 8022994C */ void isLightEnd();
-    /* 802299AC */ void decideOutFontRupeeColor(int);
-    /* 80232A20 */ void getActorPos();
-
-    /* 80238C78 */ void setActorPos(cXyz pos) { mActorPos = pos; }
-
-    /* 80228CB4 */ virtual ~jmessage_tReference();
-
-private:
-    /* 0x0008 */ STControl* mpStick;
-    /* 0x000C */ u16 field_0xc[0x200];
-    /* 0x040C */ s16 field_0x40c;
-    /* 0x040E */ s16 field_0x40e;
-    /* 0x0410 */ s16 mCountBackUp;
-    /* 0x0414 */ cXyz mActorPos;
-    /* 0x0420 */ f32 mFontSizeX;
-    /* 0x0424 */ f32 mFontSizeY;
-    /* 0x0428 */ f32 mRubySize;
-    /* 0x042C */ f32 mTBoxWidth;
-    /* 0x0430 */ f32 mTBoxHeight;
-    /* 0x0434 */ f32 mLineSpace;
-    /* 0x0438 */ f32 mCharSpace;
-    /* 0x043C */ f32 mRubyCharSpace;
-    /* 0x0440 */ f32 mSelFontSize;
-    /* 0x0444 */ f32 mSelRubySize;
-    /* 0x0448 */ f32 mSelTBoxWidth;
-    /* 0x044C */ f32 mSelCharSpace;
-    /* 0x0450 */ f32 mSelRubyCharSpace;
-    /* 0x0454 */ f32 mDistanceScale;
-    /* 0x0458 */ f32 mAddCharAllAlphaRate;
-    /* 0x045C */ f32 mCharAllAlphaRate;
-    /* 0x0460 */ f32 mAddCharAlpha;
-    /* 0x0464 */ f32 mCharAlpha;
-    /* 0x0468 */ f32 mStrLength[40];
-    /* 0x0508 */ f32 mSpaceLength[40];
-    /* 0x05A8 */ f32 mSelLength[3];
-    /* 0x05B4 */ u32 mDemoFrame;
-    /* 0x05B8 */ u32 mRevoMessageID;
-    /* 0x05BC */ u16* mpStatus;
-    /* 0x05C0 */ dMsgObject_c* mpObjectPtr;
-    /* 0x05C4 */ char* mpSelMsgPtr;
-    /* 0x05C8 */ JUTFont* mpFont;
-    /* 0x05CC */ s16 mStartLineCount;
-    /* 0x05CE */ s16 mEndLineCount;
-    /* 0x05D0 */ u16 mLineCount;
-    /* 0x05D2 */ s16 field_0x5d2;
-    /* 0x05D4 */ s16 mPageEndCount;
-    /* 0x05D6 */ s16 mSendTimer;
-    /* 0x05D8 */ s16 mCharCnt;
-    /* 0x05DA */ s16 mPageNum;
-    /* 0x05DC */ u8 mNowLightCount;
-    /* 0x05DD */ u8 mDrawLightCount;
-    /* 0x05DE */ u16 mMsgID;
-    /* 0x05E0 */ u16 mLineScale[40];
-    /* 0x0630 */ u16 mTopTagScale;
-    /* 0x0632 */ u16 mNowTagScale;
-    /* 0x0634 */ char mWord[10][100];
-    /* 0x0A1C */ char mTextPtr[0x200];
-    /* 0x0C1C */ char mTextSPtr[0x200];
-    /* 0x0E1C */ char mRuby[0x200];
-    /* 0x101C */ u8 mSelText[3][50];
-    /* 0x10B2 */ u8 mSelRuby[3][80];
-    /* 0x11A2 */ s8 mPageLine[40];
-    /* 0x11CA */ s8 mPageLineMax[40];
-    /* 0x11F2 */ u8 mPageType[40];
-    /* 0x121A */ u8 mLineArrange[40];
-    /* 0x1242 */ u8 mSelectNum;
-    /* 0x1243 */ u8 mSelectType;
-    /* 0x1244 */ u8 mSelectPos;
-    /* 0x1245 */ u8 mFukiPosType;
-    /* 0x1246 */ u8 mFukiKind;
-    /* 0x1247 */ u8 mForm;
-    /* 0x1248 */ u8 field_0x1248;
-    /* 0x1249 */ u8 mNowColorType;
-    /* 0x124A */ u8 mTopColorType;
-    /* 0x124B */ bool mButtonTagStopFlag;
-    /* 0x124C */ u8 mSendFlag;
-    /* 0x124D */ u8 mStopFlag;
-    /* 0x124E */ u8 mSelectRubyFlag;
-    /* 0x124F */ u8 mInputFigure;
-    /* 0x1250 */ u8 mOutFontRupeeColor;
-    /* 0x1251 */ s8 mNowWordCount;
-    /* 0x1252 */ s8 mTopWordCount;
-    /* 0x1253 */ u8 mCharCountBuffer[31];
-    /* 0x1272 */ bool mLightBatchFlag;
-    /* 0x1273 */ bool mBatchFlag;
-    /* 0x1274 */ bool mSelectSetCancelFlag;
-    /* 0x1275 */ bool mBombNameUseFlag;
-    /* 0x1276 */ bool mBatchColorFlag;
-};  // Size: 0x1278
-
-struct jmessage_tControl;
-struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor {
-    /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*);
-    /* 8022C904 */ void do_name1();
-    /* 8022C908 */ void do_space(u32);
-    /* 8022CA24 */ void do_rubyset(void const*, u32);
-    /* 8022CAAC */ void push_word();
-    /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*);
-    /* 8022CBE8 */ void calcStringLength();
-
-    /* 8023299C */ virtual ~jmessage_tSequenceProcessor();
-    /* 8022B654 */ virtual void do_reset();
-    /* 8022B658 */ virtual void do_begin(void const*, char const*);
-    /* 8022BA3C */ virtual void do_end();
-    /* 8022BFE0 */ virtual void do_character(int);
-    /* 8022C1A0 */ virtual bool do_tag(u32, void const*, u32);
-    /* 8022BB7C */ virtual bool do_isReady();
-    /* 8022C8FC */ virtual bool do_jump_isReady();
-    /* 8022CBE4 */ virtual void do_jump(void const*, char const*);
-};
-
-struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
-    /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*);
-    /* 8022E12C */ void resetRendering();
-    /* 8022E17C */ void do_widthcenter();
-    /* 8022E260 */ void do_selwidthcenter(int);
-    /* 8022E318 */ void do_heightcenter();
-    /* 8022E7CC */ void do_color(u8);
-    /* 8022E860 */ void do_scale(f32);
-    /* 8022E960 */ void do_linedown(s16);
-    /* 8022E9C0 */ void do_transY(s16, bool);
-    /* 8022EAE4 */ void do_outfont(u8, u32);
-    /* 8022ED10 */ void do_arrow2();
-    /* 8022EECC */ void getLineLength(int);
-    /* 8022EF00 */ void do_strcat(char*, bool, bool, bool);
-    /* 8022F148 */ void do_rubyset(void const*, u32);
-    /* 8022F384 */ void do_rubystrcat(char*, char*, f32, f32);
-    /* 8022F53C */ void do_name1();
-    /* 8022F540 */ void do_numset(s16);
-    /* 8022F734 */ void push_word();
-    /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32);
-
-    /* 8023293C */ virtual ~jmessage_tRenderingProcessor();
-    /* 8022CDC8 */ virtual void do_reset();
-    /* 8022CDCC */ virtual void do_begin(void const*, char const*);
-    /* 8022CFD8 */ virtual void do_end();
-    /* 8022D0A0 */ virtual void do_character(int);
-    /* 8022D74C */ virtual void do_tag(u32, void const*, u32);
-};
-
 #endif /* JMESSAGE_PROCESSOR_H */