Skip to content

Matches, implement structs, fix VECTOR + MATRIX3 size #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheOnlyZac merged 5 commits into from
Oct 26, 2026
Merged

Matches, implement structs, fix VECTOR + MATRIX3 size #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d98aa9
Matches, implement CM struct, correct MATRIX3 size
545u Oct 16, 2026
eaf15bb
Remove STRUCT_OFFSET
545u Oct 16, 2026
8866367
Fix VECTOR size, implement PO + STEP, misc
545u Oct 17, 2026
17e772d
Matches in P2/cplcy, P2/cd, P2/waypoint
545u Oct 19, 2026
5c3b9b4
Merge branch 'TheOnlyZac:main' into 545u-dev
545u Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 42 additions & 36 deletions config/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ g_vtbasic = 0x217410;
g_vtlo = 0x217418;
g_vtalo = 0x217498;
g_vtso = 0x217568;
g_vtcrvl = 0x2176D0;
g_vtcrvc = 0x217708;
g_vtact = 0x219560;
g_vtactval = 0x219588;
g_vtactref = 0x2195b0;
Expand Down Expand Up @@ -71,6 +73,12 @@ g_vtlooker = 0x21e418;
g_vteyes = 0x21e438;
g_mpcidarysplopt = 0x244950;
g_mpcidpvt = 0x247448; // size:0x328
g_matIdentity = 0x2483d0; // size:0x30
g_mat4Identity = 0x248400; // size:0x40
g_matZero = 0x248440; // size:0x30
g_normalX = 0x248D00; // size:0xc
g_normalY = 0x248D10; // size:0xc
g_normalZ = 0x248D20; // size:0xc
g_vtwpsg = 0x2505c0;


