From 94a5eadb5f7b7651104cebf0dc4cc512915aa413 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 31 Aug 2026 16:08:40 -0400 Subject: [PATCH] Add DEAD_STRING macro to clearly distinguish unused strings --- include/global.h | 3 + src/JAZelAudio/JAIZelBasic.cpp | 2 +- src/JAZelAudio/JAIZelInst.cpp | 6 +- src/JSystem/J2DGraph/J2DPrint.cpp | 2 +- src/JSystem/JAudio/JAIGlobalParameter.cpp | 2 +- src/JSystem/JAudio/JAISound.cpp | 30 ++++----- src/JSystem/JAudio/JASDSPBuf.cpp | 2 +- src/JSystem/JAudio/JASDriverIF.cpp | 10 +-- src/JSystem/JAudio/JASHardStream.cpp | 38 +++++------ src/JSystem/JAudio/JASHeapCtrl.cpp | 6 +- src/JSystem/JAudio/JASTrack.cpp | 4 +- src/JSystem/JFramework/JFWDisplay.cpp | 4 +- src/JSystem/JKernel/JKRAram.cpp | 3 +- src/JSystem/JKernel/JKRAramArchive.cpp | 8 +-- src/JSystem/JKernel/JKRCompArchive.cpp | 8 +-- src/JSystem/JKernel/JKRDvdArchive.cpp | 8 +-- src/JSystem/JKernel/JKRExpHeap.cpp | 22 +++---- src/JSystem/JKernel/JKRHeap.cpp | 24 +++---- src/JSystem/JKernel/JKRStdHeap.cpp | 6 +- src/JSystem/JKernel/JKRThread.cpp | 4 +- src/JSystem/JParticle/JPABaseShape.cpp | 6 +- src/JSystem/JParticle/JPAResourceManager.cpp | 10 +-- src/JSystem/JUtility/JUTConsole.cpp | 10 +-- src/JSystem/JUtility/JUTGamePad.cpp | 22 +++---- src/JSystem/JUtility/JUTXfb.cpp | 6 +- src/SSystem/SComponent/c_bg_s.cpp | 4 +- src/c/c_dylink.cpp | 2 +- src/d/actor/d_a_dk.cpp | 2 +- src/d/actor/d_a_npc_jb1.cpp | 12 ++-- src/d/actor/d_a_npc_tt.cpp | 8 +-- src/d/actor/d_a_ygcwp.cpp | 6 +- src/d/d_bg_s_acch.cpp | 4 +- src/d/d_com_inf_game.cpp | 8 +-- src/d/d_demo.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_lib.cpp | 2 +- src/d/d_menu_window.cpp | 68 ++++++++++---------- src/d/d_meter.cpp | 24 +++---- src/d/d_msg.cpp | 4 +- src/d/d_resorce.cpp | 2 +- src/d/d_s_name.cpp | 8 +-- src/d/d_save.cpp | 2 +- src/f_op/f_op_msg_mng.cpp | 6 +- src/m_Do/m_Do_dvd_thread.cpp | 20 +++--- src/m_Do/m_Do_ext.cpp | 10 +-- src/m_Do/m_Do_machine.cpp | 2 +- src/m_Do/m_Do_machine_exception.cpp | 2 +- 47 files changed, 225 insertions(+), 221 deletions(-) diff --git a/include/global.h b/include/global.h index b25b6ac28..e57cd7321 100644 --- a/include/global.h +++ b/include/global.h @@ -79,6 +79,9 @@ extern void __sync(); #define SJIS(character, value) ((u32)value) #endif +// Hack to make strings with no references appear in the string pool for matching. +#define DEAD_STRING(s) OSReport(s) + // Hack to trick the compiler into not inlining functions that use this macro. #define FORCE_DONT_INLINE \ (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \ diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp index 7508e7c70..0ad770a11 100644 --- a/src/JAZelAudio/JAIZelBasic.cpp +++ b/src/JAZelAudio/JAIZelBasic.cpp @@ -1499,7 +1499,7 @@ void JAIZelBasic::loadStaticWaves() { } static void dummy2() { - OSReport("Warning : bgm pointer is NULL!\n"); + DEAD_STRING("Warning : bgm pointer is NULL!\n"); } /* 802AB888-802AB8B0 .text checkFirstWaves__11JAIZelBasicFv */ diff --git a/src/JAZelAudio/JAIZelInst.cpp b/src/JAZelAudio/JAIZelInst.cpp index 923fdc3f3..f5eb35ac9 100644 --- a/src/JAZelAudio/JAIZelInst.cpp +++ b/src/JAZelAudio/JAIZelInst.cpp @@ -166,9 +166,9 @@ s32 JAIZelInst::setStickPos(s32 main_stick, s32 c_stick) { } static f32 dummy() { - OSReport("[JAIZelInst::playMelody] melody number too large (%d)\n"); - OSReport("[JAIZelInst::getPlayingPattern] too large melody number : %d\n"); - OSReport("[JAIZelInst::getPlayingPattern] too large step : %d\n"); + DEAD_STRING("[JAIZelInst::playMelody] melody number too large (%d)\n"); + DEAD_STRING("[JAIZelInst::getPlayingPattern] too large melody number : %d\n"); + DEAD_STRING("[JAIZelInst::getPlayingPattern] too large step : %d\n"); return 0.0f; } diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index bfb5dc203..f9f779246 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -564,5 +564,5 @@ f32 J2DPrint::getNumberF32(const u8** param_1, f32 param_2, f32 param_3, int bas } static void dummy2() { - OSReport("buff != 0"); + DEAD_STRING("buff != 0"); } diff --git a/src/JSystem/JAudio/JAIGlobalParameter.cpp b/src/JSystem/JAudio/JAIGlobalParameter.cpp index 1a4b6122e..8bb279c92 100644 --- a/src/JSystem/JAudio/JAIGlobalParameter.cpp +++ b/src/JSystem/JAudio/JAIGlobalParameter.cpp @@ -376,7 +376,7 @@ u16 JAIGlobalParameter::getParamSeDistanceWaitMax() { } static void dummy() { - OSReport("Seqs/JaiSeInf.bst"); + DEAD_STRING("Seqs/JaiSeInf.bst"); } u8 JAIGlobalParameter::distanceParameterMoveTime = 3; diff --git a/src/JSystem/JAudio/JAISound.cpp b/src/JSystem/JAudio/JAISound.cpp index 1e7d296bf..0ca749275 100644 --- a/src/JSystem/JAudio/JAISound.cpp +++ b/src/JSystem/JAudio/JAISound.cpp @@ -79,7 +79,7 @@ void JAISound::setVolume(f32 param_1, u32 param_2, u8 param_3) { } static void dummy1() { - OSReport("JAISound::setDirectVolume サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::setDirectVolume サウンドカテゴリービットが異常です。\n"); } /* 8029878C-80298864 .text setPan__8JAISoundFfUlUc */ @@ -100,7 +100,7 @@ void JAISound::setPan(f32 param_1, u32 param_2, u8 param_3) { } static void dummy2() { - OSReport("JAISound::setDirectPan サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::setDirectPan サウンドカテゴリービットが異常です。\n"); } /* 80298864-8029893C .text setPitch__8JAISoundFfUlUc */ @@ -121,7 +121,7 @@ void JAISound::setPitch(f32 param_1, u32 param_2, u8 param_3) { } static void dummy3() { - OSReport("JAISound::setDirectPitch サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::setDirectPitch サウンドカテゴリービットが異常です。\n"); } /* 8029893C-80298A04 .text setFxmix__8JAISoundFfUlUc */ @@ -141,7 +141,7 @@ void JAISound::setFxmix(f32 param_1, u32 param_2, u8 param_3) { } static void dummy4() { - OSReport("JAISound::setDirectFxmix サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::setDirectFxmix サウンドカテゴリービットが異常です。\n"); } /* 80298A04-80298ACC .text setDolby__8JAISoundFfUlUc */ @@ -161,7 +161,7 @@ void JAISound::setDolby(f32 param_1, u32 param_2, u8 param_3) { } static void dummy5() { - OSReport("JAISound::setDirectDolby サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::setDirectDolby サウンドカテゴリービットが異常です。\n"); } /* 80298ACC-80298B74 .text setTempoProportion__8JAISoundFfUl */ @@ -277,7 +277,7 @@ void JAISound::setSeqInterVolume(u8 line_, f32 param_2, u32 param_3) { } static void dummy6() { - OSReport("JAISound::checkReady サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::checkReady サウンドカテゴリービットが異常です。\n"); } /* 8029925C-802993AC .text setSeqInterPan__8JAISoundFUcfUl */ @@ -654,15 +654,15 @@ BOOL JAInter::MoveParaSet::move() { } static void dummy7() { - OSReport("JAISound::getVolume サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getPitch サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getFxmix サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getDolby サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getTempoProportion サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getPortData サウンドカテゴリービットが異常です。\n"); - OSReport("JAISound::getTrackParameterU7 未定義のサウンドパラメータです。\n"); - OSReport("JAISound::getTrackParameterF32 未定義のサウンドパラメータです。\n"); - OSReport("JAISound::getSeParametermeterF32 未定義のサウンドパラメータです。\n"); + DEAD_STRING("JAISound::getVolume サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getPitch サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getFxmix サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getDolby サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getTempoProportion サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getPortData サウンドカテゴリービットが異常です。\n"); + DEAD_STRING("JAISound::getTrackParameterU7 未定義のサウンドパラメータです。\n"); + DEAD_STRING("JAISound::getTrackParameterF32 未定義のサウンドパラメータです。\n"); + DEAD_STRING("JAISound::getSeParametermeterF32 未定義のサウンドパラメータです。\n"); } /* 8029B0C4-8029B4AC .text init__Q27JAInter9LinkSoundFP8JAISoundUl */ diff --git a/src/JSystem/JAudio/JASDSPBuf.cpp b/src/JSystem/JAudio/JASDSPBuf.cpp index 75679831a..54c41fc9b 100644 --- a/src/JSystem/JAudio/JASDSPBuf.cpp +++ b/src/JSystem/JAudio/JASDSPBuf.cpp @@ -26,7 +26,7 @@ u8 JASystem::TDSP_DACBuffer::readBuffer; u8 JASystem::TDSP_DACBuffer::dspStatus; static void dummy() { - OSReport("----- JASDSPBuf : DSP-DAC バッファの数を %d にしました\n"); + DEAD_STRING("----- JASDSPBuf : DSP-DAC バッファの数を %d にしました\n"); } /* 802892E0-802893E4 .text init__Q28JASystem14TDSP_DACBufferFv */ diff --git a/src/JSystem/JAudio/JASDriverIF.cpp b/src/JSystem/JAudio/JASDriverIF.cpp index 4ccca6991..ae6d5de95 100644 --- a/src/JSystem/JAudio/JASDriverIF.cpp +++ b/src/JSystem/JAudio/JASDriverIF.cpp @@ -21,11 +21,11 @@ void JASystem::Driver::init() { u16 JASystem::Driver::MAX_MIXERLEVEL = 0x2ee0; static void dummy() { - OSReport("JASDriverIF.cpp"); - OSReport("(0.0 <= channel_level) && (channel_level <= 2.0)"); - OSReport("Halt"); - OSReport("(0.0 <= auto_level) && (auto_level <= 2.0)"); - OSReport("(0.0 <= dsp_level) && (dsp_level <= 8.0)"); + DEAD_STRING("JASDriverIF.cpp"); + DEAD_STRING("(0.0 <= channel_level) && (channel_level <= 2.0)"); + DEAD_STRING("Halt"); + DEAD_STRING("(0.0 <= auto_level) && (auto_level <= 2.0)"); + DEAD_STRING("(0.0 <= dsp_level) && (dsp_level <= 8.0)"); } /* 8028A9A0-8028AAC4 .text setMixerLevel__Q28JASystem6DriverFff */ diff --git a/src/JSystem/JAudio/JASHardStream.cpp b/src/JSystem/JAudio/JASHardStream.cpp index 65ef6ae3e..bc4aaf014 100644 --- a/src/JSystem/JAudio/JASHardStream.cpp +++ b/src/JSystem/JAudio/JASHardStream.cpp @@ -283,25 +283,25 @@ u16 JASystem::HardStream::TControl::getLoopNum() { } static void dummy2() { - OSReport(__FILE__); - OSReport("playPairs != 0"); - OSReport("Halt"); - OSReport("playList != 0"); - OSReport("name != 0"); - OSReport("[JASHardStream::setRootDir] ディレクトリ(%s)名が長すぎます。\n"); - OSReport("filename != 0"); - OSReport("streamFiles != 0"); - OSReport("[JASHardStream::setFile] このID(%d)には既にファイルが登録されています。\n"); - OSReport("pair_id < playPairsMax"); - OSReport("[JASHardStream::setBgmPair] このＢＧＭペアID(%d)は既に使用されています。\n"); - OSReport("[JASHardStream::setBgmPair] イントロ部のＢＧＭ番号指定が大きすぎます。(%d)\n"); - OSReport("[JASHardStream::setBgmPair] ループ部のＢＧＭ番号指定が大きすぎます。(%d)\n"); - OSReport("[JASHardStream::registBgmPair] このペア(%d)にはイントロ／ループともにありませんので登録できません。\n"); - OSReport("new_list != 0"); - OSReport("[JASHardStream::playBgm] まだ前の曲が再生中ですので、新たに開始できません。\n"); - OSReport("[JASHardStream::main] ファイルが開けません。(%s)\n"); - OSReport("finfo != 0"); - OSReport("\x00"); + DEAD_STRING(__FILE__); + DEAD_STRING("playPairs != 0"); + DEAD_STRING("Halt"); + DEAD_STRING("playList != 0"); + DEAD_STRING("name != 0"); + DEAD_STRING("[JASHardStream::setRootDir] ディレクトリ(%s)名が長すぎます。\n"); + DEAD_STRING("filename != 0"); + DEAD_STRING("streamFiles != 0"); + DEAD_STRING("[JASHardStream::setFile] このID(%d)には既にファイルが登録されています。\n"); + DEAD_STRING("pair_id < playPairsMax"); + DEAD_STRING("[JASHardStream::setBgmPair] このＢＧＭペアID(%d)は既に使用されています。\n"); + DEAD_STRING("[JASHardStream::setBgmPair] イントロ部のＢＧＭ番号指定が大きすぎます。(%d)\n"); + DEAD_STRING("[JASHardStream::setBgmPair] ループ部のＢＧＭ番号指定が大きすぎます。(%d)\n"); + DEAD_STRING("[JASHardStream::registBgmPair] このペア(%d)にはイントロ／ループともにありませんので登録できません。\n"); + DEAD_STRING("new_list != 0"); + DEAD_STRING("[JASHardStream::playBgm] まだ前の曲が再生中ですので、新たに開始できません。\n"); + DEAD_STRING("[JASHardStream::main] ファイルが開けません。(%s)\n"); + DEAD_STRING("finfo != 0"); + DEAD_STRING("\x00"); } /* 8027C5B4-8027C648 .text fileOpen__Q38JASystem10HardStream8TControlFUsP11DVDFileInfo */ diff --git a/src/JSystem/JAudio/JASHeapCtrl.cpp b/src/JSystem/JAudio/JASHeapCtrl.cpp index b0cfbd65d..a46275138 100644 --- a/src/JSystem/JAudio/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio/JASHeapCtrl.cpp @@ -126,9 +126,9 @@ bool JASystem::Kernel::THeap::free() { } static void dummy(JASystem::Kernel::TDisposer* disposer) { - OSReport("------------------------------------\n"); - OSReport("level >= 0 && level < 7"); - OSReport("%s Heap %08x [Addr %8x , Max %8x] %c\n"); + DEAD_STRING("------------------------------------\n"); + DEAD_STRING("level >= 0 && level < 7"); + DEAD_STRING("%s Heap %08x [Addr %8x , Max %8x] %c\n"); } /* 8027D088-8027D1FC .text insertChild__Q38JASystem6Kernel5THeapFPQ38JASystem6Kernel5THeapPQ38JASystem6Kernel5THeapPvUlb */ diff --git a/src/JSystem/JAudio/JASTrack.cpp b/src/JSystem/JAudio/JASTrack.cpp index 4c58c3800..7b6e28feb 100644 --- a/src/JSystem/JAudio/JASTrack.cpp +++ b/src/JSystem/JAudio/JASTrack.cpp @@ -272,8 +272,8 @@ void JASystem::TTrack::initTimed() { } static void dummy() { - OSReport("i >= 0"); - OSReport("i < 3"); + DEAD_STRING("i >= 0"); + DEAD_STRING("i < 3"); } /* 802811DC-80281258 .text connectBus__Q28JASystem6TTrackFii */ diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index 50774cd9e..bd9586c68 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -86,8 +86,8 @@ JFWDisplay* JFWDisplay::createManager(JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_nu } static void dummyFunc() { - OSReport("sManager"); - OSReport("mTemporarySingle"); + DEAD_STRING("sManager"); + DEAD_STRING("mTemporarySingle"); } /* 802553EC-80255444 .text callDirectDraw__Fv */ diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index 45deaa3d7..7e6728b27 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -308,8 +308,9 @@ u8* JKRAram::aramToMainRam(JKRAramBlock* block, u8 *buf, u32 p3, u32 p4, JKRExpa } static void dummy() { - OSReport("---------------- BAD SYNC. you'd set callback, but now call sync.\n"); + DEAD_STRING("---------------- BAD SYNC. you'd set callback, but now call sync.\n"); } + JSUList JKRAram::sAramCommandList; u32 JKRAram::sSzpBufferSize = 0x00000400; static u8* szpBuf; diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index e6c5cf139..8007a070f 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -67,10 +67,10 @@ JKRAramArchive::~JKRAramArchive() { } static void dummy() { - OSReport(__FILE__); - OSReport("isMounted()"); - OSReport("Halt"); - OSReport("mMountCount == 1"); + DEAD_STRING(__FILE__); + DEAD_STRING("isMounted()"); + DEAD_STRING("Halt"); + DEAD_STRING("mMountCount == 1"); } /* 802BA1C8-802BA4EC .text open__14JKRAramArchiveFl */ diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index c203ebdcd..c902ebdbe 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -69,10 +69,10 @@ JKRCompArchive::~JKRCompArchive() { } static void dummy() { - OSReport(__FILE__); - OSReport("isMounted()"); - OSReport("Halt"); - OSReport("mMountCount == 1"); + DEAD_STRING(__FILE__); + DEAD_STRING("isMounted()"); + DEAD_STRING("Halt"); + DEAD_STRING("mMountCount == 1"); } /* 802BBA14-802BBFDC .text open__14JKRCompArchiveFl */ diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 543335bf1..252c0fc29 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -58,10 +58,10 @@ JKRDvdArchive::~JKRDvdArchive() { } static void dummy() { - OSReport(__FILE__); - OSReport("isMounted()"); - OSReport("Halt"); - OSReport("mMountCount == 1"); + DEAD_STRING(__FILE__); + DEAD_STRING("isMounted()"); + DEAD_STRING("Halt"); + DEAD_STRING("mMountCount == 1"); } /* 802BAD98-802BB024 .text open__13JKRDvdArchiveFl */ diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index 862a3de5c..a47d561a8 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -527,8 +527,8 @@ s32 JKRExpHeap::getTotalUsedSize() const { } static void dummy1() { - OSReport("newSize > 0"); - OSReport("Halt"); + DEAD_STRING("newSize > 0"); + DEAD_STRING("Halt"); } /* 802B24EC-802B2584 .text appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */ @@ -994,15 +994,15 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::getHeapBlock(void* ptr) { } static void dummy2() { - OSReport("+---------------JKRExpHeap\n"); - OSReport("| Align Group size ( prev , next )\n"); - OSReport("| ---- FreeFirst\n"); - OSReport("| %08x "); - OSReport("%2x %3d %6x (%08x %08x)\n"); - OSReport("| ---- FreeLast\n"); - OSReport("| ---- UsedFirst\n"); - OSReport("| ---- UsedLast\n"); - OSReport("+---------------End\n"); + DEAD_STRING("+---------------JKRExpHeap\n"); + DEAD_STRING("| Align Group size ( prev , next )\n"); + DEAD_STRING("| ---- FreeFirst\n"); + DEAD_STRING("| %08x "); + DEAD_STRING("%2x %3d %6x (%08x %08x)\n"); + DEAD_STRING("| ---- FreeLast\n"); + DEAD_STRING("| ---- UsedFirst\n"); + DEAD_STRING("| ---- UsedLast\n"); + DEAD_STRING("+---------------End\n"); } /* 802B30A4-802B31D4 .text state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl */ diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 608593e77..07040bc7c 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -440,14 +440,14 @@ void operator delete[](void* ptr) { static void dummy3() { #if VERSION > VERSION_JPN - OSReport("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m"); + DEAD_STRING("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m"); #endif - OSReport("%s"); - OSReport("heap unchanged"); - OSReport("**** heap changed ****"); - OSReport("location : [%s:%d]"); - OSReport("**** heap changed : old ****"); - OSReport("**** heap changed : new ****"); + DEAD_STRING("%s"); + DEAD_STRING("heap unchanged"); + DEAD_STRING("**** heap changed ****"); + DEAD_STRING("location : [%s:%d]"); + DEAD_STRING("**** heap changed : old ****"); + DEAD_STRING("**** heap changed : new ****"); } /* 802B0D70-802B0E14 .text state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */ @@ -463,10 +463,10 @@ bool JKRHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2 } static void dummy4() { - OSReport("heap : %p / %p"); - OSReport("check-code : 0x%08x / 0x%08x"); - OSReport("id : 0x%08x / 0x%08x"); - OSReport("used size : %10u / %10u"); + DEAD_STRING("heap : %p / %p"); + DEAD_STRING("check-code : 0x%08x / 0x%08x"); + DEAD_STRING("id : 0x%08x / 0x%08x"); + DEAD_STRING("used size : %10u / %10u"); } /* 802B0E9C-802B0F24 .text state_dump__7JKRHeapCFRCQ27JKRHeap6TState */ @@ -488,6 +488,6 @@ u8 JKRHeap::do_getCurrentGroupId() { #if VERSION == VERSION_JPN static void dummy5() { - OSReport("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m"); + DEAD_STRING("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m"); } #endif diff --git a/src/JSystem/JKernel/JKRStdHeap.cpp b/src/JSystem/JKernel/JKRStdHeap.cpp index 3e452584a..03ea37bb8 100644 --- a/src/JSystem/JKernel/JKRStdHeap.cpp +++ b/src/JSystem/JKernel/JKRStdHeap.cpp @@ -57,9 +57,9 @@ JKRStdHeap::~JKRStdHeap() { } static void dummy() { - OSReport("JKRStdHeap.cpp"); - OSReport("allocFixed from %x to %x in heap %x"); - OSReport("allocFixed: cannot alloc memory (from %x to %x).\n"); + DEAD_STRING("JKRStdHeap.cpp"); + DEAD_STRING("allocFixed from %x to %x in heap %x"); + DEAD_STRING("allocFixed: cannot alloc memory (from %x to %x).\n"); } /* 802B1104-802B11A4 .text do_alloc__10JKRStdHeapFUli */ diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 8ae75a846..5ec2306ac 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -158,6 +158,6 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { } static void dummy() { - OSReport("Cannot create JKRTask Manager."); - OSReport("sManager != 0"); + DEAD_STRING("Cannot create JKRTask Manager."); + DEAD_STRING("sManager != 0"); } diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/src/JSystem/JParticle/JPABaseShape.cpp index 3c8c46fcf..e2efab1df 100644 --- a/src/JSystem/JParticle/JPABaseShape.cpp +++ b/src/JSystem/JParticle/JPABaseShape.cpp @@ -125,9 +125,9 @@ GXColor* makeColorTable(JPAColorRegAnmKey* pKey, int keyNum, int frmNum, JKRHeap } static void dummy() { - OSReport("texTable"); - OSReport("(*((s16*) (bin + 20))) != 0"); - OSReport("(*((s16*) (bin + 22))) != 0"); + DEAD_STRING("texTable"); + DEAD_STRING("(*((s16*) (bin + 20))) != 0"); + DEAD_STRING("(*((s16*) (bin + 22))) != 0"); // Fakematch? Fixes weak function order of JPABaseShape::~JPABaseShape() JPABaseShape* temp = NULL; diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp index 8c22d3eaf..c1adb50b0 100644 --- a/src/JSystem/JParticle/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -29,7 +29,7 @@ void JPATextureResource::registration(JPATexture* res) { } static void dummy() { - OSReport("pTexResArray[registNum]"); + DEAD_STRING("pTexResArray[registNum]"); } /* 80258DE4-80258E70 .text __ct__18JPAEmitterResourceFUlP7JKRHeap */ @@ -41,10 +41,10 @@ JPAEmitterResource::JPAEmitterResource(u32 num, JKRHeap* heap) { } static void dummy2() { - OSReport("(eArraySize != 0) && (tArraySize != 0)"); - OSReport("pEmtrResMgr && pTexResMgr"); - OSReport("jpa file %s was not found\n"); - OSReport("binData"); + DEAD_STRING("(eArraySize != 0) && (tArraySize != 0)"); + DEAD_STRING("pEmtrResMgr && pTexResMgr"); + DEAD_STRING("jpa file %s was not found\n"); + DEAD_STRING("binData"); } /* 80258E70-80258F18 .text registration__18JPAEmitterResourceFP14JPAEmitterDataUs */ diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 74e34d265..8f2fdbcf9 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -73,7 +73,7 @@ JUTConsole::JUTConsole(uint param_0, uint maxLines, bool param_2) { } static void dummy1() { - OSReport("console != 0"); + DEAD_STRING("console != 0"); } /* 802CA5AC-802CA658 .text __dt__10JUTConsoleFv */ @@ -348,9 +348,9 @@ JUTConsoleManager::JUTConsoleManager() { } static void dummy2() { - OSReport("console != this && console != 0"); - OSReport("\n:::dump of console[%x]----------------\n"); - OSReport(":::dump of console[%x] END------------\n"); + DEAD_STRING("console != this && console != 0"); + DEAD_STRING("\n:::dump of console[%x]----------------\n"); + DEAD_STRING(":::dump of console[%x] END------------\n"); } /* 802CB2E8-802CB380 .text createManager__17JUTConsoleManagerFP7JKRHeap */ @@ -366,7 +366,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { } static void dummy3() { - OSReport("consoleManager != 0 && sManager == consoleManager"); + DEAD_STRING("consoleManager != 0 && sManager == consoleManager"); } /* 802CB380-802CB4C4 .text appendConsole__17JUTConsoleManagerFP10JUTConsole */ diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index 33e1f92a4..73262e3ed 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -521,15 +521,15 @@ bool JUTGamePad::recalibrate(u32 mask) { } static void dummy() { - OSReport("JUTGamePad.cpp"); - OSReport("getDataSizePerFrame() > 0"); - OSReport("Halt"); - OSReport("mBuffer"); - OSReport("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd"); - OSReport("part != 0"); - OSReport("getBuffer() == getDataEnd() || part == mPart"); - OSReport("JUTGamePad.h"); - OSReport("size > 0"); - OSReport("mBuffer && isValidData( mCurrent )"); - OSReport("mBuffer && isValidBuffer( mCurrent )"); + DEAD_STRING("JUTGamePad.cpp"); + DEAD_STRING("getDataSizePerFrame() > 0"); + DEAD_STRING("Halt"); + DEAD_STRING("mBuffer"); + DEAD_STRING("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd"); + DEAD_STRING("part != 0"); + DEAD_STRING("getBuffer() == getDataEnd() || part == mPart"); + DEAD_STRING("JUTGamePad.h"); + DEAD_STRING("size > 0"); + DEAD_STRING("mBuffer && isValidData( mCurrent )"); + DEAD_STRING("mBuffer && isValidBuffer( mCurrent )"); } diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 77862e20b..665de5d74 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -123,7 +123,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber } static void dummy() { - OSReport("JX:: disp = %d\n"); - OSReport("JX:: drawing %d -> "); - OSReport("%d\n"); + DEAD_STRING("JX:: disp = %d\n"); + DEAD_STRING("JX:: drawing %d -> "); + DEAD_STRING("%d\n"); } diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp index 99de741af..85628ea63 100644 --- a/src/SSystem/SComponent/c_bg_s.cpp +++ b/src/SSystem/SComponent/c_bg_s.cpp @@ -72,7 +72,7 @@ bool cBgS::Regist(cBgW* bgw, fpc_ProcID pid, void* actor) { } static void dummy() { - OSReport("c_bg_s_poly_info.h"); + DEAD_STRING("c_bg_s_poly_info.h"); } /* 80246600-8024669C .text Release__4cBgSFP4cBgW */ @@ -239,7 +239,7 @@ cM3dGPla* cBgS::GetTriPla(int bg_index, int poly_index) const { static void dummy2() { // from c_bg_s_poly_info.h - OSReport("0 <= grp_index && grp_index < pm_bgd->m_g_num"); + DEAD_STRING("0 <= grp_index && grp_index < pm_bgd->m_g_num"); } /* 802470B8-80247178 .text GetTriPnt__4cBgSCFR13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz */ diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 439c6c232..158848a7c 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -555,7 +555,7 @@ cPhs_State cDyl_Link(s16 i_ProfName) { #if VERSION > VERSION_DEMO static void dummy() { - OSReport_Error("cDyl_LinkASync: リンクに失敗しました。諦めます\n"); + DEAD_STRING("cDyl_LinkASync: リンクに失敗しました。諦めます\n"); } #endif diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 6e3a7cc81..cc02fa748 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -24,7 +24,7 @@ daDk_HIO_c::daDk_HIO_c() { } static void dummy(f32* out) { - OSReport("Dk"); + DEAD_STRING("Dk"); *out = 0.0f; *out = -1.0f; } diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 4b7c85f1b..e10d83f7c 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -635,12 +635,12 @@ J3DModelData* daNpc_Jb1_c::create_Anm() { // Probably unused JUT_ASSERTS static void dummy() { - OSReport("m_app_mdl != 0"); - OSReport("m_app_bck != 0"); - OSReport("m_app_btk != 0"); - OSReport("m_app_brk != 0"); - OSReport("splash"); - OSReport("m_spl_jnt_num >= 0"); + DEAD_STRING("m_app_mdl != 0"); + DEAD_STRING("m_app_bck != 0"); + DEAD_STRING("m_app_btk != 0"); + DEAD_STRING("m_app_brk != 0"); + DEAD_STRING("splash"); + DEAD_STRING("m_spl_jnt_num >= 0"); } /* 00001A0C-00001B78 .text create_lgt__11daNpc_Jb1_cFv */ diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index 98bfbc8f3..335ea6aac 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -86,10 +86,10 @@ void daNpc_Tt_c::setAnmStatus() { //probably unused JUT_ASSERT static void dummy() { - OSReport("Tt"); - OSReport("d_a_npc_tt.cpp"); - OSReport("0"); - OSReport("Halt"); + DEAD_STRING("Tt"); + DEAD_STRING("d_a_npc_tt.cpp"); + DEAD_STRING("0"); + DEAD_STRING("Halt"); } #include "d/actor/d_a_npc_tt_anm.inc" diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index 22fd41dbe..bbabbd065 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -28,9 +28,9 @@ const u32 daYgcwp_c::M_brk_mode_table[] = { const char daYgcwp_c::M_arcname[6] = "Ygcwp"; static void dummy() { - OSReport("rtn_warp"); - OSReport("fg_warp0"); - OSReport("fg_warp1"); + DEAD_STRING("rtn_warp"); + DEAD_STRING("fg_warp0"); + DEAD_STRING("fg_warp1"); } static char* M_act_table[] = { diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 685797f4c..7c815f31c 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -76,7 +76,7 @@ dBgS_Acch::dBgS_Acch() { } static void dummy1() { - OSReport("***********************************\ndBgS_Acch::copy constructer called.\n***********************************\n"); + DEAD_STRING("***********************************\ndBgS_Acch::copy constructer called.\n***********************************\n"); } /* 800A2CFC-800A2D78 .text Init__9dBgS_AcchFv */ @@ -451,6 +451,6 @@ f32 dBgS_Acch::GetWallAddY(Vec& vec, int) { } static void dummy2() { - OSReport("\x1B[43;30m**************************************\ndBgS_ObjAcch::copy constructer called.\n**************************************\n\033[m"); + DEAD_STRING("\x1B[43;30m**************************************\ndBgS_ObjAcch::copy constructer called.\n**************************************\n\033[m"); dBgS_ObjAcch acch; // fakematch to get dBgS_ObjAcch's vtable and destructor to show up in this TU } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 690a580a1..2c600871d 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1226,10 +1226,10 @@ int dComIfGd_setShadow(u32 id, s8 shouldFade, J3DModel* pModel, cXyz* pPos, f32 } static void dummy() { - OSReport("0 <= cam_id && cam_id < mapc->num"); - OSReport("0 <= arrow_id && arrow_id < mapa->num"); - OSReport("0 <= room_cam_id && room_cam_id < pcam->num"); - OSReport("0 <= arrow_id && arrow_id < parr->num"); + DEAD_STRING("0 <= cam_id && cam_id < mapc->num"); + DEAD_STRING("0 <= arrow_id && arrow_id < mapa->num"); + DEAD_STRING("0 <= room_cam_id && room_cam_id < pcam->num"); + DEAD_STRING("0 <= arrow_id && arrow_id < parr->num"); } /* 8005468C-800547BC .text getSceneList__Fi */ diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 6d68f13db..519b91efd 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -680,7 +680,7 @@ bool dDemo_manager_c::create(const u8* r29, cXyz* r30, f32 f31) { static void dummy() { // "Demo data reloading error!!\n" - OSReport_Error("デモデータ再読み込みエラー！！\n"); + DEAD_STRING("デモデータ再読み込みエラー！！\n"); } /* 8006B0D4-8006B12C .text remove__15dDemo_manager_cFv */ diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 7ddb80651..deb3e2bfb 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -614,7 +614,7 @@ void dEvent_manager_c::exceptionProc() { } static void dummy1() { - OSReport("EVENT_DEBUG_OFF"); + DEAD_STRING("EVENT_DEBUG_OFF"); } diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index eec41fddd..23aa3775c 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -130,7 +130,7 @@ bool dLib_btkInit(J3DModelData* modelData, mDoExt_btkAnm* anm, const char* arcNa } static void dummy() { - OSReport("bck != 0"); + DEAD_STRING("bck != 0"); } /* 800576B0-80057844 .text dLib_setAnm__FPCcP14mDoExt_McaMorfPScPScPScPC14dLib_anm_idx_cPC14dLib_anm_prm_cb */ diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index ce13acbe9..36c1be561 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -27,42 +27,42 @@ // TODO: Remove me when all the JUT asserts and other strings are filled out. // This is temporary, just to make the strings match. static void dummy0() { - OSReport("cmap_tri.bti"); - OSReport("cmap_treasure.bti"); - OSReport("cmap_tingle.bti"); - OSReport("cmap_phantomship.bti"); - OSReport("cmap_hint.bti"); - OSReport("f_item_tri.bti"); - OSReport("f_get_rupy.bti"); - OSReport("f_heart_up_02.bti"); - OSReport("f_korog_kare.bti"); - OSReport("f_korog_saki.bti"); - OSReport("d_menu_window.cpp"); - OSReport("i_Ms->name[i] != 0"); - OSReport("Halt"); - OSReport(""); - OSReport("i_Ms->note[i] != 0"); - OSReport("i_Ms->dummy[i] != 0"); - OSReport("i_Ms->buffer_p[i] != 0"); + DEAD_STRING("cmap_tri.bti"); + DEAD_STRING("cmap_treasure.bti"); + DEAD_STRING("cmap_tingle.bti"); + DEAD_STRING("cmap_phantomship.bti"); + DEAD_STRING("cmap_hint.bti"); + DEAD_STRING("f_item_tri.bti"); + DEAD_STRING("f_get_rupy.bti"); + DEAD_STRING("f_heart_up_02.bti"); + DEAD_STRING("f_korog_kare.bti"); + DEAD_STRING("f_korog_saki.bti"); + DEAD_STRING("d_menu_window.cpp"); + DEAD_STRING("i_Ms->name[i] != 0"); + DEAD_STRING("Halt"); + DEAD_STRING(""); + DEAD_STRING("i_Ms->note[i] != 0"); + DEAD_STRING("i_Ms->dummy[i] != 0"); + DEAD_STRING("i_Ms->buffer_p[i] != 0"); #if VERSION == VERSION_PAL - OSReport("i_Ms->title_p != 0"); + DEAD_STRING("i_Ms->title_p != 0"); #endif - OSReport("dMi_c != 0"); - OSReport("dMc_c != 0"); - OSReport("dMf_c != 0"); - OSReport("dMs_capture_c != 0"); - OSReport("dMd_c != 0"); - OSReport("dNm_c != 0"); - OSReport("dMs_c != 0"); - OSReport("cloth_c != 0"); - OSReport("dMs_cloth_c != 0"); - OSReport("i_Ms->childHeap != 0"); - OSReport("awake"); - OSReport("majyuu_shinnyuu"); - OSReport("アイテムビット"); - OSReport("ダンジョンビット"); - OSReport("fonttype != 0"); - OSReport("rfonttype != 0"); + DEAD_STRING("dMi_c != 0"); + DEAD_STRING("dMc_c != 0"); + DEAD_STRING("dMf_c != 0"); + DEAD_STRING("dMs_capture_c != 0"); + DEAD_STRING("dMd_c != 0"); + DEAD_STRING("dNm_c != 0"); + DEAD_STRING("dMs_c != 0"); + DEAD_STRING("cloth_c != 0"); + DEAD_STRING("dMs_cloth_c != 0"); + DEAD_STRING("i_Ms->childHeap != 0"); + DEAD_STRING("awake"); + DEAD_STRING("majyuu_shinnyuu"); + DEAD_STRING("アイテムビット"); + DEAD_STRING("ダンジョンビット"); + DEAD_STRING("fonttype != 0"); + DEAD_STRING("rfonttype != 0"); } dMenu_FmapSv_c dMv_CIO_c; diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 48d04c394..f6d4c6b26 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -78,21 +78,21 @@ dDlst_2Dm_c tekari; dDlst_2Dm_c clock[3]; static void dummy(f32* m, u32 p2, s32 p3) { - OSReport("cmap_tri.bti"); - OSReport("cmap_treasure.bti"); - OSReport("cmap_tingle.bti"); - OSReport("cmap_phantomship.bti"); - OSReport("cmap_hint.bti"); - OSReport("f_item_tri.bti"); + DEAD_STRING("cmap_tri.bti"); + DEAD_STRING("cmap_treasure.bti"); + DEAD_STRING("cmap_tingle.bti"); + DEAD_STRING("cmap_phantomship.bti"); + DEAD_STRING("cmap_hint.bti"); + DEAD_STRING("f_item_tri.bti"); #if VERSION == VERSION_DEMO - OSReport("get_rupy.bti"); - OSReport("heart_up_02.bti"); + DEAD_STRING("get_rupy.bti"); + DEAD_STRING("heart_up_02.bti"); #else - OSReport("f_get_rupy.bti"); - OSReport("f_heart_up_02.bti"); + DEAD_STRING("f_get_rupy.bti"); + DEAD_STRING("f_heart_up_02.bti"); #endif - OSReport("f_korog_kare.bti"); - OSReport("f_korog_saki.bti"); + DEAD_STRING("f_korog_kare.bti"); + DEAD_STRING("f_korog_saki.bti"); m[0] = 0.8f; m[1] = 0.0f; m[2] = 1.2f; diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index d36b7712f..c6c055767 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -1521,8 +1521,8 @@ void dMsg_numberInput(sub_msg_class* i_Msg) { } static void dummy() { - OSReport("hukidashi_021.bti"); - OSReport("texture != 0"); + DEAD_STRING("hukidashi_021.bti"); + DEAD_STRING("texture != 0"); }; /* 80210CA4-80210F28 .text dMsg_tactInput__FP13sub_msg_class */ diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 3388eb518..49767ee00 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -479,7 +479,7 @@ static SArcHeader* getArcHeader(JKRArchive* pArchive) { } static void dummy() { - OSReport("%5.1f %5x %5.1f %5x %3d %s\n"); + DEAD_STRING("%5.1f %5x %5.1f %5x %3d %s\n"); } /* 8006EBF8-8006ECF4 .text dump_long__11dRes_info_cFP11dRes_info_ci */ diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 966ec4157..820d44f67 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -285,10 +285,10 @@ void dScnName_c::cloth2D_create() { } static void dummy() { - OSReport("baseMdl != 0"); - OSReport("baseMdl->getModel() != 0"); - OSReport("brkAnm != 0"); - OSReport("res != 0"); + DEAD_STRING("baseMdl != 0"); + DEAD_STRING("baseMdl->getModel() != 0"); + DEAD_STRING("brkAnm != 0"); + DEAD_STRING("res != 0"); } /* 802302F8-80230500 .text buttonIconCreate__10dScnName_cFv */ diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 4d4e199d6..7d0c0654b 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1150,7 +1150,7 @@ BOOL dSv_memBit_c::isDungeonItem(int i_no) { } static void dummy() { - OSReport("(123 <= i_no) && (i_no <= 132)"); + DEAD_STRING("(123 <= i_no) && (i_no <= 132)"); } /* 8005C8E8-8005C908 .text init__11dSv_ocean_cFv */ diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index db9bb5d72..0b1cff1fc 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -9438,7 +9438,7 @@ void fopMsgM_msgDataProc_c::tag_stock_pendant() { #if VERSION == VERSION_PAL static void dummy() { - OSReport(" "); + DEAD_STRING(" "); } #endif @@ -10192,6 +10192,6 @@ void fopMsgM_destroyExpHeap(JKRExpHeap* i_heap) { } static void dummy2() { - OSReport("\x1B""CU[%d]"); - OSReport("\x1B""CD[%d]"); + DEAD_STRING("\x1B""CU[%d]"); + DEAD_STRING("\x1B""CD[%d]"); } diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 34ce4e60d..8df17ca81 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -323,14 +323,14 @@ BOOL mDoDvdThd_toMainRam_c::execute() { } static void dummy2() { - OSReport("m_Do_dvd_thread.cpp"); - OSReport("mArchive != 0"); - OSReport("Halt"); - OSReport("archive"); - OSReport("mDoDvdThd_getResource_c::create() クラス生成に失敗\n"); - OSReport("mDoDvdThd_getResource_c::create() リソース取得に失敗\n"); - OSReport("entry"); - OSReport("mArchive"); - OSReport("mDoDvdThd_getResource_c::execute() リソース取得に失敗\n"); - OSReport("mEntryNum != -1"); + DEAD_STRING("m_Do_dvd_thread.cpp"); + DEAD_STRING("mArchive != 0"); + DEAD_STRING("Halt"); + DEAD_STRING("archive"); + DEAD_STRING("mDoDvdThd_getResource_c::create() クラス生成に失敗\n"); + DEAD_STRING("mDoDvdThd_getResource_c::create() リソース取得に失敗\n"); + DEAD_STRING("entry"); + DEAD_STRING("mArchive"); + DEAD_STRING("mDoDvdThd_getResource_c::execute() リソース取得に失敗\n"); + DEAD_STRING("mEntryNum != -1"); } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 5920008b7..96c93c6a9 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -980,11 +980,11 @@ JKRExpHeap* mDoExt_getArchiveHeap() { } static void dummy() { - OSReport("situationHeap == 0 || heapSize == 0"); - OSReport("situationHeapLocked == 0"); - OSReport("situationHeap"); - OSReport("situationHeapLocked"); - OSReport("heap == situationHeap"); + DEAD_STRING("situationHeap == 0 || heapSize == 0"); + DEAD_STRING("situationHeapLocked == 0"); + DEAD_STRING("situationHeap"); + DEAD_STRING("situationHeapLocked"); + DEAD_STRING("heap == situationHeap"); } /* 80011ABC-80011B54 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */ diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 4f68fd592..236ef6e38 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -273,7 +273,7 @@ void myExceptionCallback(OSError, OSContext*, u32, u32) { #if VERSION == VERSION_DEMO static void dummy() { - OSReport("myAllocCallback: 条件一致しました\n"); + DEAD_STRING("myAllocCallback: 条件一致しました\n"); } #endif diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index c5c19ae89..208167782 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -29,7 +29,7 @@ void print(const char* string) { } static void dummy() { - OSReport("--------------------------------------\n"); + DEAD_STRING("--------------------------------------\n"); } #if VERSION == VERSION_DEMO