Skip to content

Split P2/memcard, fix PjsgeAllocJsg bug, misc matches + cleanup #268

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

Open
545u wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Split P2/memcard, fix PjsgeAllocJsg bug, misc matches + cleanup #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
214a597
Split P2/memcard + misc matches
545u Jul 26, 2026
04c3045
Fix PjsgeAllocJsg bug + convert line endings
545u Jul 26, 2026
7b6bbf3
Identify .rodata & .data segments, misc matches + cleanup
545u Aug 3, 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
57 changes: 30 additions & 27 deletions config/sly1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ segments:
- [0x86c18, c, P2/mark]
- [0x894c0, c, P2/mat]
- [0x8b388, c, P2/mb]
- [0x8c580, asm, P2/memcard]
- [0x8c580, c, P2/memcard]
- [0x8e430, c, P2/memory]
- [0x8e8e0, c, P2/missile]
- [0x8f410, c, P2/mpeg]
Expand Down Expand Up @@ -295,10 +295,16 @@ segments:
- [0x14aff8, rodata] # P2/dartgun Alignment issue, this should be 0x14b000.
- [0x14b0e0, .rodata, P2/dmas]
- [0x14b0f8, rodata]
#- [0x14b794, .rodata, P2/hide]
#- [0x14b7a0, .rodata, P2/hideout]
#- [0x14b7dc, .rodata, P2/hnd]
#- [0x14b7f0, .rodata, P2/jlo]
#- [0x14b848, .rodata, P2/joy]
#- [0x14b860, .rodata, P2/jt]
- [0x14c1e8, .rodata, P2/main]
- [0x14c258, rodata]
- [0x14E220, .rodata, P2/shdanim]
- [0x14E268, rodata]
- [0x14e220, .rodata, P2/shdanim]
- [0x14e268, rodata]
#- [0x14e3b0, .rodata, P2/spire]
#- [0x14e3c0, .rodata, P2/spliceobj]
#- [0x14e560, .rodata, P2/squish] # TODO: Might be something else.
Expand Down Expand Up @@ -350,10 +356,7 @@ segments:
- [0x162880, data, P2/cm]
- [0x1629a0, data, P2/coin]
- [0x162bf0, data, P2/cplcy]
#- [0x, data, P2/credit]
#- [0x, data, P2/crout]
#- [0x, data, P2/crusher]
#- [0x, data, P2/crv]
- [0x162c90, data, P2/crusher]
- [0x162cc8, data, P2/dart]
- [0x162ce0, data, P2/dartgun]
- [0x162d08, data, P2/dialog]
Expand All @@ -364,26 +367,15 @@ segments:
- [0x163180, data, P2/fly]
- [0x163250, data, P2/font]
- [0x163280, data, P2/frm]
#- [0x, data, P2/freeze]
#- [0x, data, P2/frzg]
- [0x1633c0, data, P2/game]
#- [0x1633d8, data]

#- [0x, data, P2/geom]
#- [0x, data, P2/gifs]
#- [0x, data, P2/glbs]
#- [0x, data, P2/glob]
#- [0x, data, P2/gomer]
#- [0x, data, P2/gs]
#- [0x, data, P2/hide]
#- [0x, data, P2/hnd]
#- [0x, data, P2/ik]
#- [0x, data, P2/jlo]
- [0x1633e0, data, P2/glob]
- [0x163480, data, P2/gs]
- [0x1636e8, .data, P2/hide]
- [0x163718, data, P2/hideout]
- [0x1639c8, data, P2/jlo]
- [0x163a30, data, P2/joy]
- [0x163e10, data, P2/jt]
#- [0x163e40, data] # TBD

