diff --git a/config/SOUE01/config.yml b/config/SOUE01/config.yml index fee20c86..9bd91d28 100644 --- a/config/SOUE01/config.yml +++ b/config/SOUE01/config.yml @@ -4,7 +4,9 @@ splits: config/SOUE01/splits.txt symbols: config/SOUE01/symbols.txt mw_comment_version: 8 quick_analysis: true - +force_active: [ + "searchBaseByID__10fManager_cF9fBaseID_e", +] # modules: # - object: orig/SOUE01/rels/d_a_asura_bulletNP.rel # splits: config/SOUE01/rels/d_a_asura_bulletNP/splits.txt diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index fb0d5609..f84fec00 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -142,10 +142,10 @@ f/f_base.cpp: .bss start:0x805B84C8 end:0x805B84D8 f/f_list.cpp: - .text start:0x802E2680 end:0x802E28C0 + .text start:0x802E2680 end:0x802E2878 f/f_manager.cpp: - .text start:0x802E28C0 end:0x802E2C0C + .text start:0x802E2880 end:0x802E2C0C .ctors start:0x804DB8C4 end:0x804DB8C8 .data start:0x805423A8 end:0x805423E8 .sdata start:0x80573FC0 end:0x80573FC8 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index fb87d17e..195dcdc3 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -17359,9 +17359,9 @@ searchBaseByID__10fManager_cF9fBaseID_e = .text:0x802E28D0; // type:function siz searchBaseByProfName__10fManager_cFUsPC7fBase_c = .text:0x802E2920; // type:function size:0x54 searchBaseByGroupType__10fManager_cFUcPC7fBase_c = .text:0x802E2980; // type:function size:0x54 mainLoop__10fManager_cFv = .text:0x802E29E0; // type:function size:0xC0 -__sinit_\f_manager_cpp = .text:0x802E2AA0; // type:function size:0x138 +__sinit_\f_manager_cpp = .text:0x802E2AA0; // type:function size:0x138 scope:local __ct__9fLiMgBa_cFv = .text:0x802E2BE0; // type:function size:0x10 -fn_802E2BF0 = .text:0x802E2BF0; // type:function size:0x1C scope:local +__arraydtor$4018 = .text:0x802E2BF0; // type:function size:0x1C scope:local walkPack__11fTrMgPTMF_cFv = .text:0x802E2C10; // type:function size:0x84 searchNodeByProfName__9fTrMgBa_cCFUsPC9fTrNdBa_c = .text:0x802E2CA0; // type:function size:0x68 searchNodeByGroupType__9fTrMgBa_cCFUcPC9fTrNdBa_c = .text:0x802E2D10; // type:function size:0x68 @@ -27388,7 +27388,7 @@ __destroy_global_chain = .text:0x804C65D8; // type:function size:0x48 scope:glob fn_804C6620 = .text:0x804C6620; // type:function size:0x104 fn_804C6724 = .text:0x804C6724; // type:function size:0xBC __construct_array = .text:0x804C67E0; // type:function size:0xF8 -fn_804C68D8 = .text:0x804C68D8; // type:function size:0x78 +__destroy_arr = .text:0x804C68D8; // type:function size:0x78 fn_804C6950 = .text:0x804C6950; // type:function size:0x80 __ptmf_test = .text:0x804C69D0; // type:function size:0x30 fn_804C6A00 = .text:0x804C6A00; // type:function size:0x3C @@ -35671,7 +35671,11 @@ lbl_80541A70 = .data:0x80541A70; // type:object size:0x808 lbl_80542278 = .data:0x80542278; // type:object size:0xB4 data:4byte lbl_8054232C = .data:0x8054232C; // type:object size:0x30 __vt__7fBase_c = .data:0x8054235C; // type:object size:0x4C -lbl_805423A8 = .data:0x805423A8; // type:object size:0x40 data:4byte +lbl_805423A8 = .data:0x805423A8; // type:object size:0xC data:4byte +lbl_805423B4 = .data:0x805423B4; // type:object size:0xC data:4byte +lbl_805423C0 = .data:0x805423C0; // type:object size:0xC data:4byte +lbl_805423CC = .data:0x805423CC; // type:object size:0xC data:4byte +lbl_805423D8 = .data:0x805423D8; // type:object size:0xC data:4byte lbl_805423E8 = .data:0x805423E8; // type:object size:0x20 lbl_80542408 = .data:0x80542408; // type:object size:0x18 lbl_80542420 = .data:0x80542420; // type:object size:0x10 @@ -39011,7 +39015,7 @@ lbl_80573FA8 = .sdata:0x80573FA8; // type:object size:0x8 lbl_80573FB0 = .sdata:0x80573FB0; // type:object size:0x4 data:4byte lbl_80573FB4 = .sdata:0x80573FB4; // type:object size:0x4 data:4byte m_rootUniqueID__7fBase_c = .sdata:0x80573FB8; // type:object size:0x4 data:4byte -m_nowLoopProc__10fManager_c = .sdata:0x80573FC0; // type:object size:0x8 data:4byte +m_nowLoopProc__10fManager_c = .sdata:0x80573FC0; // type:object size:0x4 data:4byte lbl_80573FC8 = .sdata:0x80573FC8; // type:object size:0x8 data:4byte lbl_80573FD0 = .sdata:0x80573FD0; // type:object size:0x4 lbl_80573FD4 = .sdata:0x80573FD4; // type:object size:0x1 data:byte diff --git a/configure.py b/configure.py index 89eeff37..c3cea48b 100644 --- a/configure.py +++ b/configure.py @@ -127,7 +127,7 @@ config.wibo_tag = "0.6.11" # Project config.config_path = Path("config") / config.version / "config.yml" config.check_sha_path = Path("orig") / f"{config.version}.sha1" -config.linker_version = "Wii/1.7" +config.linker_version = "Wii/1.6" config.ldflags = [ "-fp hardware", "-nodefaults", @@ -186,7 +186,7 @@ cflags_framework = [ *cflags_base, "-inline noauto", "-str reuse", - + "-ipa file", ] # EGG flags @@ -215,7 +215,7 @@ cflags_rel = [ def Rel(status, rel_name, cpp_name, extra_cflags=[]): return { "lib": rel_name, - "mw_version": "Wii/1.7", + "mw_version": "Wii/1.6", "cflags": cflags_rel + extra_cflags, "host": False, "objects": [ @@ -239,7 +239,7 @@ def DolphinLib(lib_name, objects): def EGGLib(lib_name, objects): return { "lib": lib_name, - "mw_version": "Wii/1.7", + "mw_version": "Wii/1.6", "cflags": cflags_egg, "host": False, "objects": objects, @@ -249,7 +249,7 @@ def EGGLib(lib_name, objects): def nw4rLib(lib_name, objects): return { "lib": lib_name, - "mw_version": "Wii/1.7", + "mw_version": "Wii/1.6", "cflags": cflags_nw4r, "host": False, "objects": objects, @@ -264,7 +264,7 @@ config.warn_missing_source = False # TODO config.libs = [ { "lib": "framework", - "mw_version": "Wii/1.7", + "mw_version": "Wii/1.6", "cflags": cflags_framework, "host": False, "objects": [ @@ -288,8 +288,8 @@ config.libs = [ Object(NonMatching, "toBeSorted/file_manager.cpp"), Object(NonMatching, "toBeSorted/save_manager.cpp"), Object(NonMatching, "f/f_base.cpp"), - Object(NonMatching, "f/f_list.cpp"), - Object(NonMatching, "f/f_manager.cpp"), + Object(Matching, "f/f_list.cpp"), + Object(Matching, "f/f_manager.cpp"), Object(Matching, "m/m_heap.cpp"), Object(NonMatching, "m/m_mtx.cpp"), # framework (f_name) diff --git a/include/f/f_list_mg.h b/include/f/f_list_mg.h index eb4d86d7..c6601f21 100644 --- a/include/f/f_list_mg.h +++ b/include/f/f_list_mg.h @@ -15,6 +15,7 @@ class fBase_c; /// @brief A list of fLiNdBa_c nodes. class fLiMgBa_c : public cListMg_c { public: + ~fLiMgBa_c() {} /** * @brief Counts the number of nodes of a given profile in this list. *