diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index a41b4447..683dcaf7 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -1406,5 +1406,31 @@ libhu/setvf.c: libhu/subvf.c: .text start:0x80115474 end:0x801154A8 +msm/msmsys.c: + .text start:0x801154A8 end:0x801176C8 + .bss start:0x801D2C20 end:0x801D3120 + .sdata2 start:0x801D6BB8 end:0x801D6BC0 + +msm/msmmem.c: + .text start:0x801176C8 end:0x801178F8 + .bss start:0x801D3120 end:0x801D3150 + +msm/msmfio.c: + .text start:0x801178F8 end:0x801179E8 + .bss start:0x801D3150 end:0x801D3160 + +msm/msmmus.c: + .text start:0x801179E8 end:0x80118A80 + .bss start:0x801D3160 end:0x801D32D8 + +msm/msmse.c: + .text start:0x80118A80 end:0x8011A044 + .bss start:0x801D32D8 end:0x801D33C0 + .sdata2 start:0x801D6BC0 end:0x801D6BD8 + +msm/msmstream.c: + .text start:0x8011A044 end:0x8011CCC4 + .bss start:0x801D33C0 end:0x801D3420 + game/kerent.c: .text start:0x8011CCC4 end:0x8011DCA8 diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 6e7e35ce..94b8012c 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -5693,11 +5693,11 @@ aramQueueHi = .bss:0x801D053C; // type:object size:0x284 scope:local aramStreamBuffers = .bss:0x801D07C0; // type:object size:0x400 scope:local data:4byte dsp_task = .bss:0x801D0BC0; // type:object size:0x60 scope:local align:8 dram_image = .bss:0x801D0C20; // type:object size:0x2000 scope:local align:32 -sys = .bss:0x801D2C20; // type:object size:0x500 scope:local data:4byte +sys = .bss:0x801D2C20; // type:object size:0x4FC scope:local data:4byte mem = .bss:0x801D3120; // type:object size:0x2C scope:local data:4byte fio = .bss:0x801D3150; // type:object size:0xC scope:local data:4byte mus = .bss:0x801D3160; // type:object size:0x178 scope:local data:2byte -se = .bss:0x801D32D8; // type:object size:0xE8 scope:local data:4byte +se = .bss:0x801D32D8; // type:object size:0xDC scope:local data:4byte StreamInfo = .bss:0x801D33C0; // type:object size:0x60 scope:local align:32 data:4byte lbl_801D3420 = .sdata:0x801D3420; // type:object size:0x5 data:string lbl_801D3425 = .sdata:0x801D3425; // type:object size:0x7 @@ -8556,8 +8556,7 @@ value0_3 = .sdata2:0x801D6BA0; // type:object size:0x4 scope:local data:float value0_6 = .sdata2:0x801D6BA4; // type:object size:0x4 scope:local data:float lbl_801D6BA8 = .sdata2:0x801D6BA8; // type:object size:0x4 data:float i2fMagic = .sdata2:0x801D6BB0; // type:object size:0x8 scope:local data:double -lbl_801D6BB8 = .sdata2:0x801D6BB8; // type:object size:0x4 data:4byte -lbl_801D6BBC = .sdata2:0x801D6BBC; // type:object size:0x4 data:4byte +lbl_801D6BB8 = .sdata2:0x801D6BB8; // type:object size:0x8 data:4byte lbl_801D6BC0 = .sdata2:0x801D6BC0; // type:object size:0x4 data:float lbl_801D6BC4 = .sdata2:0x801D6BC4; // type:object size:0x4 data:float lbl_801D6BC8 = .sdata2:0x801D6BC8; // type:object size:0x4 data:float diff --git a/configure.py b/configure.py index cc796128..84c7baa5 100644 --- a/configure.py +++ b/configure.py @@ -248,6 +248,11 @@ cflags_libhu = [ "-fp_contract off", ] +# Game flags +cflags_msm = [ + *cflags_base, +] + config.linker_version = "GC/2.6" config.rel_strip_partial = False config.rel_empty_file = "REL/empty.c" @@ -734,6 +739,20 @@ config.libs = [ Object(NonMatching, "libhu/subvf.c"), ], }, + { + "lib": "msm", + "mw_version": config.linker_version, + "cflags": cflags_msm, + "host": False, + "objects": [ + Object(NonMatching, "msm/msmsys.c"), + Object(NonMatching, "msm/msmmem.c"), + Object(NonMatching, "msm/msmfio.c"), + Object(NonMatching, "msm/msmmus.c"), + Object(NonMatching, "msm/msmse.c"), + Object(NonMatching, "msm/msmstream.c"), + ], + }, { "lib": "_minigameDLL", "mw_version": config.linker_version,