Match & link PAL core factory metadata

Author: henriquegemignani

config/GM8P01_00/splits.txt

@@ -122,12 +122,12 @@ MetroidPrime/CAnimData.cpp:
 	.sdata2     start:0x8046C250 end:0x8046C278
 
 MetroidPrime/Factories/CCharacterFactory.cpp:
-	.text       start:0x80033508 end:0x800361E8
+	.text       start:0x80033508 end:0x800361D8
 	.rodata     start:0x803B7720 end:0x803B7728
 	.data       start:0x803C4F88 end:0x803C5068
 
 MetroidPrime/Factories/CAssetFactory.cpp:
-	.text       start:0x800361E8 end:0x800367D8
+	.text       start:0x800361D8 end:0x800367D8
 	.rodata     start:0x803B7728 end:0x803B7730
 	.data       start:0x803C5068 end:0x803C5098
 
@@ -202,7 +202,7 @@ MetroidPrime/CIOWinManager.cpp:
 	.rodata     start:0x803B78C8 end:0x803B7908
 
 MetroidPrime/CIOWin.cpp:
-	.text       start:0x80053CB0 end:0x80053D60
+	.text       start:0x80053CA0 end:0x80053D60
 	.data       start:0x803C5270 end:0x803C5290
 
 MetroidPrime/CActor.cpp:

config/GM8P01_00/symbols.txt

@@ -996,8 +996,8 @@ advance<Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rs
 __advance<Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag = .text:0x80036168; // type:function size:0x14
 distance<Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x8003617C; // type:function size:0x44
 __distance<Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator<Q24rstl9pair<i,i>,Q24rstl52vector<Q24rstl9pair<i,i>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag = .text:0x800361C0; // type:function size:0x18
-fn_800361D8 = .text:0x800361D8; // type:function size:0x8
-fn_800361E0 = .text:0x800361E0; // type:function size:0x8
+CanBuild__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTag = .text:0x800361D8; // type:function size:0x8 scope:weak
+GetResourceIdByName__Q224CCharacterFactoryBuilder13CDummyFactoryCFPCc = .text:0x800361E0; // type:function size:0x8 scope:weak
 __dt__Q224CCharacterFactoryBuilder13CDummyFactoryFv = .text:0x800361E8; // type:function size:0x5C
 GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes = .text:0x80036244; // type:function size:0x9C
 Null__15CVParamTransferFv = .text:0x800362E0; // type:function size:0x1C
@@ -1485,9 +1485,9 @@ __ct__Q213CIOWinManager11IOWinPQNodeFQ24rstl17ncrc_ptr<6CIOWin>iPQ213CIOWinManag
 __dt__13CIOWinManagerFv = .text:0x80053BF4; // type:function size:0x64
 __ct__13CIOWinManagerFv = .text:0x80053C58; // type:function size:0x28
 __eq<6CIOWin>__4rstlFRCQ24rstl15rc_ptr<6CIOWin>RCQ24rstl15rc_ptr<6CIOWin> = .text:0x80053C80; // type:function size:0x20
-fn_80053CA0 = .text:0x80053CA0; // type:function size:0x4
-fn_80053CA4 = .text:0x80053CA4; // type:function size:0x4
-fn_80053CA8 = .text:0x80053CA8; // type:function size:0x8
+PreDraw__6CIOWinCFv = .text:0x80053CA0; // type:function size:0x4 scope:global
+Draw__6CIOWinCFv = .text:0x80053CA4; // type:function size:0x4 scope:global
+GetIsContinueDraw__6CIOWinCFv = .text:0x80053CA8; // type:function size:0x8 scope:global
 GetName__6CIOWinCFv = .text:0x80053CB0; // type:function size:0x8
 __dt__6CIOWinFv = .text:0x80053CB8; // type:function size:0x68
 __ct__6CIOWinFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator> = .text:0x80053D20; // type:function size:0x40