#- [0x, data, P2/jp]
- [0x1649c0, data, P2/jp]
#- [0x164e34, data, P2/jsg] # TODO: Alignment issue.
- [0x164e50, data, P2/jump]
- [0x165098, data, P2/keyhole]
Expand Down Expand Up @@ -412,10 +404,9 @@ segments:
- [0x16c530, data, P2/rip]
- [0x16c778, data, P2/rog]
#- [0x16d3dc, data, P2/rumble] # TODO: Alignment issue.
#- [0x, data, P2/rwm]
#- [0x, data, P2/screen]
#- [0x16d3ec, data, P2/screen] # TODO: Alignment issue.
- [0x1754b8, data, P2/sensor]
- [0x1754f0, data, P2/shadow]
- [0x1754f0, .data, P2/shadow]
- [0x1754f8, data, P2/shd]
- [0x175568, data, P2/shdanim]
- [0x175620, data, P2/smartguard]
Expand Down Expand Up @@ -476,6 +467,9 @@ segments:
# - P2/cat
# - P2/clip
# - P2/cnvo
# - P2/credit
# - P2/crout
# - P2/crv
# - P2/dl
# - P2/dsp
# - P2/dzg
Expand All @@ -484,6 +478,14 @@ segments:
# - P2/UNKNOWN1
# - P2/find
# - P2/flash
# - P2/freeze
#- P2/frzg
# - P2/geom
# - P2/gifs
# - P2/glbs
# - P2/gomer
# - P2/hnd
# - P2/ik
# - P2/landing
# - P2/lo
# - P2/mat
Expand All @@ -492,6 +494,7 @@ segments:
# - P2/prog
# - P2/proxy
# - P2/rail
# - P2/rwm
# - P2/shape
# - P2/sky
# - P2/slotheap
Expand Down
52 changes: 38 additions & 14 deletions config/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ _t18CStructTypeFactory1Z3SMP$s_slotheap = 0x62C598; // size:0x10

////////////////////////////////////////////////////////////////
// P2/989snd.c
////////////////////////////////////////////////////////////////
// Unmangled names were in the header with extern "C"
////////////////////////////////////////////////////////////////
snd_StartSoundSystem = 0x0011cbb8; //type:func size:632
snd_FlushSoundCommands = 0x0011ce30; //type:func size:556
junk_0x0011d060 = 0x0011d060; //type:func size:24
Expand Down Expand Up @@ -1607,6 +1607,7 @@ FUN_0014cd70 = 0x14CD70; // type:func
FUN_0014cdc8 = 0x14CDC8; // type:func
handle_crbrain_message = 0x14CF30; // type:func

// .sbss
DAT_0027c008 = 0x27C008; // size:0x4


Expand Down Expand Up @@ -1674,6 +1675,7 @@ SetDartDarts__FP4DART5DARTS = 0x14F110; // type:func
ApplyDartThrow__FP4DARTP2PO = 0x14F168; // type:func
UpdateDartAirborne__FP4DARTf = 0x14F270; // type:func

// .data
s_asnipDart = 0x261CC8;


Expand Down Expand Up @@ -1740,6 +1742,7 @@ OnDifficultyCollectKey__FP10DIFFICULTY = 0x151FC8; // type:func
OnDifficultyBreak = 0x152010; // type:func
ChangeSuck__FfP10DIFFICULTY = 0x152410; // type:func

// .data
g_difficultyMedium = 0x261d70; // size:0x5c
g_difficultyHard = 0x261e30; // size:0x5c
g_difficultyEasy = 0x261e90; // size:0x5c
Expand All @@ -1763,6 +1766,7 @@ FIsDlEmpty__FP2DL = 0x152720; // type:func
MergeDl__FP2DLT0 = 0x152730; // type:func
CPvDl__FP2DL = 0x1527D8; // type:func

// .sbss
s_pdliFirst = 0x27B314; // size:0x4


Expand Down Expand Up @@ -1791,8 +1795,10 @@ EndDmaCnt__4DMAS = 0x152D70; // type:func
EndPrim__4DMASi = 0x152E18; // type:func
junk_00152E20 = 0x152E20; // type:func

// .rodata
_vt$4DMAS = 0x24A0E0; // size:0x10

// .data
g_pdcVif0 = 0x261f14; // size:0x4
g_pdcVif1 = 0x261f18; // size:0x4
g_pdcGif = 0x261f1c; // size:0x4
Expand Down Expand Up @@ -2228,6 +2234,9 @@ DrawGlob__FP3RPL = 0x166690; // type:func
glob__static_initialization_and_destruction_0 = 0x167D20; // type:func
_GLOBAL_$I$g_dro = 0x167D48; // type:func

// .data
g_iqwBase = 0x262474; // size:0xc


////////////////////////////////////////////////////////////////
// P2/gomer.c
Expand Down Expand Up @@ -2276,6 +2285,17 @@ PropagateSurs__Fv = 0x169718; // type:func
PqwVifsBitmapUpload__Fi = 0x169780; // type:func
DrawOnBitmap__FP3BMPP4GIFS = 0x169B18; // type:func

