Skip to content

Commit 707cb52

Browse files
Match & link PAL script and color TUs (#499)
1 parent 621124c commit 707cb52

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎config/GM8P01_00/splits.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,7 @@ Kyoto/PVS/CPVSVisSet.cpp:
26762676
.text start:0x802FED68 end:0x802FF1B8
26772677

26782678
Kyoto/Particles/CColorElement.cpp:
2679-
.text start:0x802FF1B8 end:0x803003C8
2679+
.text start:0x802FF1B8 end:0x8030049C
26802680
.data start:0x803D5878 end:0x803D58F8
26812681
.sdata start:0x8046A950 end:0x8046A990
26822682
.sdata2 start:0x80470938 end:0x80470948

‎config/GM8P01_00/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11737,7 +11737,7 @@ __ct__15CCEFastConstantFffff = .text:0x80300060; // type:function size:0x10C
1173711737
GetValue__11CCEConstantCFiR6CColor = .text:0x8030016C; // type:function size:0x124
1173811738
__dt__11CCEConstantFv = .text:0x80300290; // type:function size:0x100
1173911739
__ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement = .text:0x80300390; // type:function size:0x38
11740-
fn_803003C8 = .text:0x803003C8; // type:function size:0xD4
11740+
reserve__Q24rstl42vector<6CColor,Q24rstl17rmemory_allocator>Fi = .text:0x803003C8; // type:function size:0xD4 scope:weak
1174111741
fn_8030049C = .text:0x8030049C; // type:function size:0x8
1174211742
fn_803004A4 = .text:0x803004A4; // type:function size:0x8
1174311743
fn_803004AC = .text:0x803004AC; // type:function size:0x8

‎configure.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ def EquivalentFor(*versions):
725725
"MetroidPrime/ScriptObjects/CScriptRelay.cpp",
726726
),
727727
Object(
728-
MatchingFor("GM8E01_00", "GM8E01_01"),
728+
MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
729729
"MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp"
730730
),
731731
Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp"),
@@ -917,7 +917,7 @@ def EquivalentFor(*versions):
917917
"MetroidPrime/BodyState/CBSScripted.cpp",
918918
),
919919
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/Enemies/CPuddleToadGamma.cpp"),
920-
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/ScriptObjects/CScriptDistanceFog.cpp"),
920+
Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"), "MetroidPrime/ScriptObjects/CScriptDistanceFog.cpp"),
921921
Object(
922922
MatchingFor("GM8E01_00", "GM8E01_01"),
923923
"MetroidPrime/BodyState/CBSProjectileAttack.cpp",
@@ -1737,7 +1737,7 @@ def EquivalentFor(*versions):
17371737
Object(NonMatching, "Kyoto/PVS/CPVSVisOctree.cpp"),
17381738
Object(NonMatching, "Kyoto/PVS/CPVSVisSet.cpp"),
17391739
Object(
1740-
MatchingFor("GM8E01_00", "GM8E01_01"),
1740+
MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
17411741
"Kyoto/Particles/CColorElement.cpp",
17421742
),
17431743
Object(NonMatching, "Kyoto/Particles/CElementGen.cpp"),

0 commit comments

Comments
 (0)