Skip to content

GC2D/GCConsole2: decompile the HUD update and draw paths #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mrkol merged 7 commits into from
Aug 25, 2026
Merged

GC2D/GCConsole2: decompile the HUD update and draw paths #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bff78a
GC2D/GCConsole2: decompile the HUD update and draw paths
KakarottoCake Aug 23, 2026
ed7adb2
GC2D/GCConsole2: fold three single-use helpers back into perform
KakarottoCake Aug 24, 2026
8d4618f
GC2D/GCConsole2: replace the macros with ordinary functions
KakarottoCake Aug 24, 2026
e120dc9
GC2D/GCConsole2: mark the fabricated inlines
KakarottoCake Aug 24, 2026
71c0149
GC2D/GCConsole2: remove fake layout helpers
KakarottoCake Aug 24, 2026
77982b1
GC2D/GCConsole2: fold fabricated drawing helpers
KakarottoCake Aug 24, 2026
c1d62b7
GC2D/GCConsole2: tidy external declarations
KakarottoCake Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/GC2D/ExPane.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class TExPane {
mOffsetAnimPending = true;
}

// fabricated

@TheAzack9 TheAzack9 Aug 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not the fabricated inlines that should be marked possibly inline, but rather the un-inlined sections of code that might seem like inlines 🤔

@TheAzack9 TheAzack9 Aug 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also avoid changing other TUs unless you know for certain it is correct, and in that case update all other instances as well.
For AI i would avoid it entierly for now as it will likely go wayy to ham on them 😅 This should be mostly a first pass