@@ -16118,7 +16118,7 @@ gPressInputs__13ControlMapper = .data:0x803C4898; // type:object size:0x114 data
 @310 = .data:0x803C49AC; // type:object size:0xF4 scope:local
 @336 = .data:0x803C4AA0; // type:object size:0x5C scope:local
 __vt__18CFirstPersonCamera = .data:0x803C4B00; // type:object size:0x78
-__vt__11CObjectList = .data:0x803C4B78; // type:object size:0x10
+__vt__11CObjectList = .data:0x803C4B78; // type:object size:0xC
 __vt__7CPlayer = .data:0x803C4B88; // type:object size:0x88
 jumptable_803C4C10 = .data:0x803C4C10; // type:object size:0x1C scope:local
 jumptable_803C4C2C = .data:0x803C4C2C; // type:object size:0x58 scope:local
@@ -16160,7 +16160,7 @@ __vt__10IVParamObj = .data:0x803C5024; // type:object size:0xC
 __vt__8IFactory = .data:0x803C5030; // type:object size:0x20
 __vt__10IMetaTrans = .data:0x803C5050; // type:object size:0x18
 __vt__Q224CCharacterFactoryBuilder13CDummyFactory = .data:0x803C5068; // type:object size:0x20
-__vt__45TObjOwnerDerivedFromIObj<17CCharacterFactory> = .data:0x803C5088; // type:object size:0x10
+__vt__45TObjOwnerDerivedFromIObj<17CCharacterFactory> = .data:0x803C5088; // type:object size:0xC
 __vt__12CTweakPlayer = .data:0x803C5098; // type:object size:0xC scope:weak
 __vt__12ITweakObject = .data:0x803C50A4; // type:object size:0xC scope:weak
 __vt__10CTweakGame = .data:0x803C50B0; // type:object size:0xC
@@ -16174,7 +16174,7 @@ __vt__17CArchMsgParmInt32 = .data:0x803C5230; // type:object size:0xC
 __vt__29CArchMsgParmInt32Int32VoidPtr = .data:0x803C5240; // type:object size:0xC
 __vt__16CArchMsgParmNull = .data:0x803C5250; // type:object size:0xC
 __vt__18CArchMsgParmReal32 = .data:0x803C5260; // type:object size:0xC
-__vt__6CIOWin = .data:0x803C5270; // type:object size:0x20
+__vt__6CIOWin = .data:0x803C5270; // type:object size:0x1C
 __vt__6CActor = .data:0x803C5290; // type:object size:0x6C
 jumptable_803C52FC = .data:0x803C52FC; // type:object size:0xA0 scope:local
 __vt__11CDummyWorld = .data:0x803C53A0; // type:object size:0x38
@@ -16288,7 +16288,7 @@ __vt__11CScriptDock = .data:0x803C9B20; // type:object size:0x84
 jumptable_803C9BA4 = .data:0x803C9BA4; // type:object size:0x80 scope:local
 __vt__17CScriptCameraHint = .data:0x803C9C28; // type:object size:0x6C
 __vt__19CCameraOverrideInfo = .data:0x803C9C94; // type:object size:0xC
-__vt__41TObjOwnerDerivedFromIObj<13CStateMachine> = .data:0x803C9CA0; // type:object size:0x10
+__vt__41TObjOwnerDerivedFromIObj<13CStateMachine> = .data:0x803C9CA0; // type:object size:0xC
 __vt__11CPlasmaBeam = .data:0x803C9CB0; // type:object size:0x48
 __vt__10CPowerBeam = .data:0x803C9CF8; // type:object size:0x48
 __vt__9CWaveBeam = .data:0x803C9D40; // type:object size:0x48
@@ -16616,7 +16616,7 @@ __vt__9CSeedling = .data:0x803D2350; // type:object size:0x2D0
 __vt__41TObjOwnerDerivedFromIObj<13CGameHintInfo> = .data:0x803D2620; // type:object size:0x10
 __vt__11CWallWalker = .data:0x803D2630; // type:object size:0x2D0
 __vt__18CErrorOutputWindow = .data:0x803D2900; // type:object size:0x20
