Cleanup the 3 path/point structs

This commit is contained in:
LagoLunatic
2025-03-28 20:31:04 -04:00
parent 8cfd2f7a1e
commit b72d243f9b
16 changed files with 117 additions and 115 deletions
+8 -6
View File
@@ -4,27 +4,29 @@
#include "d/d_bg_s.h"
#include "dolphin/types.h"
struct dPath__Point {
struct dPnt {
/* 0x00 */ u8 mArg0;
/* 0x01 */ u8 mArg1;
/* 0x02 */ u8 mArg2;
/* 0x03 */ u8 mArg3;
/* 0x04 */ cXyz mPos;
/* 0x04 */ cXyz m_position;
};
struct dPath {
/* 0x00 */ u16 m_num;
/* 0x02 */ u16 mNextPathId;
/* 0x02 */ u16 m_nextID;
/* 0x04 */ u8 mArg0;
/* 0x05 */ u8 mLoops;
/* 0x05 */ u8 m_closed;
/* 0x06 */ u8 field4_0x6;
/* 0x07 */ u8 field5_0x7;
/* 0x08 */ dPath__Point* mpPnt;
/* 0x08 */ dPnt* m_points;
};
dPath__Point* dPath_GetPnt(dPath*, int);
inline BOOL dPath_ChkClose(dPath* i_path) { return i_path->m_closed & 1; }
dPath* dPath_GetRoomPath(int, int);
dPath* dPath_GetNextRoomPath(dPath*, int);
dPnt* dPath_GetPnt(dPath*, int);
bool dPath_GetPolyRoomPathVec(cBgS_PolyInfo&, cXyz*, int*);
#endif /* D_PATH_H */
+6 -5
View File
@@ -26,6 +26,7 @@ enum StageType {
/* 0x08 */ dStageType_UNKNOWN_8_e,
};
// Virt
class stage_vrbox_info_class {
public:
/* 0x00 */ u32 field_0x00;
@@ -260,6 +261,7 @@ struct stage_sound_data {
/* 0x1A */ u8 field_0x1a;
}; // Size: 0x1C
// SOND
struct dStage_SoundInfo_c {
/* 0x0 */ int num;
/* 0x4 */ stage_sound_data* m_entries;
@@ -271,12 +273,11 @@ public:
/* 0x4 */ f32 mSeaLevel;
};
// PPNT / RPPN
struct dPnt;
struct dStage_dPnt_c {
/* 0x0 */ u8 field_0x0;
/* 0x1 */ u8 field_0x1;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 field_0x3;
/* 0x4 */ cXyz m_position;
/* 0x0 */ int num;
/* 0x4 */ u32 m_pnt_offset;
}; // Size: 0x10
struct dStage_FloorInfo_entry_c {