From ba7cdd4fe9919cca0419950995f6d80583299953 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 9 Nov 2025 14:43:14 -0500 Subject: [PATCH] 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 --- .clang-format | 2 + config/GZ2E01/rels/d_a_e_bee/symbols.txt | 1 + config/RZDE01_00/rels/d_a_e_yh/symbols.txt | 2 +- config/RZDE01_02/rels/d_a_e_yh/symbols.txt | 2 +- config/ShieldD/splits.txt | 8 +- config/ShieldD/symbols.txt | 18 +- configure.py | 10 +- include/DynamicLink.h | 1 + include/JSystem/JFramework/JFWSystem.h | 33 +- include/JSystem/JKernel/JKRAramStream.h | 4 + include/JSystem/JKernel/JKRHeap.h | 8 + include/Z2AudioLib/Z2SoundObject.h | 7 +- include/d/actor/d_a_balloon_2D.h | 3 - include/m_Do/m_Do_ext.h | 1 + include/m_Do/m_Do_machine.h | 2 +- include/revolution/vi/vitypes.h | 1 + src/JSystem/JFramework/JFWSystem.cpp | 2 +- src/d/actor/d_a_b_ds.cpp | 175 +------- src/d/actor/d_a_b_yo.cpp | 174 +------- src/d/actor/d_a_e_arrow.cpp | 186 +-------- src/d/actor/d_a_e_bee.cpp | 208 +--------- src/d/actor/d_a_e_fb.cpp | 2 +- src/d/actor/d_a_e_oct_bg.cpp | 177 +------- src/d/actor/d_a_e_tt.cpp | 175 +------- src/d/actor/d_a_e_vt.cpp | 175 +------- src/d/actor/d_a_e_yh.cpp | 2 +- src/d/actor/d_a_kytag06.cpp | 174 +------- src/d/actor/d_a_mg_fshop.cpp | 175 +------- src/d/actor/d_a_npc_chat.cpp | 12 +- src/d/actor/d_a_npc_doc.cpp | 175 +------- src/d/actor/d_a_npc_gnd.cpp | 2 +- src/d/actor/d_a_npc_gra.cpp | 175 +------- src/d/actor/d_a_npc_grd.cpp | 175 +------- src/d/actor/d_a_npc_gro.cpp | 175 +------- src/d/actor/d_a_npc_grs.cpp | 175 +------- src/d/actor/d_a_npc_moi.cpp | 10 +- src/d/actor/d_a_npc_post.cpp | 175 +------- src/d/actor/d_a_npc_soldierB.cpp | 175 +------- src/d/actor/d_a_npc_toby.cpp | 6 +- src/d/actor/d_a_obj_lv4bridge.cpp | 2 +- src/d/actor/d_a_obj_lv4prwall.cpp | 2 +- src/d/actor/d_a_obj_mirror_table.cpp | 22 +- src/d/actor/d_a_obj_rotBridge.cpp | 2 +- src/d/actor/d_a_obj_stopper2.cpp | 2 +- src/d/actor/d_a_obj_swLight.cpp | 2 +- src/d/actor/d_a_obj_swchain.cpp | 4 +- src/d/d_kankyo.cpp | 6 +- src/m_Do/m_Do_machine.cpp | 450 +++++++++++++-------- src/m_Do/m_Do_main.cpp | 25 +- 49 files changed, 480 insertions(+), 3020 deletions(-) diff --git a/.clang-format b/.clang-format index 867b90cecc..1428d3c71e 100644 --- a/.clang-format +++ b/.clang-format @@ -45,6 +45,8 @@ DerivePointerAlignment: false DisableFormat: false ForEachMacros: [] IncludeCategories: + - Regex: '"(?:d/dolzel(_rel)|JSystem/JSystem)?\.h"' + Priority: -1000 - Regex: '^<[Ww]indows\.h>$' Priority: 1 - Regex: '^<' diff --git a/config/GZ2E01/rels/d_a_e_bee/symbols.txt b/config/GZ2E01/rels/d_a_e_bee/symbols.txt index a3385370eb..8d9f657de5 100644 --- a/config/GZ2E01/rels/d_a_e_bee/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bee/symbols.txt @@ -111,6 +111,7 @@ lbl_173_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte lbl_173_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte @4455 = .bss:0x00000068; // type:object size:0xC scope:local +init$2267 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 non$4454 = .bss:0x00000078; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000088; // type:object size:0x4 scope:global diff --git a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt index 9ce8f1c3ec..d7cdc8475c 100644 --- a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt @@ -148,6 +148,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C @95827 = .data:0x00000418; // type:object size:0xC scope:local lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local +l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt index 894e57b4eb..15d75d34c4 100644 --- a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt @@ -158,6 +158,6 @@ __RTTI__15cBgS_GrpPassChk = .data:0x0000046C; // type:object size:0x58 scope:glo __RTTI__13JORReflexible = .data:0x000004C4; // type:object size:0x8 scope:global align:4 __vt__12J3DFrameCtrl = .data:0x000004CC; // type:object size:0x24 scope:global align:4 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global align:4 -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local +l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local align:4 l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global align:4 data:byte diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 98a0f80be8..0dc23bc49d 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -47,16 +47,16 @@ m_Do/m_Do_graphic.cpp: .text start:0x8000DBD0 end:0x800163A0 .ctors start:0x8062F7CC end:0x8062F7D0 .data start:0x80661190 end:0x80661890 - .sdata start:0x8073F2F0 end:0x8073F364 - .sbss start:0x8074C310 end:0x8074C388 + .sdata start:0x8073F2F0 end:0x8073F360 + .sbss start:0x8074C310 end:0x8074C380 .sdata2 start:0x8074D780 end:0x8074D870 .bss start:0x80755780 end:0x80755868 m_Do/m_Do_machine.cpp: .text start:0x800163A0 end:0x80017DE0 .data start:0x80661890 end:0x80661ED0 - .sdata start:0x8073F364 end:0x8073F3E8 - .sbss start:0x8074C388 end:0x8074C3B0 + .sdata start:0x8073F360 end:0x8073F3E8 + .sbss start:0x8074C380 end:0x8074C3B0 .sdata2 start:0x8074D870 end:0x8074D878 .bss start:0x80755868 end:0x807558E0 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 1e45a75079..40e544e6d4 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -56964,10 +56964,10 @@ __RTTI__12mDoGph_HIO_c = .sdata:0x8073F340; // type:object size:0x8 scope:global __RTTI__15dDlst_heapMap_c = .sdata:0x8073F348; // type:object size:0x8 scope:global hash:0xA50805B2 dhash:0x6FBC6996 __RTTI__12dDlst_base_c = .sdata:0x8073F350; // type:object size:0x8 scope:global hash:0xED29DC00 dhash:0x7919B4C3 @STRING@getPortStatus__10JUTGamePadFQ210JUTGamePad8EPadPort@2 = .sdata:0x8073F358; // type:object size:0x5 scope:local data:string hash:0x3DF2356D dhash:0x5FD505CF -lbl_8073F360 = .sdata:0x8073F360; // type:object size:0x1 data:byte hash:0x770BE7C0 dhash:0x1233C916 -lbl_8073F361 = .sdata:0x8073F361; // type:object size:0x1 data:byte hash:0x86CEFEB6 dhash:0x39A3EA60 -lbl_8073F362 = .sdata:0x8073F362; // type:object size:0x1 data:byte hash:0x8BC2EDFC dhash:0x37963EEA -lbl_8073F363 = .sdata:0x8073F363; // type:object size:0x1 data:byte hash:0x27F09799 dhash:0x2356ACAF +mDebugFill__6mDoMch = .sdata:0x8073F360; // type:object size:0x1 data:byte hash:0x770BE7C0 dhash:0x1233C916 +mDebugFillNotUse__6mDoMch = .sdata:0x8073F361; // type:object size:0x1 data:byte hash:0x86CEFEB6 dhash:0x39A3EA60 +mDebugFillNew__6mDoMch = .sdata:0x8073F362; // type:object size:0x1 data:byte hash:0x8BC2EDFC dhash:0x37963EEA +mDebugFillDelete__6mDoMch = .sdata:0x8073F363; // type:object size:0x1 data:byte hash:0x27F09799 dhash:0x2356ACAF mRenderModeObj__15mDoMch_render_c = .sdata:0x8073F364; // type:object size:0x4 scope:global data:4byte hash:0xB51C70AB dhash:0x7255B94F @114420 = .sdata:0x8073F368; // type:object size:0x8 scope:local data:string hash:0xAC930EC7 @114421 = .sdata:0x8073F370; // type:object size:0x5 scope:local data:string hash:0xAC930EC6 @@ -64170,11 +64170,11 @@ m_csr__13mDoGph_gInf_c = .sbss:0x8074C364; // type:object size:0x4 scope:global m_heap__13mDoGph_gInf_c = .sbss:0x8074C368; // type:object size:0x4 scope:global data:4byte hash:0x8D1D5775 dhash:0xFBA20237 @LOCAL@drawDepth2__FP10view_classP15view_port_classi@l_tevColor0 = .sbss:0x8074C370; // type:object size:0x8 scope:local data:4byte hash:0x021C56A2 dhash:0xA2341A0F mDoGph_HIO = .sbss:0x8074C378; // type:object size:0x8 scope:global hash:0xCDDF850D -lbl_8074C380 = .sbss:0x8074C380; // type:object size:0x1 hash:0x5B5A5D41 dhash:0x80224177 -lbl_8074C381 = .sbss:0x8074C381; // type:object size:0x1 hash:0x735CFD14 dhash:0x6A8C0F42 -lbl_8074C382 = .sbss:0x8074C382; // type:object size:0x1 data:byte hash:0xE570A767 dhash:0xAB04DC91 -lbl_8074C383 = .sbss:0x8074C383; // type:object size:0x1 data:byte hash:0x8A6D3020 dhash:0x24107736 -lbl_8074C384 = .sbss:0x8074C384; // type:object size:0x1 data:byte hash:0x7B40A2F1 dhash:0xE9D49147 +myHeapVerbose__6mDoMch = .sbss:0x8074C380; // type:object size:0x1 hash:0x5B5A5D41 dhash:0x80224177 +myHeapCallbackCheck__6mDoMch = .sbss:0x8074C381; // type:object size:0x1 hash:0x735CFD14 dhash:0x6A8C0F42 +FpscrEnableBits__6mDoMch = .sbss:0x8074C382; // type:object size:0x1 data:byte hash:0xE570A767 dhash:0xAB04DC91 +GXWarningLevel__6mDoMch = .sbss:0x8074C383; // type:object size:0x1 data:byte hash:0x8A6D3020 dhash:0x24107736 +GXWarningExecuteFrame__6mDoMch = .sbss:0x8074C384; // type:object size:0x1 data:byte hash:0x7B40A2F1 dhash:0xE9D49147 lbl_8074C385 = .sbss:0x8074C385; // type:object size:0x1 data:byte hash:0x864F750C dhash:0x12B501DA solidHeapErrors = .sbss:0x8074C388; // type:object size:0x4 scope:global data:4byte hash:0x3F1F4CCF gameHeapErrors = .sbss:0x8074C38C; // type:object size:0x4 scope:global data:4byte hash:0x9601B0DC diff --git a/configure.py b/configure.py index a6c04441e2..9936797d49 100755 --- a/configure.py +++ b/configure.py @@ -500,7 +500,7 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_controller_pad.cpp"), Object(NonMatching, "m_Do/m_Re_controller_pad.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_graphic.cpp"), - Object(NonMatching, "m_Do/m_Do_machine.cpp"), + Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_machine.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_mtx.cpp"), Object(NonMatching, "m_Do/m_Do_ext.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_lib.cpp"), @@ -1729,7 +1729,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ai"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_arrow"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ba"), - ActorRel(NonMatching, "d_a_e_bee"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_bee"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_bg"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_bi"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_bi_leaf"), @@ -1892,12 +1892,12 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_lf"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_lud"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_midp"), - ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_mk"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01", "ShieldD"), "d_a_npc_mk"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_moi"), ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_myna2", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_ne"), - ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_p2"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01", "ShieldD"), "d_a_npc_p2"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_pachi_besu"), ActorRel(NonMatching, "d_a_npc_pachi_maro"), ActorRel(NonMatching, "d_a_npc_pachi_taro"), @@ -2308,7 +2308,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_wara_howl"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_watchge"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_waterfall"), - ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_wljump"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_wljump"), # debug weak func order ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tag_yami"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_talk"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_tboxSw"), diff --git a/include/DynamicLink.h b/include/DynamicLink.h index 21ea5b722f..fc07cec7d4 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -38,6 +38,7 @@ struct DynamicModuleControlBase { /* 80262364 */ BOOL unlink(); /* 802623EC */ BOOL load_async(); /* 8026242C */ bool force_unlink(); + static JKRHeap* createHeap(u32, JKRHeap*); static inline DynamicModuleControlBase* getFirstClass() { return mFirst; } inline DynamicModuleControlBase* getNextClass() { return mNext; } diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index dfdbf31def..98238c1a99 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -2,6 +2,7 @@ #define JFWSYSTEM_H #include "dolphin/types.h" +#include "JSystem/JUtility/JUTAssert.h" typedef struct _GXRenderModeObj GXRenderModeObj; class JKRExpHeap; @@ -27,7 +28,7 @@ struct JFWSystem { static s32 decompPriority; static s32 aPiecePriority; static ResFONT* systemFontRes; - static GXRenderModeObj* renderMode; + static const GXRenderModeObj* renderMode; static u32 exConsoleBufferSize; }; @@ -38,12 +39,30 @@ struct JFWSystem { static JKRExpHeap* getSystemHeap() { return systemHeap; } static JUTResFont* getSystemFont() { return systemFont; } - static void setMaxStdHeap(s32 max) { CSetUpParam::maxStdHeaps = max; } - static void setSysHeapSize(u32 size) { CSetUpParam::sysHeapSize = size; } - static void setFifoBufSize(u32 size) { CSetUpParam::fifoBufSize = size; } - static void setAramAudioBufSize(u32 size) { CSetUpParam::aramAudioBufSize = size; } - static void setAramGraphBufSize(u32 size) { CSetUpParam::aramGraphBufSize = size; } - static void setRenderMode(GXRenderModeObj* p_modeObj) { CSetUpParam::renderMode = p_modeObj; } + static void setMaxStdHeap(int max) { + JUT_ASSERT(47, sInitCalled == FALSE); + CSetUpParam::maxStdHeaps = max; + } + static void setSysHeapSize(u32 size) { + JUT_ASSERT(50, sInitCalled == FALSE); + CSetUpParam::sysHeapSize = size; + } + static void setFifoBufSize(u32 size) { + JUT_ASSERT(53, sInitCalled == FALSE); + CSetUpParam::fifoBufSize = size; + } + static void setAramAudioBufSize(u32 size) { + JUT_ASSERT(58, sInitCalled == FALSE); + CSetUpParam::aramAudioBufSize = size; + } + static void setAramGraphBufSize(u32 size) { + JUT_ASSERT(61, sInitCalled == FALSE); + CSetUpParam::aramGraphBufSize = size; + } + static void setRenderMode(const GXRenderModeObj* p_modeObj) { + JUT_ASSERT(80, sInitCalled == FALSE); + CSetUpParam::renderMode = p_modeObj; + } static JKRExpHeap* rootHeap; static JKRExpHeap* systemHeap; diff --git a/include/JSystem/JKernel/JKRAramStream.h b/include/JSystem/JKernel/JKRAramStream.h index a5eb0b468f..a1a78a6706 100644 --- a/include/JSystem/JKernel/JKRAramStream.h +++ b/include/JSystem/JKernel/JKRAramStream.h @@ -77,4 +77,8 @@ inline JKRAramStreamCommand* JKRStreamToAram_Async(JSUFileInputStream *stream, u return JKRAramStream::write_StreamToAram_Async(stream, addr, size, offset, returnSize); } +inline void JKRSetAramTransferBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) { + JKRAramStream::setTransBuffer(buffer, bufferSize, heap); +} + #endif /* JKRARAMSTREAM_H */ diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index cdc60480d5..474edf5757 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -253,6 +253,14 @@ inline JKRHeap* JKRGetRootHeap() { return JKRHeap::getRootHeap(); } +inline JKRErrorHandler JKRSetErrorHandler(JKRErrorHandler errorHandler) { + return JKRHeap::setErrorHandler(errorHandler); +} + +inline bool JKRSetErrorFlag(JKRHeap* heap, bool flag) { + return heap->setErrorFlag(flag); +} + #if PLATFORM_WII || PLATFORM_SHIELD inline JKRHeap* JKRGetRootHeap2() { return JKRHeap::getRootHeap2(); diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index 30c7157344..4bab61402e 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -17,6 +17,10 @@ public: bool isAlive() const { return mIsInitialized; } void setSoundStarter(Z2SoundStarter* i_soundStarter) { mSoundStarter = i_soundStarter; } +#if VERSION == VERSION_SHIELD_DEBUG + /* 0x10 */ u8 unk_0x10[0x20 - 0x10]; +#endif + virtual void framework(u32, s8 reverb); virtual void dispose(); virtual bool stopOK(Z2SoundHandlePool& pool); @@ -24,9 +28,6 @@ public: virtual Z2SoundHandlePool* startSound(JAISoundID, u32, s8); virtual Z2SoundHandlePool* startLevelSound(JAISoundID, u32, s8); -#if VERSION == VERSION_SHIELD_DEBUG - /* 0x14 */ u8 unk_0x14[0x24 - 0x14]; -#endif /* 0x14 */ Z2SoundStarter* mSoundStarter; /* 0x18 */ JGeometry::TVec3* mSoundPos; /* 0x1C */ u16 field_0x1c; diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h index 019e7d35c7..ec052c25e1 100644 --- a/include/d/actor/d_a_balloon_2D.h +++ b/include/d/actor/d_a_balloon_2D.h @@ -107,7 +107,4 @@ public: #include "f_op/f_op_actor_mng.h" -struct JKRExpHeap {}; - - #endif /* D_A_BALLOON_2D_H */ diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index f78bcdadd4..e4f36465d5 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -812,6 +812,7 @@ void mDoExt_modelTexturePatch(J3DModelData* i_modelData); #if VERSION == VERSION_SHIELD_DEBUG s32 mDoExt_getSafeZeldaHeapSize(); void mDoExt_addSafeZeldaHeapSize(s32); +JKRHeap* mDoExt_createHostIOHeap(u32, JKRHeap*); #endif struct JUTFont; diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 4fe72f05f0..a9bfa34485 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -32,7 +32,7 @@ public: namespace mDoMch { extern u8 mDebugFill; - extern u8 mDebugFillNotuse; + extern u8 mDebugFillNotUse; extern u8 mDebugFillNew; extern u8 mDebugFillDelete; diff --git a/include/revolution/vi/vitypes.h b/include/revolution/vi/vitypes.h index 807af6d5e9..d042cad2c3 100644 --- a/include/revolution/vi/vitypes.h +++ b/include/revolution/vi/vitypes.h @@ -24,6 +24,7 @@ typedef enum { VI_TVMODE_PAL_DS = VI_TVMODE(VI_PAL, VI_NON_INTERLACE), VI_TVMODE_EURGB60_INT = VI_TVMODE(VI_EURGB60, VI_INTERLACE), VI_TVMODE_EURGB60_DS = VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE), + VI_TVMODE_EURGB60_PROG = VI_TVMODE(VI_EURGB60, VI_PROGRESSIVE), VI_TVMODE_MPAL_INT = VI_TVMODE(VI_MPAL, VI_INTERLACE), VI_TVMODE_MPAL_DS = VI_TVMODE(VI_MPAL, VI_NON_INTERLACE), VI_TVMODE_DEBUG_INT = VI_TVMODE(VI_DEBUG, VI_INTERLACE), diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 0216f06b92..84dc644d34 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -58,7 +58,7 @@ s32 JFWSystem::CSetUpParam::aPiecePriority = 6; ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12; /* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */ -GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; +const GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; /* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata * exConsoleBufferSize__Q29JFWSystem11CSetUpParam */ diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 4b616ffb94..9888e8aef4 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -17,6 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" #include "f_op/f_op_actor_enemy.h" +#include "Z2AudioLib/Z2Instances.h" enum daB_DS_Joint { DS_JNT_BACKBONE1, @@ -5769,178 +5770,6 @@ static cPhs__Step daB_DS_Create(daB_DS_c* i_this) { return i_this->create(); } -/* ############################################################################################## */ -/* 805DE2AC-805DE2B0 000844 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_805DE2AC[4]; -#pragma pop - -/* 805DE2B0-805DE2B4 000848 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_805DE2B0[4]; -#pragma pop - -/* 805DE2B4-805DE2B8 00084C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2B4[4]; -#pragma pop - -/* 805DE2B8-805DE2BC 000850 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2B8[4]; -#pragma pop - -/* 805DE2BC-805DE2C0 000854 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2BC[4]; -#pragma pop - -/* 805DE2C0-805DE2C4 000858 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2C0[4]; -#pragma pop - -/* 805DE2C4-805DE2C8 00085C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2C4[4]; -#pragma pop - -/* 805DE2C8-805DE2CC 000860 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_805DE2C8[4]; -#pragma pop - -/* 805DE2CC-805DE2D0 000864 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_805DE2CC[4]; -#pragma pop - -/* 805DE2D0-805DE2D4 000868 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_805DE2D0[4]; -#pragma pop - -/* 805DE2D4-805DE2D8 00086C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2D4[4]; -#pragma pop - -/* 805DE2D8-805DE2DC 000870 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2D8[4]; -#pragma pop - -/* 805DE2DC-805DE2E0 000874 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2DC[4]; -#pragma pop - -/* 805DE2E0-805DE2E4 000878 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2E0[4]; -#pragma pop - -/* 805DE2E4-805DE2E8 00087C 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_805DE2E4[4]; -#pragma pop - -/* 805DE2E8-805DE2EC 000880 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_805DE2E8[4]; -#pragma pop - -/* 805DE2EC-805DE2F0 000884 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_805DE2EC[4]; -#pragma pop - -/* 805DE2F0-805DE2F4 000888 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_805DE2F0[4]; -#pragma pop - -/* 805DE2F4-805DE2F8 00088C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2F4[4]; -#pragma pop - -/* 805DE2F8-805DE2FC 000890 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE2F8[4]; -#pragma pop - -/* 805DE2FC-805DE300 000894 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_805DE2FC[4]; -#pragma pop - -/* 805DE300-805DE304 000898 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE300[4]; -#pragma pop - -/* 805DE304-805DE308 00089C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE304[4]; -#pragma pop - -/* 805DE308-805DE30C 0008A0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_805DE308[4]; -#pragma pop - -/* 805DE30C-805DE310 0008A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_805DE30C[4]; -#pragma pop - /* 805DD994-805DD9B4 -00001 0020+00 1/0 0/0 0/0 .data l_daB_DS_Method */ static actor_method_class l_daB_DS_Method = { (process_method_func)daB_DS_Create, (process_method_func)daB_DS_Delete, @@ -5965,3 +5794,5 @@ extern actor_process_profile_definition g_profile_B_DS = { fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, }; + +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 3e6a86ad76..3b1afa94ab 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -22,6 +22,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include "Z2AudioLib/Z2Instances.h" class daB_YO_HIO_c { public: @@ -3495,177 +3496,6 @@ static u32 m_common_count; } // namespace -/* 80639FFC-8063A000 0000CC 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80639FFC[4]; -#pragma pop - -/* 8063A000-8063A004 0000D0 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_8063A000[4]; -#pragma pop - -/* 8063A004-8063A008 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A004[4]; -#pragma pop - -/* 8063A008-8063A00C 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A008[4]; -#pragma pop - -/* 8063A00C-8063A010 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A00C[4]; -#pragma pop - -/* 8063A010-8063A014 0000E0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A010[4]; -#pragma pop - -/* 8063A014-8063A018 0000E4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_8063A014[4]; -#pragma pop - -/* 8063A018-8063A01C 0000E8 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8063A018[4]; -#pragma pop - -/* 8063A01C-8063A020 0000EC 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8063A01C[4]; -#pragma pop - -/* 8063A020-8063A024 0000F0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_8063A020[4]; -#pragma pop - -/* 8063A024-8063A028 0000F4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A024[4]; -#pragma pop - -/* 8063A028-8063A02C 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A028[4]; -#pragma pop - -/* 8063A02C-8063A030 0000FC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A02C[4]; -#pragma pop - -/* 8063A030-8063A034 000100 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A030[4]; -#pragma pop - -/* 8063A034-8063A038 000104 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8063A034[4]; -#pragma pop - -/* 8063A038-8063A03C 000108 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_8063A038[4]; -#pragma pop - -/* 8063A03C-8063A040 00010C 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_8063A03C[4]; -#pragma pop - -/* 8063A040-8063A044 000110 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8063A040[4]; -#pragma pop - -/* 8063A044-8063A048 000114 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_8063A044[4]; -#pragma pop - -/* 8063A048-8063A04C 000118 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A048[4]; -#pragma pop - -/* 8063A04C-8063A050 00011C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_8063A04C[4]; -#pragma pop - -/* 8063A050-8063A054 000120 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A050[4]; -#pragma pop - -/* 8063A054-8063A058 000124 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A054[4]; -#pragma pop - -/* 8063A058-8063A05C 000128 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8063A058[4]; -#pragma pop - -/* 8063A05C-8063A060 00012C 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_8063A05C[4]; -#pragma pop - /* 80639E58-80639E78 -00001 0020+00 1/0 0/0 0/0 .data l_daB_YO_Method */ static actor_method_class l_daB_YO_Method = { (process_method_func)daB_YO_Create, @@ -3692,3 +3522,5 @@ extern actor_process_profile_definition g_profile_B_YO = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; + +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 69b2a6d7a7..0f81f3a889 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -14,6 +14,8 @@ #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_s_play.h" +#include "Z2AudioLib/Z2Instances.h" +#include "JSystem/JAudio2/JAUSectionHeap.h" /* 8067C7CC-8067C874 0000EC 00A8+00 1/0 0/0 0/0 .text daE_ARROW_Draw__FP13e_arrow_class */ static int daE_ARROW_Draw(e_arrow_class* i_this) { @@ -789,184 +791,6 @@ extern actor_process_profile_definition g_profile_E_ARROW = { fopAc_CULLBOX_0_e, }; -// TODO: these are unreferenced, supposed to be auto generated? fix eventually - -/* 8067EB90-8067EB94 000080 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_8067EB90[4]; -#pragma pop - -/* 8067EB94-8067EB98 000084 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_8067EB94[4]; -#pragma pop - -/* 8067EB98-8067EB9C 000088 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EB98[4]; -#pragma pop - -/* 8067EB9C-8067EBA0 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EB9C[4]; -#pragma pop - -/* 8067EBA0-8067EBA4 000090 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBA0[4]; -#pragma pop - -/* 8067EBA4-8067EBA8 000094 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBA4[4]; -#pragma pop - -/* 8067EBA8-8067EBAC 000098 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBA8[4]; -#pragma pop - -/* 8067EBAC-8067EBB0 00009C 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8067EBAC[4]; -#pragma pop - -/* 8067EBB0-8067EBB4 0000A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8067EBB0[4]; -#pragma pop - -/* 8067EBB4-8067EBB8 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_8067EBB4[4]; -#pragma pop - -/* 8067EBB8-8067EBBC 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EBB8[4]; -#pragma pop - -/* 8067EBBC-8067EBC0 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EBBC[4]; -#pragma pop - -/* 8067EBC0-8067EBC4 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EBC0[4]; -#pragma pop - -/* 8067EBC4-8067EBC8 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBC4[4]; -#pragma pop - -/* 8067EBC8-8067EBCC 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8067EBC8[4]; -#pragma pop - -/* 8067EBCC-8067EBD0 0000BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_8067EBCC[4]; -#pragma pop - -/* 8067EBD0-8067EBD4 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_8067EBD0[4]; -#pragma pop - -/* 8067EBD4-8067EBD8 0000C4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8067EBD4[4]; -#pragma pop - -/* 8067EBD8-8067EBDC 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBD8[4]; -#pragma pop - -/* 8067EBDC-8067EBE0 0000CC 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EBDC[4]; -#pragma pop - -/* 8067EBE0-8067EBE4 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBE0[4]; -#pragma pop - -/* 8067EBE4-8067EBE8 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBE4[4]; -#pragma pop - -/* 8067EBE8-8067EBEC 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBE8[4]; -#pragma pop - -/* 8067EBEC-8067EBF0 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8067EBEC[4]; -#pragma pop - -/* 8067EBF0-8067EBF4 0000E0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_8067EBF0[4]; -#pragma pop - -/* 8067EBF4-8067EBF8 0000E4 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JAUSectionHeap> */ -#pragma push -#pragma force_active on -static u8 data_8067EBF4[4]; -#pragma pop - -/* 8067E96C-8067E96C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; +template<> +JAUSectionHeap* JASGlobalInstance::sInstance; diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 05b4f02cae..62d201a77c 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2Instances.h" /* 80685674-80685678 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 80685675 0003+00 data_80685675 None */ @@ -456,39 +457,31 @@ static void bee_start(e_bee_class* i_this, bee_s* i_bee) { } /* 80684248-80684A94 001AC8 084C+00 1/1 0/0 0/0 .text bee_control__FP11e_bee_class */ -// NONMATCHING regalloc static void bee_control(e_bee_class* i_this) { - fopAc_ac_c* parent; - s8 bees_in_nest; - camera_class* camera; - e_nest_class* nest; - int i; fopAc_ac_c* a_this; - cXyz* hit_pos_p; - bee_s* bee; - s8 nest_health; - s8 active_bees; - s8 bees_flying; - a_this = (fopAc_ac_c*)i_this; + s8 nest_health; nest_health = 0; static cXyz non(-20000.0f, 30000.0f, -15000.0f); i_this->mCcSph.SetC(a_this->current.pos + non); - parent = fopAcM_SearchByID(a_this->parentActorID); + e_nest_class* parent; + parent = (e_nest_class*)fopAcM_SearchByID(a_this->parentActorID); + e_nest_class* nest; nest = NULL; if (parent != NULL) { if (parent != NULL && parent->health != 0) { nest_health = parent->health; } - nest = (e_nest_class*)parent; + nest = parent; a_this->home.pos = nest->mCenterPos; } dComIfG_Ccsp()->Set(&i_this->mCcCyl); + cXyz* hit_pos_p; hit_pos_p = NULL; cXyz hit_pos; f32 hit_radius = 120.0f; @@ -496,7 +489,8 @@ static void bee_control(e_bee_class* i_this) { if (i_this->mCcCyl.ChkTgHit()) { cXyz vec1, vec2; hit_pos_p = &hit_pos; - cCcD_Obj* hit_obj = i_this->mCcCyl.GetTgHitObj(); + cCcD_Obj* hit_obj; + hit_obj = i_this->mCcCyl.GetTgHitObj(); if (hit_obj->ChkAtType(AT_TYPE_BOMB) || hit_obj->ChkAtType(AT_TYPE_BOOMERANG) || hit_obj->ChkAtType(AT_TYPE_IRON_BALL)) { fopAc_ac_c* hit_actor = dCc_GetAc(hit_obj->GetAc()); @@ -532,13 +526,18 @@ static void bee_control(e_bee_class* i_this) { i_this->mBoomerangAngle = 0; } + bee_s* bee; bee = i_this->mBees; + s8 active_bees; active_bees = 0; cXyz vec3; ccCylSet = 0; + s8 bees_in_nest; bees_in_nest = 0; + s8 bees_flying; bees_flying = 0; - camera = dComIfGp_getCamera(0); + camera_class* camera; + camera = (camera_class*)dComIfGp_getCamera(0); if ((nest != NULL && nest->mDemoStage == 0 && dComIfGp_event_runCheck()) || !daPy_getPlayerActorClass()->checkSwimUp() @@ -552,7 +551,7 @@ static void bee_control(e_bee_class* i_this) { i_this->mHomeTimer = 10; } - for (i = 0; i < i_this->mNumBees; i++, bee++) { + for (int i = 0; i < i_this->mNumBees; i++, bee++) { if (bee->mAction != bee_s::ACT_DEAD) { active_bees++; bee->mNoDraw = false; @@ -826,179 +825,6 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) { return step; } -/* 806856B4-806856B8 000084 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_806856B4[4]; -#pragma pop - -/* 806856B8-806856BC 000088 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_806856B8[4]; -#pragma pop - -/* 806856BC-806856C0 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_806856BC[4]; -#pragma pop - -/* 806856C0-806856C4 000090 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_806856C0[4]; -#pragma pop - -/* 806856C4-806856C8 000094 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_806856C4[4]; -#pragma pop - -/* 806856C8-806856CC 000098 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_806856C8[4]; -#pragma pop - -/* 806856CC-806856D0 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_806856CC[4]; -#pragma pop - -/* 806856D0-806856D4 0000A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_806856D0[4]; -#pragma pop - -/* 806856D4-806856D8 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_806856D4[4]; -#pragma pop - -/* 806856D8-806856DC 0000A8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_806856D8[4]; -#pragma pop - -/* 806856DC-806856E0 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_806856DC[4]; -#pragma pop - -/* 806856E0-806856E4 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_806856E0[4]; -#pragma pop - -/* 806856E4-806856E8 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_806856E4[4]; -#pragma pop - -/* 806856E8-806856EC 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_806856E8[4]; -#pragma pop - -/* 806856EC-806856F0 0000BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_806856EC[4]; -#pragma pop - -/* 806856F0-806856F4 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_806856F0[4]; -#pragma pop - -/* 806856F4-806856F8 0000C4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_806856F4[4]; -#pragma pop - -/* 806856F8-806856FC 0000C8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_806856F8[4]; -#pragma pop - -/* 806856FC-80685700 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_806856FC[4]; -#pragma pop - -/* 80685700-80685704 0000D0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80685700[4]; -#pragma pop - -/* 80685704-80685708 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_80685704[4]; -#pragma pop - -/* 80685708-8068570C 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80685708[4]; -#pragma pop - -/* 8068570C-80685710 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8068570C[4]; -#pragma pop - -/* 80685710-80685714 0000E0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80685710[4]; -#pragma pop - -/* 80685714-80685718 0000E4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80685714[4]; -#pragma pop - -/* 80685524-80685524 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 806855B0-806855D0 -00001 0020+00 1/0 0/0 0/0 .data l_daE_Bee_Method */ static actor_method_class l_daE_Bee_Method = { (process_method_func)daE_Bee_Create, @@ -1025,3 +851,5 @@ extern actor_process_profile_definition g_profile_E_BEE = { fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; + +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 4b53d6021f..bfb47c20a3 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -884,7 +884,7 @@ static int daE_FB_Delete(daE_FB_c* i_this) { /* 806B8678-806B8878 0022B8 0200+00 1/1 0/0 0/0 .text CreateHeap__8daE_FB_cFv */ int daE_FB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_FL", 0xB); - JUT_ASSERT(1516, modelData != 0); + JUT_ASSERT(1516, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_FL", 0x8), 0, 1.0f, 0, -1, &mCreatureSound, 0, 0x31000084); diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index a8121ab010..c8f156619c 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -19,6 +19,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "Z2AudioLib/Z2Instances.h" /* 80739E80-80739EC0 00002C 0040+00 0/1 0/0 0/0 .data cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ */ static dCcD_SrcSph cc_obg_src = { @@ -930,180 +931,6 @@ static int daE_OctBg_IsDelete(daE_OctBg_c* i_this) { return 1; } -/* ############################################################################################## */ -/* 8073A174-8073A178 00007C 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_8073A174[4]; -#pragma pop - -/* 8073A178-8073A17C 000080 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_8073A178[4]; -#pragma pop - -/* 8073A17C-8073A180 000084 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A17C[4]; -#pragma pop - -/* 8073A180-8073A184 000088 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A180[4]; -#pragma pop - -/* 8073A184-8073A188 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A184[4]; -#pragma pop - -/* 8073A188-8073A18C 000090 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A188[4]; -#pragma pop - -/* 8073A18C-8073A190 000094 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_8073A18C[4]; -#pragma pop - -/* 8073A190-8073A194 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8073A190[4]; -#pragma pop - -/* 8073A194-8073A198 00009C 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8073A194[4]; -#pragma pop - -/* 8073A198-8073A19C 0000A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_8073A198[4]; -#pragma pop - -/* 8073A19C-8073A1A0 0000A4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A19C[4]; -#pragma pop - -/* 8073A1A0-8073A1A4 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A1A0[4]; -#pragma pop - -/* 8073A1A4-8073A1A8 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A1A4[4]; -#pragma pop - -/* 8073A1A8-8073A1AC 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1A8[4]; -#pragma pop - -/* 8073A1AC-8073A1B0 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8073A1AC[4]; -#pragma pop - -/* 8073A1B0-8073A1B4 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_8073A1B0[4]; -#pragma pop - -/* 8073A1B4-8073A1B8 0000BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_8073A1B4[4]; -#pragma pop - -/* 8073A1B8-8073A1BC 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8073A1B8[4]; -#pragma pop - -/* 8073A1BC-8073A1C0 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1BC[4]; -#pragma pop - -/* 8073A1C0-8073A1C4 0000C8 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A1C0[4]; -#pragma pop - -/* 8073A1C4-8073A1C8 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1C4[4]; -#pragma pop - -/* 8073A1C8-8073A1CC 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1C8[4]; -#pragma pop - -/* 8073A1CC-8073A1D0 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1CC[4]; -#pragma pop - -/* 8073A1D0-8073A1D4 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8073A1D0[4]; -#pragma pop - -/* 8073A1D4-8073A1D8 0000DC 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_8073A1D4[4]; -#pragma pop - -/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - static actor_method_class l_daE_OctBg_Method = { (process_method_func)daE_OctBg_Create, (process_method_func)daE_OctBg_Delete, @@ -1129,3 +956,5 @@ extern actor_process_profile_definition g_profile_E_OctBg = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; + +AUDIO_INSTANCES; 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; diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 48af765ccd..4abf254242 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -16,6 +16,7 @@ #include "d/d_camera.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include "Z2AudioLib/Z2Instances.h" #define WL_CUT_TYPE_SMALL 1 #define WL_CUT_TYPE_JUMP 2 @@ -3982,178 +3983,6 @@ static int daE_VA_Create(daE_VA_c* i_this) { return i_this->create(); } -/* ############################################################################################## */ -/* 807CF6E4-807CF6E8 000274 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_807CF6E4[4]; -#pragma pop - -/* 807CF6E8-807CF6EC 000278 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_807CF6E8[4]; -#pragma pop - -/* 807CF6EC-807CF6F0 00027C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF6EC[4]; -#pragma pop - -/* 807CF6F0-807CF6F4 000280 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF6F0[4]; -#pragma pop - -/* 807CF6F4-807CF6F8 000284 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF6F4[4]; -#pragma pop - -/* 807CF6F8-807CF6FC 000288 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF6F8[4]; -#pragma pop - -/* 807CF6FC-807CF700 00028C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_807CF6FC[4]; -#pragma pop - -/* 807CF700-807CF704 000290 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_807CF700[4]; -#pragma pop - -/* 807CF704-807CF708 000294 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_807CF704[4]; -#pragma pop - -/* 807CF708-807CF70C 000298 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_807CF708[4]; -#pragma pop - -/* 807CF70C-807CF710 00029C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF70C[4]; -#pragma pop - -/* 807CF710-807CF714 0002A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF710[4]; -#pragma pop - -/* 807CF714-807CF718 0002A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF714[4]; -#pragma pop - -/* 807CF718-807CF71C 0002A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF718[4]; -#pragma pop - -/* 807CF71C-807CF720 0002AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_807CF71C[4]; -#pragma pop - -/* 807CF720-807CF724 0002B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_807CF720[4]; -#pragma pop - -/* 807CF724-807CF728 0002B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_807CF724[4]; -#pragma pop - -/* 807CF728-807CF72C 0002B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_807CF728[4]; -#pragma pop - -/* 807CF72C-807CF730 0002BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_807CF72C[4]; -#pragma pop - -/* 807CF730-807CF734 0002C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF730[4]; -#pragma pop - -/* 807CF734-807CF738 0002C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_807CF734[4]; -#pragma pop - -/* 807CF738-807CF73C 0002C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF738[4]; -#pragma pop - -/* 807CF73C-807CF740 0002CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF73C[4]; -#pragma pop - -/* 807CF740-807CF744 0002D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_807CF740[4]; -#pragma pop - -/* 807CF744-807CF748 0002D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_807CF744[4]; -#pragma pop - /* 807CF384-807CF3A4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_VA_Method */ static actor_method_class l_daE_VA_Method = { (process_method_func)daE_VA_Create, @@ -4180,3 +4009,5 @@ extern actor_process_profile_definition g_profile_E_VT = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; + +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 783f4c3fae..6a276d0b05 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2133,7 +2133,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_yd", 0x1a); - JUT_ASSERT(3719, modelData != 0); + JUT_ASSERT(3719, modelData != NULL); for (int i = 1; i < 11; i++) { if ((i & 1) != 0) { diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 2493cd0b5b..d7508b0928 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include "Z2AudioLib/Z2Instances.h" /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text dice_wether_init__FUcff */ static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { @@ -1249,175 +1250,4 @@ extern actor_process_profile_definition g_profile_KYTAG06 = { fopAc_CULLBOX_0_e, }; -/* 8085A18C-8085A190 000064 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_8085A18C[4]; -#pragma pop - -/* 8085A190-8085A194 000068 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_8085A190[4]; -#pragma pop - -/* 8085A194-8085A198 00006C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A194[4]; -#pragma pop - -/* 8085A198-8085A19C 000070 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A198[4]; -#pragma pop - -/* 8085A19C-8085A1A0 000074 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A19C[4]; -#pragma pop - -/* 8085A1A0-8085A1A4 000078 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1A0[4]; -#pragma pop - -/* 8085A1A4-8085A1A8 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1A4[4]; -#pragma pop - -/* 8085A1A8-8085A1AC 000080 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8085A1A8[4]; -#pragma pop - -/* 8085A1AC-8085A1B0 000084 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8085A1AC[4]; -#pragma pop - -/* 8085A1B0-8085A1B4 000088 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_8085A1B0[4]; -#pragma pop - -/* 8085A1B4-8085A1B8 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A1B4[4]; -#pragma pop - -/* 8085A1B8-8085A1BC 000090 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A1B8[4]; -#pragma pop - -/* 8085A1BC-8085A1C0 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A1BC[4]; -#pragma pop - -/* 8085A1C0-8085A1C4 000098 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1C0[4]; -#pragma pop - -/* 8085A1C4-8085A1C8 00009C 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8085A1C4[4]; -#pragma pop - -/* 8085A1C8-8085A1CC 0000A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_8085A1C8[4]; -#pragma pop - -/* 8085A1CC-8085A1D0 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_8085A1CC[4]; -#pragma pop - -/* 8085A1D0-8085A1D4 0000A8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8085A1D0[4]; -#pragma pop - -/* 8085A1D4-8085A1D8 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1D4[4]; -#pragma pop - -/* 8085A1D8-8085A1DC 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A1D8[4]; -#pragma pop - -/* 8085A1DC-8085A1E0 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1DC[4]; -#pragma pop - -/* 8085A1E0-8085A1E4 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1E0[4]; -#pragma pop - -/* 8085A1E4-8085A1E8 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1E4[4]; -#pragma pop - -/* 8085A1E8-8085A1EC 0000C0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8085A1E8[4]; -#pragma pop - -/* 8085A1EC-8085A1F0 0000C4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_8085A1EC[4]; -#pragma pop - -/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 2505bdd23c..2a9e32a8b3 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -17,6 +17,7 @@ #include "dol2asm.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2Instances.h" // // Forward References: @@ -2471,176 +2472,4 @@ extern "C" void __ct__9fs_lure_sFv() { /* empty function */ } -/* ############################################################################################## */ -/* 80870AC8-80870ACC 000178 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80870AC8[4]; -#pragma pop - -/* 80870ACC-80870AD0 00017C 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_80870ACC[4]; -#pragma pop - -/* 80870AD0-80870AD4 000180 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870AD0[4]; -#pragma pop - -/* 80870AD4-80870AD8 000184 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870AD4[4]; -#pragma pop - -/* 80870AD8-80870ADC 000188 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870AD8[4]; -#pragma pop - -/* 80870ADC-80870AE0 00018C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870ADC[4]; -#pragma pop - -/* 80870AE0-80870AE4 000190 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_80870AE0[4]; -#pragma pop - -/* 80870AE4-80870AE8 000194 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80870AE4[4]; -#pragma pop - -/* 80870AE8-80870AEC 000198 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80870AE8[4]; -#pragma pop - -/* 80870AEC-80870AF0 00019C 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_80870AEC[4]; -#pragma pop - -/* 80870AF0-80870AF4 0001A0 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870AF0[4]; -#pragma pop - -/* 80870AF4-80870AF8 0001A4 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870AF4[4]; -#pragma pop - -/* 80870AF8-80870AFC 0001A8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870AF8[4]; -#pragma pop - -/* 80870AFC-80870B00 0001AC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870AFC[4]; -#pragma pop - -/* 80870B00-80870B04 0001B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80870B00[4]; -#pragma pop - -/* 80870B04-80870B08 0001B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_80870B04[4]; -#pragma pop - -/* 80870B08-80870B0C 0001B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_80870B08[4]; -#pragma pop - -/* 80870B0C-80870B10 0001BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80870B0C[4]; -#pragma pop - -/* 80870B10-80870B14 0001C0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_80870B10[4]; -#pragma pop - -/* 80870B14-80870B18 0001C4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870B14[4]; -#pragma pop - -/* 80870B18-80870B1C 0001C8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_80870B18[4]; -#pragma pop - -/* 80870B1C-80870B20 0001CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870B1C[4]; -#pragma pop - -/* 80870B20-80870B24 0001D0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870B20[4]; -#pragma pop - -/* 80870B24-80870B28 0001D4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80870B24[4]; -#pragma pop - -/* 80870B28-80870B2C 0001D8 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80870B28[4]; -#pragma pop - -/* 8087027C-8087027C 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index e9c1a1e54c..12aab6db5c 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2318,7 +2318,7 @@ daNpcChat_HIOParam const daNpcChat_Param_c::m = { BOOL daNpcChat_c::NpcCreate(int type) { J3DModelData* a_mdlData_p = getNpcMdlDataP(type); - JUT_ASSERT(185, 0 != a_mdlData_p); + JUT_ASSERT(185, NULL != a_mdlData_p); J3DAnmTexPattern* texAnmP = getTexAnmP(type); u32 uVar1 = texAnmP != NULL ? 0x11020084 : 0x11000084; @@ -4016,7 +4016,7 @@ bool daNpcChat_c::wait(void* param_1) { break; default: - JUT_ASSERT(2580, 0); + JUT_ASSERT(2580, FALSE); } return true; @@ -4055,7 +4055,7 @@ bool daNpcChat_c::fear(void* param_1) { break; default: - JUT_ASSERT(2664, 0); + JUT_ASSERT(2664, FALSE); break; } @@ -4142,7 +4142,7 @@ bool daNpcChat_c::talk(void* param_1) { break; default: - JUT_ASSERT(2764, 0); + JUT_ASSERT(2764, FALSE); break; } @@ -4166,7 +4166,7 @@ bool daNpcChat_c::demo(void* param_1) { if (staffId != -1) { mStaffID = staffId; - JUT_ASSERT(2798, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(2798, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { eventManager.cutEnd(staffId); @@ -4187,7 +4187,7 @@ bool daNpcChat_c::demo(void* param_1) { break; default: - JUT_ASSERT(2826, 0); + JUT_ASSERT(2826, FALSE); break; } diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 0b50c1651b..e9167a690a 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_doc.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1378,176 +1379,4 @@ static void func_809AA300() { // NONMATCHING } -/* ############################################################################################## */ -/* 809AAB3C-809AAB40 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_809AAB3C[4]; -#pragma pop - -/* 809AAB40-809AAB44 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_809AAB40[4]; -#pragma pop - -/* 809AAB44-809AAB48 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB44[4]; -#pragma pop - -/* 809AAB48-809AAB4C 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB48[4]; -#pragma pop - -/* 809AAB4C-809AAB50 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB4C[4]; -#pragma pop - -/* 809AAB50-809AAB54 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB50[4]; -#pragma pop - -/* 809AAB54-809AAB58 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB54[4]; -#pragma pop - -/* 809AAB58-809AAB5C 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809AAB58[4]; -#pragma pop - -/* 809AAB5C-809AAB60 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809AAB5C[4]; -#pragma pop - -/* 809AAB60-809AAB64 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_809AAB60[4]; -#pragma pop - -/* 809AAB64-809AAB68 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB64[4]; -#pragma pop - -/* 809AAB68-809AAB6C 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB68[4]; -#pragma pop - -/* 809AAB6C-809AAB70 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB6C[4]; -#pragma pop - -/* 809AAB70-809AAB74 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB70[4]; -#pragma pop - -/* 809AAB74-809AAB78 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809AAB74[4]; -#pragma pop - -/* 809AAB78-809AAB7C 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_809AAB78[4]; -#pragma pop - -/* 809AAB7C-809AAB80 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_809AAB7C[4]; -#pragma pop - -/* 809AAB80-809AAB84 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809AAB80[4]; -#pragma pop - -/* 809AAB84-809AAB88 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB84[4]; -#pragma pop - -/* 809AAB88-809AAB8C 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB88[4]; -#pragma pop - -/* 809AAB8C-809AAB90 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB8C[4]; -#pragma pop - -/* 809AAB90-809AAB94 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB90[4]; -#pragma pop - -/* 809AAB94-809AAB98 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB94[4]; -#pragma pop - -/* 809AAB98-809AAB9C 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809AAB98[4]; -#pragma pop - -/* 809AAB9C-809AABA0 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_809AAB9C[4]; -#pragma pop - -/* 809AA428-809AA428 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index bc40192b5a..ee032aaa79 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -194,7 +194,7 @@ int daNpc_Gnd_c::CreateHeap() { int res_name_idx = l_bmdData[bmdIdx][1]; int my_bmd = l_bmdData[bmdIdx][0]; mdlData_p = static_cast(dComIfG_getObjectRes(l_resNameList[res_name_idx], my_bmd)); - JUT_ASSERT(433, 0 != mdlData_p); + JUT_ASSERT(433, NULL != mdlData_p); u32 sp_0x24 = 0x11020285; mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x24); diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 9d7a3d578b..5abce2e311 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gra.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -3753,176 +3754,4 @@ static void func_809C9D7C() { // NONMATCHING } -/* ############################################################################################## */ -/* 809CB364-809CB368 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_809CB364[4]; -#pragma pop - -/* 809CB368-809CB36C 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_809CB368[4]; -#pragma pop - -/* 809CB36C-809CB370 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB36C[4]; -#pragma pop - -/* 809CB370-809CB374 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB370[4]; -#pragma pop - -/* 809CB374-809CB378 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB374[4]; -#pragma pop - -/* 809CB378-809CB37C 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB378[4]; -#pragma pop - -/* 809CB37C-809CB380 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_809CB37C[4]; -#pragma pop - -/* 809CB380-809CB384 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809CB380[4]; -#pragma pop - -/* 809CB384-809CB388 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809CB384[4]; -#pragma pop - -/* 809CB388-809CB38C 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_809CB388[4]; -#pragma pop - -/* 809CB38C-809CB390 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB38C[4]; -#pragma pop - -/* 809CB390-809CB394 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB390[4]; -#pragma pop - -/* 809CB394-809CB398 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB394[4]; -#pragma pop - -/* 809CB398-809CB39C 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB398[4]; -#pragma pop - -/* 809CB39C-809CB3A0 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809CB39C[4]; -#pragma pop - -/* 809CB3A0-809CB3A4 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_809CB3A0[4]; -#pragma pop - -/* 809CB3A4-809CB3A8 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_809CB3A4[4]; -#pragma pop - -/* 809CB3A8-809CB3AC 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809CB3A8[4]; -#pragma pop - -/* 809CB3AC-809CB3B0 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_809CB3AC[4]; -#pragma pop - -/* 809CB3B0-809CB3B4 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB3B0[4]; -#pragma pop - -/* 809CB3B4-809CB3B8 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_809CB3B4[4]; -#pragma pop - -/* 809CB3B8-809CB3BC 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB3B8[4]; -#pragma pop - -/* 809CB3BC-809CB3C0 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB3BC[4]; -#pragma pop - -/* 809CB3C0-809CB3C4 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809CB3C0[4]; -#pragma pop - -/* 809CB3C4-809CB3C8 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_809CB3C4[4]; -#pragma pop - -/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index bf31eac1a5..283e09b08e 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grd.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1403,176 +1404,4 @@ static void func_809D39E8() { // NONMATCHING } -/* ############################################################################################## */ -/* 809D3F1C-809D3F20 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_809D3F1C[4]; -#pragma pop - -/* 809D3F20-809D3F24 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_809D3F20[4]; -#pragma pop - -/* 809D3F24-809D3F28 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F24[4]; -#pragma pop - -/* 809D3F28-809D3F2C 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F28[4]; -#pragma pop - -/* 809D3F2C-809D3F30 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F2C[4]; -#pragma pop - -/* 809D3F30-809D3F34 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F30[4]; -#pragma pop - -/* 809D3F34-809D3F38 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F34[4]; -#pragma pop - -/* 809D3F38-809D3F3C 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809D3F38[4]; -#pragma pop - -/* 809D3F3C-809D3F40 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809D3F3C[4]; -#pragma pop - -/* 809D3F40-809D3F44 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_809D3F40[4]; -#pragma pop - -/* 809D3F44-809D3F48 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F44[4]; -#pragma pop - -/* 809D3F48-809D3F4C 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F48[4]; -#pragma pop - -/* 809D3F4C-809D3F50 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F4C[4]; -#pragma pop - -/* 809D3F50-809D3F54 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F50[4]; -#pragma pop - -/* 809D3F54-809D3F58 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809D3F54[4]; -#pragma pop - -/* 809D3F58-809D3F5C 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_809D3F58[4]; -#pragma pop - -/* 809D3F5C-809D3F60 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_809D3F5C[4]; -#pragma pop - -/* 809D3F60-809D3F64 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809D3F60[4]; -#pragma pop - -/* 809D3F64-809D3F68 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F64[4]; -#pragma pop - -/* 809D3F68-809D3F6C 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F68[4]; -#pragma pop - -/* 809D3F6C-809D3F70 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F6C[4]; -#pragma pop - -/* 809D3F70-809D3F74 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F70[4]; -#pragma pop - -/* 809D3F74-809D3F78 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F74[4]; -#pragma pop - -/* 809D3F78-809D3F7C 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809D3F78[4]; -#pragma pop - -/* 809D3F7C-809D3F80 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_809D3F7C[4]; -#pragma pop - -/* 809D3BF4-809D3BF4 0001F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index c7a3015f4f..61e672d5fb 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gro.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1846,176 +1847,4 @@ static void func_809DEF60() { // NONMATCHING } -/* ############################################################################################## */ -/* 809DF76C-809DF770 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_809DF76C[4]; -#pragma pop - -/* 809DF770-809DF774 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_809DF770[4]; -#pragma pop - -/* 809DF774-809DF778 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF774[4]; -#pragma pop - -/* 809DF778-809DF77C 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF778[4]; -#pragma pop - -/* 809DF77C-809DF780 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF77C[4]; -#pragma pop - -/* 809DF780-809DF784 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF780[4]; -#pragma pop - -/* 809DF784-809DF788 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_809DF784[4]; -#pragma pop - -/* 809DF788-809DF78C 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809DF788[4]; -#pragma pop - -/* 809DF78C-809DF790 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809DF78C[4]; -#pragma pop - -/* 809DF790-809DF794 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_809DF790[4]; -#pragma pop - -/* 809DF794-809DF798 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF794[4]; -#pragma pop - -/* 809DF798-809DF79C 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF798[4]; -#pragma pop - -/* 809DF79C-809DF7A0 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF79C[4]; -#pragma pop - -/* 809DF7A0-809DF7A4 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7A0[4]; -#pragma pop - -/* 809DF7A4-809DF7A8 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809DF7A4[4]; -#pragma pop - -/* 809DF7A8-809DF7AC 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_809DF7A8[4]; -#pragma pop - -/* 809DF7AC-809DF7B0 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_809DF7AC[4]; -#pragma pop - -/* 809DF7B0-809DF7B4 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809DF7B0[4]; -#pragma pop - -/* 809DF7B4-809DF7B8 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7B4[4]; -#pragma pop - -/* 809DF7B8-809DF7BC 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF7B8[4]; -#pragma pop - -/* 809DF7BC-809DF7C0 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7BC[4]; -#pragma pop - -/* 809DF7C0-809DF7C4 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7C0[4]; -#pragma pop - -/* 809DF7C4-809DF7C8 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7C4[4]; -#pragma pop - -/* 809DF7C8-809DF7CC 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809DF7C8[4]; -#pragma pop - -/* 809DF7CC-809DF7D0 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_809DF7CC[4]; -#pragma pop - -/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 346d607992..e0e4f2ecc0 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grs.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1375,176 +1376,4 @@ static void func_809E7DB0() { // NONMATCHING } -/* ############################################################################################## */ -/* 809E82A4-809E82A8 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_809E82A4[4]; -#pragma pop - -/* 809E82A8-809E82AC 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_809E82A8[4]; -#pragma pop - -/* 809E82AC-809E82B0 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82AC[4]; -#pragma pop - -/* 809E82B0-809E82B4 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82B0[4]; -#pragma pop - -/* 809E82B4-809E82B8 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E82B4[4]; -#pragma pop - -/* 809E82B8-809E82BC 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E82B8[4]; -#pragma pop - -/* 809E82BC-809E82C0 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_809E82BC[4]; -#pragma pop - -/* 809E82C0-809E82C4 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809E82C0[4]; -#pragma pop - -/* 809E82C4-809E82C8 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_809E82C4[4]; -#pragma pop - -/* 809E82C8-809E82CC 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_809E82C8[4]; -#pragma pop - -/* 809E82CC-809E82D0 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82CC[4]; -#pragma pop - -/* 809E82D0-809E82D4 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82D0[4]; -#pragma pop - -/* 809E82D4-809E82D8 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82D4[4]; -#pragma pop - -/* 809E82D8-809E82DC 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E82D8[4]; -#pragma pop - -/* 809E82DC-809E82E0 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809E82DC[4]; -#pragma pop - -/* 809E82E0-809E82E4 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_809E82E0[4]; -#pragma pop - -/* 809E82E4-809E82E8 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_809E82E4[4]; -#pragma pop - -/* 809E82E8-809E82EC 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_809E82E8[4]; -#pragma pop - -/* 809E82EC-809E82F0 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_809E82EC[4]; -#pragma pop - -/* 809E82F0-809E82F4 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E82F0[4]; -#pragma pop - -/* 809E82F4-809E82F8 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_809E82F4[4]; -#pragma pop - -/* 809E82F8-809E82FC 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E82F8[4]; -#pragma pop - -/* 809E82FC-809E8300 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E82FC[4]; -#pragma pop - -/* 809E8300-809E8304 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_809E8300[4]; -#pragma pop - -/* 809E8304-809E8308 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_809E8304[4]; -#pragma pop - -/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index a4763a5a68..f4f73792fe 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -552,7 +552,7 @@ void daNpc_Moi_c::reset() { break; case TYPE_2: if (daNpcT_chkEvtBit(0xcd)) { - JUT_ASSERT(1932, 0 != mPath.getPathInfo()); + JUT_ASSERT(1932, NULL != mPath.getPathInfo()); iVar8 = g_Counter.mCounter0 % mPath.getNumPnts(); cStack_30 = mPath.getPntPos(iVar8); setPos(cStack_30); @@ -1220,7 +1220,7 @@ int daNpc_Moi_c::injuryCheck() { if (bVar1 && timer != 0) { if (field_0x1667 != 0) { - if (timer & 1 != 0) { + if ((timer & 1) != 0) { mMotionSeqMngr.setNo(MOT_UNK_38, -1.0f, 0, 0); } else { mMotionSeqMngr.setNo(MOT_UNK_37, -1.0f, 0, 0); @@ -1250,7 +1250,7 @@ int daNpc_Moi_c::injuryTurn(cXyz param_1) { BOOL bVar1 = FALSE; switch (field_0x1654) { - case 0: + case 0: { s16 iVar1 = cLib_targetAngleY(¤t.pos, ¶m_1) - mCurAngle.y; if (abs(iVar1) < 0x2000) { bVar1 = TRUE; @@ -1264,6 +1264,7 @@ int daNpc_Moi_c::injuryTurn(cXyz param_1) { field_0x1654 = 1; } break; + } case 1: if (turn(field_0x1664, 40, 1)) { current.angle.y = mCurAngle.y; @@ -1460,7 +1461,7 @@ int daNpc_Moi_c::cutDeliveredSw(int param_1) { switch (iVar6) { case 0: - case 1: + case 1: { mJntAnm.lookNone(0); if (cLib_calcTimer(&mEventTimer) == 0) { if (iVar6 == 1) { @@ -1488,6 +1489,7 @@ int daNpc_Moi_c::cutDeliveredSw(int param_1) { rv = 1; } break; + } case 2: mJntAnm.lookPlayer(0); if (cLib_calcTimer(&mEventTimer) == 0) { diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 7a641505e3..65c14fc797 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_post.h" +#include "Z2AudioLib/Z2Instances.h" #include "dol2asm.h" // @@ -1652,176 +1653,4 @@ extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz() { // NONMATCHING } -/* ############################################################################################## */ -/* 80AADC5C-80AADC60 000074 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80AADC5C[4]; -#pragma pop - -/* 80AADC60-80AADC64 000078 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_80AADC60[4]; -#pragma pop - -/* 80AADC64-80AADC68 00007C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADC64[4]; -#pragma pop - -/* 80AADC68-80AADC6C 000080 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADC68[4]; -#pragma pop - -/* 80AADC6C-80AADC70 000084 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADC6C[4]; -#pragma pop - -/* 80AADC70-80AADC74 000088 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADC70[4]; -#pragma pop - -/* 80AADC74-80AADC78 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_80AADC74[4]; -#pragma pop - -/* 80AADC78-80AADC7C 000090 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80AADC78[4]; -#pragma pop - -/* 80AADC7C-80AADC80 000094 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80AADC7C[4]; -#pragma pop - -/* 80AADC80-80AADC84 000098 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_80AADC80[4]; -#pragma pop - -/* 80AADC84-80AADC88 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADC84[4]; -#pragma pop - -/* 80AADC88-80AADC8C 0000A0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADC88[4]; -#pragma pop - -/* 80AADC8C-80AADC90 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADC8C[4]; -#pragma pop - -/* 80AADC90-80AADC94 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADC90[4]; -#pragma pop - -/* 80AADC94-80AADC98 0000AC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80AADC94[4]; -#pragma pop - -/* 80AADC98-80AADC9C 0000B0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_80AADC98[4]; -#pragma pop - -/* 80AADC9C-80AADCA0 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_80AADC9C[4]; -#pragma pop - -/* 80AADCA0-80AADCA4 0000B8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80AADCA0[4]; -#pragma pop - -/* 80AADCA4-80AADCA8 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_80AADCA4[4]; -#pragma pop - -/* 80AADCA8-80AADCAC 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADCA8[4]; -#pragma pop - -/* 80AADCAC-80AADCB0 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_80AADCAC[4]; -#pragma pop - -/* 80AADCB0-80AADCB4 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADCB0[4]; -#pragma pop - -/* 80AADCB4-80AADCB8 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADCB4[4]; -#pragma pop - -/* 80AADCB8-80AADCBC 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80AADCB8[4]; -#pragma pop - -/* 80AADCBC-80AADCC0 0000D4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80AADCBC[4]; -#pragma pop - -/* 80AAD34C-80AAD34C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; 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; diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 6cdde5e0c8..78582617b6 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -1107,7 +1107,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { break; case 1: - JUT_ASSERT(2331, 0 != atmt_p); + JUT_ASSERT(2331, NULL != atmt_p); field_0x0FFF = 1; setParam(); setPos(atmt_p->current.pos); @@ -1402,7 +1402,7 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) { daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle.y, 0); } - JUT_ASSERT(2703, 0 != scannon_p); + JUT_ASSERT(2703, NULL != scannon_p); ((daSCannon_c*)scannon_p)->setCannonRepair(); if (mEventTimer) { Z2GetAudioMgr()->bgmStreamPrepare(0x02000003); @@ -2070,7 +2070,7 @@ int daNpc_Toby_c::walk(void*) { case 2: if (mStagger.checkStagger() == 0) { cXyz work; - JUT_ASSERT(3620, 0 != mPath.getPathInfo()); + JUT_ASSERT(3620, NULL != mPath.getPathInfo()); int dst_pos_h = mPath.getDstPosH(current.pos, &work, mPath.getNumPnts(), 2); calcSpeedAndAngle(work, dst_pos_h, 4, 0x800); if (dst_pos_h && cM3d_IsZero(speedF)) { diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 508570eb11..ddfb8539c2 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -50,7 +50,7 @@ static char* l_arcName = "Obj_l4brg"; /* 80C62A2C-80C62A9C 00022C 0070+00 1/0 0/0 0/0 .text CreateHeap__13daObjLv4Brg_cFv */ int daObjLv4Brg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(170, modelData != 0); + JUT_ASSERT(170, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 43631cc6f1..c551b8be8c 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -90,7 +90,7 @@ void daObjLv4PRwall_c::setMtx() { /* 80C68F20-80C68FA0 000300 0080+00 1/0 0/0 0/0 .text CreateHeap__16daObjLv4PRwall_cFv */ int daObjLv4PRwall_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmdidx[mType]); - JUT_ASSERT(226, model_data != 0); + JUT_ASSERT(226, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index b57056d8a2..fb2fba8140 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -28,7 +28,7 @@ static int createSolidHeap(fopAc_ac_c* i_this) { /* 80C99938-80C99F34 000098 05FC+00 1/1 0/0 0/0 .text createHeap__18daObjMirrorTable_cFv */ int daObjMirrorTable_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 21); - JUT_ASSERT(105, modelData != 0); + JUT_ASSERT(105, modelData != NULL); mpTableModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpTableModel == NULL) { return 0; @@ -41,14 +41,14 @@ int daObjMirrorTable_c::createHeap() { /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */ int mirror_res_id = dComIfGs_isEventBit(u16(dSv_event_flag_c::saveBitLabels[354])) ? TRUE_RES : FALSE_RES; modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, mirror_res_id); - JUT_ASSERT(114, modelData != 0); + JUT_ASSERT(114, modelData != NULL); mpMirrorModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpMirrorModel == NULL) { return 0; } J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 10); - JUT_ASSERT(123, bck != 0); + JUT_ASSERT(123, bck != NULL); mpTableUpBckAnm = new mDoExt_bckAnm(); f32 rate = isSwitch() ? 1.0f : 0.0f; if (mpTableUpBckAnm == NULL || !mpTableUpBckAnm->init(bck, 1, 0, rate, 0, -1, false)) { @@ -84,11 +84,11 @@ int daObjMirrorTable_c::createHeap() { /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */ if (dComIfGs_isEventBit(u16(dSv_event_flag_c::saveBitLabels[354]))) { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 20); - JUT_ASSERT(153, modelData != 0); + JUT_ASSERT(153, modelData != NULL); mpStairModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 25); - JUT_ASSERT(160, brk != 0); + JUT_ASSERT(160, brk != NULL); mpStairBrkAnm = new mDoExt_brkAnm(); if (mpStairBrkAnm == NULL || !mpStairBrkAnm->init(modelData, brk, 1, 0, 1.0f, 0, -1)) @@ -101,15 +101,15 @@ int daObjMirrorTable_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 19); - JUT_ASSERT(173, modelData != 0); + JUT_ASSERT(173, modelData != NULL); mpPanelModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 17); - JUT_ASSERT(180, modelData != 0); + JUT_ASSERT(180, modelData != NULL); mpLightModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 28); - JUT_ASSERT(187, btk != 0); + JUT_ASSERT(187, btk != NULL); mpLightBtkAnm = new mDoExt_btkAnm(); if (mpLightBtkAnm == NULL || !mpLightBtkAnm->init(modelData, btk, 1, 0, 1.0f, 0, -1)) @@ -118,11 +118,11 @@ int daObjMirrorTable_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 18); - JUT_ASSERT(195, modelData != 0); + JUT_ASSERT(195, modelData != NULL); mpMSquareModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 24); - JUT_ASSERT(202, brk != 0); + JUT_ASSERT(202, brk != NULL); mpMSquareBrkAnm = new mDoExt_brkAnm(); if (mpMSquareBrkAnm == NULL || !mpMSquareBrkAnm->init(modelData, brk, 1, 0, 1.0f, 0, -1)) @@ -131,7 +131,7 @@ int daObjMirrorTable_c::createHeap() { } bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(210, bck != 0); + JUT_ASSERT(210, bck != NULL); mpMSquareBckAnm = new mDoExt_bckAnm(); if (mpMSquareBckAnm == NULL || !mpMSquareBckAnm->init(bck, 1, 0, 1.0f, 0, -1, false)) diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index 8a49ab3b6b..f4216d8596 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -73,7 +73,7 @@ static const int l_bckIdx[] = { /* 80CBEB38-80CBECBC 000298 0184+00 1/0 0/0 0/0 .text CreateHeap__13daRotBridge_cFv */ int daRotBridge_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bmdIdx[mType]); - JUT_ASSERT(216, modelData != 0); + JUT_ASSERT(216, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index d49ba92f94..768546487d 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -177,7 +177,7 @@ void daObjStopper2_c::actionWait() { eventInfo.onCondition(dEvtCnd_CANDEMO_e); break; default: - JUT_ASSERT(346, 0); + JUT_ASSERT(346, FALSE); break; } } else { diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 84b9db4e9b..f5452f3cb0 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -168,7 +168,7 @@ int daObjSwLight_c::Create() { /* 80CF71F0-80CF7260 0002D0 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjSwLight_cFv */ int daObjSwLight_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(385, modelData != 0); + JUT_ASSERT(385, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mpModel == NULL ? 0 : 1; } diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index cebefc524a..4bdcd6517c 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -225,7 +225,7 @@ int daObjSwChain_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(532, modelData != 0); + JUT_ASSERT(532, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -233,7 +233,7 @@ int daObjSwChain_c::CreateHeap() { } mChainModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3); - JUT_ASSERT(545, mChainModelData != 0); + JUT_ASSERT(545, mChainModelData != NULL); return 1; } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index e21bd8cd4b..0b178c4342 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -2523,7 +2523,7 @@ void dScnKy_env_light_c::setLight() { #if DEBUG if (bloomInf0_p == NULL || bloomInf2_p == NULL || bloomInf1_p == NULL || bloomInf3_p == NULL) { - JUT_ASSERT(3839, 0); + JUT_ASSERT(3839, FALSE); } #endif @@ -6764,7 +6764,7 @@ void dKy_bgparts_activelight_set(LIGHT_INFLUENCE* light_inf_p, int bgpart_id) { memcpy(&g_env_light.bgparts_active_light[bgpart_id], light_inf_p, sizeof(LIGHT_INFLUENCE)); g_env_light.bgparts_active_light[bgpart_id].mIndex = bgpart_id + 1; } else { - JUT_ASSERT(13758, 0); + JUT_ASSERT(13758, FALSE); } } @@ -7186,7 +7186,7 @@ void dKy_set_nexttime(f32 next_time) { OS_REPORT("\n\n\nnext_time=[%f]\n\n\n", next_time); #if DEBUG if (next_time > 360.0f) { - JUT_ASSERT(14615, 0); + JUT_ASSERT(14615, FALSE); } #endif diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index cd54ce571f..38cc4363be 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -24,11 +24,12 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_machine_exception.h" #include "m_Do/m_Do_main.h" +#include "DynamicLink.h" /* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss None */ #if DEBUG u8 mDoMch::mDebugFill = true; -u8 mDoMch::mDebugFillNotuse = 0xDD; +u8 mDoMch::mDebugFillNotUse = 0xDD; u8 mDoMch::mDebugFillNew = 0xF7; u8 mDoMch::mDebugFillDelete = 0xDD; @@ -62,12 +63,153 @@ static int unknownHeapErrors; /* 80450C0C-80450C10 00010C 0004+00 1/1 0/0 0/0 .sbss heapErrors */ static u32 heapErrors; +#if VERSION != VERSION_GCN_PAL +/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ +GXRenderModeObj g_ntscZeldaIntDf = { + VI_TVMODE_NTSC_INT, + 608, + 448, + 448, + 27, + 16, + 666, + 448, + VI_XFBMODE_DF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {8, 8, 10, 12, 10, 8, 8}, +}; + +/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */ +GXRenderModeObj g_ntscZeldaProg = { + VI_TVMODE_NTSC_PROG, + 608, + 448, + 448, + 27, + 16, + 666, + 448, + VI_XFBMODE_SF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {0, 0, 21, 22, 21, 0, 0}, +}; +#else +/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ +GXRenderModeObj g_ntscZeldaIntDf = { + VI_TVMODE_PAL_INT, + 608, + 448, + 538, + 25, + 18, + 670, + 538, + VI_XFBMODE_DF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {8, 8, 10, 12, 10, 8, 8}, +}; + +/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */ +GXRenderModeObj g_ntscZeldaProg = { + VI_TVMODE_EURGB60_INT, + 608, + 448, + 448, + 27, + 16, + 666, + 448, + VI_XFBMODE_DF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {8, 8, 10, 12, 10, 8, 8}, +}; +#endif + +#ifdef DEBUG +static void myGXVerifyCallback(GXWarningLevel, u32, const char*); + +GXRenderModeObj g_palZeldaProg60 = { + VI_TVMODE_EURGB60_PROG, + 640, 456, 456, 25, 12, 670, 456, + VI_XFBMODE_SF, 0, 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + { 8, 8, 10, 12, 10, 8, 8 }, +}; +#endif + +/* 804505A0-804505A8 -00001 0004+04 1/1 3/3 0/0 .sdata mRenderModeObj__15mDoMch_render_c + */ +GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf; + /* 8000B1EC-8000B3EC 005B2C 0200+00 2/2 0/0 0/0 .text myGetHeapTypeByString__FP7JKRHeap */ static const char* myGetHeapTypeByString(JKRHeap* p_heap) { static char tmpString[5]; - if (p_heap == JKRHeap::getSystemHeap()) { + if (p_heap == JKRGetSystemHeap()) { return "SystemHeap"; } @@ -416,135 +558,17 @@ static void dummy_string() { /* 8000BCF4-8000BCF8 006634 0004+00 1/1 0/0 0/0 .text my_PrintHeap__FPCcUl */ static void my_PrintHeap(char const* heapName, u32 heapSize) { - /* empty function */ + OS_REPORT("\x1b[32m%-24s = size=%d KB\n\x1b[m", heapName, heapSize / 1024); } /* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text my_SysPrintHeap__FPCcPvUl */ void my_SysPrintHeap(char const* message, void* start, u32 size) { + uintptr_t end = (uintptr_t)start + size; OSReport_System("\x1b[32m%-24s = %08x-%08x size=%d KB\n\x1b[m", message, start, - (uintptr_t)start + size, size / 1024); + end, size / 1024); } -#if VERSION != VERSION_GCN_PAL -/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ -extern GXRenderModeObj g_ntscZeldaIntDf = { - VI_TVMODE_NTSC_INT, - 608, - 448, - 448, - 27, - 16, - 666, - 448, - VI_XFBMODE_DF, - 0, - 0, - {{6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}}, - {8, 8, 10, 12, 10, 8, 8}, -}; - -/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */ -extern GXRenderModeObj g_ntscZeldaProg = { - VI_TVMODE_NTSC_PROG, - 608, - 448, - 448, - 27, - 16, - 666, - 448, - VI_XFBMODE_SF, - 0, - 0, - {{6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}}, - {0, 0, 21, 22, 21, 0, 0}, -}; -#else -/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ -extern GXRenderModeObj g_ntscZeldaIntDf = { - VI_TVMODE_PAL_INT, - 608, - 448, - 538, - 25, - 18, - 670, - 538, - VI_XFBMODE_DF, - 0, - 0, - {{6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}}, - {8, 8, 10, 12, 10, 8, 8}, -}; - -/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */ -extern GXRenderModeObj g_ntscZeldaProg = { - VI_TVMODE_EURGB60_INT, - 608, - 448, - 448, - 27, - 16, - 666, - 448, - VI_XFBMODE_DF, - 0, - 0, - {{6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}, - {6, 6}}, - {8, 8, 10, 12, 10, 8, 8}, -}; -#endif - -/* 804505A0-804505A8 -00001 0004+04 1/1 3/3 0/0 .sdata mRenderModeObj__15mDoMch_render_c - */ -GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf; - /* 8000BD44-8000C0CC 006684 0388+00 0/0 2/1 0/0 .text mDoMch_Create__Fv */ -// NONMATCHING - small regalloc int mDoMch_Create() { if (mDoMain::developmentMode == 0 || !(OSGetConsoleType() & 0x10000000)) { OSReportDisable(); @@ -552,7 +576,7 @@ int mDoMch_Create() { JKRHeap::setDefaultDebugFill(mDoMch::mDebugFill); #ifdef DEBUG - JKRSetDebugFillNotuse(mDoMch::mDebugFillNotuse); + JKRSetDebugFillNotuse(mDoMch::mDebugFillNotUse); JKRSetDebugFillNew(mDoMch::mDebugFillNew); JKRSetDebugFillDelete(mDoMch::mDebugFillDelete); #endif @@ -574,31 +598,98 @@ int mDoMch_Create() { arenaSize += mDoMain::memMargin; } - #ifdef DEBUG - u32 uVar14 = 0xf20c00; - u32 local_1c = 0x74e000; - if (mDoMain::archiveHeapSize == -1) { - mDoMain::archiveHeapSize = 0x106ec00; - } else { - OSReport_Error("アーカイブヒープサイズ指定！\n"); - uVar14 = mDoMain::archiveHeapSize; - } - if (mDoMain::gameHeapSize == -1) { - mDoMain::gameHeapSize = 0x74e000; - } else { - OSReport_Error("ゲームヒープサイズ指定！\n"); - local_1c = mDoMain::gameHeapSize; - } + JKRHeap* heap; // sp4C + u32 archiveHeapSize; // r30 + u32 j2dHeapSize; // sp48 + u32 gameHeapSize; // sp44 + u32 commandHeapSize; // sp40 + u32 dynamicLinkHeapSize; // sp3C + u32 dbPrintHeapSize; // sp38 + dbPrintHeapSize = 0x1800; + commandHeapSize = 0x1000; + gameHeapSize = 0x400000; + archiveHeapSize = 0x740000; + archiveHeapSize += 0xED000; + archiveHeapSize += 0xA0000; + gameHeapSize += 0x4E000; + archiveHeapSize += 0x30000; + archiveHeapSize += 0x2000; + archiveHeapSize += 0x4B000; + archiveHeapSize -= 0xC0000; + archiveHeapSize += 0x4800; + j2dHeapSize = 0xBB800; + archiveHeapSize += 0x10000; + archiveHeapSize += 0x2400; + archiveHeapSize += 0x80000; + archiveHeapSize += 0x100000; + archiveHeapSize += 0x400000; + archiveHeapSize += 0x100000; + gameHeapSize += 0x200000; + gameHeapSize += 0x100000; + dynamicLinkHeapSize = 0x180000; + + #ifndef DEBUG + // Fakematch because the heap sizes differ between debug and retail. + // Maybe the actual calculations above use sizeof or constants and that's why it's different? + archiveHeapSize -= 0x641800; + j2dHeapSize -= 0x3E800; + gameHeapSize -= 0x300000; + #endif + #if VERSION == VERSION_GCN_JPN + archiveHeapSize += 0x6C00; + gameHeapSize += 0xC800; #endif - JFWSystem::setSysHeapSize(arenaSize - 0xDACD30); - my_PrintHeap("システムヒープ", arenaSize - 0xDACD30); + #ifdef DEBUG + if (mDoMain::archiveHeapSize != -1) { + OSReport_Error("アーカイブヒープサイズ指定！\n"); + archiveHeapSize = mDoMain::archiveHeapSize; + } else { + mDoMain::archiveHeapSize = archiveHeapSize + 0x14E000; + } + if (mDoMain::gameHeapSize != -1) { + OSReport_Error("ゲームヒープサイズ指定！\n"); + gameHeapSize = mDoMain::gameHeapSize; + } else { + mDoMain::gameHeapSize = gameHeapSize; + } + arenaSize -= dynamicLinkHeapSize; + arenaSize -= gameHeapSize + commandHeapSize; + #endif + + arenaSize -= (dbPrintHeapSize + 0x10); + arenaSize -= 0x120; + #ifndef DEBUG + arenaSize -= 0xDAB400; + #endif + #if VERSION == VERSION_GCN_JPN + arenaSize -= 0x6C00; + arenaSize -= 0xC800; + #endif + JFWSystem::setSysHeapSize(arenaSize); + my_PrintHeap("システムヒープ", arenaSize); + + if (arenaSize) { + // Fakematch to force arenaSize into a register for debug. + } JFWSystem::setFifoBufSize(0xA0000); + #ifdef DEBUG + JFWSystem::setAramAudioBufSize(0xB00000); + #else JFWSystem::setAramAudioBufSize(0xA00000); + #endif JFWSystem::setAramGraphBufSize(-1); - #if VERSION != VERSION_GCN_PAL + #ifdef DEBUG + VIInit(); + if (VIGetDTVStatus() != 0 && mDoMch_IsProgressiveMode()) { + mDoMch_render_c::setProgressiveMode(); + OSReport("=== プログレッシブモードです ===\n"); + } else if (VIGetTvFormat() == 5) { + mDoMch_render_c::setRenderModeObj(&g_palZeldaProg60); + } + #elif VERSION != VERSION_GCN_PAL if ((OSGetResetCode() >> 31) == 0) { if (VIGetDTVStatus() == 0) { OSSetProgressiveMode(0); @@ -620,8 +711,9 @@ int mDoMch_Create() { JFWSystem::setRenderMode(mDoMch_render_c::getRenderModeObj()); JFWSystem::firstInit(); - JUTDbPrint::start(NULL, mDoExt_createDbPrintHeap(0x1800, JKRHeap::getRootHeap())); - mDoExt_createAssertHeap(JKRHeap::getRootHeap()); + JKRExpHeap* dbPrintHeap = mDoExt_createDbPrintHeap(dbPrintHeapSize, JKRGetRootHeap()); + JUTDbPrint::start(NULL, dbPrintHeap); + mDoExt_createAssertHeap(JKRGetRootHeap()); JFWSystem::init(); if (mDoMain::developmentMode == 0) { @@ -629,48 +721,90 @@ int mDoMch_Create() { JUTDbPrint::getManager()->setVisible(false); } - JKRHeap::setErrorHandler(myMemoryErrorRoutine); - JKRHeap::getRootHeap()->setErrorFlag(true); - JFWSystem::getSystemHeap()->setErrorFlag(true); + JKRSetErrorHandler(myMemoryErrorRoutine); + JKRSetErrorFlag(JKRHeap::getRootHeap(), true); + JKRSetErrorFlag(JFWSystem::getSystemHeap(), true); + + JKRHeap* rootHeap = (JKRHeap*)JKRGetRootHeap(); + #ifdef DEBUG + JKRHeap* rootHeap2 = JKRGetRootHeap2(); + #else + JKRHeap* rootHeap2 = rootHeap; + #endif - JKRHeap* rootHeap = JKRGetRootHeap(); // Command Heap size: 4 KB - my_SysPrintHeap("コマンドヒープ", mDoExt_createCommandHeap(0x1000, rootHeap), 0x1000); + heap = mDoExt_createCommandHeap(commandHeapSize, rootHeap); + my_SysPrintHeap("コマンドヒープ", heap, commandHeapSize); + + #ifdef DEBUG + heap = DynamicModuleControlBase::createHeap(dynamicLinkHeapSize, rootHeap); + my_SysPrintHeap("ダイナミックリンクヒープ", heap, dynamicLinkHeapSize); + #endif // Archive Heap size: 9085 KB - my_SysPrintHeap("アーカイブヒープ", mDoExt_createArchiveHeap(0x8DF400, rootHeap), 0x8DF400); + heap = mDoExt_createArchiveHeap(archiveHeapSize, rootHeap2); + my_SysPrintHeap("アーカイブヒープ", heap, archiveHeapSize); // J2D Heap size: 500 KB - my_SysPrintHeap("Ｊ２Ｄ用ヒープ", mDoExt_createJ2dHeap(0x7D000, rootHeap), 0x7D000); + heap = mDoExt_createJ2dHeap(j2dHeapSize, rootHeap2); + my_SysPrintHeap("Ｊ２Ｄ用ヒープ", heap, j2dHeapSize); // Game Heap size: 4408 KB - my_SysPrintHeap("ゲームヒープ", mDoExt_createGameHeap(0x44E000, rootHeap), 0x44E000); + heap = mDoExt_createGameHeap(gameHeapSize, rootHeap); + my_SysPrintHeap("ゲームヒープ", heap, gameHeapSize); - JKRHeap* sysHeap = JKRGetSystemHeap(); - u32 zeldaHeapSize = sysHeap->getFreeSize() - 0x10000; - JKRHeap* zeldaHeap = mDoExt_createZeldaHeap(zeldaHeapSize, sysHeap); - my_SysPrintHeap("ゼルダヒープ", zeldaHeap, zeldaHeapSize); - zeldaHeap->becomeCurrentHeap(); + #ifdef DEBUG + JKRHeap* sp28 = rootHeap2; + u32 hostIOHeapSize = 0x71450; + hostIOHeapSize += 0x32000; + JKRHeap* hostIOHeap = mDoExt_createHostIOHeap(hostIOHeapSize, sp28); + my_SysPrintHeap("HostIOヒープ", hostIOHeap, hostIOHeapSize); + #endif - JKRAramStream::setTransBuffer(NULL, 0x2000, JKRGetSystemHeap()); + JKRHeap* systemHeap = JKRGetSystemHeap(); + s32 size = systemHeap->getFreeSize(); + size -= 0x10000; + JUT_ASSERT(1549, size > 0); + JKRHeap* zeldaHeap = mDoExt_createZeldaHeap(size, systemHeap); + my_SysPrintHeap("ゼルダヒープ", zeldaHeap, size); + JKRSetCurrentHeap(zeldaHeap); + + #ifdef DEBUG + my_PrintHeap("システムヒープ", JKRGetSystemHeap()->getTotalFreeSize()); + my_PrintHeap("ルートヒープ", JKRGetRootHeap()->getTotalFreeSize()); + my_PrintHeap("ルートヒープ2", JKRGetRootHeap2()->getTotalFreeSize()); + #endif + + JKRSetAramTransferBuffer(NULL, 0x2000, JKRGetSystemHeap()); JKRThreadSwitch::createManager(NULL); + { // Fakematch to fix stack on debug, unsure where this block is supposed to go JKRThread* thread = new JKRThread(OSGetCurrentThread(), 0); + } JUTConsole* sysConsole = JFWSystem::getSystemConsole(); sysConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); sysConsole->setPosition(16, 42); +#ifdef DEBUG + JUTException::setMapFile("/map/RVL/Debug/RframeworkD.map"); +#else JUTException::appendMapFile("/map/Final/Release/frameworkF.map"); +#endif JUTException::setPreUserCallback(myExceptionCallback); JUTException::setPostUserCallback(fault_callback_scroll); cMl::init(mDoExt_getZeldaHeap()); cM_initRnd(100, 100, 100); + #ifdef DEBUG + GXSetVerifyLevel((GXWarningLevel)mDoMch::GXWarningLevel); + GXSetVerifyCallback((GXVerifyCallback)&myGXVerifyCallback); + #endif JKRDvdRipper::setSZSBufferSize(0x4000); JKRDvdAramRipper::setSZSBufferSize(0x4000); JKRAram::setSZSBufferSize(0x2000); mDoDvdThd::create(OSGetThreadPriority(OSGetCurrentThread()) - 2); mDoDvdErr_ThdInit(); mDoMemCd_ThdInit(); + return 1; } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 0d90e64ebd..a717a82424 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -500,7 +500,7 @@ void mDoMain_HIO_c::listenPropertyEvent(const JORPropertyEvent* property) { } } - JKRSetDebugFillNotuse(mDoMch::mDebugFillNotuse); + JKRSetDebugFillNotuse(mDoMch::mDebugFillNotUse); JKRSetDebugFillNew(mDoMch::mDebugFillNew); JKRSetDebugFillDelete(mDoMch::mDebugFillDelete); } @@ -977,91 +977,114 @@ bool JKRHeap::dump_sort() { /* ############################################################################################## */ /* 80450B38-80450B3C 000038 0004+00 0/0 2/2 0/0 .sbss * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ +template<> Z2WolfHowlMgr* JASGlobalInstance::sInstance; /* 80450B3C-80450B40 00003C 0004+00 0/0 6/6 0/0 .sbss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> */ +template<> Z2EnvSeMgr* JASGlobalInstance::sInstance; /* 80450B40-80450B44 000040 0004+00 0/0 6/6 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2FxLineMgr> */ +template<> Z2FxLineMgr* JASGlobalInstance::sInstance; /* 80450B44-80450B48 000044 0004+00 0/0 18/18 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2Audience> */ +template<> Z2Audience* JASGlobalInstance::sInstance; /* 80450B48-80450B4C 000048 0004+00 0/0 17/17 0/0 .sbss * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ +template<> Z2SoundObjMgr* JASGlobalInstance::sInstance; /* 80450B4C-80450B50 00004C 0004+00 0/0 10/10 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2SoundInfo> */ +template<> Z2SoundInfo* JASGlobalInstance::sInstance; /* 80450B50-80450B54 000050 0004+00 0/0 5/5 0/0 .sbss * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ +template<> JAUSoundInfo* JASGlobalInstance::sInstance; /* 80450B54-80450B58 000054 0004+00 0/0 2/2 0/0 .sbss * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ +template<> JAUSoundNameTable* JASGlobalInstance::sInstance; /* 80450B58-80450B5C 000058 0004+00 0/0 12/12 0/0 .sbss * sInstance__34JASGlobalInstance<13JAUSoundTable> */ +template<> JAUSoundTable* JASGlobalInstance::sInstance; /* 80450B5C-80450B60 00005C 0004+00 0/0 6/6 0/0 .sbss * sInstance__33JASGlobalInstance<12JAISoundInfo> */ +template<> JAISoundInfo* JASGlobalInstance::sInstance; /* 80450B60-80450B64 000060 0004+00 0/0 29/29 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2SoundMgr> */ +template<> Z2SoundMgr* JASGlobalInstance::sInstance; /* 80450B64-80450B68 000064 0004+00 0/0 2/2 0/0 .sbss * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ +template<> JAIStreamMgr* JASGlobalInstance::sInstance; /* 80450B68-80450B6C 000068 0004+00 0/0 3/3 0/0 .sbss sInstance__29JASGlobalInstance<9JAISeqMgr> */ +template<> JAISeqMgr* JASGlobalInstance::sInstance; /* 80450B6C-80450B70 00006C 0004+00 0/0 4/4 0/0 .sbss sInstance__28JASGlobalInstance<8JAISeMgr> */ +template<> JAISeMgr* JASGlobalInstance::sInstance; /* 80450B70-80450B74 000070 0004+00 0/0 9/9 0/0 .sbss * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ +template<> Z2SpeechMgr2* JASGlobalInstance::sInstance; /* 80450B74-80450B78 000074 0004+00 0/0 22/22 0/0 .sbss * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ +template<> Z2SoundStarter* JASGlobalInstance::sInstance; /* 80450B78-80450B7C 000078 0004+00 0/0 2/2 0/0 .sbss * sInstance__36JASGlobalInstance<15JAISoundStarter> */ +template<> JAISoundStarter* JASGlobalInstance::sInstance; /* 80450B7C-80450B80 00007C 0004+00 0/0 34/34 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2StatusMgr> */ +template<> Z2StatusMgr* JASGlobalInstance::sInstance; /* 80450B80-80450B84 000080 0004+00 0/0 46/46 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2SceneMgr> */ +template<> Z2SceneMgr* JASGlobalInstance::sInstance; /* 80450B84-80450B88 000084 0004+00 0/0 38/38 0/0 .sbss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ +template<> Z2SeqMgr* JASGlobalInstance::sInstance; /* 80450B88-80450B8C 000088 0004+00 0/0 25/25 0/0 .sbss sInstance__27JASGlobalInstance<7Z2SeMgr> */ +template<> Z2SeMgr* JASGlobalInstance::sInstance; /* 80450B8C-80450B90 00008C 0004+00 0/0 6/6 0/0 .sbss * sInstance__35JASGlobalInstance<14JASAudioThread> */ +template<> JASAudioThread* JASGlobalInstance::sInstance; /* 80450B90-80450B98 000090 0004+04 0/0 4/4 0/0 .sbss * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ +template<> JASDefaultBankTable* JASGlobalInstance::sInstance;