// .data
g_clatchOdev = 0x262480; // size:0x4
g_ilatchOdev = 0x262484; // size:0x4
g_db = 0x262490; // size:0x230
g_cframeDisplay = 0x2626c0; // size:0x4
g_odevDraw = 0x2626c4; // size:0x4
g_odevDisplay = 0x2626c8; // size:0x4
g_vbact = 0x2626cc; // size:0x4
g_csur = 0x2626d0; // size:0x4
g_gsbMove = 0x2626d8; // size:0x10


////////////////////////////////////////////////////////////////
// P2/hide.c
Expand Down Expand Up @@ -2308,6 +2328,7 @@ CdartStuckHbsk__FP4HBSK = 0x16A758; // type:func
PdartOldestHbskStuck__FP4HBSK = 0x16A820; // type:func
GetHbskClosestHidePos__FP4HBSKP6VECTORPf = 0x16A910; // type:func

// .data
g_dlHshape = 0x2626E8; // size:0xc
g_dlHpnt = 0x2626F8; // size:0xc
g_dlHbsk = 0x262708; // size:0xc
Expand All @@ -2320,6 +2341,7 @@ InitHnd__FP3HND = 0x16C470; // type:func
LoadHndFromBrx__FP3HNDP18CBinaryInputStream = 0x16C4B8; // type:func
junk_0016c4d8 = 0x16C4D8; // type:func

// .rodata
D_0024A7DC = 0x24A7DC; // size:0x4


Expand Down Expand Up @@ -2799,7 +2821,7 @@ InitMemcard__FP7MEMCARD = 0x18B5C0; // type:func
FUN_0018b600__Fv = 0x18B600; // type:func
CreateMemcardThread__FP7MEMCARDii = 0x18B670; // type:func
SetMemcardThreadHighPrio__FP7MEMCARD = 0x18B720; // type:func
FCheckMemcardThread__FP7MEMCARD = 0x18B770; // type:func
FMemcardThreadValid__FP7MEMCARD = 0x18B770; // type:func
FUN_0018b780 = 0x18B780; // type:func
FUN_0018b910__Fi = 0x18B910; // type:func
FUN_0018b930__Fi = 0x18B930; // type:func
Expand All @@ -2822,7 +2844,7 @@ FUN_0018c7f8__FP4SAVE = 0x18C7F8; // type:func
FUN_0018c888 = 0x18C888; // type:func
FUN_0018c9c0 = 0x18C9C0; // type:func
FUN_0018ca10 = 0x18CA10; // type:func
load_sly_icon_from_disc = 0x18CDF8; // type:func
load_sly_icon_from_disc = 0x18CBF8; // type:func
load_file_from_disc = 0x18CC20; // type:func
FUN_0018cdd8 = 0x18CDD8; // type:func
FUN_0018cfc0 = 0x18CFC0; // type:func
Expand Down Expand Up @@ -3294,9 +3316,6 @@ DrawSw__FP2SWP2CM = 0x19DC98; // type:func
FillScreenRect__FiiiiffffP4GIFS = 0x19DDA0; // type:func
StartupRender__Fv = 0x19DF48; // type:func

// TODO: Does this belong here?
g_iqwBase = 0x262474; // size:0xc

g_vecScreenMultiply = 0x26abf0; // size:0x10
g_vecScreenAdd = 0x26ac00; // size:0x10
g_prplCur = 0x26ac10; // size:0x10
Expand Down Expand Up @@ -3517,7 +3536,7 @@ DAT_0026c3dc = 0x26C3DC;
// P2/rwm.c
////////////////////////////////////////////////////////////////
InitRwm__FP3RWM = 0x1A7FE8; // type:func
OnRwmRemove = 0x1A80E0; // type:func
OnRwmRemove__FP3RWM = 0x1A80E0; // type:func
FUN_001a8110 = 0x1A8110; // type:func
FUN_001a8150 = 0x1A8150; // type:func
InitRwmCallback__FP3RWM5MSGIDPv = 0x1A8208; // type:func
Expand Down Expand Up @@ -3760,6 +3779,9 @@ DrawShadow__FP6SHADOW = 0x1B2640; // type:func
FShadowIntersectsSphere__FP6SHADOWP6VECTORf = 0x1B26F8; // type:func
FindSwShadows__FP2SWP6VECTORfiPiPP6SHADOW = 0x1B2790; // type:func

// .data
DW_Fade = 0x2744f0; // size:0x4


