summaryrefslogtreecommitdiff
path: root/src/d/meter/d_meter2_draw.cpp
diff options
context:
space:
mode:
authorJulgodis <>2021-04-07 09:16:47 +0200
committerJulgodis <>2021-04-07 09:16:47 +0200
commitdca1d2a1c032f239c65aa1b7767132c12e89f628 (patch)
tree103f2574cfa7c6b9f19df522447d0b58861b60ba /src/d/meter/d_meter2_draw.cpp
parented1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff)
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/d/meter/d_meter2_draw.cpp')
-rw-r--r--src/d/meter/d_meter2_draw.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp
index ab54732434..e7bab2bf1a 100644
--- a/src/d/meter/d_meter2_draw.cpp
+++ b/src/d/meter/d_meter2_draw.cpp
@@ -29,6 +29,10 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
+struct JMSMesgEntry_c {};
+
+struct ResTLUT {};
+
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -36,8 +40,6 @@ struct JGeometry {
struct TBox2__template0 {};
};
-struct ResTLUT {};
-
struct ResTIMG {};
struct J2DPicture {
@@ -45,8 +47,6 @@ struct J2DPicture {
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
-struct JMSMesgEntry_c {};
-
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*);
@@ -71,10 +71,21 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
+struct CPaneMgrAlpha {
+ /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
+ /* 802555C8 */ void show();
+ /* 80255608 */ void hide();
+ /* 8025564C */ void isVisible();
+ /* 802557D0 */ void setAlphaRate(f32);
+ /* 80255828 */ void getAlphaRate();
+};
+
struct JUtility {
struct TColor {};
};
+struct J2DAnmColor {};
+
struct J2DBasePosition {};
struct J2DRotateAxis {};
@@ -94,17 +105,6 @@ struct CPaneMgr {
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
-struct J2DAnmColor {};
-
-struct CPaneMgrAlpha {
- /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
- /* 802555C8 */ void show();
- /* 80255608 */ void hide();
- /* 8025564C */ void isVisible();
- /* 802557D0 */ void setAlphaRate(f32);
- /* 80255828 */ void getAlphaRate();
-};
-
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
@@ -215,10 +215,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
-struct JAISoundID {};
-
struct Vec {};
+struct JAISoundID {};
+
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -454,7 +454,7 @@ SECTION_RODATA static u8 const a_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
-SECTION_DEAD void* const cg_80398258 = (void*)(&a_tag);
+COMPILER_STRIP_GATE(80398258, &a_tag);
/* 80398280-803982A8 0248E0 0028+00 0/1 0/0 0/0 .rodata b_tag$3950 */
#pragma push
@@ -464,7 +464,7 @@ SECTION_RODATA static u8 const b_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74,
};
-SECTION_DEAD void* const cg_80398280 = (void*)(&b_tag);
+COMPILER_STRIP_GATE(80398280, &b_tag);
#pragma pop
/* 803982A8-803982D0 024908 0028+00 0/1 0/0 0/0 .rodata z_tag$3951 */
@@ -475,7 +475,7 @@ SECTION_RODATA static u8 const z_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x72, 0x74,
};
-SECTION_DEAD void* const cg_803982A8 = (void*)(&z_tag);
+COMPILER_STRIP_GATE(803982A8, &z_tag);
#pragma pop
/* 803982D0-803982F8 024930 0028+00 0/1 0/0 0/0 .rodata x_tag$3952 */
@@ -486,7 +486,7 @@ SECTION_RODATA static u8 const x_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x78, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x35,
};
-SECTION_DEAD void* const cg_803982D0 = (void*)(&x_tag);
+COMPILER_STRIP_GATE(803982D0, &x_tag);
#pragma pop
/* 803982F8-80398320 024958 0028+00 0/1 0/0 0/0 .rodata y_tag$3953 */
@@ -497,7 +497,7 @@ SECTION_RODATA static u8 const y_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x79, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x35,
};
-SECTION_DEAD void* const cg_803982F8 = (void*)(&y_tag);
+COMPILER_STRIP_GATE(803982F8, &y_tag);
#pragma pop
/* 803BF328-803BF350 -00001 0028+00 1/1 0/0 0/0 .data bmg_filename$3954 */
@@ -803,7 +803,7 @@ SECTION_RODATA static u8 const life_tag[160] = {
0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x36, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x37,
0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x38, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x39,
};
-SECTION_DEAD void* const cg_80398320 = (void*)(&life_tag);
+COMPILER_STRIP_GATE(80398320, &life_tag);
#pragma pop
/* 803983C0-80398460 024A20 00A0+00 0/1 0/0 0/0 .rodata mark_tag$4932 */
@@ -821,7 +821,7 @@ SECTION_RODATA static u8 const mark_tag[160] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x36, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x37,
0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x38, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x39,
};
-SECTION_DEAD void* const cg_803983C0 = (void*)(&mark_tag);
+COMPILER_STRIP_GATE(803983C0, &mark_tag);
#pragma pop
/* 80398460-80398500 024AC0 00A0+00 0/1 0/0 0/0 .rodata base_tag$4933 */
@@ -839,7 +839,7 @@ SECTION_RODATA static u8 const base_tag[160] = {
0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x36, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x37,
0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x38, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x39,
};
-SECTION_DEAD void* const cg_80398460 = (void*)(&base_tag);
+COMPILER_STRIP_GATE(80398460, &base_tag);
#pragma pop
/* 80398500-803985A0 024B60 00A0+00 0/1 0/0 0/0 .rodata lifet1_tag$4934 */
@@ -857,7 +857,7 @@ SECTION_RODATA static u8 const lifet1_tag[160] = {
0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, 0x73,
0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, 0x73,
};
-SECTION_DEAD void* const cg_80398500 = (void*)(&lifet1_tag);
+COMPILER_STRIP_GATE(80398500, &lifet1_tag);
#pragma pop
/* 803985A0-80398640 024C00 00A0+00 0/1 0/0 0/0 .rodata lifet2_tag$4935 */
@@ -875,7 +875,7 @@ SECTION_RODATA static u8 const lifet2_tag[160] = {
0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37,
0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39,
};
-SECTION_DEAD void* const cg_803985A0 = (void*)(&lifet2_tag);
+COMPILER_STRIP_GATE(803985A0, &lifet2_tag);
#pragma pop
/* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */
@@ -912,7 +912,7 @@ SECTION_RODATA static u8 const tuta_0[128] = {
0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x35,
};
-SECTION_DEAD void* const cg_80398640 = (void*)(&tuta_0);
+COMPILER_STRIP_GATE(80398640, &tuta_0);
#pragma pop
/* 803986C0-80398740 024D20 0080+00 0/1 0/0 0/0 .rodata tuta_1$5095 */
@@ -928,7 +928,7 @@ SECTION_RODATA static u8 const tuta_1[128] = {
0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x35,
};
-SECTION_DEAD void* const cg_803986C0 = (void*)(&tuta_1);
+COMPILER_STRIP_GATE(803986C0, &tuta_1);
#pragma pop
/* 80398740-803987C0 024DA0 0080+00 0/1 0/0 0/0 .rodata tuta_2$5096 */
@@ -944,7 +944,7 @@ SECTION_RODATA static u8 const tuta_2[128] = {
0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x35,
};
-SECTION_DEAD void* const cg_80398740 = (void*)(&tuta_2);
+COMPILER_STRIP_GATE(80398740, &tuta_2);
#pragma pop
/* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */
@@ -965,7 +965,7 @@ SECTION_RODATA static u8 const rupeet1_tag[32] = {
0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x73,
0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x73,
};
-SECTION_DEAD void* const cg_803987C0 = (void*)(&rupeet1_tag);
+COMPILER_STRIP_GATE(803987C0, &rupeet1_tag);
#pragma pop
/* 803987E0-80398800 024E40 0020+00 0/1 0/0 0/0 .rodata rupeet2_tag$5153 */
@@ -975,7 +975,7 @@ SECTION_RODATA static u8 const rupeet2_tag[32] = {
0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32,
0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34,
};
-SECTION_DEAD void* const cg_803987E0 = (void*)(&rupeet2_tag);
+COMPILER_STRIP_GATE(803987E0, &rupeet2_tag);
#pragma pop
/* 80398800-80398828 024E60 0028+00 0/1 0/0 0/0 .rodata key_tag$5165 */
@@ -986,7 +986,7 @@ SECTION_RODATA static u8 const key_tag[40] = {
0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E,
0x5F, 0x33, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x6E,
};
-SECTION_DEAD void* const cg_80398800 = (void*)(&key_tag);
+COMPILER_STRIP_GATE(80398800, &key_tag);
#pragma pop
/* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */
@@ -1006,7 +1006,7 @@ SECTION_RODATA static u8 const juji_i_tag[40] = {
0x30, 0x30, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x31, 0x6A, 0x75, 0x5F, 0x72,
0x69, 0x6E, 0x67, 0x32, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x34,
};
-SECTION_DEAD void* const cg_80398828 = (void*)(&juji_i_tag);
+COMPILER_STRIP_GATE(80398828, &juji_i_tag);
/* 80398850-80398878 024EB0 0028+00 1/1 0/0 0/0 .rodata juji_m_tag$5270 */
SECTION_RODATA static u8 const juji_m_tag[40] = {
@@ -1014,7 +1014,7 @@ SECTION_RODATA static u8 const juji_m_tag[40] = {
0x30, 0x32, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x33, 0x6A, 0x75, 0x5F, 0x72,
0x69, 0x6E, 0x67, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-SECTION_DEAD void* const cg_80398850 = (void*)(&juji_m_tag);
+COMPILER_STRIP_GATE(80398850, &juji_m_tag);
/* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */
#pragma push
@@ -1139,13 +1139,13 @@ SECTION_RODATA static u8 const tag_bigh[32] = {
0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x30, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x31,
0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x32, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x33,
};
-SECTION_DEAD void* const cg_80398878 = (void*)(&tag_bigh);
+COMPILER_STRIP_GATE(80398878, &tag_bigh);
/* 80398898-803988A8 024EF8 0010+00 1/1 0/0 0/0 .rodata tag_du$5852 */
SECTION_RODATA static u8 const tag_du[16] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x6C, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x75, 0x6E,
};
-SECTION_DEAD void* const cg_80398898 = (void*)(&tag_du);
+COMPILER_STRIP_GATE(80398898, &tag_du);
/* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */
#pragma push
@@ -1548,7 +1548,7 @@ asm void dMeter2Draw_c::drawButtonBin(u8 param_0) {
SECTION_RODATA static u8 const tag_7361[16] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x79, 0x5F, 0x6E,
};
-SECTION_DEAD void* const cg_803988A8 = (void*)(&tag_7361);
+COMPILER_STRIP_GATE(803988A8, &tag_7361);
/* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */
#pragma push
@@ -2177,7 +2177,7 @@ SECTION_RODATA static u8 const tag_7759[24] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D,
0x5F, 0x79, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6A, 0x5F, 0x6E,
};
-SECTION_DEAD void* const cg_803988B8 = (void*)(&tag_7759);
+COMPILER_STRIP_GATE(803988B8, &tag_7759);
#pragma pop
/* 803988D0-80398A78 024F30 01A7+01 6/5 0/0 0/0 .rodata @stringBase0 */