// Possibly inline
void updatePaneOffset(s32 time, s32 target_x, s32 target_y)
{
setPaneOffset(time, target_x, target_y,
Expand All @@ -60,7 +60,7 @@ class TExPane {
mSizeAnimPending = true;
}

// fabricated
// Possibly inline
void updatePaneSize(s32 time, s32 target_w, s32 target_h)
{
setPaneSize(time, target_w, target_h, mSizeInterpolator.getCurrentX(),
Expand Down Expand Up @@ -90,7 +90,7 @@ class TExPane {
(initH - initial_h) * 0.5f);
}

// fabricated
// Possibly inline
void updateCenteredSize(s32 time, s32 target_w, s32 target_h)
{
setCenteredSize(time, target_w, target_h,
Expand Down
82 changes: 45 additions & 37 deletions include/GC2D/GCConsole2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class TExPane;
class JPABaseEmitter;
class J2DPicture;
class J2DPane;
class J2DWindow;
class J2DTextBox;
class TMessageLoader;
class TConsoleStr;
Expand Down Expand Up @@ -65,22 +66,22 @@ class TGCConsole2 : public JDrama::TViewObj {

void perform(u32 cue, JDrama::TGraphics* graphics);

void processAppearLife(int) { }
void processInsertLife(int) { }
void processAppearStar(int) { }
void processDownCoin(int) { }
void processAppearTank(int) { }
void processAppearCoin(int) { }
void processAppearMario(int) { }
void processDrawTelop(u32) { }
void checkChangeTelopArray() { }
void processAppearJet(int) { }
void processAppearRed(int) { }
void processAppearTimer(int) { }
void processAppearBalloon() { }
void processDisappearBalloon() { }
void drawJuice(J2DOrthoGraph&, u32) { }
void drawWater(J2DOrthoGraph&) { }
inline bool processAppearLife(int);
inline bool processInsertLife(int);
inline bool processAppearStar(int);
inline bool processDownCoin(int);
inline bool processAppearTank(int);
inline bool processAppearCoin(int);
inline bool processAppearMario(int);
inline bool processDrawTelop(u32);
inline void checkChangeTelopArray();
inline bool processAppearJet(int);
inline bool processAppearRed(int);
inline bool processAppearTimer(int);
inline bool processAppearBalloon();
inline bool processDisappearBalloon();
inline void drawJuice(J2DOrthoGraph&, u32);
void drawWater(J2DOrthoGraph&);

static JUTPoint cDownTopPoint;
static JUTPoint cDownMidPoint;
Expand All @@ -96,7 +97,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x10 */ int unk10;
/* 0x14 */ u32 unk14;
/* 0x18 */ u32 unk18;
/* 0x1C */ u16 unk1C;
/* 0x1C */ s16 unk1C;
/* 0x20 */ u32 unk20;
/* 0x24 */ u32 unk24;
/* 0x28 */ u32 unk28;
Expand All @@ -112,10 +113,15 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x64 */ u32 unk64;
/* 0x68 */ u8 unk68;
/* 0x6C */ u32 unk6C;
/* 0x70 */ char unk70[0x8];
/* 0x70 */ u16 unk70;
/* 0x72 */ u8 unk72;
/* 0x73 */ u8 unk73;
/* 0x74 */ u16 unk74;
/* 0x76 */ u8 unk76;
/* 0x77 */ u8 unk77;
/* 0x78 */ u16 unk78;
/* 0x7A */ char unk7A[2];
/* 0x7C */ u16 unk7C;
/* 0x7C */ s16 unk7C;
/* 0x80 */ u32 unk80;
/* 0x84 */ u16 unk84;
/* 0x86 */ u16 unk86;
Expand All @@ -128,11 +134,11 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x9A */ u8 unk9A[20];
/* 0xB0 */ J2DSetScreen* unkB0;
/* 0xB4 */ u8 unkB4;
/* 0xB6 */ u16 unkB6;
/* 0xB6 */ s16 unkB6;
/* 0xB8 */ u32 unkB8;
/* 0xBC */ u32 unkBC;
/* 0xC0 */ u32 unkC0;
/* 0xC4 */ u32 unkC4;
/* 0xBC */ void* unkBC;
/* 0xC0 */ void* unkC0;

@TheAzack9 TheAzack9 Aug 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fake

/* 0xC4 */ void* unkC4;
/* 0xC8 */ TBoundPane* unkC8;
/* 0xCC */ TBoundPane* unkCC;
/* 0xD0 */ TBoundPane* unkD0;
Expand All @@ -144,25 +150,26 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x128 */ TBoundPane* unk128;
/* 0x12C */ TBoundPane* unk12C;
/* 0x130 */ TBoundPane* unk130;
/* 0x134 */ TBoundPane* unk134[3];
/* 0x134 */ TBlendPane* unk134[3];
/* 0x140 */ TExPane* unk140;
/* 0x144 */ JPABaseEmitter* unk144;
/* 0x148 */ TBoundPane* unk148;
/* 0x14C */ TBoundPane* unk14C;
/* 0x150 */ TBoundPane* unk150;
/* 0x154 */ J2DPicture** unk154;
/* 0x158 */ J2DPicture** unk158;
/* 0x15C */ J2DPicture** unk15C;
/* 0x154 */ TBoundPane* unk154[3];
/* 0x160 */ TExPane* unk160;
/* 0x164 */ JPABaseEmitter* unk164;
/* 0x168 */ char unk168[0xC];
/* 0x168 */ u32 unk168;
/* 0x16C */ u16 unk16C;
/* 0x16E */ char unk16E[2];
/* 0x170 */ s32 unk170;
/* 0x174 */ TBoundPane* unk174;
/* 0x178 */ TBoundPane* unk178;
/* 0x17C */ J2DPane* unk17C[18];
/* 0x1C4 */ TBoundPane* unk1C4;
/* 0x1C8 */ u16 unk1C8;
/* 0x1CA */ u16 unk1CA;
/* 0x1CC */ char unk1CC[4];
/* 0x1C8 */ s16 unk1C8;
/* 0x1CA */ s16 unk1CA;
/* 0x1CC */ u8 unk1CC[4];
/* 0x1D0 */ JUTRect unk1D0[9];
/* 0x260 */ TBoundPane* unk260;
/* 0x264 */ u16 unk264;
Expand All @@ -178,7 +185,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x29C */ TBoundPane* unk29C;
/* 0x2A0 */ J2DPicture* unk2A0[3];
/* 0x2AC */ J2DPicture* unk2AC[3];
/* 0x2B8 */ char unk2B8[0x4];
/* 0x2B8 */ f32 unk2B8;
/* 0x2BC */ JUTRect unk2BC[3];
/* 0x2EC */ JUtility::TColor unk2EC[3];
/* 0x2F8 */ TExPane* unk2F8;
Expand All @@ -198,11 +205,11 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x39C */ TBoundPane* unk39C[3];
/* 0x3A8 */ TExPane* unk3A8;
/* 0x3AC */ char unk3AC[0x4];
/* 0x3B0 */ J2DPane* unk3B0;
/* 0x3B0 */ J2DWindow* unk3B0;
/* 0x3B4 */ J2DTextBox* unk3B4;
/* 0x3B8 */ J2DTextBox* unk3B8;
/* 0x3BC */ JUTRect unk3BC;
/* 0x3CC */ u16 unk3CC;
/* 0x3CC */ s16 unk3CC;
/* 0x3D0 */ TMessageLoader* unk3D0;
/* 0x3D4 */ JSUInputStream* unk3D4;
/* 0x3D8 */ JSUOutputStream* unk3D8;
Expand All @@ -213,15 +220,16 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x3EC */ f32 unk3EC;
/* 0x3F0 */ u16 unk3F0;
/* 0x3F4 */ u32 unk3F4;
/* 0x3F8 */ char unk3F8[0x4];
/* 0x3F8 */ u8 unk3F8;
/* 0x3F9 */ char unk3F9[0x3];
/* 0x3FC */ TExPane* unk3FC;
/* 0x400 */ TBoundPane* unk400;
/* 0x404 */ TBoundPane* unk404;
/* 0x408 */ TBoundPane* unk408;
/* 0x40C */ TBoundPane* unk40C;
/* 0x410 */ TBoundPane* unk410;
/* 0x414 */ TBoundPane* unk414[4];
/* 0x424 */ char unk424[0x2];
/* 0x414 */ TBlendPane* unk414[4];
/* 0x424 */ u8 unk424[2];
/* 0x426 */ u8 unk426;
/* 0x428 */ TExPane* unk428;
/* 0x42C */ TBoundPane* unk42C;
Expand Down
5 changes: 4 additions & 1 deletion include/JSystem/J2D/J2DWindow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@ class J2DWindow : public J2DPane {
virtual void drawSelf(int, int);
virtual void drawSelf(int, int, Mtx*);

// Possibly inline
const JUTRect& getContentsBounds() const { return mContentsBounds; }

protected:
/* 0xEC */ JUTRect unkEC;

@TheAzack9 TheAzack9 Aug 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this name is validated and correct? I would avoid doing this inline for now

/* 0xEC */ JUTRect mContentsBounds;
/* 0xFC */ void* unkFC;
/* 0x100 */ Texture* unk100;
/* 0x104 */ Texture* unk104;
Expand Down
Loading
Loading