mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 22:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tag_shop_camera OK, d_a_tag_watchge OK, JUTFader OK, JUtility work from Pikmin 2 (#292)

Browse Source
This commit is contained in:
Pheenoh
2023-02-18 16:17:35 -07:00
committed by GitHub
parent 0aaa6fed7a
commit 3acf288950
37 changed files with 642 additions and 1601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTFader.h
-2
View File
@@ -3,7 +3,6 @@
#include "JSystem/JGeometry.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/types.h"
class JUTFader {
public:
@@ -24,7 +23,6 @@ public:
s32 getStatus() const { return mStatus; }
void setColor(JUtility::TColor color) { mColor.set(color); }
//private:
/* 0x04 */ s32 mStatus;
/* 0x08 */ u16 field_0x8;
/* 0x0A */ u16 field_0xa;
include/JSystem/JUtility/JUTFont.h
+2
View File
@@ -23,6 +23,7 @@ struct ResFONT {
/* 0x04 */ u32 size;
/* 0x08 */ u16 startCode;
/* 0x0A */ u16 endCode;
/* 0x0C */ u8 mChunkNum[4];
};
struct MAP1 {
@@ -32,6 +33,7 @@ struct ResFONT {
/* 0x0A */ u16 startCode;
/* 0x0C */ u16 endCode;
/* 0x0E */ u16 numEntries;
/* 0x10 */ u16 mLeading;
};
struct GLY1 {
include/JSystem/JUtility/JUTResFont.h
+11 -9
View File
@@ -5,6 +5,8 @@
#include "JSystem/JUtility/JUTFont.h"
#include "dolphin/types.h"
typedef bool (*IsLeadByte)(int);
class JUTResFont : public JUTFont {
public:
/* 802DF000 */ virtual ~JUTResFont();
@@ -34,7 +36,7 @@ public:
/* 802DF248 */ void countBlock();
/* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
/* 802DFDD8 */ int getFontCode(int) const;
/* 802E00C4 */ void convertSjis(int, u16*) const;
/* 802E00C4 */ int convertSjis(int, u16*) const;
inline void delete_and_initialize() {
deleteMemBlocks_ResFont();
@@ -44,22 +46,22 @@ public:
static void* const saoAboutEncoding_[3];
// some types uncertain, may need to be fixed
/* 0x1C */ void* field_0x1c;
/* 0x20 */ void* field_0x20;
/* 0x1C */ int mWidth;
/* 0x20 */ int mHeight;
/* 0x24 */ _GXTexObj field_0x24;
/* 0x44 */ int field_0x44;
/* 0x48 */ const ResFONT* mResFont;
/* 0x4C */ ResFONT::INF1* mInf1Ptr;
/* 0x50 */ void* field_0x50;
/* 0x54 */ ResFONT::WID1* mWid1Ptr;
/* 0x58 */ ResFONT::GLY1* mGly1Ptr;
/* 0x5C */ ResFONT::MAP1* mMap1Ptr;
/* 0x50 */ void** mMemBlocks;
/* 0x54 */ ResFONT::WID1** mpWidthBlocks;
/* 0x58 */ ResFONT::GLY1** mpGlyphBlocks;
/* 0x5C */ ResFONT::MAP1** mpMapBlocks;
/* 0x60 */ u16 mWid1BlockNum;
/* 0x62 */ u16 mGly1BlockNum;
/* 0x64 */ u16 mMap1BlockNum;
/* 0x66 */ u16 field_0x66;
/* 0x68 */ u16 field_0x68;
/* 0x6C */ void* field_0x6c;
/* 0x68 */ u16 mMaxCode;
/* 0x6C */ IsLeadByte* mIsLeadByte;
};
#endif /* JUTRESFONT_H */