Expand Down Expand Up @@ -1417,26 +1425,26 @@ InitCm__FP2CM = 0x143648; // type:func
SetSwCameraFov__Ff = 0x1437C0; // type:func
SetSwCameraNearClip__Ff = 0x1437E8; // type:func
SetSwCameraFarClip__Ff = 0x143810; // type:func
SetSwCameraSProgress__Ff = 0x143838; // type:func
FUN_00143860__Ff = 0x143860; // type:func
FUN_00143888__Ff = 0x143888; // type:func
SetSwCameraNearFog__Ff = 0x143838; // type:func
SetSwCameraFarFog__Ff = 0x143860; // type:func
SetSwCameraUFogMax__Ff = 0x143888; // type:func
SetSwCameraRgbaFog__FP2SWP4RGBA = 0x1438B0; // type:func
SetSwCameraMrdRatio__Ff = 0x1438D8; // type:func
SetCmPos__FP2CMP6VECTOR = 0x143900; // type:func
SetCmMat__FP2CMP7MATRIX3 = 0x143920; // type:func
SetCmFov__FP2CMf = 0x143940; // type:func
SetCmNearClip__FP2CMf = 0x143968; // type:func
SetCmFarClip__FP2CMf = 0x143988; // type:func
SetCmSProgress__FP2CMf = 0x1439A8; // type:func
FUN_001439c8__FP2CMf = 0x1439C8; // type:func
FUN_001439e8__FP2CMf = 0x1439E8; // type:func
SetCmNearFog__FP2CMf = 0x1439A8; // type:func
SetCmFarFog__FP2CMf = 0x1439C8; // type:func
SetCmUFogMax__FP2CMf = 0x1439E8; // type:func
SetCmRgbaFog__FP2CMP4RGBA = 0x143A08; // type:func
SetCmMrdRatio__FP2CMf = 0x143A38; // type:func
ResetCm = 0x143A60; // type:func
ResetCm__FP2CMi = 0x143A60; // type:func
ClearCmFadeObjects__FP2CM = 0x143AF0; // type:func
AddCmFadeObject__FP2CM3OID = 0x143AF8; // type:func
RemoveCmFadeObject = 0x143B20; // type:func
FUN_00143BA8 = 0x143BA8; // type:func
AddCmFadeObject__FP2CMP3ALO = 0x143AF8; // type:func
RemoveCmFadeObject__FP2CMP3ALO = 0x143B20; // type:func
FFilterCamera__FPvP2SO = 0x143BA8; // type:func
UpdateCmFade = 0x143BE0; // type:func
UpdateCmLast = 0x143E40; // type:func
SetupCmRotateToCam = 0x144008; // type:func
Expand All @@ -1451,7 +1459,7 @@ SetCmPosMat__FP2CMP6VECTORP7MATRIX3 = 0x1448C8; // type:func
SetCmLookAt = 0x144938; // type:func
ConvertWorldToCylindVelocity = 0x144978; // type:func
ConvertCylindToWorldVelocity = 0x144AA0; // type:func
ResetCmLookAtSmooth = 0x144B70; // type:func
ResetCmLookAtSmooth__FP2CMP6VECTOR = 0x144B70; // type:func
SetCmLookAtSmooth = 0x144BE8; // type:func
AdjustCmJoy__FP2CMP3JOY5JOYIDPf = 0x144FF8; // type:func
junk_00145080 = 0x145080; // type:func
Expand All @@ -1461,21 +1469,21 @@ FInsideCmMrd = 0x1453B0; // type:func
DecomposeCylind = 0x145438; // type:func
DecomposeSphere = 0x1454E0; // type:func
SetCmCut__FP2CMPf = 0x1455C0; // type:func
SetResetFlag__FP2CM = 0x1455E0; // type:func
EnableCmNextCut__FP2CM = 0x1455E0; // type:func
ClearCmCut__FP2CM = 0x1455F0; // type:func
AdaptCm = 0x145610; // type:func
SetCm = 0x145718; // type:func
PsoEnemyStepguard = 0x145810; // type:func
FUN_00145810 = 0x145810; // type:func
FUN_00145950 = 0x145950; // type:func
FUN_00145b68 = 0x145B68; // type:func
FUN_00145dd8__FP2CM = 0x145DD8; // type:func
FUN_00145dd8__FPvP2SO = 0x145DD8; // type:func
FUN_00145de8 = 0x145DE8; // type:func
FUN_00145e68 = 0x145E68; // type:func
PushLookkCm__FP2CM5LOOKK = 0x145FB8; // type:func
LookkPopCm__FP2CM = 0x145FD8; // type:func
LookkCurCm__FP2CM = 0x145FF8; // type:func
SetCmSniperFocus__FP2CMP3PNTff = 0x146018; // type:func
FUN_00146028__FP2CM = 0x146028; // type:func
SetCmSniperFocus__FP2CMP3ALOff = 0x146018; // type:func
JoltCm__FP2CM = 0x146028; // type:func
FUN_00146038 = 0x146038; // type:func
cm__static_initialization_and_destruction_0__Fii = 0x1460B8; // type:func
_GLOBAL_$I$StartupCm__Fv = 0x1460E0; // type:func
Expand Down Expand Up @@ -1559,7 +1567,7 @@ FUN_00148748 = 0x148748; // type:func
FUN_00148770 = 0x148770; // type:func
FUN_00148828 = 0x148828; // type:func
FUN_00148888 = 0x148888; // type:func
FUN_00148910__FPfT0 = 0x148910; // type:func
SgnCompareSdprize__FPCvT0 = 0x148910; // type:func
FUN_00148938 = 0x148938; // type:func
CpdprizeAttractSwDprizes__FP2SW3CIDP6VECTORiPP6DPRIZE = 0x148AC0; // type:func
RemoveSwExtraneousCharms__FP2SW = 0x148CE0; // type:func
Expand All @@ -1581,23 +1589,26 @@ s_asnipDprize = 0x2619A0; // size:0x3c
InitCplcy__FP5CPLCYP2CM = 0x149398; // type:func
FActiveCplcy__FP5CPLCY = 0x1493A0; // type:func
SetCpmanCpmt__FP5CPMAN4CPMT = 0x1493B8; // type:func
FUN_001493c0__Fv = 0x1493C0; // type:func
PosCplookAnchor = 0x1493C8; // type:func
FUN_00149458 = 0x149458; // type:func
plays_binoc_sfx = 0x149508; // type:func
UpdateCpman__FP5CPMANP6CPDEFIP3JOYf = 0x1493C0; // type:func
PosCplookAnchor__FP6CPLOOK = 0x1493C8; // type:func
PosCplookEye__FP6CPLOOK = 0x149458; // type:func
StartCplookSound__FP6CPLOOK = 0x149508; // type:func
PushCplookLookk__FP6CPLOOK5LOOKK = 0x1495E8; // type:func
LookkPopCplook__FP6CPLOOK = 0x149610; // type:func
LookkCurCplook__FP6CPLOOK = 0x149638; // type:func
InitCplook = 0x149660; // type:func
FUN_001496c0 = 0x1496C0; // type:func
UpdateCplook = 0x149760; // type:func
FUN_0014a7b8 = 0x14A7B8; // type:func
InitCpalign = 0x14A888; // type:func
FUN_0014a8d0 = 0x14A8D0; // type:func
UpdateCpalign = 0x14A8F8; // type:func
FUN_0014aa90__FPii = 0x14AA90; // type:func
FUN_0014aa98__FPv = 0x14AA98; // type:func
UpdateCpaseg = 0x14AAA0; // type:func
InitCplook__FP6CPLOOKP2CM = 0x149660; // type:func
ActivateCplook__FP6CPLOOKPv = 0x1496C0; // type:func
UpdateCplook__FP6CPLOOKP6CPDEFIP3JOYf = 0x149760; // type:func
DeactivateCplook__FP6CPLOOKPv = 0x14A7B8; // type:func
InitCpalign__FP7CPALIGNP2CM = 0x14A888; // type:func
ActivateCpalign__FP7CPALIGNPv = 0x14A8D0; // type:func
UpdateCpalign__FP7CPALIGNP6CPDEFIP3JOYf = 0x14A8F8; // type:func
ActivateCpaseg__FP6CPASEGPv = 0x14AA90; // type:func
DeactivateCpaseg__FP6CPASEGPv = 0x14AA98; // type:func
UpdateCpaseg__FP6CPASEGP6CPDEFIP3JOYf = 0x14AAA0; // type:func

