detect more floats/doubles, including from relocations

This commit is contained in:
Julgodis
2021-04-07 09:16:47 +02:00
parent ed1ee30dd2
commit dca1d2a1c0
1645 changed files with 69992 additions and 69984 deletions
+2 -2
View File
@@ -240,10 +240,10 @@ struct Z2StatusMgr {
/* 802B5F70 */ void heartGaugeOn();
};
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);
+39 -39
View File
@@ -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 */
+18 -18
View File
@@ -60,18 +60,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct cXyz {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct cXyz {};
struct JUTFont {};
struct J2DPicture {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
@@ -720,7 +720,7 @@ SECTION_RODATA static u8 const black_color_4634[148] = {
0x46, 0x46, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80398A78 = (void*)(&black_color_4634);
COMPILER_STRIP_GATE(80398A78, &black_color_4634);
/* 80398B0C-80398BA0 02516C 0094+00 0/1 0/0 0/0 .rodata white_color$4635 */
#pragma push
@@ -737,7 +737,7 @@ SECTION_RODATA static u8 const white_color_4635[148] = {
0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398B0C = (void*)(&white_color_4635);
COMPILER_STRIP_GATE(80398B0C, &white_color_4635);
#pragma pop
/* 80398BA0-80398C34 025200 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4636 */
@@ -755,7 +755,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4636[148] = {
0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398BA0 = (void*)(&vertex_color_lu_4636);
COMPILER_STRIP_GATE(80398BA0, &vertex_color_lu_4636);
#pragma pop
/* 80398C34-80398CC8 025294 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4637 */
@@ -773,7 +773,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4637[148] = {
0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398C34 = (void*)(&vertex_color_ru_4637);
COMPILER_STRIP_GATE(80398C34, &vertex_color_ru_4637);
#pragma pop
/* 80398CC8-80398D5C 025328 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4638 */
@@ -791,7 +791,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4638[148] = {
0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398CC8 = (void*)(&vertex_color_ld_4638);
COMPILER_STRIP_GATE(80398CC8, &vertex_color_ld_4638);
#pragma pop
/* 80398D5C-80398DF0 0253BC 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4639 */
@@ -809,7 +809,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4639[148] = {
0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398D5C = (void*)(&vertex_color_rd_4639);
COMPILER_STRIP_GATE(80398D5C, &vertex_color_rd_4639);
#pragma pop
/* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture
@@ -839,7 +839,7 @@ SECTION_RODATA static u8 const black_color_4675[148] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80398DF0 = (void*)(&black_color_4675);
COMPILER_STRIP_GATE(80398DF0, &black_color_4675);
#pragma pop
/* 80398E84-80398F18 0254E4 0094+00 0/1 0/0 0/0 .rodata white_color$4676 */
@@ -857,7 +857,7 @@ SECTION_RODATA static u8 const white_color_4676[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398E84 = (void*)(&white_color_4676);
COMPILER_STRIP_GATE(80398E84, &white_color_4676);
#pragma pop
/* 80398F18-80398FAC 025578 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4677 */
@@ -875,7 +875,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4677[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398F18 = (void*)(&vertex_color_lu_4677);
COMPILER_STRIP_GATE(80398F18, &vertex_color_lu_4677);
#pragma pop
/* 80398FAC-80399040 02560C 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4678 */
@@ -893,7 +893,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4678[148] = {
0xFF, 0xFF, 0xFF, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398FAC = (void*)(&vertex_color_ru_4678);
COMPILER_STRIP_GATE(80398FAC, &vertex_color_ru_4678);
#pragma pop
/* 80399040-803990D4 0256A0 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4679 */
@@ -911,7 +911,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4679[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80399040 = (void*)(&vertex_color_ld_4679);
COMPILER_STRIP_GATE(80399040, &vertex_color_ld_4679);
#pragma pop
/* 803990D4-80399168 025734 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4680 */
@@ -929,7 +929,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4680[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_803990D4 = (void*)(&vertex_color_rd_4680);
COMPILER_STRIP_GATE(803990D4, &vertex_color_rd_4680);
#pragma pop
/* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture
+21 -21
View File
@@ -408,7 +408,7 @@ SECTION_RODATA static u8 const fipaScale[24] = {
0x3F, 0x7A, 0xE1, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x8C, 0xCC, 0xCD,
};
SECTION_DEAD void* const cg_80397E50 = (void*)(&fipaScale);
COMPILER_STRIP_GATE(80397E50, &fipaScale);
/* 80397E68-80397E80 0244C8 0018+00 0/1 0/0 0/0 .rodata fipaPosX$3872 */
#pragma push
@@ -417,7 +417,7 @@ SECTION_RODATA static u8 const fipaPosX[24] = {
0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00,
0x40, 0x7D, 0x70, 0xA4, 0x40, 0x80, 0x00, 0x00, 0x41, 0xDC, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397E68 = (void*)(&fipaPosX);
COMPILER_STRIP_GATE(80397E68, &fipaPosX);
#pragma pop
/* 80397E80-80397E98 0244E0 0018+00 0/1 0/0 0/0 .rodata fipaPosY$3873 */
@@ -427,7 +427,7 @@ SECTION_RODATA static u8 const fipaPosY[24] = {
0xC1, 0x13, 0x33, 0x33, 0xC1, 0xDC, 0x00, 0x00, 0xC1, 0x3B, 0x33, 0x33,
0xC1, 0x13, 0x33, 0x33, 0xC1, 0xF0, 0xCC, 0xCD, 0xC1, 0x8F, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397E80 = (void*)(&fipaPosY);
COMPILER_STRIP_GATE(80397E80, &fipaPosY);
#pragma pop
/* 80397E98-80397EB0 0244F8 0018+00 0/1 0/0 0/0 .rodata finaScale$3874 */
@@ -437,7 +437,7 @@ SECTION_RODATA static u8 const finaScale[24] = {
0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66,
0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66,
};
SECTION_DEAD void* const cg_80397E98 = (void*)(&finaScale);
COMPILER_STRIP_GATE(80397E98, &finaScale);
#pragma pop
/* 80397EB0-80397EC8 024510 0018+00 0/1 0/0 0/0 .rodata finaPosX$3875 */
@@ -447,7 +447,7 @@ SECTION_RODATA static u8 const finaPosX[24] = {
0xC1, 0xC8, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EB0 = (void*)(&finaPosX);
COMPILER_STRIP_GATE(80397EB0, &finaPosX);
#pragma pop
/* 80397EC8-80397EE0 024528 0018+00 0/1 0/0 0/0 .rodata finaPosY$3876 */
@@ -457,7 +457,7 @@ SECTION_RODATA static u8 const finaPosY[24] = {
0xC1, 0x80, 0x00, 0x00, 0xC2, 0x22, 0x66, 0x66, 0xC1, 0xC0, 0x00, 0x00,
0xC1, 0x3B, 0x33, 0x33, 0xC2, 0x17, 0x99, 0x9A, 0xC1, 0x50, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EC8 = (void*)(&finaPosY);
COMPILER_STRIP_GATE(80397EC8, &finaPosY);
#pragma pop
/* 80397EE0-80397EF8 024540 0018+00 0/1 0/0 0/0 .rodata filiScale$3877 */
@@ -467,7 +467,7 @@ SECTION_RODATA static u8 const filiScale[24] = {
0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66,
0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66,
};
SECTION_DEAD void* const cg_80397EE0 = (void*)(&filiScale);
COMPILER_STRIP_GATE(80397EE0, &filiScale);
#pragma pop
/* 80397EF8-80397F10 024558 0018+00 0/1 0/0 0/0 .rodata filiPosX$3878 */
@@ -477,7 +477,7 @@ SECTION_RODATA static u8 const filiPosX[24] = {
0xC1, 0xE0, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x41, 0x13, 0x33, 0x33,
0x41, 0x13, 0x33, 0x33, 0x41, 0x13, 0x33, 0x33, 0xC1, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EF8 = (void*)(&filiPosX);
COMPILER_STRIP_GATE(80397EF8, &filiPosX);
#pragma pop
/* 80397F10-80397F28 024570 0018+00 0/1 0/0 0/0 .rodata filiPosY$3879 */
@@ -487,7 +487,7 @@ SECTION_RODATA static u8 const filiPosY[24] = {
0xC0, 0xD3, 0x33, 0x33, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x66, 0x66, 0x66,
0x41, 0xC7, 0x33, 0x33, 0xC1, 0x3B, 0x33, 0x33, 0x41, 0xC7, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397F10 = (void*)(&filiPosY);
COMPILER_STRIP_GATE(80397F10, &filiPosY);
#pragma pop
/* 80397F28-80397F40 024588 0018+00 0/1 0/0 0/0 .rodata bboxScale$3880 */
@@ -497,7 +497,7 @@ SECTION_RODATA static u8 const bboxScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F28 = (void*)(&bboxScale);
COMPILER_STRIP_GATE(80397F28, &bboxScale);
#pragma pop
/* 80397F40-80397F58 0245A0 0018+00 0/0 0/0 0/0 .rodata bboxPosX$3881 */
@@ -507,7 +507,7 @@ SECTION_RODATA static u8 const bboxPosX[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F40 = (void*)(&bboxPosX);
COMPILER_STRIP_GATE(80397F40, &bboxPosX);
#pragma pop
/* 80397F58-80397F70 0245B8 0018+00 0/0 0/0 0/0 .rodata bboxPosY$3882 */
@@ -517,7 +517,7 @@ SECTION_RODATA static u8 const bboxPosY[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F58 = (void*)(&bboxPosY);
COMPILER_STRIP_GATE(80397F58, &bboxPosY);
#pragma pop
/* 80397F70-80397F88 0245D0 0018+00 0/1 0/0 0/0 .rodata rboxScale$3883 */
@@ -527,7 +527,7 @@ SECTION_RODATA static u8 const rboxScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F70 = (void*)(&rboxScale);
COMPILER_STRIP_GATE(80397F70, &rboxScale);
#pragma pop
/* 80397F88-80397FA0 0245E8 0018+00 0/1 0/0 0/0 .rodata rboxPosX$3884 */
@@ -537,7 +537,7 @@ SECTION_RODATA static u8 const rboxPosX[24] = {
0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F88 = (void*)(&rboxPosX);
COMPILER_STRIP_GATE(80397F88, &rboxPosX);
#pragma pop
/* 80397FA0-80397FB8 024600 0018+00 0/1 0/0 0/0 .rodata rboxPosY$3885 */
@@ -547,7 +547,7 @@ SECTION_RODATA static u8 const rboxPosY[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397FA0 = (void*)(&rboxPosY);
COMPILER_STRIP_GATE(80397FA0, &rboxPosY);
#pragma pop
/* 80397FB8-80397FD0 024618 0018+00 0/1 0/0 0/0 .rodata finfoScale$3886 */
@@ -557,7 +557,7 @@ SECTION_RODATA static u8 const finfoScale[24] = {
0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x61, 0x47, 0xAE,
0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52,
};
SECTION_DEAD void* const cg_80397FB8 = (void*)(&finfoScale);
COMPILER_STRIP_GATE(80397FB8, &finfoScale);
#pragma pop
/* 80397FD0-80397FE8 024630 0018+00 0/1 0/0 0/0 .rodata finfoPosX$3887 */
@@ -567,7 +567,7 @@ SECTION_RODATA static u8 const finfoPosX[24] = {
0xC1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, 0xC2, 0x03, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397FD0 = (void*)(&finfoPosX);
COMPILER_STRIP_GATE(80397FD0, &finfoPosX);
#pragma pop
/* 80397FE8-80398000 024648 0018+00 0/1 0/0 0/0 .rodata finfoPosY$3888 */
@@ -577,7 +577,7 @@ SECTION_RODATA static u8 const finfoPosY[24] = {
0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397FE8 = (void*)(&finfoPosY);
COMPILER_STRIP_GATE(80397FE8, &finfoPosY);
#pragma pop
/* 80398000-80398018 024660 0018+00 0/1 0/0 0/0 .rodata fishnScale$3889 */
@@ -587,7 +587,7 @@ SECTION_RODATA static u8 const fishnScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80398000 = (void*)(&fishnScale);
COMPILER_STRIP_GATE(80398000, &fishnScale);
#pragma pop
/* 80398018-80398030 024678 0018+00 0/1 0/0 0/0 .rodata fishnPosX$3890 */
@@ -597,7 +597,7 @@ SECTION_RODATA static u8 const fishnPosX[24] = {
0x40, 0x80, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66,
0x40, 0xD3, 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x13, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80398018 = (void*)(&fishnPosX);
COMPILER_STRIP_GATE(80398018, &fishnPosX);
#pragma pop
/* 80398030-80398048 024690 0018+00 0/1 0/0 0/0 .rodata fishnPosY$3891 */
@@ -607,7 +607,7 @@ SECTION_RODATA static u8 const fishnPosY[24] = {
0xC2, 0x90, 0x33, 0x33, 0x43, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00,
0x40, 0xD3, 0x33, 0x33, 0x42, 0x03, 0x33, 0x33, 0x41, 0x3B, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80398030 = (void*)(&fishnPosY);
COMPILER_STRIP_GATE(80398030, &fishnPosY);
#pragma pop
/* 80454538-8045453C 002B38 0004+00 1/1 0/0 0/0 .sdata2 @3902 */
+12 -12
View File
@@ -24,15 +24,15 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct JUTFont {};
struct dMsgObject_c {
@@ -181,6 +181,10 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -188,10 +192,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
@@ -203,10 +203,10 @@ struct dComIfG_play_c {
/* 8002C97C */ void getLayerNo(int);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -797,7 +797,7 @@ SECTION_RODATA static u8 const text_tag[80] = {
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37,
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39,
};
SECTION_DEAD void* const cg_80398048 = (void*)(&text_tag);
COMPILER_STRIP_GATE(80398048, &text_tag);
/* 80398098-803980E8 0246F8 0050+00 1/1 0/0 0/0 .rodata ftext_tag$5462 */
SECTION_RODATA static u8 const ftext_tag[80] = {
@@ -807,7 +807,7 @@ SECTION_RODATA static u8 const ftext_tag[80] = {
0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37,
0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39,
};
SECTION_DEAD void* const cg_80398098 = (void*)(&ftext_tag);
COMPILER_STRIP_GATE(80398098, &ftext_tag);
/* 80454770-80454774 002D70 0004+00 4/4 0/0 0/0 .sdata2 @5628 */
SECTION_SDATA2 static f32 lit_5628 = 0.5f;
+4 -4
View File
@@ -31,6 +31,10 @@ struct dMeterHakusha_c {
/* 8020D480 */ void getHakushaNum();
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -38,10 +42,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
+2 -2
View File
@@ -80,10 +80,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};