mirror of
https://github.com/zeldaret/tp
synced 2026-06-17 15:17:13 -04:00
Regalloc/debug/misc fixes (#2794)
* Fix "0" asserts * More debug and regalloc fixes * Fix PTMF syntax for compatibility with other compilers * Fix some fakematches, link more TUs for J/P
This commit is contained in:
@@ -564,7 +564,7 @@ struct J2DColorChanInfo {
|
||||
/* 0x0 */ u8 field_0x3;
|
||||
};
|
||||
|
||||
inline u8 J2DCalcColorChanID(const J2DColorChanInfo& info) { return info.field_0x1; }
|
||||
inline u16 J2DCalcColorChanID(u8 param_0) { return param_0; }
|
||||
extern const J2DColorChanInfo j2dDefaultColorChanInfo;
|
||||
|
||||
/**
|
||||
@@ -577,11 +577,11 @@ public:
|
||||
setColorChanInfo(j2dDefaultColorChanInfo);
|
||||
}
|
||||
J2DColorChan(const J2DColorChanInfo& info) {
|
||||
mColorChan = J2DCalcColorChanID(info);
|
||||
mColorChan = J2DCalcColorChanID(info.field_0x1);
|
||||
}
|
||||
|
||||
void setColorChanInfo(const J2DColorChanInfo& info) {
|
||||
mColorChan = J2DCalcColorChanID(info);
|
||||
mColorChan = J2DCalcColorChanID(info.field_0x1);
|
||||
}
|
||||
|
||||
u16 getMatSrc() const { return mColorChan & 1; }
|
||||
|
||||
@@ -215,7 +215,7 @@ public:
|
||||
chunk = chunk->getNextChunk();
|
||||
}
|
||||
|
||||
JUT_PANIC(362,"Cannnot free for JASMemChunkPool")
|
||||
JUT_PANIC(362, "Cannnot free for JASMemChunkPool");
|
||||
}
|
||||
|
||||
/* 0x18 */ MemoryChunk* field_0x18;
|
||||
|
||||
@@ -89,7 +89,7 @@ private:
|
||||
/* 0x5BC */ u8 field_0x5bc[0x5DC - 0x5BC];
|
||||
/* 0x5DC */ u8 mDoorAction;
|
||||
/* 0x5E0 */ dPath* mpPath;
|
||||
/* 0x5E4 */ cXyz mPoint;
|
||||
/* 0x5E4 */ Vec mPoint;
|
||||
/* 0x5F0 */ u8 mPathIndex;
|
||||
/* 0x5F4 */ int mPointIndex;
|
||||
/* 0x5F8 */ u8 mBossHealth;
|
||||
|
||||
@@ -10,9 +10,6 @@ class J3DModelData;
|
||||
class dBgW;
|
||||
|
||||
struct fs_weed_s {
|
||||
/* 8086FED8 */ ~fs_weed_s();
|
||||
/* 8086FF38 */ fs_weed_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00[15];
|
||||
/* 0xB4 */ f32 field_0xb4;
|
||||
/* 0xB8 */ f32 field_0xb8;
|
||||
@@ -20,9 +17,6 @@ struct fs_weed_s {
|
||||
};
|
||||
|
||||
struct fs_tsubo_s {
|
||||
/* 8086FE98 */ ~fs_tsubo_s();
|
||||
/* 8086FED4 */ fs_tsubo_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ u8 field_0x0c[0x14 - 0x0c];
|
||||
/* 0x14 */ J3DModel* field_0x14;
|
||||
@@ -34,9 +28,6 @@ struct fs_tsubo_s {
|
||||
};
|
||||
|
||||
struct fs_rod_s {
|
||||
/* 8086FF84 */ ~fs_rod_s();
|
||||
/* 8086FFC0 */ fs_rod_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ u8 field_0x0C[0x14 - 0x0C];
|
||||
/* 0x14 */ J3DModel* field_0x14;
|
||||
@@ -49,9 +40,6 @@ struct fs_rod_s {
|
||||
};
|
||||
|
||||
struct fs_lure_s {
|
||||
/* 8086FFDC */ ~fs_lure_s();
|
||||
/* 80870018 */ fs_lure_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ s16 field_0x0c;
|
||||
/* 0x0E */ s16 field_0x0e;
|
||||
@@ -72,9 +60,6 @@ struct fs_lure_s {
|
||||
};
|
||||
|
||||
struct fs_koro2_s {
|
||||
/* 8086FD78 */ ~fs_koro2_s();
|
||||
/* 8086FDB4 */ fs_koro2_s();
|
||||
|
||||
/* 0x00 */ J3DModel* mpModel;
|
||||
/* 0x04 */ Mtx field_0x04;
|
||||
/* 0x34 */ s8 field_0x34;
|
||||
|
||||
@@ -1112,7 +1112,7 @@ public:
|
||||
struct daNpcF_anmPlayData {
|
||||
u16 idx;
|
||||
f32 morf;
|
||||
s32 numLoops;
|
||||
int numLoops;
|
||||
};
|
||||
|
||||
enum AnmFlags {
|
||||
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
void doNormalAction() {
|
||||
void doNormalAction(int) {
|
||||
mOrderEvtNo = 0;
|
||||
if (mpNextActionFn != NULL) {
|
||||
if (mpNextActionFn == mpActionFn) {
|
||||
|
||||
@@ -244,7 +244,7 @@ public:
|
||||
break;
|
||||
default:
|
||||
OS_REPORT("%s: Line.%d arg=%d\n", "d_a_passer_mng.cpp", 1049, param_1);
|
||||
JUT_PANIC(1050, 0);
|
||||
JUT_ASSERT(1050, FALSE);
|
||||
break;
|
||||
}
|
||||
return paramLow << 8;
|
||||
|
||||
@@ -273,6 +273,7 @@ public:
|
||||
class dEvDtFlag_c {
|
||||
public:
|
||||
dEvDtFlag_c() {}
|
||||
~dEvDtFlag_c() {}
|
||||
BOOL flagCheck(int flag);
|
||||
BOOL flagSet(int flag);
|
||||
BOOL flagMaxCheck(int flag);
|
||||
|
||||
@@ -10,6 +10,7 @@ class fopAc_ac_c;
|
||||
class dEvent_exception_c {
|
||||
public:
|
||||
dEvent_exception_c() { mEventInfoIdx = -1; }
|
||||
~dEvent_exception_c() {}
|
||||
void init();
|
||||
int setStartDemo(int mapToolID);
|
||||
const char* getEventName();
|
||||
|
||||
@@ -831,10 +831,7 @@ public:
|
||||
/* 0x2DB */ u8 door_light_influence_ratio;
|
||||
/* 0x2DC */ s16 unk_light_influence_ratio;
|
||||
/* 0x2DE */ u8 fish_pond_colreg_adjust_ON;
|
||||
/* 0x2E0 */ s16 fish_pond_colreg_c0_R;
|
||||
/* 0x2E2 */ s16 fish_pond_colreg_c0_G;
|
||||
/* 0x2E4 */ s16 fish_pond_colreg_c0_B;
|
||||
/* 0x2E6 */ u8 field_0x2E6[0x2E8 - 0x2E6];
|
||||
/* 0x2E0 */ GXColorS10 fish_pond_colreg_c0;
|
||||
/* 0x2E8 */ u8 water_mud_adjust_ON;
|
||||
/* 0x2EA */ s16 field_0x2ea;
|
||||
/* 0x2EC */ s16 field_0x2ec;
|
||||
|
||||
@@ -180,7 +180,7 @@ public:
|
||||
void setArchiveName(char* name) { mArchiveName = name; }
|
||||
u8 getMapToolId() { return mMapToolId; }
|
||||
s16 getEventId() { return mEventId; }
|
||||
s16 getIdx() { return mIndex; }
|
||||
s16 getIdx() { return (s8)mIndex; }
|
||||
void setIdx(u8 i_idx) { mIndex = i_idx; }
|
||||
char* getArchiveName() { return mArchiveName; }
|
||||
BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; }
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
/* 0x06 */ u16 mCondition;
|
||||
/* 0x08 */ s16 mEventId;
|
||||
/* 0x0A */ u8 mMapToolId;
|
||||
/* 0x0B */ s8 mIndex;
|
||||
/* 0x0B */ u8 mIndex;
|
||||
/* 0x0C */ char* mArchiveName;
|
||||
/* 0x10 */ u8 field_0x10;
|
||||
/* 0x14 */ void (*field_0x14)(void*);
|
||||
|
||||
Reference in New Issue
Block a user