summaryrefslogtreecommitdiff
path: root/include/SComponent
diff options
context:
space:
mode:
authorjdflyer <yeacub@gmail.com>2021-01-31 18:03:38 -0700
committerGitHub <noreply@github.com>2021-01-31 20:03:38 -0500
commitf1924e91f4a1ea1dea62b4fb0a1342f94a55ccfe (patch)
tree143b3d8aa6bb5e975c8aa0bcf18975f797d8ba8c /include/SComponent
parent24d529f67b310b50ac1ee22ffb6e1e06645985d9 (diff)
d_kyeff, d_kyeff2, m_Do_printf, and m_Do_graphic (#109)
* Split d_kyeff * Partially matched d_kyeff * split d_kyeff2 * Match d_kyeff2 * split m_Do_printf * m_Do_printf partially matched * hotfix and clang-format * split m_Do_graphic * rename symbols in m_Do_graphic * Match a few functions in m_Do_graphic * Fix Merge Errors * Delete sh.exe.stackdump * Update OSReportInit
Diffstat (limited to 'include/SComponent')
-rw-r--r--include/SComponent/c_lib.h4
-rw-r--r--include/SComponent/c_xyz.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/include/SComponent/c_lib.h b/include/SComponent/c_lib.h
index 459a12ad9e..32bea17d90 100644
--- a/include/SComponent/c_lib.h
+++ b/include/SComponent/c_lib.h
@@ -38,4 +38,8 @@ void MtxPosition(cXyz*, cXyz*);
void MtxPush(void);
Mtx* MtxPull(void);
+extern "C" {
+int strcmp(const char*, const char*);
+};
+
#endif \ No newline at end of file
diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h
index 1893872f89..f8c62769d9 100644
--- a/include/SComponent/c_xyz.h
+++ b/include/SComponent/c_xyz.h
@@ -18,7 +18,7 @@ extern u8 lbl_80430CE8;
class cXyz : public Vec {
public:
- ~cXyz(){};
+ ~cXyz() {}
cXyz() {}
cXyz(f32 x, f32 y, f32 z) {
this->x = x;
@@ -106,4 +106,8 @@ extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX
extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY
+extern "C" { // needed for inline asm
+void cXyz_NS_dtor(void);
+}
+
#endif \ No newline at end of file