From 4fb3af91b8aff0b9042affa4d430aa3375199973 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 28 Nov 2025 00:34:18 -0500 Subject: Various small matches (#2879) * Misc debug matches * Fix JASBasicWaveBank weak func order * Remove more dol2asm stuff, fix missing includes * Some data fixes * Update comments * d_file_sel_warning is already OK * Fix Z2 splits * Fix movebox namespace * Fix inlining issue in m_Do_ext * Fix Z2 splits for P and J --- src/d/d_msg_object.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'src/d/d_msg_object.cpp') diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 547eb68a1d..5bf59fdd7c 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -415,20 +415,19 @@ int dMsgObject_c::_create(msg_class* param_1) { return 4; } -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg"; -SECTION_DEAD static char const* const stringBase_8039966B = "zel_01.bmg"; -SECTION_DEAD static char const* const stringBase_80399676 = "zel_02.bmg"; -SECTION_DEAD static char const* const stringBase_80399681 = "zel_03.bmg"; -SECTION_DEAD static char const* const stringBase_8039968C = "zel_04.bmg"; -SECTION_DEAD static char const* const stringBase_80399697 = "zel_05.bmg"; -SECTION_DEAD static char const* const stringBase_803996A2 = "zel_06.bmg"; -SECTION_DEAD static char const* const stringBase_803996AD = "zel_07.bmg"; -SECTION_DEAD static char const* const stringBase_803996B8 = "zel_08.bmg"; -SECTION_DEAD static char const* const stringBase_803996C3 = "zel_99.bmg"; -SECTION_DEAD static char const* const stringBase_803996CE = ""; -#pragma pop +static void dummyStrings() { + DEAD_STRING("zel_00.bmg"); + DEAD_STRING("zel_01.bmg"); + DEAD_STRING("zel_02.bmg"); + DEAD_STRING("zel_03.bmg"); + DEAD_STRING("zel_04.bmg"); + DEAD_STRING("zel_05.bmg"); + DEAD_STRING("zel_06.bmg"); + DEAD_STRING("zel_07.bmg"); + DEAD_STRING("zel_08.bmg"); + DEAD_STRING("zel_99.bmg"); + DEAD_STRING(""); +} /* 8043028C-8043069C 05CFAC 0410+00 7/7 51/51 0/0 .bss g_MsgObject_HIO_c */ dMsgObject_HIO_c g_MsgObject_HIO_c; -- cgit v1.2.3