-__vt__46TObjOwnerDerivedFromIObj<18CWorldSaveGameInfo> = .data:0x803D2920; // type:object size:0x10
+__vt__46TObjOwnerDerivedFromIObj<18CWorldSaveGameInfo> = .data:0x803D2920; // type:object size:0xC
 @892 = .data:0x803D2930; // type:object size:0xC scope:local data:4byte
 @904 = .data:0x803D293C; // type:object size:0xC scope:local data:4byte
 @915 = .data:0x803D2948; // type:object size:0xC scope:local data:4byte
@@ -22873,7 +22873,7 @@ lbl_8046EA18 = .sdata2:0x8046EA18; // type:object size:0x8 align:4 data:float
 @1146 = .sdata2:0x8046EA3C; // type:object size:0x4 scope:local align:4 data:float
 @317 = .sdata2:0x8046EA40; // type:object size:0x4 scope:local align:4 data:float
 @435 = .sdata2:0x8046EA44; // type:object size:0x4 scope:local align:4 data:float
-@575 = .sdata2:0x8046EA48; // type:object size:0x8 scope:local align:4 data:float
+@575 = .sdata2:0x8046EA48; // type:object size:0x4 scope:local align:4 data:float
 @563 = .sdata2:0x8046EA50; // type:object size:0x4 scope:local align:4 data:float
 @696 = .sdata2:0x8046EA54; // type:object size:0x4 scope:local align:4 data:float
 @697 = .sdata2:0x8046EA58; // type:object size:0x4 scope:local align:4 data:float

configure.py

@@ -502,7 +502,8 @@ def EquivalentFor(*versions):
             ),
             Object(NonMatching, "MetroidPrime/Cameras/CFirstPersonCamera.cpp"),
             Object(
-                MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CObjectList.cpp"
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
+                "MetroidPrime/CObjectList.cpp",
             ),
             Object(NonMatching, "MetroidPrime/Player/CPlayer.cpp"),
             Object(
@@ -527,7 +528,7 @@ def EquivalentFor(*versions):
             Object(NonMatching, "MetroidPrime/CAnimData.cpp"),
             Object(NonMatching, "MetroidPrime/Factories/CCharacterFactory.cpp"),
             Object(
-                MatchingFor("GM8E01_00", "GM8E01_01"),
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
                 "MetroidPrime/Factories/CAssetFactory.cpp",
             ),
             Object(
@@ -567,7 +568,7 @@ def EquivalentFor(*versions):
             ),
             Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"), "MetroidPrime/Decode.cpp"),
             Object(NonMatching, "MetroidPrime/CIOWinManager.cpp"),
-            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CIOWin.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"), "MetroidPrime/CIOWin.cpp"),
             Object(NonMatching, "MetroidPrime/CActor.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CWorld.cpp"),
             Object(
@@ -704,7 +705,7 @@ def EquivalentFor(*versions):
             Object(NonMatching, "MetroidPrime/ScriptLoader.cpp"),
             Object(NonMatching, "MetroidPrime/CSamusDoll.cpp"),
             Object(
-                MatchingFor("GM8E01_00", "GM8E01_01"),
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
                 "MetroidPrime/Factories/CStateMachineFactory.cpp",
             ),
             Object(
@@ -1062,7 +1063,10 @@ def EquivalentFor(*versions):
                 "MetroidPrime/PathFinding/CPathFindArea.cpp",
                 cflags=[*cflags_retro, "-inline auto"],
             ),
-            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/PathFinding/CPathFindSpline.cpp"),
+            Object(
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
+                "MetroidPrime/PathFinding/CPathFindSpline.cpp",
+            ),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
                 "MetroidPrime/Weapons/GunController/CGunController.cpp",
@@ -1266,7 +1270,7 @@ def EquivalentFor(*versions):
             Object(NonMatching, "MetroidPrime/CErrorOutputWindow.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CRainSplashGenerator.cpp"),
             Object(
-                MatchingFor("GM8E01_00", "GM8E01_01"),
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
                 "MetroidPrime/CWorldSaveGameInfo.cpp",
                 cflags=cflags_retro,
             ),