diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-16 13:36:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 13:36:46 -0700 |
| commit | 3d0382e9ca31188bec73d692e65cbdc7900a1ad6 (patch) | |
| tree | 660c4f81a0657689995c15ef3622fbe14efbd0af /include/JSystem | |
| parent | 20cc6db46bbf036ce447f9ee9d1ef2b93502e23d (diff) | |
| parent | 9f8cc5429f0aecf10aade2816ff5eea120874076 (diff) | |
Merge pull request #526 from Jcw87/J2DWindow
J2DWindow
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DWindow.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index 11c92c8b..e0f45525 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -29,15 +29,19 @@ public: void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor); public: - /* 0x0CC */ JUTTexture * mpFrameTexture[4]; - /* 0x0DC */ JUTTexture * mpContentsTexture; + /* 0x0CC */ JUTTexture* mpFrameTexture1; + /* 0x0D0 */ JUTTexture* mpFrameTexture2; + /* 0x0D4 */ JUTTexture* mpFrameTexture3; + /* 0x0D8 */ JUTTexture* mpFrameTexture4; + /* 0x0DC */ JUTTexture* mpContentsTexture; /* 0x0E0 */ JGeometry::TBox2<f32> mWindowBox; - /* 0x0F0 */ JUTPalette * mpPalette; + /* 0x0F0 */ JUTPalette* mpPalette; /* 0x0F4 */ JUtility::TColor mColorTL; /* 0x0F8 */ JUtility::TColor mColorTR; /* 0x0FC */ JUtility::TColor mColorBL; /* 0x100 */ JUtility::TColor mColorBR; - /* 0x104 */ JUtility::TColor mFrameColor[2]; + /* 0x104 */ JUtility::TColor mWhite; + /* 0x108 */ JUtility::TColor mBlack; /* 0x10C */ s16 mTextureWidth; /* 0x10E */ s16 mTextureHeight; /* 0x110 */ u8 field_0x110; |