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_skill.cpp | |
| parent | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff) | |
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/d/menu/d_menu_skill.cpp')
| -rw-r--r-- | src/d/menu/d_menu_skill.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 97915f3497..75ec61427e 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -21,10 +21,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DPane {}; - struct JKRArchive {}; +struct J2DPane {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -44,13 +44,13 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap {}; + struct CSTControl {}; struct dMenu_Skill_c { @@ -86,10 +86,10 @@ struct dMenu_Skill_c { /* 801F9A08 */ void draw(); }; -struct JAISoundID {}; - struct Vec {}; +struct JAISoundID {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -520,14 +520,14 @@ SECTION_RODATA static u8 const i_id[28] = { 0x00, 0x00, 0x06, 0xB4, 0x00, 0x00, 0x06, 0xB3, 0x00, 0x00, 0x06, 0xB5, 0x00, 0x00, 0x06, 0xB6, 0x00, 0x00, 0x06, 0xB7, 0x00, 0x00, 0x06, 0xB8, 0x00, 0x00, 0x06, 0xB9, }; -SECTION_DEAD void* const cg_80397A18 = (void*)(&i_id); +COMPILER_STRIP_GATE(80397A18, &i_id); /* 80397A34-80397A50 024094 001C+00 1/1 0/0 0/0 .rodata i_id1$4088 */ SECTION_RODATA static u8 const i_id1_4088[28] = { 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, }; -SECTION_DEAD void* const cg_80397A34 = (void*)(&i_id1_4088); +COMPILER_STRIP_GATE(80397A34, &i_id1_4088); /* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv */ @@ -609,7 +609,7 @@ SECTION_RODATA static u8 const tag_sub0[56] = { 0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x31, }; -SECTION_DEAD void* const cg_80397A50 = (void*)(&tag_sub0); +COMPILER_STRIP_GATE(80397A50, &tag_sub0); #pragma pop /* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */ @@ -621,7 +621,7 @@ SECTION_RODATA static u8 const tag_sub1[56] = { 0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, }; -SECTION_DEAD void* const cg_80397A88 = (void*)(&tag_sub1); +COMPILER_STRIP_GATE(80397A88, &tag_sub1); #pragma pop /* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */ @@ -633,7 +633,7 @@ SECTION_RODATA static u8 const tag_name0[56] = { 0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x32, }; -SECTION_DEAD void* const cg_80397AC0 = (void*)(&tag_name0); +COMPILER_STRIP_GATE(80397AC0, &tag_name0); #pragma pop /* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */ @@ -645,7 +645,7 @@ SECTION_RODATA static u8 const tag_name1[56] = { 0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31, }; -SECTION_DEAD void* const cg_80397AF8 = (void*)(&tag_name1); +COMPILER_STRIP_GATE(80397AF8, &tag_name1); #pragma pop /* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */ @@ -657,7 +657,7 @@ SECTION_RODATA static u8 const ftag_sub0[56] = { 0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73, }; -SECTION_DEAD void* const cg_80397B30 = (void*)(&ftag_sub0); +COMPILER_STRIP_GATE(80397B30, &ftag_sub0); #pragma pop /* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */ @@ -669,7 +669,7 @@ SECTION_RODATA static u8 const ftag_sub1[56] = { 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, }; -SECTION_DEAD void* const cg_80397B68 = (void*)(&ftag_sub1); +COMPILER_STRIP_GATE(80397B68, &ftag_sub1); #pragma pop /* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */ @@ -681,7 +681,7 @@ SECTION_RODATA static u8 const ftag_name0[56] = { 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, 0x73, }; -SECTION_DEAD void* const cg_80397BA0 = (void*)(&ftag_name0); +COMPILER_STRIP_GATE(80397BA0, &ftag_name0); #pragma pop /* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */ @@ -693,7 +693,7 @@ SECTION_RODATA static u8 const ftag_name1[56] = { 0x75, 0x5F, 0x31, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, }; -SECTION_DEAD void* const cg_80397BD8 = (void*)(&ftag_name1); +COMPILER_STRIP_GATE(80397BD8, &ftag_name1); #pragma pop /* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */ @@ -705,7 +705,7 @@ SECTION_RODATA static u8 const tag_letter[56] = { 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x36, 0x5F, 0x6E, }; -SECTION_DEAD void* const cg_80397C10 = (void*)(&tag_letter); +COMPILER_STRIP_GATE(80397C10, &tag_letter); #pragma pop /* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */ @@ -717,7 +717,7 @@ SECTION_RODATA static u8 const tag_frame[56] = { 0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36, }; -SECTION_DEAD void* const cg_80397C48 = (void*)(&tag_frame); +COMPILER_STRIP_GATE(80397C48, &tag_frame); #pragma pop /* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */ @@ -729,7 +729,7 @@ SECTION_RODATA static u8 const tag_maki[56] = { 0x69, 0x5F, 0x33, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, 0x6E, }; -SECTION_DEAD void* const cg_80397C80 = (void*)(&tag_maki); +COMPILER_STRIP_GATE(80397C80, &tag_maki); #pragma pop /* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */ @@ -741,7 +741,7 @@ SECTION_RODATA static u8 const tag_makic[56] = { 0x6B, 0x69, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, }; -SECTION_DEAD void* const cg_80397CB8 = (void*)(&tag_makic); +COMPILER_STRIP_GATE(80397CB8, &tag_makic); #pragma pop /* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */ @@ -760,14 +760,14 @@ SECTION_RODATA static u8 const name_tag[32] = { 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37, }; -SECTION_DEAD void* const cg_80397CF0 = (void*)(&name_tag); +COMPILER_STRIP_GATE(80397CF0, &name_tag); /* 80397D10-80397D30 024370 0020+00 1/1 0/0 0/0 .rodata fame_tag$4307 */ SECTION_RODATA static u8 const fame_tag[32] = { 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34, }; -SECTION_DEAD void* const cg_80397D10 = (void*)(&fame_tag); +COMPILER_STRIP_GATE(80397D10, &fame_tag); /* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv */ @@ -787,7 +787,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -SECTION_DEAD void* const cg_80397D30 = (void*)(&text_a_tag); +COMPILER_STRIP_GATE(80397D30, &text_a_tag); /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */ SECTION_RODATA static u8 const text_b_tag[40] = { @@ -795,7 +795,7 @@ SECTION_RODATA static u8 const text_b_tag[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -SECTION_DEAD void* const cg_80397D58 = (void*)(&text_b_tag); +COMPILER_STRIP_GATE(80397D58, &text_b_tag); /* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv */ @@ -834,14 +834,14 @@ SECTION_RODATA static u8 const i_id0[28] = { 0x00, 0x00, 0x06, 0xA5, 0x00, 0x00, 0x06, 0xA6, 0x00, 0x00, 0x06, 0xA7, 0x00, 0x00, 0x06, 0xA8, 0x00, 0x00, 0x06, 0xA9, 0x00, 0x00, 0x06, 0xAA, 0x00, 0x00, 0x06, 0xAB, }; -SECTION_DEAD void* const cg_80397D80 = (void*)(&i_id0); +COMPILER_STRIP_GATE(80397D80, &i_id0); /* 80397D9C-80397DB8 0243FC 001C+00 1/1 0/0 0/0 .rodata i_id1$4479 */ SECTION_RODATA static u8 const i_id1_4479[28] = { 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, }; -SECTION_DEAD void* const cg_80397D9C = (void*)(&i_id1_4479); +COMPILER_STRIP_GATE(80397D9C, &i_id1_4479); /* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */ #pragma push |
