summaryrefslogtreecommitdiff
path: root/libs/JSystem/J2DGraph/J2DTextBox.cpp
diff options
context:
space:
mode:
authorJulgodis <>2021-03-30 01:58:08 +0200
committerJulgodis <>2021-03-30 01:58:08 +0200
commita868b6ae56e5d586f31a445f47b45f5ac039c74a (patch)
tree304857807d7375019ce452ceaad17045683a8c98 /libs/JSystem/J2DGraph/J2DTextBox.cpp
parent88eb7be90cfa48808f2416e427498a97b1d71faa (diff)
re-generate with bug fixes
Diffstat (limited to 'libs/JSystem/J2DGraph/J2DTextBox.cpp')
-rw-r--r--libs/JSystem/J2DGraph/J2DTextBox.cpp38
1 files changed, 13 insertions, 25 deletions
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index c0180639c1..2d8cf284f1 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -53,23 +53,21 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
-struct J2DMaterial {};
+struct J2DAnmTextureSRTKey {};
-struct J2DAnmBase {};
+struct J2DAnmColor {};
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmVtxColor {};
+
+struct J2DAnmVisibilityFull {};
struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
-struct J2DAnmColor {};
-
struct J2DAnmTransform {};
-struct J2DAnmVisibilityFull {};
-
-struct J2DAnmVtxColor {};
+struct J2DAnmBase {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -109,6 +107,8 @@ struct J2DPane {
/* 802F8474 */ void update();
};
+struct J2DMaterial {};
+
struct J2DTextBox {
/* 80186C84 */ void setWhite(JUtility::TColor);
/* 8019230C */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
@@ -156,8 +156,6 @@ struct J2DPrint {
// Forward References:
//
-extern "C" extern char const* const J2DTextBox__stringBase0;
-
extern "C" void __ct__10J2DTextBoxFv();
extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive();
extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial();
@@ -349,27 +347,17 @@ asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRA
/* ############################################################################################## */
/* 80456280-80456288 0004+04 s=6 e=0 z=0 None .sdata2 @1660 */
-SECTION_SDATA2 static u8 lit_1660[4 + 4 /* padding */] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
+SECTION_SDATA2 static f32 lit_1660[1 + 1 /* padding */] = {
+ 0.0f,
/* padding */
- 0x00,
- 0x00,
- 0x00,
- 0x00,
+ 0.0f,
};
/* 80456288-80456290 0008+00 s=3 e=0 z=0 None .sdata2 @1662 */
-SECTION_SDATA2 static u8 lit_1662[8] = {
- 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
+SECTION_SDATA2 static f64 lit_1662 = 4503601774854144.0 /* cast s32 to float */;
/* 80456290-80456298 0008+00 s=2 e=0 z=0 None .sdata2 @1665 */
-SECTION_SDATA2 static u8 lit_1665[8] = {
- 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
+SECTION_SDATA2 static f64 lit_1665 = 4503599627370496.0 /* cast u32 to float */;
/* 802FF75C-802FFBC4 0468+00 s=0 e=1 z=0 None .text
* __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */