diff options
| author | Julgodis <> | 2021-04-07 09:16:47 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-07 09:16:47 +0200 |
| commit | dca1d2a1c032f239c65aa1b7767132c12e89f628 (patch) | |
| tree | 103f2574cfa7c6b9f19df522447d0b58861b60ba /src/d/menu/d_menu_fmap2D.cpp | |
| parent | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff) | |
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/d/menu/d_menu_fmap2D.cpp')
| -rw-r--r-- | src/d/menu/d_menu_fmap2D.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp index e9e5d4d376..af03980af4 100644 --- a/src/d/menu/d_menu_fmap2D.cpp +++ b/src/d/menu/d_menu_fmap2D.cpp @@ -48,8 +48,6 @@ struct dMeter2Info_c { struct JKRExpHeap {}; -struct J2DAnmTextureSRTKey {}; - struct JGeometry { template <typename A1> struct TBox2 {}; @@ -77,6 +75,8 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; +struct J2DAnmTextureSRTKey {}; + struct dMenu_Fmap2DTop_c { /* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*); /* 801D6700 */ ~dMenu_Fmap2DTop_c(); @@ -188,10 +188,10 @@ struct dMenuMapCommon_c { /* 801C4600 */ void moveLightDropAnime(); }; -struct JAISoundID {}; - struct Vec {}; +struct JAISoundID {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -429,7 +429,7 @@ SECTION_RODATA static u8 const cur_tag_3868[32] = { 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, }; -SECTION_DEAD void* const cg_80396248 = (void*)(&cur_tag_3868); +COMPILER_STRIP_GATE(80396248, &cur_tag_3868); /* 803BD750-803BD760 01A870 0010+00 2/2 0/0 0/0 .data __vt__17dMenu_Fmap2DTop_c */ SECTION_DATA extern void* __vt__17dMenu_Fmap2DTop_c[4] = { @@ -492,7 +492,7 @@ SECTION_RODATA static u8 const cur_tag_4092[32] = { 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, }; -SECTION_DEAD void* const cg_80396268 = (void*)(&cur_tag_4092); +COMPILER_STRIP_GATE(80396268, &cur_tag_4092); /* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */ SECTION_SDATA2 static f32 lit_4199 = 608.0f; @@ -1263,7 +1263,7 @@ SECTION_RODATA static u8 const area_name[24] = { 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x73, 0x00, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x31, }; -SECTION_DEAD void* const cg_80396288 = (void*)(&area_name); +COMPILER_STRIP_GATE(80396288, &area_name); #pragma pop /* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */ @@ -1273,7 +1273,7 @@ SECTION_RODATA static u8 const farea_name_5815[24] = { 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32, }; -SECTION_DEAD void* const cg_803962A0 = (void*)(&farea_name_5815); +COMPILER_STRIP_GATE(803962A0, &farea_name_5815); #pragma pop /* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */ @@ -1285,7 +1285,7 @@ SECTION_RODATA static u8 const sfont_name[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32, }; -SECTION_DEAD void* const cg_803962B8 = (void*)(&sfont_name); +COMPILER_STRIP_GATE(803962B8, &sfont_name); #pragma pop /* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */ @@ -1297,7 +1297,7 @@ SECTION_RODATA static u8 const ffont_name_5822[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34, }; -SECTION_DEAD void* const cg_803962F0 = (void*)(&ffont_name_5822); +COMPILER_STRIP_GATE(803962F0, &ffont_name_5822); #pragma pop /* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */ @@ -1308,7 +1308,7 @@ SECTION_RODATA static u8 const cont_zt[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, }; -SECTION_DEAD void* const cg_80396328 = (void*)(&cont_zt); +COMPILER_STRIP_GATE(80396328, &cont_zt); #pragma pop /* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */ @@ -1319,7 +1319,7 @@ SECTION_RODATA static u8 const font_zt_5829[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35, }; -SECTION_DEAD void* const cg_80396350 = (void*)(&font_zt_5829); +COMPILER_STRIP_GATE(80396350, &font_zt_5829); #pragma pop /* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */ @@ -1330,7 +1330,7 @@ SECTION_RODATA static u8 const cont_bt[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_80396378 = (void*)(&cont_bt); +COMPILER_STRIP_GATE(80396378, &cont_bt); #pragma pop /* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */ @@ -1341,7 +1341,7 @@ SECTION_RODATA static u8 const font_bt_5836[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35, }; -SECTION_DEAD void* const cg_803963A0 = (void*)(&font_bt_5836); +COMPILER_STRIP_GATE(803963A0, &font_bt_5836); #pragma pop /* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */ @@ -1352,7 +1352,7 @@ SECTION_RODATA static u8 const cont_at[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, }; -SECTION_DEAD void* const cg_803963C8 = (void*)(&cont_at); +COMPILER_STRIP_GATE(803963C8, &cont_at); #pragma pop /* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */ @@ -1363,7 +1363,7 @@ SECTION_RODATA static u8 const font_at_5843[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35, }; -SECTION_DEAD void* const cg_803963F0 = (void*)(&font_at_5843); +COMPILER_STRIP_GATE(803963F0, &font_at_5843); #pragma pop /* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */ @@ -1374,7 +1374,7 @@ SECTION_RODATA static u8 const juji_c_5849[40] = { 0x30, 0x31, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -SECTION_DEAD void* const cg_80396418 = (void*)(&juji_c_5849); +COMPILER_STRIP_GATE(80396418, &juji_c_5849); #pragma pop /* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */ @@ -1385,7 +1385,7 @@ SECTION_RODATA static u8 const fuji_c[40] = { 0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -SECTION_DEAD void* const cg_80396440 = (void*)(&fuji_c); +COMPILER_STRIP_GATE(80396440, &fuji_c); #pragma pop /* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */ @@ -1396,7 +1396,7 @@ SECTION_RODATA static u8 const ast_c_5856[40] = { 0x30, 0x31, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -SECTION_DEAD void* const cg_80396468 = (void*)(&ast_c_5856); +COMPILER_STRIP_GATE(80396468, &ast_c_5856); #pragma pop /* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */ @@ -1407,7 +1407,7 @@ SECTION_RODATA static u8 const fst_c[40] = { 0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -SECTION_DEAD void* const cg_80396490 = (void*)(&fst_c); +COMPILER_STRIP_GATE(80396490, &fst_c); #pragma pop /* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text @@ -1490,7 +1490,7 @@ SECTION_RODATA static u8 const ffont_name_6110[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34, }; -SECTION_DEAD void* const cg_803964B8 = (void*)(&ffont_name_6110); +COMPILER_STRIP_GATE(803964B8, &ffont_name_6110); /* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl */ @@ -1509,7 +1509,7 @@ SECTION_RODATA static u8 const farea_name_6125[24] = { 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32, }; -SECTION_DEAD void* const cg_803964F0 = (void*)(&farea_name_6125); +COMPILER_STRIP_GATE(803964F0, &farea_name_6125); /* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */ #pragma push @@ -1528,7 +1528,7 @@ SECTION_RODATA static u8 const font_zt_6148[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35, }; -SECTION_DEAD void* const cg_80396508 = (void*)(&font_zt_6148); +COMPILER_STRIP_GATE(80396508, &font_zt_6148); /* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1548,7 +1548,7 @@ SECTION_RODATA static u8 const font_bt_6176[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35, }; -SECTION_DEAD void* const cg_80396530 = (void*)(&font_bt_6176); +COMPILER_STRIP_GATE(80396530, &font_bt_6176); /* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1568,7 +1568,7 @@ SECTION_RODATA static u8 const font_at_6194[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35, }; -SECTION_DEAD void* const cg_80396558 = (void*)(&font_at_6194); +COMPILER_STRIP_GATE(80396558, &font_at_6194); /* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1588,7 +1588,7 @@ SECTION_RODATA static u8 const juji_c_6209[40] = { 0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -SECTION_DEAD void* const cg_80396580 = (void*)(&juji_c_6209); +COMPILER_STRIP_GATE(80396580, &juji_c_6209); /* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */ #pragma push @@ -1607,7 +1607,7 @@ SECTION_RODATA static u8 const ast_c_6233[40] = { 0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -SECTION_DEAD void* const cg_803965A8 = (void*)(&ast_c_6233); +COMPILER_STRIP_GATE(803965A8, &ast_c_6233); /* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl */ |
