summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/J2DGraph/J2DPicture.h4
-rw-r--r--include/JSystem/JStudio/JStudio_JAudio2/control.h4
-rw-r--r--include/JSystem/JUtility/JUTAssert.h5
-rw-r--r--include/d/actor/d_a_obj_mirror_6pole.h15
-rw-r--r--include/d/d_drawlist.h5
-rw-r--r--include/d/d_menu_dmap.h1
-rw-r--r--include/d/d_menu_dmap_map.h1
-rw-r--r--include/d/d_msg_flow.h2
-rw-r--r--include/d/d_stage.h3
9 files changed, 12 insertions, 28 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index 94165f44df..c37a8c2d7f 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -90,8 +90,8 @@ public:
/* 802FF320 */ virtual void prepend(JUTTexture* param_0, f32 param_1) {
insert(param_0, 0, param_1);
}
- /* 801BDD70 */ virtual bool insert(ResTIMG const*, u8, f32) {
- // NONMATCHING
+ /* 801BDD70 */ virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
+ return insert(param_0, NULL, param_1, param_2);
}
/* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h
index 7671c6a1c0..8753338dee 100644
--- a/include/JSystem/JStudio/JStudio_JAudio2/control.h
+++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h
@@ -93,11 +93,7 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound {
void set_bPermit_onExit_notEnd_(bool param_1) { field_0x11c = param_1; }
- #ifndef NONMATCHING
static TVVOSetValue_ saoVVOSetValue_[6];
- #else
- static u8 saoVVOSetValue_[72];
- #endif
/* 0x114 */ TCreateObject* pCreateObject_;
/* 0x118 */ JAISoundHandle opJAISoundHandle_;
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index e951fe4f98..6fa2d62d5d 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -30,9 +30,12 @@
#define JUT_LOG(LINE, ...) \
JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__)
-#define JUT_CONFIRM(LINE, COND) \
+#define JUT_SET_CONFIRM(LINE, COND) \
JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND)
+#define JUT_CONFIRM(LINE, COND) \
+ JUT_SET_CONFIRM(LINE, COND)
+
#else
#define JUT_ASSERT(...) (void)0;
#define JUT_ASSERT_MSG(...) (void)0;
diff --git a/include/d/actor/d_a_obj_mirror_6pole.h b/include/d/actor/d_a_obj_mirror_6pole.h
index b02aa94e20..59d106e582 100644
--- a/include/d/actor/d_a_obj_mirror_6pole.h
+++ b/include/d/actor/d_a_obj_mirror_6pole.h
@@ -50,18 +50,11 @@ public:
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
}
- void setAction(Mode_e i_action) {
- mMode = i_action;
- mAction = ActionTable[mMode];
+ inline void setAction(Mode_e i_action);
+ inline void callInit();
+ inline void callExecute();
- callInit();
- }
-
- void callInit() { (this->*mAction[0])(); }
-
- void callExecute() { (this->*mAction[1])(); }
-
- static actionFunc ActionTable[][2];
+ static const actionFunc ActionTable[][2];
private:
/* 0x568 */ J3DModel* mpModel;
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 0434be72ad..f6f4d9e20a 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -32,12 +32,7 @@ class dDlst_base_c {
public:
dDlst_base_c() {}
- // hack, remove later
- #ifdef NO_INLINE_DLSTBASE_DRAW
- virtual void draw();
- #else
virtual void draw() {}
- #endif
};
class dDlst_snapShot_c : public dDlst_base_c {
diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h
index d475c0a80e..7735d9c41c 100644
--- a/include/d/d_menu_dmap.h
+++ b/include/d/d_menu_dmap.h
@@ -25,7 +25,6 @@ struct dMenu_DmapMapCtrl_c;
class renderingDmap_c : public renderingPlusDoor_c {
public:
/* 801C0380 */ virtual ~renderingDmap_c() {}
- /* 801C051C */ renderingDmap_c() {}
/* 801C0C48 */ virtual const GXColor* getColor(int);
/* 801C0C10 */ virtual int getLineWidth(int);
diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h
index 1147526cd0..6f24eae4f4 100644
--- a/include/d/d_menu_dmap_map.h
+++ b/include/d/d_menu_dmap_map.h
@@ -204,7 +204,6 @@ public:
class dMenu_DmapMapCtrl_c : public dMenu_StageMapCtrl_c {
public:
- /* 801BD144 */ virtual ~dMenu_DmapMapCtrl_c() {}
/* 801C2028 */ virtual bool isEnableZoomMove() const;
/* 801C1B14 */ virtual void calcZoomCenter(f32*, f32*);
/* 801C2598 */ virtual void getInitWholeMapScale(f32*, f32, f32, f32, f32);
diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h
index f971439005..b071f198dc 100644
--- a/include/d/d_msg_flow.h
+++ b/include/d/d_msg_flow.h
@@ -182,7 +182,7 @@ public:
u16 getSelectNum() { return query005(NULL, NULL, 0); }
int getChoiceNo() { return (s16)mChoiceNo; }
void setMsg(u32 msg) { mMsg = msg; }
- bool checkEndFlow() { return field_0x26 == 1; }
+ bool checkEndFlow() { return (u32)field_0x26 == 1; }
static queryFunc mQueryList[53];
static eventFunc mEventList[43];
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 318d8bd5ee..7cffbbd2c9 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -4,7 +4,6 @@
#include "SSystem/SComponent/c_lib.h"
#include "d/d_kankyo.h"
#include "d/d_kankyo_data.h"
-#include "d/d_map_path_dmap.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
@@ -217,7 +216,7 @@ struct stage_tgsc_class {
// MPAT
struct map_path_class {
/* 0x0 */ int num;
- /* 0x4 */ dDrawPath_c::room_class* m_entries;
+ /* 0x4 */ void* m_entries;
};
// RTBL
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 11:08:35 +0000