summaryrefslogtreecommitdiff
path: root/libs/JSystem/J2DGraph
diff options
context:
space:
mode:
authorJulgodis <>2021-04-07 09:16:47 +0200
committerJulgodis <>2021-04-07 09:16:47 +0200
commitdca1d2a1c032f239c65aa1b7767132c12e89f628 (patch)
tree103f2574cfa7c6b9f19df522447d0b58861b60ba /libs/JSystem/J2DGraph
parented1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff)
detect more floats/doubles, including from relocations
Diffstat (limited to 'libs/JSystem/J2DGraph')
-rw-r--r--libs/JSystem/J2DGraph/J2DMatBlock.cpp2
-rw-r--r--libs/JSystem/J2DGraph/J2DMaterial.cpp20
-rw-r--r--libs/JSystem/J2DGraph/J2DMaterialFactory.cpp4
-rw-r--r--libs/JSystem/J2DGraph/J2DPane.cpp26
-rw-r--r--libs/JSystem/J2DGraph/J2DPicture.cpp16
-rw-r--r--libs/JSystem/J2DGraph/J2DPictureEx.cpp22
-rw-r--r--libs/JSystem/J2DGraph/J2DScreen.cpp16
-rw-r--r--libs/JSystem/J2DGraph/J2DTevs.cpp10
-rw-r--r--libs/JSystem/J2DGraph/J2DTextBox.cpp12
-rw-r--r--libs/JSystem/J2DGraph/J2DTextBoxEx.cpp24
-rw-r--r--libs/JSystem/J2DGraph/J2DWindow.cpp20
-rw-r--r--libs/JSystem/J2DGraph/J2DWindowEx.cpp66
12 files changed, 119 insertions, 119 deletions
diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 0d78d2374b..8f52d5d193 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -814,7 +814,7 @@ asm void J2DColorBlock::initialize() {
SECTION_RODATA static u8 const lit_1463[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03,
};
-SECTION_DEAD void* const cg_803A1C00 = (void*)(&lit_1463);
+COMPILER_STRIP_GATE(803A1C00, &lit_1463);
/* 802EB424-802EB510 2E5D64 00EC+00 0/0 1/1 0/0 .text setGX__13J2DColorBlockFv */
#pragma push
diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp
index b92f57defc..c686e6e2ac 100644
--- a/libs/JSystem/J2DGraph/J2DMaterial.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp
@@ -82,12 +82,10 @@ struct J2DPEBlock {
/* 802F1840 */ void setGX();
};
-struct J2DAnmColor {
- /* 802EB390 */ void getColor(u16, _GXColor*) const;
-};
-
-struct J2DAnmTextureSRTKey {
- /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
+struct J2DAnmTexPattern {
+ /* 8030BEE8 */ void getTexNo(u16, u16*) const;
+ /* 8030BF9C */ void getResTIMG(u16) const;
+ /* 8030BFF0 */ void getPalette(u16) const;
};
struct J2DAnmTevRegKey {
@@ -95,10 +93,12 @@ struct J2DAnmTevRegKey {
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
};
-struct J2DAnmTexPattern {
- /* 8030BEE8 */ void getTexNo(u16, u16*) const;
- /* 8030BF9C */ void getResTIMG(u16) const;
- /* 8030BFF0 */ void getPalette(u16) const;
+struct J2DAnmColor {
+ /* 802EB390 */ void getColor(u16, _GXColor*) const;
+};
+
+struct J2DAnmTextureSRTKey {
+ /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
};
struct J2DMaterial {
diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 12e130a6e9..97e27b3d80 100644
--- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -34,13 +34,13 @@ struct J2DResReference {
/* 8030CF44 */ void getName(u16) const;
};
+struct J2DMaterialBlock {};
+
struct J2DMaterial {
/* 802EA410 */ void createTevBlock(int, bool);
/* 802EA5C4 */ void createIndBlock(int, bool);
};
-struct J2DMaterialBlock {};
-
struct J2DMaterialFactory {
/* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
/* 802F2C94 */ void countStages(int) const;
diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp
index a22c888126..717817cae3 100644
--- a/libs/JSystem/J2DGraph/J2DPane.cpp
+++ b/libs/JSystem/J2DGraph/J2DPane.cpp
@@ -56,29 +56,29 @@ struct JGeometry {
struct J2DRotateAxis {};
-struct J2DAnmBase {};
+struct J2DBasePosition {};
-struct J2DAnmColor {};
+struct J2DAnmVtxColor {};
-struct J2DGrafContext {
- /* 802E8E20 */ void setScissor();
- /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
-};
+struct J2DAnmTextureSRTKey {};
-struct J2DAnmVisibilityFull {};
+struct J2DAnmColor {};
-struct J2DAnmTransform {};
+struct J2DAnmBase {};
struct J2DAnmTevRegKey {};
-struct J2DBasePosition {};
-
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTransform {};
-struct J2DAnmVtxColor {};
+struct J2DGrafContext {
+ /* 802E8E20 */ void setScissor();
+ /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
+};
struct J2DAnmTexPattern {};
+struct J2DAnmVisibilityFull {};
+
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053BC0 */ void calcMtx();
@@ -524,7 +524,7 @@ asm void J2DPane::resize(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss static_mBounds__7J2DPane */
-static u8 static_mBounds__7J2DPane[16];
+static f32 static_mBounds__7J2DPane[4];
/* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text getBounds__7J2DPaneFv */
#pragma push
diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp
index f57a5cfa8c..8fa038478b 100644
--- a/libs/JSystem/J2DGraph/J2DPicture.cpp
+++ b/libs/JSystem/J2DGraph/J2DPicture.cpp
@@ -73,21 +73,23 @@ struct J2DScreen {
/* 802F9640 */ void getNameResource(char const*);
};
-struct J2DAnmBase {};
+struct J2DBinding {};
-struct J2DAnmColor {};
+struct J2DAnmBase {};
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
-struct J2DAnmVisibilityFull {};
-
struct J2DAnmTransform {};
+struct J2DAnmTextureSRTKey {};
+
+struct J2DAnmVisibilityFull {};
+
struct J2DAnmTexPattern {};
-struct J2DAnmTevRegKey {};
+struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -132,8 +134,6 @@ struct J2DPane {
struct J2DMaterial {};
-struct J2DBinding {};
-
struct J2DMirror {};
struct J2DPicture {
diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
index 7e2f611bb7..182409e903 100644
--- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -71,18 +71,22 @@ struct J2DScreen {
/* 802F9640 */ void getNameResource(char const*);
};
-struct J2DAnmBase {};
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
-struct J2DAnmVtxColor {};
+struct J2DAnmBase {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmTransform {};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
-struct J2DAnmTransform {};
-
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -108,10 +112,6 @@ struct J2DPane {
/* 802F8474 */ void update();
};
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTextureSRTKey {};
-
struct J2DAnmTexPattern {};
struct J2DMaterial {
@@ -768,7 +768,7 @@ SECTION_RODATA static u8 const lit_2555[32] = {
0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0E, 0x0F, 0x0F, 0x08, 0x0E, 0x00,
0x0F, 0x0A, 0x00, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x00, 0x0F,
};
-SECTION_DEAD void* const cg_803A1D50 = (void*)(&lit_2555);
+COMPILER_STRIP_GATE(803A1D50, &lit_2555);
/* 80305688-80305928 2FFFC8 02A0+00 1/1 0/0 0/0 .text
* setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum */
@@ -1283,7 +1283,7 @@ SECTION_RODATA static u8 const lit_2556[32] = {
0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 0x00,
0x07, 0x05, 0x00, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x01, 0x02, 0x00, 0x07,
};
-SECTION_DEAD void* const cg_803A1D70 = (void*)(&lit_2556);
+COMPILER_STRIP_GATE(803A1D70, &lit_2556);
#pragma pop
/* 803A1D90-803A1DB8 02E3F0 0028+00 0/0 0/0 0/0 .rodata @2557 */
@@ -1294,5 +1294,5 @@ SECTION_RODATA static u8 const lit_2557[40] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1D90 = (void*)(&lit_2557);
+COMPILER_STRIP_GATE(803A1D90, &lit_2557);
#pragma pop
diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp
index 202100def5..9f57437703 100644
--- a/libs/JSystem/J2DGraph/J2DScreen.cpp
+++ b/libs/JSystem/J2DGraph/J2DScreen.cpp
@@ -54,14 +54,14 @@ struct JGeometry {
struct J2DAnmBase {};
-struct J2DGrafContext {};
-
struct J2DAnmVtxColor {};
-struct J2DAnmVisibilityFull {};
-
struct J2DAnmTransform {};
+struct J2DGrafContext {};
+
+struct J2DAnmVisibilityFull {};
+
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -91,13 +91,13 @@ struct J2DPane {
/* 802F8478 */ void drawSelf(f32, f32);
};
-struct J2DAnmColor {};
-
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTexPattern {};
struct J2DAnmTevRegKey {};
-struct J2DAnmTexPattern {};
+struct J2DAnmColor {};
+
+struct J2DAnmTextureSRTKey {};
struct J2DMaterial {
/* 802EA1AC */ J2DMaterial();
diff --git a/libs/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/J2DGraph/J2DTevs.cpp
index 59f2394bbf..f5a5e3f891 100644
--- a/libs/JSystem/J2DGraph/J2DTevs.cpp
+++ b/libs/JSystem/J2DGraph/J2DTevs.cpp
@@ -321,7 +321,7 @@ SECTION_RODATA extern u8 const j2dDefaultTexCoordInfo[32] = {
0x01, 0x04, 0x3C, 0x00, 0x01, 0x05, 0x3C, 0x00, 0x01, 0x06, 0x3C, 0x00, 0x01, 0x07, 0x3C, 0x00,
0x01, 0x08, 0x3C, 0x00, 0x01, 0x09, 0x3C, 0x00, 0x01, 0x0A, 0x3C, 0x00, 0x01, 0x0B, 0x3C, 0x00,
};
-SECTION_DEAD void* const cg_803A1B80 = (void*)(&j2dDefaultTexCoordInfo);
+COMPILER_STRIP_GATE(803A1B80, &j2dDefaultTexCoordInfo);
/* 803A1BA0-803A1BC4 02E200 0024+00 0/0 3/3 0/0 .rodata j2dDefaultTexMtxInfo */
SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = {
@@ -329,27 +329,27 @@ SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1BA0 = (void*)(&j2dDefaultTexMtxInfo);
+COMPILER_STRIP_GATE(803A1BA0, &j2dDefaultTexMtxInfo);
/* 803A1BC4-803A1BE0 02E224 001C+00 0/0 3/3 0/0 .rodata j2dDefaultIndTexMtxInfo */
SECTION_RODATA extern u8 const j2dDefaultIndTexMtxInfo[28] = {
0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1BC4 = (void*)(&j2dDefaultIndTexMtxInfo);
+COMPILER_STRIP_GATE(803A1BC4, &j2dDefaultIndTexMtxInfo);
/* 803A1BE0-803A1BF4 02E240 0014+00 0/0 1/1 0/0 .rodata j2dDefaultTevStageInfo */
SECTION_RODATA extern u8 const j2dDefaultTevStageInfo[20] = {
0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1BE0 = (void*)(&j2dDefaultTevStageInfo);
+COMPILER_STRIP_GATE(803A1BE0, &j2dDefaultTevStageInfo);
/* 803A1BF4-803A1C00 02E254 000C+00 0/0 7/7 0/0 .rodata j2dDefaultIndTevStageInfo */
SECTION_RODATA extern u8 const j2dDefaultIndTevStageInfo[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1BF4 = (void*)(&j2dDefaultIndTevStageInfo);
+COMPILER_STRIP_GATE(803A1BF4, &j2dDefaultIndTevStageInfo);
/* 8045617C-80456180 00477C 0004+00 0/0 1/1 0/0 .sdata2 j2dDefaultColInfo */
SECTION_SDATA2 extern u32 j2dDefaultColInfo = 0xFFFFFFFF;
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index 97f9088dbf..6f0fa56f26 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -55,19 +55,19 @@ struct J2DTextBoxHBinding {};
struct J2DAnmBase {};
-struct J2DAnmColor {};
-
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
-struct J2DAnmVisibilityFull {};
-
struct J2DAnmTransform {};
+struct J2DAnmTextureSRTKey {};
+
+struct J2DAnmVisibilityFull {};
+
struct J2DAnmTexPattern {};
-struct J2DAnmTevRegKey {};
+struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
index 59db2e2db7..0777ee74b7 100644
--- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
@@ -38,18 +38,22 @@ struct J2DTextBoxVBinding {};
struct J2DTextBoxHBinding {};
-struct J2DAnmBase {};
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
-struct J2DAnmVtxColor {};
+struct J2DAnmBase {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmTransform {};
struct J2DAnmVisibilityFull {
/* 8030C048 */ void getVisibility(u16, u8*) const;
};
-struct J2DAnmTransform {};
-
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -73,12 +77,8 @@ struct J2DPane {
/* 802F8474 */ void update();
};
-struct J2DAnmTevRegKey {};
-
struct J2DTevStage {};
-struct J2DAnmTextureSRTKey {};
-
struct J2DAnmTexPattern {};
struct J2DMaterial {
@@ -426,7 +426,7 @@ asm void J2DTextBoxEx::setTevStage(bool param_0) {
SECTION_RODATA static u8 const lit_1953[12] = {
0x0F, 0x08, 0x0A, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0A, 0x00, 0x0F,
};
-SECTION_DEAD void* const cg_803A1DB8 = (void*)(&lit_1953);
+COMPILER_STRIP_GATE(803A1DB8, &lit_1953);
/* 803A1DC4-803A1DD0 02E424 000C+00 0/1 0/0 0/0 .rodata @1954 */
#pragma push
@@ -434,7 +434,7 @@ SECTION_DEAD void* const cg_803A1DB8 = (void*)(&lit_1953);
SECTION_RODATA static u8 const lit_1954[12] = {
0x07, 0x04, 0x05, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x05, 0x00, 0x07,
};
-SECTION_DEAD void* const cg_803A1DC4 = (void*)(&lit_1954);
+COMPILER_STRIP_GATE(803A1DC4, &lit_1954);
#pragma pop
/* 803A1DD0-803A1DE0 02E430 000F+01 0/1 0/0 0/0 .rodata @1955 */
@@ -459,7 +459,7 @@ SECTION_RODATA static u8 const lit_1955[15 + 1 /* padding */] = {
/* padding */
0x00,
};
-SECTION_DEAD void* const cg_803A1DD0 = (void*)(&lit_1955);
+COMPILER_STRIP_GATE(803A1DD0, &lit_1955);
#pragma pop
/* 803A1DE0-803A1DF0 02E440 000F+01 0/1 0/0 0/0 .rodata @1956 */
@@ -484,7 +484,7 @@ SECTION_RODATA static u8 const lit_1956[15 + 1 /* padding */] = {
/* padding */
0x00,
};
-SECTION_DEAD void* const cg_803A1DE0 = (void*)(&lit_1956);
+COMPILER_STRIP_GATE(803A1DE0, &lit_1956);
#pragma pop
/* 80307F94-8030823C 3028D4 02A8+00 1/1 0/0 0/0 .text
diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp
index 385a41b916..05dbbd7b8f 100644
--- a/libs/JSystem/J2DGraph/J2DWindow.cpp
+++ b/libs/JSystem/J2DGraph/J2DWindow.cpp
@@ -59,19 +59,19 @@ struct JGeometry {
struct J2DAnmBase {};
-struct J2DAnmColor {};
-
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTevRegKey {};
struct J2DAnmVtxColor {};
-struct J2DAnmVisibilityFull {};
-
struct J2DAnmTransform {};
+struct J2DAnmTextureSRTKey {};
+
+struct J2DAnmVisibilityFull {};
+
struct J2DAnmTexPattern {};
-struct J2DAnmTevRegKey {};
+struct J2DAnmColor {};
struct J2DPane {
/* 80020158 */ void setAlpha(u8);
@@ -361,13 +361,13 @@ asm J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, JKRArc
SECTION_RODATA static u8 const lit_1831[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C10 = (void*)(&lit_1831);
+COMPILER_STRIP_GATE(803A1C10, &lit_1831);
/* 803A1C20-803A1C30 02E280 0010+00 1/1 0/0 0/0 .rodata @1849 */
SECTION_RODATA static u8 const lit_1849[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C20 = (void*)(&lit_1849);
+COMPILER_STRIP_GATE(803A1C20, &lit_1849);
/* 80456240-80456248 004840 0008+00 7/7 0/0 0/0 .sdata2 @1971 */
SECTION_SDATA2 static f64 lit_1971 = 4503601774854144.0 /* cast s32 to float */;
@@ -578,7 +578,7 @@ asm void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1,
SECTION_RODATA static u8 const lit_3028[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C30 = (void*)(&lit_3028);
+COMPILER_STRIP_GATE(803A1C30, &lit_3028);
/* 802FBE60-802FBEDC 2F67A0 007C+00 1/0 0/0 0/0 .text getFrameTexture__9J2DWindowCFUcUc
*/
@@ -620,7 +620,7 @@ SECTION_RODATA static u8 const lit_3037[20 + 4 /* padding */] = {
0x00,
0x00,
};
-SECTION_DEAD void* const cg_803A1C40 = (void*)(&lit_3037);
+COMPILER_STRIP_GATE(803A1C40, &lit_3037);
/* 802FBEDC-802FBF98 2F681C 00BC+00 1/0 0/0 0/0 .text isUsed__9J2DWindowFPC7ResTIMG */
#pragma push
diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
index 5b7df8345b..6cd7d9f161 100644
--- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -41,20 +41,34 @@ struct JGeometry {
struct TBox2__template0 {};
};
-struct J2DAnmBase {};
-
-struct J2DAnmColor {};
-
struct J2DAnmVtxColor {
/* 8030363C */ void getColor(u8, u16, _GXColor*) const;
};
-struct J2DAnmVisibilityFull {
- /* 8030C048 */ void getVisibility(u16, u8*) const;
+struct J2DAnmTextureSRTKey {};
+
+struct J2DWindow {
+ struct TMaterial {};
+
+ /* 802F9A7C */ J2DWindow();
+ /* 802FA880 */ ~J2DWindow();
+ /* 802FB000 */ void resize(f32, f32);
+ /* 802FB1D8 */ void drawSelf(f32, f32);
+ /* 802FBF98 */ s32 getTypeID() const;
};
+struct J2DAnmColor {};
+
+struct J2DAnmBase {};
+
+struct J2DAnmTevRegKey {};
+
struct J2DAnmTransform {};
+struct J2DAnmVisibilityFull {
+ /* 8030C048 */ void getVisibility(u16, u8*) const;
+};
+
struct J2DPane {
/* 80053BC0 */ void calcMtx();
/* 80053C00 */ void makeMatrix(f32, f32);
@@ -81,22 +95,8 @@ struct J2DPane {
/* 802F8474 */ void update();
};
-struct J2DAnmTevRegKey {};
-
-struct J2DWindow {
- struct TMaterial {};
-
- /* 802F9A7C */ J2DWindow();
- /* 802FA880 */ ~J2DWindow();
- /* 802FB000 */ void resize(f32, f32);
- /* 802FB1D8 */ void drawSelf(f32, f32);
- /* 802FBF98 */ s32 getTypeID() const;
-};
-
struct J2DTevStage {};
-struct J2DAnmTextureSRTKey {};
-
struct J2DAnmTexPattern {};
struct J2DMaterial {
@@ -280,7 +280,7 @@ extern "C" void _restgpr_29();
SECTION_RODATA static u8 const lit_1508[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C60 = (void*)(&lit_1508);
+COMPILER_STRIP_GATE(803A1C60, &lit_1508);
/* 803CD3E8-803CD4B8 02A508 00CC+04 2/2 0/0 0/0 .data __vt__11J2DWindowEx */
SECTION_DATA extern void* __vt__11J2DWindowEx[51 + 1 /* padding */] = {
@@ -715,7 +715,7 @@ asm void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
SECTION_RODATA static u8 const lit_1557[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C70 = (void*)(&lit_1557);
+COMPILER_STRIP_GATE(803A1C70, &lit_1557);
#pragma pop
/* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata @1566 */
@@ -724,7 +724,7 @@ SECTION_DEAD void* const cg_803A1C70 = (void*)(&lit_1557);
SECTION_RODATA static u8 const lit_1566[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C80 = (void*)(&lit_1566);
+COMPILER_STRIP_GATE(803A1C80, &lit_1566);
#pragma pop
/* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata @1575 */
@@ -733,7 +733,7 @@ SECTION_DEAD void* const cg_803A1C80 = (void*)(&lit_1566);
SECTION_RODATA static u8 const lit_1575[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1C90 = (void*)(&lit_1575);
+COMPILER_STRIP_GATE(803A1C90, &lit_1575);
#pragma pop
/* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata @1581 */
@@ -742,7 +742,7 @@ SECTION_DEAD void* const cg_803A1C90 = (void*)(&lit_1575);
SECTION_RODATA static u8 const lit_1581[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1CA0 = (void*)(&lit_1581);
+COMPILER_STRIP_GATE(803A1CA0, &lit_1581);
#pragma pop
/* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata @1587 */
@@ -751,7 +751,7 @@ SECTION_DEAD void* const cg_803A1CA0 = (void*)(&lit_1581);
SECTION_RODATA static u8 const lit_1587[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1CB0 = (void*)(&lit_1587);
+COMPILER_STRIP_GATE(803A1CB0, &lit_1587);
#pragma pop
/* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata @1596 */
@@ -760,7 +760,7 @@ SECTION_DEAD void* const cg_803A1CB0 = (void*)(&lit_1587);
SECTION_RODATA static u8 const lit_1596[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1CC0 = (void*)(&lit_1596);
+COMPILER_STRIP_GATE(803A1CC0, &lit_1596);
#pragma pop
/* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata @1605 */
@@ -769,7 +769,7 @@ SECTION_DEAD void* const cg_803A1CC0 = (void*)(&lit_1596);
SECTION_RODATA static u8 const lit_1605[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1CD0 = (void*)(&lit_1605);
+COMPILER_STRIP_GATE(803A1CD0, &lit_1605);
#pragma pop
/* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata @1612 */
@@ -778,7 +778,7 @@ SECTION_DEAD void* const cg_803A1CD0 = (void*)(&lit_1605);
SECTION_RODATA static u8 const lit_1612[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1CE0 = (void*)(&lit_1612);
+COMPILER_STRIP_GATE(803A1CE0, &lit_1612);
#pragma pop
/* 803A1CF0-803A1D08 02E350 0018+00 0/0 0/0 0/0 .rodata @2530 */
@@ -788,7 +788,7 @@ SECTION_RODATA static u8 const lit_2530[24] = {
0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x0A, 0x00, 0x0F,
0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0F, 0x0F, 0x0A,
};
-SECTION_DEAD void* const cg_803A1CF0 = (void*)(&lit_2530);
+COMPILER_STRIP_GATE(803A1CF0, &lit_2530);
#pragma pop
/* 803A1D08-803A1D20 02E368 0018+00 0/0 0/0 0/0 .rodata @2531 */
@@ -798,7 +798,7 @@ SECTION_RODATA static u8 const lit_2531[24] = {
0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x05, 0x00, 0x07,
0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x07, 0x07, 0x07, 0x05,
};
-SECTION_DEAD void* const cg_803A1D08 = (void*)(&lit_2531);
+COMPILER_STRIP_GATE(803A1D08, &lit_2531);
#pragma pop
/* 803A1D20-803A1D40 02E380 001E+02 0/0 0/0 0/0 .rodata @2532 */
@@ -839,14 +839,14 @@ SECTION_RODATA static u8 const lit_2532[30 + 2 /* padding */] = {
0x00,
0x00,
};
-SECTION_DEAD void* const cg_803A1D20 = (void*)(&lit_2532);
+COMPILER_STRIP_GATE(803A1D20, &lit_2532);
#pragma pop
/* 803A1D40-803A1D50 02E3A0 0010+00 1/1 0/0 0/0 .rodata @3089 */
SECTION_RODATA static u8 const lit_3089[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_803A1D40 = (void*)(&lit_3089);
+COMPILER_STRIP_GATE(803A1D40, &lit_3089);
/* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text
* animationPane__11J2DWindowExFPC15J2DAnmTransform */