diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-09 14:43:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-09 11:43:14 -0800 |
| commit | ba7cdd4fe9919cca0419950995f6d80583299953 (patch) | |
| tree | 826e1d78d0ddbade52462db553e4fce44aa52915 /src/d/actor/d_a_npc_soldierB.cpp | |
| parent | cefde2a42cab384221da75210601d72b5a64dcd3 (diff) | |
Debug work + some retail regalloc fixes (#2787)
* Debug work + some retail regalloc fixes
* Use AUDIO_INSTANCES in places it's missing, link d_a_e_bee
* Link m_Do_machine
* Fix clang putting other includes before the pchs
* Link some more debug TUs that already match
Diffstat (limited to 'src/d/actor/d_a_npc_soldierB.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_soldierB.cpp | 175 |
1 files changed, 2 insertions, 173 deletions
diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 051c8a18a3..a5c8a122f8 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_soldierB.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1076,176 +1077,4 @@ static void func_80AF5AB8() { // NONMATCHING } -/* ############################################################################################## */ -/* 80AF5E9C-80AF5EA0 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80AF5E9C[4]; -#pragma pop - -/* 80AF5EA0-80AF5EA4 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EA0[4]; -#pragma pop - -/* 80AF5EA4-80AF5EA8 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EA4[4]; -#pragma pop - -/* 80AF5EA8-80AF5EAC 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EA8[4]; -#pragma pop - -/* 80AF5EAC-80AF5EB0 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EAC[4]; -#pragma pop - -/* 80AF5EB0-80AF5EB4 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EB0[4]; -#pragma pop - -/* 80AF5EB4-80AF5EB8 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EB4[4]; -#pragma pop - -/* 80AF5EB8-80AF5EBC 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EB8[4]; -#pragma pop - -/* 80AF5EBC-80AF5EC0 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EBC[4]; -#pragma pop - -/* 80AF5EC0-80AF5EC4 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EC0[4]; -#pragma pop - -/* 80AF5EC4-80AF5EC8 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EC4[4]; -#pragma pop - -/* 80AF5EC8-80AF5ECC 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EC8[4]; -#pragma pop - -/* 80AF5ECC-80AF5ED0 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5ECC[4]; -#pragma pop - -/* 80AF5ED0-80AF5ED4 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5ED0[4]; -#pragma pop - -/* 80AF5ED4-80AF5ED8 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80AF5ED4[4]; -#pragma pop - -/* 80AF5ED8-80AF5EDC 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_80AF5ED8[4]; -#pragma pop - -/* 80AF5EDC-80AF5EE0 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EDC[4]; -#pragma pop - -/* 80AF5EE0-80AF5EE4 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EE0[4]; -#pragma pop - -/* 80AF5EE4-80AF5EE8 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EE4[4]; -#pragma pop - -/* 80AF5EE8-80AF5EEC 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EE8[4]; -#pragma pop - -/* 80AF5EEC-80AF5EF0 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EEC[4]; -#pragma pop - -/* 80AF5EF0-80AF5EF4 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EF0[4]; -#pragma pop - -/* 80AF5EF4-80AF5EF8 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EF4[4]; -#pragma pop - -/* 80AF5EF8-80AF5EFC 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AF5EF8[4]; -#pragma pop - -/* 80AF5EFC-80AF5F00 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AF5EFC[4]; -#pragma pop - -/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; |
