diff --git a/config/SOUE01/config.yml b/config/SOUE01/config.yml index 3615db70..3acb2db1 100644 --- a/config/SOUE01/config.yml +++ b/config/SOUE01/config.yml @@ -12,6 +12,11 @@ force_active: [ "ProcessTab__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut15PrintContext", # "RemoveResourceBuffer__Q44nw4r2ut6detail11ResFontBaseFv", "RemoveResource__Q34nw4r2ut7ResFontFv", + "ModuleProlog", + "ModuleEpilog", + "ModuleUnresolved", + "ModuleConstructorsX", + "ModuleDestructorsX", ] # modules: # - object: orig/SOUE01/rels/d_a_asura_bulletNP.rel diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 5ca0c46b..fdd52647 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -192,7 +192,7 @@ toBeSorted/counters/extra_wallet_counter.cpp: .sbss start:0x80575640 end:0x80575648 DynamicLink.cpp: - .text start:0x802DF100 end:0x802DFCB0 + .text start:0x802DF100 end:0x802DFD74 .data start:0x805419E8 end:0x80541A70 .sdata start:0x80573F78 end:0x80573FB0 .sbss start:0x80575B80 end:0x80575BA0 diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 24bbbe5e..f1d048a6 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -311,10 +311,10 @@ int DynamicModuleControl::getModuleSize() const { const char *DynamicModuleControl::getModuleTypeString() const { static const char *REL_LOAD_TYPES[4] = { - "????", - "MEM", - "ARAM", - "DVD", + "????", + "MEM", + "ARAM", + "DVD", }; return REL_LOAD_TYPES[mResourceType & 3]; } @@ -351,23 +351,24 @@ void DbMapFile::Unregister() { unk_0 = 0; } } -/* -// probably part of a different file -extern "C" void ModuleProlog() {} +extern "C" { -extern "C" void ModuleEpilog() {} +void ModuleProlog() {} -extern "C" void ModuleUnresolved() {} +void ModuleEpilog() {} -extern "C" void ModuleConstructorsX(void (**ptrs)()) { +void ModuleUnresolved() {} + +void ModuleConstructorsX(void (**ptrs)()) { for (; *ptrs != nullptr; ptrs++) { (*ptrs)(); } } -extern "C" void ModuleDestructorsX(void (**ptrs)()) { +void ModuleDestructorsX(void (**ptrs)()) { for (; *ptrs != nullptr; ptrs++) { (*ptrs)(); } } -*/ + +}