diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 13fc1045..89411d03 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2357,7 +2357,7 @@ d/snd/d_snd_actor.cpp: d/snd/d_snd_3d_actor.cpp: .text start:0x8035A8A0 end:0x8035BB78 align:16 - .data start:0x805486B0 end:0x80548710 + .data start:0x805486A0 end:0x80548710 .sdata2 start:0x8057D2C0 end:0x8057D308 d/snd/d_snd_3d_engine.cpp: @@ -2373,6 +2373,8 @@ d/snd/d_snd_sound.cpp: d/snd/d_snd_player_mgr.cpp: .text start:0x8035DA90 end:0x8035F04C align:16 .data start:0x80548758 end:0x805487A0 + .sbss start:0x80575D38 end:0x80575D40 + .sdata2 start:0x8057D380 end:0x8057D390 d/snd/d_snd_control_player_mgr.cpp: .text start:0x8035F050 end:0x80360C28 align:16 @@ -2406,14 +2408,24 @@ d/snd/d_snd_control_player.cpp: .data start:0x80548C38 end:0x80548CC8 .sdata2 start:0x8057D938 end:0x8057D940 -d/snd/d_snd_mgr_effect.cpp: - .text start:0x8036C6B0 end:0x8037F8B4 align:16 +d/snd/d_snd_unk_15.cpp: + .text start:0x8036C6B0 end:0x8037D800 align:16 + +d/snd/d_snd_effect_mgr.cpp: + .text start:0x8037D800 end:0x8037F8B4 align:16 + .data start:0x805491B8 end:0x805491D0 + .sbss start:0x80575D98 end:0x80575DA0 + .sdata2 start:0x8057DA80 end:0x8057DAD0 d/snd/d_snd_harp_mgr.cpp: .text start:0x8037F8C0 end:0x80382150 align:16 + .data start:0x805491D0 end:0x805491E0 + .sbss start:0x80575DA0 end:0x80575DA8 + .sdata2 start:0x8057DAD0 end:0x8057DB48 d/snd/d_snd_anim_sound.cpp: .text start:0x80382150 end:0x8038240C align:16 + .sdata2 start:0x8057DB50 end:0x8057DB68 d/snd/d_snd_mgr_unk_14.cpp: .text start:0x80382410 end:0x803864C8 align:16 diff --git a/configure.py b/configure.py index eefbc18f..cf06b3c6 100644 --- a/configure.py +++ b/configure.py @@ -715,7 +715,8 @@ config.libs = [ Object(NonMatching, "d/snd/d_snd_sound_ex.cpp"), Object(Matching, "d/snd/d_snd_control_sound.cpp"), Object(Matching, "d/snd/d_snd_control_player.cpp"), - Object(NonMatching, "d/snd/d_snd_mgr_effect.cpp"), + Object(NonMatching, "d/snd/d_snd_unk_15.cpp"), + Object(NonMatching, "d/snd/d_snd_effect_mgr.cpp"), Object(NonMatching, "d/snd/d_snd_harp_mgr.cpp"), Object(NonMatching, "d/snd/d_snd_anim_sound.cpp"), Object(NonMatching, "d/snd/d_snd_mgr_unk_14.cpp"),