diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index e6d865bf..220f455e 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -29056,7 +29056,7 @@ grp17 = .rodata:0x804F39A0; // type:object size:0x11 scope:local @169 = .rodata:0x804F3A60; // type:object size:0x9 scope:local data:string @174 = .rodata:0x804F3A6C; // type:object size:0x9 scope:local data:string sActorBaseNamePairs = .rodata:0x804F3A78; // type:object size:0x3C0 data:4byte -lbl_804F3E38 = .rodata:0x804F3E38; // type:object size:0x4C0 +sLinkVoiceConfig = .rodata:0x804F3E38; // type:object size:0x4C0 scope:local lbl_804F42F8 = .rodata:0x804F42F8; // type:object size:0x480 lbl_804F4778 = .rodata:0x804F4778; // type:object size:0x788 align:4 data:float kprDeadKeyMap = .rodata:0x804F4F00; // type:object size:0x288 data:2byte diff --git a/configure.py b/configure.py index 9a240a9c..04b579cd 100644 --- a/configure.py +++ b/configure.py @@ -309,6 +309,7 @@ def Rel(status, rel_name, cpp_name, extra_cflags=[]): ], } + def RelLib(lib_name, progress_category, objects, extra_cflags=[]): return { "lib": lib_name, @@ -799,7 +800,7 @@ config.libs = [ Object(NonMatching, "d/snd/d_snd_sound_npc_callbacks.cpp"), Object(NonMatching, "d/snd/d_snd_sound_npc_2_callbacks.cpp"), Object(NonMatching, "d/snd/d_snd_sound_tgsound_callbacks.cpp"), - Object(NonMatching, "d/snd/d_snd_rng_link_voice.cpp"), + Object(Matching, "d/snd/d_snd_rng_link_voice.cpp"), Object(NonMatching, "d/snd/d_snd_fi_vocal_mgr.cpp"), Object(NonMatching, "d/snd/d_snd_rng.cpp"), Object(Matching, "d/snd/d_snd_rng_mgr.cpp"), @@ -1989,33 +1990,37 @@ config.libs = [ ), ], }, - RelLib("keyboard", "keyboard", [ - Object(NonMatching, "REL/keyboard/tiPcKeyboard.cpp"), - Object(NonMatching, "REL/keyboard/tiCellPhone.cpp"), - Object(NonMatching, "REL/keyboard/tiInputForm.cpp"), - Object(NonMatching, "REL/keyboard/tiCandidateBox.cpp"), - Object(NonMatching, "REL/keyboard/tiToolBar.cpp"), - Object(NonMatching, "REL/keyboard/tiPredictLang.cpp"), - Object(NonMatching, "REL/keyboard/tiSignWindow.cpp"), - Object(NonMatching, "REL/keyboard/tiString.cpp"), - Object(NonMatching, "REL/keyboard/tiTextDrawer.cpp"), - Object(NonMatching, "REL/keyboard/tiNw4rManager.cpp"), - Object(NonMatching, "REL/keyboard/tiManager.cpp"), - Object(NonMatching, "REL/keyboard/tiUtil.cpp"), - Object(NonMatching, "REL/keyboard/tiCpData.cpp"), - Object(NonMatching, "REL/keyboard/tiSwData.cpp"), - Object(NonMatching, "REL/keyboard/tiPkData.cpp"), - Object(NonMatching, "REL/keyboard/tiLanguageIndependentData.cpp"), - Object(NonMatching, "REL/keyboard/tiTextInputBase.cpp"), - Object(NonMatching, "REL/keyboard/MyTiManager.cpp"), - Object(NonMatching, "REL/keyboard/MyTiInputForm.cpp"), - Object(NonMatching, "REL/keyboard/MyTiBg.cpp"), - Object(NonMatching, "REL/keyboard/tiDebug.cpp"), - Object(NonMatching, "REL/keyboard/tiGUIManager.cpp"), - Object(NonMatching, "REL/keyboard/tiHKBManager.cpp"), - Object(NonMatching, "REL/keyboard/tiHwKeyboard.cpp"), - Object(NonMatching, "REL/keyboard/tiLayout.cpp"), - ]), + RelLib( + "keyboard", + "keyboard", + [ + Object(NonMatching, "REL/keyboard/tiPcKeyboard.cpp"), + Object(NonMatching, "REL/keyboard/tiCellPhone.cpp"), + Object(NonMatching, "REL/keyboard/tiInputForm.cpp"), + Object(NonMatching, "REL/keyboard/tiCandidateBox.cpp"), + Object(NonMatching, "REL/keyboard/tiToolBar.cpp"), + Object(NonMatching, "REL/keyboard/tiPredictLang.cpp"), + Object(NonMatching, "REL/keyboard/tiSignWindow.cpp"), + Object(NonMatching, "REL/keyboard/tiString.cpp"), + Object(NonMatching, "REL/keyboard/tiTextDrawer.cpp"), + Object(NonMatching, "REL/keyboard/tiNw4rManager.cpp"), + Object(NonMatching, "REL/keyboard/tiManager.cpp"), + Object(NonMatching, "REL/keyboard/tiUtil.cpp"), + Object(NonMatching, "REL/keyboard/tiCpData.cpp"), + Object(NonMatching, "REL/keyboard/tiSwData.cpp"), + Object(NonMatching, "REL/keyboard/tiPkData.cpp"), + Object(NonMatching, "REL/keyboard/tiLanguageIndependentData.cpp"), + Object(NonMatching, "REL/keyboard/tiTextInputBase.cpp"), + Object(NonMatching, "REL/keyboard/MyTiManager.cpp"), + Object(NonMatching, "REL/keyboard/MyTiInputForm.cpp"), + Object(NonMatching, "REL/keyboard/MyTiBg.cpp"), + Object(NonMatching, "REL/keyboard/tiDebug.cpp"), + Object(NonMatching, "REL/keyboard/tiGUIManager.cpp"), + Object(NonMatching, "REL/keyboard/tiHKBManager.cpp"), + Object(NonMatching, "REL/keyboard/tiHwKeyboard.cpp"), + Object(NonMatching, "REL/keyboard/tiLayout.cpp"), + ], + ), Rel(NonMatching, "d_SoftwareKeyboard", "REL/d/d_SoftwareKeyboard.cpp"), Rel(NonMatching, "d_a_asura_bullet", "REL/d/a/d_a_asura_bullet.cpp"), Rel(NonMatching, "d_a_avater_bullet", "REL/d/a/d_a_avater_bullet.cpp"), @@ -2413,9 +2418,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_city", "REL/d/a/obj/d_a_obj_city.cpp"), Rel(NonMatching, "d_a_obj_city_water", "REL/d/a/obj/d_a_obj_city_water.cpp"), Rel(NonMatching, "d_a_obj_claw_shot_tg", "REL/d/a/obj/d_a_obj_claw_shot_tg.cpp"), - Rel( - Matching, "d_a_obj_clearness_wall", "REL/d/a/obj/d_a_obj_clearness_wall.cpp" - ), + Rel(Matching, "d_a_obj_clearness_wall", "REL/d/a/obj/d_a_obj_clearness_wall.cpp"), Rel(NonMatching, "d_a_obj_clef", "REL/d/a/obj/d_a_obj_clef.cpp"), Rel(Matching, "d_a_obj_cloud_dive", "REL/d/a/obj/d_a_obj_cloud_dive.cpp"), Rel(NonMatching, "d_a_obj_col", "REL/d/a/obj/d_a_obj_col.cpp"), @@ -2782,7 +2785,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_tumble_weed", "REL/d/a/obj/d_a_obj_tumble_weed.cpp"), Rel(NonMatching, "d_a_obj_underground", "REL/d/a/obj/d_a_obj_underground.cpp"), Rel( - NonMatching, + Matching, "d_a_obj_underground_switch", "REL/d/a/obj/d_a_obj_underground_switch.cpp", ), diff --git a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp index 491170b5..f7e1a5af 100644 --- a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp +++ b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp @@ -20,7 +20,6 @@ const f32 dAcOUgSwitch_c::sActivationRadius = 40.0f; const u8 dAcOUgSwitch_c::sEventTimer = 15; bool dAcOUgSwitch_c::createHeap() { - // Why. Regswap... void *data = getOarcResFile("SwitchPass"); mRes = nw4r::g3d::ResFile(data);