Misc matches (#2845)

* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches
This commit is contained in:
LagoLunatic
2025-11-21 18:52:16 -05:00
committed by GitHub
parent 31621c3dac
commit e2fddadf32
55 changed files with 341 additions and 266 deletions
+4 -11
View File
@@ -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;
-5
View File
@@ -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 {
-1
View File
@@ -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);
-1
View File
@@ -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);
+1 -1
View File
@@ -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];
+1 -2
View File
@@ -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