////////////////////////////////////////////////////////////////
// P2/shape.c
Expand Down Expand Up @@ -3796,6 +3818,7 @@ SetSaiDuDv__FP3SAIff = 0x1B4750; // type:func
PropagateSais__Fv = 0x1B47C0; // type:func
UpdateShaders__Ff = 0x1B4878; // type:func

// .data
g_cshd = 0x2744f8; // size:0x4
g_ashd = 0x2744fc; // size:0x4
g_cbmp = 0x274500; // size:0x4
Expand Down Expand Up @@ -4464,19 +4487,19 @@ PostJtLoadZap__FP2JT = 0x1D4848; // type:func
PresetJtAccelZap__FP2JT = 0x1D48E8; // type:func
UpdateJtZap__FP2JT = 0x1D4A98; // type:func
FUN_001d4c90 = 0x1D4C90; // type:func
FUN_001d4c98 = 0x1D4C98; // type:func
FUN_001d4c98__FP2JT = 0x1D4C98; // type:func
FTakeJtDamage__FP2JTP3ZPR = 0x1D4D08; // type:func
FUN_001d51a0 = 0x1D51A0; // type:func
FUN_001d5398 = 0x1D5398; // type:func
FUN_001d5418 = 0x1D5418; // type:func
FUN_001d5468 = 0x1D5468; // type:func
FUN_001d51a0__FP2JT = 0x1D51A0; // type:func
FUN_001d5398__FP2JT = 0x1D5398; // type:func
FUN_001d5418__FP2JT = 0x1D5418; // type:func
FUN_001d5468__FP2JT = 0x1D5468; // type:func
FUN_001d54e0 = 0x1D54E0; // type:func
FUN_001d5620 = 0x1D5620; // type:func
SgnCmpSpkn__FPCvT0 = 0x1D5650; // type:func
DrawHaloSpks__FP6VECTORiP4SPKSP4SPKDP3RPL = 0x1D5678; // type:func
DrawJtHaloElectric__FP3RPL = 0x1D5FA8; // type:func
DrawJtHaloFire__FP3RPL = 0x1D60B0; // type:func
FUN_001d61c8 = 0x1D61C8; // type:func
FUN_001d61c8__FP3RPL = 0x1D61C8; // type:func
RenderJtSelfZap__FP2JTP2CMP2RO = 0x1D62E0; // type:func
JthsCurrentJt__FP2JT = 0x1D65D8; // type:func
UseJtCharm__FP2JT = 0x1D6608; // type:func
Expand Down Expand Up @@ -5152,6 +5175,7 @@ rand = 0x1F6708; // type:func
// klib.s
////////////////////////////////////////////////////////////////
CreateThread = 0x1F6A10; // type:func
StartThread = 0x1F6A20; // type:func
ChangeThreadPriority = 0x1F6A50; // type:func
GetThreadId = 0x1F6A90; // type:func
CreateSema = 0x1F6B20; // type:func
Expand Down Expand Up @@ -5278,7 +5302,7 @@ fmodf = 0x2058a0; // type:func
////////////////////////////////////////////////////////////////
// libmc.c
////////////////////////////////////////////////////////////////
mcInit__Fv = 0x2093F0; // type:func
sceMcInit = 0x2093F0; // type:func


////////////////////////////////////////////////////////////////
Expand Down
18 changes: 9 additions & 9 deletions include/alarm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ struct ALARM : public SO
float dtReset;
/* 0x564 */ int calbrks; // count of breakables
/* 0x568 */ OID aoidAlbrks[4]; // array of breakable OIDs
int coidSensors;
OID aoidSensors[16];
int cpsensors;
SENSOR *apsensors[16];
int coidStepguards;
OID aoidStepguards[6];
int calbrksDisabled;
/* 0x578 */ int coidSensors;
/* 0x57c */ OID aoidSensors[16];
/* 0x5bc */ int cpsensors;
/* 0x5c0 */ SENSOR *apsensors[16];
/* 0x600 */ int coidStepguards;
/* 0x604 */ OID aoidStepguards[6];
/* 0x61c */ int calbrksDisabled;
AMB *pambSiren;
EXC *pexc;
int fSilent;
int crsmg;
RSMG arsmg[8];
/* 0x62c */ int crsmg;
/* 0x630 */ RSMG arsmg[8];
/* 0x6b0 */ int ichkDisabled;
};

Expand Down
Loading
Loading