summaryrefslogtreecommitdiff
path: root/src/d/msg
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/msg
parented1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff)
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/d/msg')
-rw-r--r--src/d/msg/d_msg_class.cpp30
-rw-r--r--src/d/msg/d_msg_object.cpp8
-rw-r--r--src/d/msg/d_msg_string.cpp4
-rw-r--r--src/d/msg/d_msg_string_base.cpp10
4 files changed, 26 insertions, 26 deletions
diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index 43abf1cfc3..522b974f41 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -11,6 +11,12 @@
// Types:
//
+struct Vec {};
+
+struct cXyz {
+ /* 80266B34 */ void operator-(Vec const&) const;
+};
+
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80228CB4 */ ~jmessage_tReference();
@@ -43,12 +49,6 @@ struct jmessage_tReference {
/* 80232A20 */ void getActorPos();
};
-struct Vec {};
-
-struct cXyz {
- /* 80266B34 */ void operator-(Vec const&) const;
-};
-
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
@@ -115,19 +115,14 @@ struct jmessage_tMeasureProcessor {
/* 8022B5F4 */ ~jmessage_tMeasureProcessor();
};
-struct jmessage_string_tControl {
- /* 8022FB5C */ jmessage_string_tControl();
- /* 802328DC */ ~jmessage_string_tControl();
+struct J2DTextBox {
+ /* 80300658 */ void getStringPtr() const;
};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
-struct J2DTextBox {
- /* 80300658 */ void getStringPtr() const;
-};
-
struct JUTFont {};
struct jmessage_string_tReference {
@@ -145,6 +140,11 @@ struct jmessage_string_tReference {
/* 8022FB24 */ void getLineCountNowPage();
};
+struct jmessage_string_tControl {
+ /* 8022FB5C */ jmessage_string_tControl();
+ /* 802328DC */ ~jmessage_string_tControl();
+};
+
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);
@@ -712,7 +712,7 @@ SECTION_RODATA static u8 const colorTable_3861[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
-SECTION_DEAD void* const cg_803995C8 = (void*)(&colorTable_3861);
+COMPILER_STRIP_GATE(803995C8, &colorTable_3861);
/* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */
#pragma push
@@ -731,7 +731,7 @@ SECTION_RODATA static u8 const colorTable_3877[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
-SECTION_DEAD void* const cg_803995EC = (void*)(&colorTable_3877);
+COMPILER_STRIP_GATE(803995EC, &colorTable_3877);
/* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */
#pragma push
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 3672b1a5df..131222e0ae 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -13,14 +13,14 @@
struct msg_class {};
-struct JKRHeap {
- /* 802CE784 */ void getTotalFreeSize();
-};
-
struct JKRArchive {
struct EMountMode {};
};
+struct JKRHeap {
+ /* 802CE784 */ void getTotalFreeSize();
+};
+
struct mDoDvdThd_mountXArchive_c {
/* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
};
diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp
index 39e894f609..42c47ff24e 100644
--- a/src/d/msg/d_msg_string.cpp
+++ b/src/d/msg/d_msg_string.cpp
@@ -11,12 +11,12 @@
// Types:
//
+struct J2DTextBox {};
+
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
-struct J2DTextBox {};
-
struct JUTFont {};
struct dMsgString_c {
diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp
index 1847d3191b..4eca1f8453 100644
--- a/src/d/msg/d_msg_string_base.cpp
+++ b/src/d/msg/d_msg_string_base.cpp
@@ -11,14 +11,10 @@
// Types:
//
-struct jmessage_string_tControl {
- /* 8022FB5C */ jmessage_string_tControl();
-};
+struct J2DTextBox {};
struct COutFont_c {};
-struct J2DTextBox {};
-
struct JUTFont {};
struct jmessage_string_tReference {
@@ -27,6 +23,10 @@ struct jmessage_string_tReference {
/* 8022FA38 */ void getLineLength(int);
};
+struct jmessage_string_tControl {
+ /* 8022FB5C */ jmessage_string_tControl();
+};
+
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);