Skip to content

Some work on GCConsole2 #93

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

Open
lingomaniac88 wants to merge 11 commits into
base: main
Choose a base branch
from
+316 −18
Open

Some work on GCConsole2 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d9839f
startAppearTank, startAppearCoin, startDisappearCoin
lingomaniac88 Mar 8, 2026
7a2eeec
resetLife
lingomaniac88 Mar 8, 2026
6210eb7
remove unneeded comment
lingomaniac88 Mar 9, 2026
07a3d2e
startDownLeftBot
lingomaniac88 Mar 9, 2026
cd6f450
getInitialY2 -> getNegativeInitialY2Plus1
lingomaniac88 Mar 9, 2026
330488f
Formatting
lingomaniac88 Mar 9, 2026
16c1ba2
startAppearTelop
lingomaniac88 Mar 9, 2026
65698e6
startDisappearTelop
lingomaniac88 Mar 9, 2026
b085237
clang format
lingomaniac88 Mar 12, 2026
0892af1
Timer stuff
lingomaniac88 Mar 12, 2026
4f71898
clang-format
lingomaniac88 Mar 15, 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
10 changes: 10 additions & 0 deletions include/GC2D/ExPane.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ class TExPane {
J2DPane* getPane() const { return mPane; }
const JUTRect& getInitialBounds() const { return mInitialBounds; }

// fabricated, but they make a lot of things in GCConsole2 work
int get465MinusInitialY1() const { return 465 - mInitialBounds.y1; }
int getNegativeInitialY2Plus1() const { return -(mInitialBounds.y2 + 1); }

bool isBoundsAnimationCompleted() const
{
bool result = false;
Expand All @@ -117,6 +121,12 @@ class TExPane {
return result;
}

bool isInterpolatorAtZero() const
{
return mOffsetInterpolator.getCurrentX() == 0
&& mOffsetInterpolator.getCurrentY() == 0;
}

public:
/* 0x0 */ J2DPane* mPane;
/* 0x4 */ JUTRect mInitialBounds;
Expand Down
11 changes: 6 additions & 5 deletions include/GC2D/GCConsole2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x8C */ int unk8C;
/* 0x90 */ THelpActor** unk90;
/* 0x94 */ TConsoleStr* unk94;
/* 0x98 */ u16 unk98;
/* 0x98 */ s16 unk98;
/* 0x9A */ u8 unk9A[20];
/* 0xB0 */ J2DSetScreen* unkB0;
/* 0xB4 */ u8 unkB4;
Expand Down Expand Up @@ -168,7 +168,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x264 */ u16 unk264;
/* 0x266 */ u8 unk266;
/* 0x268 */ u16 unk268;
/* 0x26A */ u16 unk26A;
/* 0x26A */ s16 unk26A;
/* 0x26C */ TBoundPane* unk26C;
/* 0x270 */ TBoundPane* unk270;
/* 0x274 */ TBoundPane* unk274;
Expand Down Expand Up @@ -245,7 +245,8 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x500 */ J2DPane* unk500[2];
/* 0x508 */ int unk508;
/* 0x50C */ int unk50C;
/* 0x510 */ char unk510[0x8];
/* 0x510 */ bool unk510;
/* 0x514 */ s32 unk514;
/* 0x518 */ int unk518;
/* 0x51C */ u8 unk51C;
/* 0x520 */ TExPane* unk520;
Expand All @@ -255,7 +256,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x530 */ TMessageLoader* unk530;
/* 0x534 */ JUTRect unk534;
/* 0x544 */ JUTRect unk544;
/* 0x554 */ u32 unk554;
/* 0x554 */ s32 mTelopTextWidth;
/* 0x558 */ u8 unk558;
/* 0x55C */ u32 unk55C;
/* 0x560 */ u16 unk560;
Expand All @@ -264,7 +265,7 @@ class TGCConsole2 : public JDrama::TViewObj {
/* 0x568 */ f32 unk568;
/* 0x56C */ u8 unk56C;
/* 0x56D */ u8 unk56D;
/* 0x570 */ u32 unk570;
/* 0x570 */ u32* unk570; // Some sort of Dolphic News struct?
};

#endif
3 changes: 3 additions & 0 deletions include/JSystem/JParticle/JPAEmitter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ class JPABaseEmitter {
}

bool checkUnk11C(u32 flag) const { return unk11C & flag ? true : false; }
void clearUnk11CFlag(u32 flag) { unk11C &= ~flag; }
void setUnk11CFlag(u32 flag) { unk11C |= flag; }

bool isThing() const
{
if (checkUnk11C(0x8)
Expand Down
Loading
Loading