// .data
RAD_CplookTiltDefault = 0x261bf0; // size:0x4


////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -2831,11 +2842,6 @@ LoadScaleMatrixScalar__FP6VECTORfP7MATRIX4 = 0x18A008; // type:fun
LoadScaleMatrixVector__FP6VECTORP7MATRIX3T0P7MATRIX4 = 0x18A040; // type:func
LoadRotateVectorMatrix__FP6VECTORT0P7MATRIX3 = 0x18A160; // type:func

// TODO: Do these belong here?
g_normalX = 0x248D00; // size:0xc
g_normalY = 0x248D10; // size:0xc
g_normalZ = 0x248D20; // size:0xc


////////////////////////////////////////////////////////////////
// P2/mb.c
Expand Down
6 changes: 0 additions & 6 deletions include/ac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,8 @@ struct KVB
/* 0x00 */ float t;
/* 0x04 */ STRUCT_PADDING(3);
/* 0x10 */ VECTOR vec;
/* 0x1c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x20 */ VECTOR dvecIn;
/* 0x2c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x30 */ VECTOR dvecOut;
/* 0x3c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
};

/**
Expand Down Expand Up @@ -145,7 +142,6 @@ struct ACPC : public ACP
{
/* 0x0c */ STRUCT_PADDING(1);
/* 0x10 */ VECTOR posDefault;
/* 0x1c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x20 */ ACG *apacg[3];
/* 0x2c */ STRUCT_PADDING(1);
};
Expand Down Expand Up @@ -185,7 +181,6 @@ struct ACRC : public ACR
{
/* 0x0c */ STRUCT_PADDING(1);
/* 0x10 */ VECTOR eulDefault;
/* 0x1c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x20 */ ACG *apacg[3];
/* 0x2c */ STRUCT_PADDING(1);
};
Expand Down Expand Up @@ -224,7 +219,6 @@ struct ACSC : public ACS
{
/* 0x08 */ STRUCT_PADDING(2);
/* 0x10 */ VECTOR vecDefault;
/* 0x1c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x20 */ ACG *apacg[3];
/* 0x2c */ STRUCT_PADDING(1);
};
Expand Down
13 changes: 0 additions & 13 deletions include/alo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ struct WKR
float gSort;
STRUCT_PADDING(2);
/* 0x20 */ VECTOR pos;
/* 0x2c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x30 */ VECTOR v;
/* 0x3c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
};

/**
Expand Down Expand Up @@ -146,21 +144,13 @@ struct SNIP
struct XF
{
/* 0x00 */ MATRIX3 mat;
STRUCT_PADDING(3); // TODO: Remove once MATRIX3 is 48 bytes.
/* 0x30 */ VECTOR pos;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0x40 */ MATRIX3 matWorld;
STRUCT_PADDING(3); // TODO: Remove once MATRIX3 is 48 bytes.
/* 0x70 */ VECTOR posWorld;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0x80 */ VECTOR v;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0x90 */ VECTOR w;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0xa0 */ VECTOR dv;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0xb0 */ VECTOR dw;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
};

