summaryrefslogtreecommitdiff
path: root/include/d
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2021-10-24 14:35:00 -0700
committerGitHub <noreply@github.com>2021-10-24 23:35:00 +0200
commit5020395dfd34d4dc846e3ea228f6271bfca1c72a (patch)
tree9b553bbfc8b0807d7f860964d6044d6ccf6d1342 /include/d
parentb88cb8cdc0b7a8af4df22e303ff81e0e617dbc85 (diff)
J2D structs + print / fix GX + MSL string headers (#157)
* J2D structs + print / fix GX + MSL string headers * remove msl_c/string.h
Diffstat (limited to 'include/d')
-rw-r--r--include/d/d_stage.h1
-rw-r--r--include/d/kankyo/d_kankyo.h6
-rw-r--r--include/d/save/d_save.h3
3 files changed, 3 insertions, 7 deletions
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 9253e3b623..dffffcdc5b 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -8,7 +8,6 @@
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
-#include "msl_c/string.h"
struct stage_vrboxcol_info_class {};
diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h
index 85857442e7..4a35b1fc32 100644
--- a/include/d/kankyo/d_kankyo.h
+++ b/include/d/kankyo/d_kankyo.h
@@ -7,7 +7,7 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXTexture.h"
+#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
@@ -328,10 +328,6 @@ private:
/* 0x18 */ EVIL_EFF field_0x18[2000];
};
-struct GXFogAdjTable {
- u16 field_0x0[10];
-};
-
class fopAc_ac_c;
class dScnKy_env_light_c {
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index cf0cdeef5d..96baf9dc29 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1,9 +1,10 @@
#ifndef D_SAVE_D_SAVE_H
#define D_SAVE_D_SAVE_H
+#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/printf.h"
+#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
-#include "msl_c/string.h"
#define DEFAULT_SELECT_ITEM_INDEX 0
#define MAX_SELECT_ITEM 4