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/msg | |
| parent | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff) | |
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/msg')
| -rw-r--r-- | src/msg/scrn/d_msg_scrn_3select.cpp | 10 | ||||
| -rw-r--r-- | src/msg/scrn/d_msg_scrn_explain.cpp | 12 | ||||
| -rw-r--r-- | src/msg/scrn/d_msg_scrn_item.cpp | 4 | ||||
| -rw-r--r-- | src/msg/scrn/d_msg_scrn_kanban.cpp | 2 | ||||
| -rw-r--r-- | src/msg/scrn/d_msg_scrn_tree.cpp | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/msg/scrn/d_msg_scrn_3select.cpp b/src/msg/scrn/d_msg_scrn_3select.cpp index 1ad7f84c15..13ba2d0cbd 100644 --- a/src/msg/scrn/d_msg_scrn_3select.cpp +++ b/src/msg/scrn/d_msg_scrn_3select.cpp @@ -11,13 +11,13 @@ // Types: // +struct JKRArchive {}; + struct J2DPane { /* 802F7100 */ void getBounds(); /* 802F7FCC */ void animationTransform(); }; -struct JKRArchive {}; - struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -207,7 +207,7 @@ SECTION_RODATA static u8 const tag_name[288] = { 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x32, 0x00, 0x63, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x63, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72, }; -SECTION_DEAD void* const cg_80399708 = (void*)(&tag_name); +COMPILER_STRIP_GATE(80399708, &tag_name); /* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -675,7 +675,7 @@ asm void dMsgScrn3Select_c::getTextBoxGlobalPosY(int param_0) { SECTION_RODATA static u8 const lit_4497[12] = { 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80399828 = (void*)(&lit_4497); +COMPILER_STRIP_GATE(80399828, &lit_4497); /* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text open1Proc__17dMsgScrn3Select_cFv */ #pragma push @@ -692,7 +692,7 @@ asm void dMsgScrn3Select_c::open1Proc() { SECTION_RODATA static u8 const lit_4520[12] = { 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80399834 = (void*)(&lit_4520); +COMPILER_STRIP_GATE(80399834, &lit_4520); /* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text open2Proc__17dMsgScrn3Select_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index d41bcdc9e6..771a2242fb 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -69,15 +69,15 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; -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 { @@ -96,10 +96,10 @@ struct Z2SpeechMgr2 { /* 802CBF60 */ void setTextCount(s16); }; -struct JAISoundID {}; - struct Vec {}; +struct JAISoundID {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp index 10db26f1aa..beb3b087f4 100644 --- a/src/msg/scrn/d_msg_scrn_item.cpp +++ b/src/msg/scrn/d_msg_scrn_item.cpp @@ -18,10 +18,10 @@ struct dMsgScrnLight_c { struct JKRExpHeap {}; -struct J2DAnmTextureSRTKey {}; - struct J2DAnmColor {}; +struct J2DAnmTextureSRTKey {}; + struct dMsgScrnItem_c { /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); /* 8023F51C */ ~dMsgScrnItem_c(); diff --git a/src/msg/scrn/d_msg_scrn_kanban.cpp b/src/msg/scrn/d_msg_scrn_kanban.cpp index e5c636df39..42b854ad51 100644 --- a/src/msg/scrn/d_msg_scrn_kanban.cpp +++ b/src/msg/scrn/d_msg_scrn_kanban.cpp @@ -150,7 +150,7 @@ SECTION_RODATA static u8 const t_tag[24] = { 0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73, }; -SECTION_DEAD void* const cg_80399AA0 = (void*)(&t_tag); +COMPILER_STRIP_GATE(80399AA0, &t_tag); /* 803C1240-803C1298 01E360 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnKanban_c */ SECTION_DATA extern void* __vt__16dMsgScrnKanban_c[22] = { diff --git a/src/msg/scrn/d_msg_scrn_tree.cpp b/src/msg/scrn/d_msg_scrn_tree.cpp index 7321f4e207..7e0f55270f 100644 --- a/src/msg/scrn/d_msg_scrn_tree.cpp +++ b/src/msg/scrn/d_msg_scrn_tree.cpp @@ -157,7 +157,7 @@ SECTION_RODATA static u8 const t_tag[24] = { 0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73, }; -SECTION_DEAD void* const cg_80399C18 = (void*)(&t_tag); +COMPILER_STRIP_GATE(80399C18, &t_tag); /* 803C1420-803C1478 01E540 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnTree_c */ SECTION_DATA extern void* __vt__14dMsgScrnTree_c[22] = { |