/**
Expand All @@ -187,11 +177,8 @@ struct ALO : public LO
/* 0x090 */ STRUCT_PADDING(16); // FRZ frz;
/* 0x0d0 */ XF xf;
/* 0x190 */ VECTOR posOrig;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0x1a0 */ MATRIX3 matOrig;
STRUCT_PADDING(3); // TODO: Remove once MATRIX3 is 48 bytes.
/* 0x1d0 */ VECTOR eulOrig;
STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes.
/* 0x1e0 */ DL dlAct;
/* 0x1ec */ ACT *pactPos;
/* 0x1f0 */ ACT *pactRot;
Expand Down
2 changes: 1 addition & 1 deletion include/barrier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct XP;
*/
struct BARRIER : public SO
{
// ...
/* 0x550 */ int fAllow;
/* 0x554 */ int coid;
/* 0x558 */ OID aoid[4];
/* 0x568 */ int ccid;
Expand Down
16 changes: 15 additions & 1 deletion include/bomb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,28 @@
// Forward.
struct WKR;

/**
* @brief Bomb detonation type?
*/
enum BDT
{
BDT_Nil = -1,
BDT_Impact = 0,
BDT_Timed = 1,
BDT_PropImpact = 2,
BDT_Manual = 3,
BDT_Player = 4,
BDT_Max = 5,
};

/**
* @class BOMB
* @brief Bomb (?).
* @todo Implement the struct.
*/
struct BOMB : public SO
{
// ...
/* 0x550 */ BDT bdt;
/* 0x554 */ float tDetonate;
// ...
/* 0x680 */ SFX *psfxDet;
Expand Down
3 changes: 0 additions & 3 deletions include/break.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,8 @@ struct XPD
/* 0x08 */ MTLK mtlk;
/* 0x0c */ STRUCT_PADDING(1);
/* 0x10 */ VECTOR pos;
/* 0x1c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x20 */ VECTOR posLeaf;
/* 0x2c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
/* 0x30 */ VECTOR v;
/* 0x3c */ STRUCT_PADDING(1); // TODO: Remove once VECTOR is 16 bytes long.
};

/**
Expand Down
1 change: 0 additions & 1 deletion include/bsp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ struct BSPC
struct VBSP
{
/* 0x00 */ VECTOR normal;
/* 0x0c */ uint padding; // TODO: Remove once VECTOR is 16 bytes long.
/* 0x10 */ float gDot;
/* 0x14 */ VBSP *pvbspNeg;
/* 0x18 */ VBSP *pvbspPos;
Expand Down
1 change: 1 addition & 0 deletions include/button.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <rs.h>

// Forward.
struct XFM;
struct ASEG;
struct DIALOG;

Expand Down
2 changes: 1 addition & 1 deletion include/cd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ enum CDS
/**
* @todo Unknown.
*/
void CpchzTokenizePath(char *pchzPath);
int CpchzTokenizePath(char *pchzPath);

/**
* @brief Checks if the disc is a PS2 DVD.
Expand Down
Loading
Loading