summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_e_tt.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-11-09 14:43:14 -0500
committerGitHub <noreply@github.com>2025-11-09 11:43:14 -0800
commitba7cdd4fe9919cca0419950995f6d80583299953 (patch)
tree826e1d78d0ddbade52462db553e4fce44aa52915 /src/d/actor/d_a_e_tt.cpp
parentcefde2a42cab384221da75210601d72b5a64dcd3 (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_e_tt.cpp')
-rw-r--r--src/d/actor/d_a_e_tt.cpp175
1 files changed, 2 insertions, 173 deletions
diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp
index 9caa2f5631..297178164f 100644
--- a/src/d/actor/d_a_e_tt.cpp
+++ b/src/d/actor/d_a_e_tt.cpp
@@ -6,6 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_tt.h"
+#include "Z2AudioLib/Z2Instances.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_enemy.h"
@@ -1126,176 +1127,4 @@ extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
-/* ############################################################################################## */
-/* 807C2494-807C2498 0000FC 0004+00 0/0 0/0 0/0 .bss
- * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
-#pragma push
-#pragma force_active on
-static u8 data_807C2494[4];
-#pragma pop
-
-/* 807C2498-807C249C 000100 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14JASAudioThread> */
-#pragma push
-#pragma force_active on
-static u8 data_807C2498[4];
-#pragma pop
-
-/* 807C249C-807C24A0 000104 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C249C[4];
-#pragma pop
-
-/* 807C24A0-807C24A4 000108 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24A0[4];
-#pragma pop
-
-/* 807C24A4-807C24A8 00010C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24A4[4];
-#pragma pop
-
-/* 807C24A8-807C24AC 000110 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24A8[4];
-#pragma pop
-
-/* 807C24AC-807C24B0 000114 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24AC[4];
-#pragma pop
-
-/* 807C24B0-807C24B4 000118 0004+00 0/0 0/0 0/0 .bss
- * sInstance__36JASGlobalInstance<15JAISoundStarter> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24B0[4];
-#pragma pop
-
-/* 807C24B4-807C24B8 00011C 0004+00 0/0 0/0 0/0 .bss
- * sInstance__35JASGlobalInstance<14Z2SoundStarter> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24B4[4];
-#pragma pop
-
-/* 807C24B8-807C24BC 000120 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24B8[4];
-#pragma pop
-
-/* 807C24BC-807C24C0 000124 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24BC[4];
-#pragma pop
-
-/* 807C24C0-807C24C4 000128 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24C0[4];
-#pragma pop
-
-/* 807C24C4-807C24C8 00012C 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAIStreamMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24C4[4];
-#pragma pop
-
-/* 807C24C8-807C24CC 000130 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24C8[4];
-#pragma pop
-
-/* 807C24CC-807C24D0 000134 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAISoundInfo> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24CC[4];
-#pragma pop
-
-/* 807C24D0-807C24D4 000138 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13JAUSoundTable> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24D0[4];
-#pragma pop
-
-/* 807C24D4-807C24D8 00013C 0004+00 0/0 0/0 0/0 .bss
- * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24D4[4];
-#pragma pop
-
-/* 807C24D8-807C24DC 000140 0004+00 0/0 0/0 0/0 .bss
- * sInstance__33JASGlobalInstance<12JAUSoundInfo> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24D8[4];
-#pragma pop
-
-/* 807C24DC-807C24E0 000144 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24DC[4];
-#pragma pop
-
-/* 807C24E0-807C24E4 000148 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24E0[4];
-#pragma pop
-
-/* 807C24E4-807C24E8 00014C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24E4[4];
-#pragma pop
-
-/* 807C24E8-807C24EC 000150 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24E8[4];
-#pragma pop
-
-/* 807C24EC-807C24F0 000154 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24EC[4];
-#pragma pop
-
-/* 807C24F0-807C24F4 000158 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
- */
-#pragma push
-#pragma force_active on
-static u8 data_807C24F0[4];
-#pragma pop
-
-/* 807C24F4-807C24F8 00015C 0004+00 0/0 0/0 0/0 .bss
- * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
-#pragma push
-#pragma force_active on
-static u8 data_807C24F4[4];
-#pragma pop
-
-/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+AUDIO_INSTANCES;